Reorganize src (#21)

* Move html files into own directory * Reorganize src
openzipkin · Sep 5, 2017 · 58c1ed7 · 58c1ed7
1 parent 2c6354a
commit 58c1ed7
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 27 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,6 +7,9 @@
     "browser": true,
     "shared-node-browser": true
   },
+  "globals": {
+    "browser": false
+  },
   "rules": {
     "react/jsx-filename-extension": "off",
     "class-methods-use-this": "off",
@@ -16,17 +19,11 @@
     "prettier/prettier": ["error", { "singleQuote": true, "trailingComma": "all" }]
   },
   "overrides": [
-    {
-      "files": "vendor/**/*",
-      "globals": {
-        "browser": false
-      }
-    },
     {
       "files": "test/**/*",
       "env": {
         "jest": true
       }
     }
   ]
-}
+}
diff --git a/vendor/background.js → src/background.js b/vendor/background.js → src/background.js
@@ -1,16 +1,15 @@
-import ExtensionToPanelPubsub from './ExtensionToPanelPubsub';
-import { RemoteStorageClient } from './RemoteStorage';
-import { RemoteSetIntervalClient } from './RemoteSetInterval';
-import ZipkinPlugin from '../js/ZipkinPlugin';
+import ExtensionToPanelPubsub from './lib/ExtensionToPanelPubsub';
+import { RemoteStorageClient } from './lib/RemoteStorage';
+import { RemoteSetIntervalClient } from './lib/RemoteSetInterval';
+import ZipkinPlugin from './lib/ZipkinPlugin';
 
-import attachBeforeSendHeadersListener from '../js/attachBeforeSendHeadersListener';
+import attachBeforeSendHeadersListener from './lib/attachBeforeSendHeadersListener';
 
 attachBeforeSendHeadersListener(browser.webRequest);
 
 const pubsub = new ExtensionToPanelPubsub(browser.runtime);
 const storage = new RemoteStorageClient(pubsub);
 const remoteSetInterval = new RemoteSetIntervalClient(pubsub);
-
 // eslint-disable-next-line no-new
 new ZipkinPlugin({
   pubsub,

diff --git a/vendor/devtools.js → src/devtools.js b/vendor/devtools.js → src/devtools.js
diff --git a/vendor/devtools.html → src/html/devtools.html b/vendor/devtools.html → src/html/devtools.html
diff --git a/vendor/panel.html → src/html/panel.html b/vendor/panel.html → src/html/panel.html
diff --git a/img/icon64.png → src/img/icon64.png b/img/icon64.png → src/img/icon64.png
diff --git a/vendor/ExtensionToPanelPubsub.js → src/lib/ExtensionToPanelPubsub.js b/vendor/ExtensionToPanelPubsub.js → src/lib/ExtensionToPanelPubsub.js
@@ -1,4 +1,4 @@
-import Pubsub from '../js/Pubsub';
+import Pubsub from './Pubsub';
 
 export default class ExtensionToPanelPubsub extends Pubsub {
   constructor(browserRuntime) {

diff --git a/vendor/PanelToExtensionPubsub.js → src/lib/PanelToExtensionPubsub.js b/vendor/PanelToExtensionPubsub.js → src/lib/PanelToExtensionPubsub.js
@@ -1,4 +1,4 @@
-import Pubsub from '../js/Pubsub';
+import Pubsub from './Pubsub';
 
 export default class PanelToExtensionPubsub extends Pubsub {
   constructor() {

diff --git a/vendor/PluginStorage.js → src/lib/PluginStorage.js b/vendor/PluginStorage.js → src/lib/PluginStorage.js
diff --git a/js/Pubsub.js → src/lib/Pubsub.js b/js/Pubsub.js → src/lib/Pubsub.js
diff --git a/vendor/RemoteSetInterval.js → src/lib/RemoteSetInterval.js b/vendor/RemoteSetInterval.js → src/lib/RemoteSetInterval.js
diff --git a/vendor/RemoteStorage.js → src/lib/RemoteStorage.js b/vendor/RemoteStorage.js → src/lib/RemoteStorage.js
diff --git a/js/ZipkinPanel.js → src/lib/ZipkinPanel.js b/js/ZipkinPanel.js → src/lib/ZipkinPanel.js
diff --git a/js/ZipkinPlugin.js → src/lib/ZipkinPlugin.js b/js/ZipkinPlugin.js → src/lib/ZipkinPlugin.js
diff --git a/js/addNetworkEvents.js → src/lib/addNetworkEvents.js b/js/addNetworkEvents.js → src/lib/addNetworkEvents.js
diff --git a/js/attachBeforeSendHeadersListener.js → src/lib/attachBeforeSendHeadersListener.js b/js/attachBeforeSendHeadersListener.js → src/lib/attachBeforeSendHeadersListener.js
diff --git a/js/checkZipkinUI.js → src/lib/checkZipkinUI.js b/js/checkZipkinUI.js → src/lib/checkZipkinUI.js
diff --git a/js/matchUrl.js → src/lib/matchUrl.js b/js/matchUrl.js → src/lib/matchUrl.js
diff --git a/js/zipkinUI.js → src/lib/zipkinUI.js b/js/zipkinUI.js → src/lib/zipkinUI.js
diff --git a/vendor/panel.js → src/panel.js b/vendor/panel.js → src/panel.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { render } from 'react-dom';
-import ZipkinPanel from '../js/ZipkinPanel';
-import PanelToExtensionPubsub from './PanelToExtensionPubsub';
-import PluginStorage from './PluginStorage';
-import { RemoteStorageServer } from './RemoteStorage';
-import addNetworkEvents from '../js/addNetworkEvents';
-import { RemoteSetIntervalServer } from './RemoteSetInterval';
+import ZipkinPanel from './lib/ZipkinPanel';
+import PanelToExtensionPubsub from './lib/PanelToExtensionPubsub';
+import PluginStorage from './lib/PluginStorage';
+import { RemoteStorageServer } from './lib/RemoteStorage';
+import addNetworkEvents from './lib/addNetworkEvents';
+import { RemoteSetIntervalServer } from './lib/RemoteSetInterval';
 
 const pubsub = new PanelToExtensionPubsub();
 addNetworkEvents(browser.devtools.network, pubsub);

diff --git a/test/matchUrl.test.js b/test/matchUrl.test.js
@@ -1,4 +1,4 @@
-const matchUrl = require('../js/matchUrl');
+const matchUrl = require('../src/lib/matchUrl');
 
 describe('urlMatcher', () => {
   it('should return null when no match is found', () => {

diff --git a/webpack.config.js b/webpack.config.js
@@ -6,9 +6,9 @@ const ZipPlugin = require('zip-webpack-plugin');
 
 module.exports = {
   entry: {
-    background: './vendor/background.js',
-    devtools: './vendor/devtools.js',
-    panel: './vendor/panel.js',
+    background: './src/background.js',
+    devtools: './src/devtools.js',
+    panel: './src/panel.js',
   },
   output: {
     filename: '[name].bundle.js',
@@ -27,8 +27,8 @@ module.exports = {
   plugins: [
     new ChromeDevPlugin(),
     new CopyWebpackPlugin([
-      { context: path.join(__dirname, 'vendor'), from: '*.html' },
-      { context: path.join(__dirname, 'img'), from: '*' },
+      { context: path.join(__dirname, 'src/html'), from: '*' },
+      { context: path.join(__dirname, 'src/img'), from: '*' },
       { from: require.resolve('webextension-polyfill') },
     ]),
     new ZipPlugin({