Move UI components to ui/ directory

ext/src/main.ts

@@ -2,7 +2,7 @@
 
 import getBridgeInfo from "./lib/getBridgeInfo";
 import messageRouter from "./lib/messageRouter";
-import defaultOptions, { Options } from "./options/defaultOptions";
+import defaultOptions, { Options } from "./defaultOptions";
 
 import { getChromeUserAgent } from "./lib/userAgents";
 import { getWindowCenteredProps } from "./lib/utils";
@@ -365,7 +365,7 @@ async function openPopup (shimId: string) {
     const centeredProps = getWindowCenteredProps(win, 350, 200);
 
     const popup = await browser.windows.create({
-        url: "popup/index.html"
+        url: "ui/popup/index.html"
       , type: "popup"
       , ...centeredProps
     });

ext/src/manifest.json

@@ -32,7 +32,7 @@
   , "manifest_version": 2
 
   , "options_ui": {
-        "page": "options/index.html"
+        "page": "ui/options/index.html"
     }
   , "permissions": [
         "downloads"

ext/src/ui/options/Bridge.tsx

@@ -5,9 +5,9 @@ import React, { Component } from "react";
 import semver from "semver";
 
 import { getNextEllipsis
-       , getWindowCenteredProps } from "../lib/utils";
+       , getWindowCenteredProps } from "../../lib/utils";
 
-import { BridgeInfo } from "../lib/getBridgeInfo";
+import { BridgeInfo } from "../../lib/getBridgeInfo";
 
 const _ = browser.i18n.getMessage;
 

ext/src/ui/options/index.tsx

@@ -4,13 +4,13 @@
 import React, { Component } from "react";
 import ReactDOM from "react-dom";
 
-import defaultOptions, { Options } from "./defaultOptions";
+import defaultOptions, { Options } from "../../defaultOptions";
 
 import Bridge from "./Bridge";
 import EditableList from "./EditableList";
 
-import getBridgeInfo, { BridgeInfo } from "../lib/getBridgeInfo";
+import getBridgeInfo, { BridgeInfo } from "../../lib/getBridgeInfo";
-import { REMOTE_MATCH_PATTERN_REGEX } from "../lib/utils";
+import { REMOTE_MATCH_PATTERN_REGEX } from "../../lib/utils";
 
 
 const _ = browser.i18n.getMessage;

ext/src/ui/popup/index.tsx

@@ -4,8 +4,8 @@
 import React, { Component } from "react";
 import ReactDOM from "react-dom";
 
-import { getNextEllipsis } from "../lib/utils";
+import { getNextEllipsis } from "../../lib/utils";
-import * as types from "../types";
+import * as types from "../../types";
 
 const _ = browser.i18n.getMessage;
 

ext/src/ui/updater/index.tsx

@@ -3,8 +3,8 @@
 import React, { Component } from "react";
 import ReactDOM from "react-dom";
 
-import { getNextEllipsis } from "../lib/utils";
+import { getNextEllipsis } from "../../lib/utils";
-import { DownloadDelta, Message } from "../types";
+import { DownloadDelta, Message } from "../../types";
 
 const _ = browser.i18n.getMessage;
 

ext/webpack.config.js

@@ -7,9 +7,13 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 module.exports = (env) => ({
     entry: {
         "main": `${env.includePath}/main.ts`
-      , "popup/bundle": `${env.includePath}/popup/index.tsx`
+
-      , "options/bundle": `${env.includePath}/options/index.tsx`
+        // UI
-      , "updater/bundle": `${env.includePath}/updater/index.tsx`
+      , "ui/popup/bundle": `${env.includePath}/ui/popup/index.tsx`
+      , "ui/options/bundle": `${env.includePath}/ui/options/index.tsx`
+      , "ui/updater/bundle": `${env.includePath}/ui/updater/index.tsx`
+
+        // Sender apps
       , "mediaCast": `${env.includePath}/mediaCast.js`
       , "mirroringCast": `${env.includePath}/mirroringCast.js`