Skip to content

Commit

Permalink
refactor: use absolute paths for ts imports
Browse files Browse the repository at this point in the history
The tsconfig.json file already defined ~ as the project root so the imports just needed to be
changed. It should make refactoring a little easier in the future.
  • Loading branch information
NoxHarmonium committed Oct 1, 2019
1 parent 3cc9caa commit 7e622ea
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions src/app/background.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { browser, Runtime } from "webextension-polyfill-ts";
import { messages } from "./constants";
import { resetTab, toggleDiffOnTab } from "./messenging";
import { Message } from "./types/messenging";
import { messages } from "~app/constants";
import { resetTab, toggleDiffOnTab } from "~app/messenging";
import { Message } from "~app/types/messenging";

const tabEnabledSet = new Set();

Expand Down
14 changes: 7 additions & 7 deletions src/app/main.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { browser, Runtime } from "webextension-polyfill-ts";
import "../scss/extension.scss";
import { messages } from "./constants";
import { setTabSupportsMulePreview } from "./messenging";
import { isDiffMode, stopDiff, toggleDiff } from "./modes/diff";
import { isPreviewMode, togglePreview } from "./modes/preview";
import { messages } from "~app/constants";
import { setTabSupportsMulePreview } from "~app/messenging";
import { isDiffMode, stopDiff, toggleDiff } from "~app/modes/diff";
import { isPreviewMode, togglePreview } from "~app/modes/preview";
import {
getBitbucketDiffElement,
getBitbucketFilePreviewElement,
isRunningInBitbucket
} from "./scms/bitbucket/ui";
import { Message } from "./types/messenging";
} from "~app/scms/bitbucket/ui";
import { Message } from "~app/types/messenging";
import "../scss/extension.scss";

const bitbucketPollPeriod = 1000; // ms
const timeout = bitbucketPollPeriod * 10; // ms
Expand Down
4 changes: 2 additions & 2 deletions src/app/messenging.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { browser } from "webextension-polyfill-ts";
import { messages } from "./constants";
import { Message } from "./types/messenging";
import { messages } from "~app/constants";
import { Message } from "~app/types/messenging";

const sendMessageRobust = async (currentTabId: number, message: Message) =>
browser.tabs.sendMessage(currentTabId, message).catch((error: unknown) => {
Expand Down
6 changes: 3 additions & 3 deletions src/app/modes/diff.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { MulePreviewDiffContent } from "@agiledigital/mule-preview";
import * as React from "react";
import * as ReactDOM from "react-dom";
import { browser } from "webextension-polyfill-ts";
import { getFileContentFromDiff } from "~app/scms/bitbucket/fetch";
import { DiffContent } from "~app/scms/bitbucket/types";
import { getBitbucketData } from "~app/scms/bitbucket/ui";
import { ScraperResponse } from "~app/types/scraper";
import { getFileContentFromDiff } from "../scms/bitbucket/fetch";
import { getBitbucketData } from "../scms/bitbucket/ui";
import { createContainerElement, getMulePreviewElement } from "../ui";
import { createContainerElement, getMulePreviewElement } from "~app/ui";

const handleBitbucketData = (bitbucketData: ScraperResponse) => {
if (!bitbucketData.valid) {
Expand Down
4 changes: 2 additions & 2 deletions src/app/modes/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import fetch from "cross-fetch";
import * as React from "react";
import * as ReactDOM from "react-dom";
import { browser } from "webextension-polyfill-ts";
import { getFileRawUrlFromContentView } from "../scms/bitbucket/ui";
import { createContainerElement, getMulePreviewElement } from "../ui";
import { getFileRawUrlFromContentView } from "~app/scms/bitbucket/ui";
import { createContainerElement, getMulePreviewElement } from "~app/ui";

const startPreview = () => {
if (getMulePreviewElement() !== null) {
Expand Down
2 changes: 1 addition & 1 deletion src/app/scms/bitbucket/fetch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fetch from "cross-fetch";
import { Change, ChangesResponse, DiffContent } from "~app/scms/bitbucket/types";
import { ValidScraperResponse } from "~app/types/scraper";
import { Change, ChangesResponse, DiffContent } from "./types";

/**
* Functions to fetch files from Bitbucket to preview and diff
Expand Down
4 changes: 2 additions & 2 deletions src/app/scms/bitbucket/ui.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { browser } from "webextension-polyfill-ts";
import { messages } from "~app/constants";
import { injectScript } from "~app/inject";
import { ScraperResponse } from "~app/types/scraper";
import { messages } from "../../constants";
import { injectScript } from "../../inject";

/**
* Functions to get the state of the Bitbucket UI
Expand Down
6 changes: 3 additions & 3 deletions src/app/scraper.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { messages } from "./constants";
import { messages } from "~app/constants";
import {
CommonPageState,
DiffPageState,
PullRequestPageState
} from "./scms/bitbucket/types";
import { DiffDetails, ScraperResponse } from "./types/scraper";
} from "~app/scms/bitbucket/types";
import { DiffDetails, ScraperResponse } from "~app/types/scraper";

// Note: Code in this file has to be injected into the target
// browser so it should be free of dependencies and small as possible
Expand Down

0 comments on commit 7e622ea

Please sign in to comment.