Moved web extension api related parts to a separate folder

mozilla · Mar 26, 2018 · bb72c7a · bb72c7a
1 parent bf4baab
commit bb72c7a
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "pretest-addon:run": "npm run pretest",
     "test": "FIREFOX_BINARY=${FIREFOX_BINARY:-firefox} XPI_NAME=test-addon/dist/shield_utils_test_add-on-1.0.0.zip mocha test-addon/test/functional/ --bail",
     "test-addon:build": "cd test-addon && web-ext build",
-    "test-addon:bundle-utils": "mkdir -p test-addon/src/privileged/shieldUtils && cp dist/api.js test-addon/src/privileged/shieldUtils/api.js && cp schema.json test-addon/src/privileged/shieldUtils/schema.json",
+    "test-addon:bundle-utils": "mkdir -p test-addon/src/privileged/shieldUtils && cp webExtensionApi/dist/api.js test-addon/src/privileged/shieldUtils/api.js && cp webExtensionApi/schema.json test-addon/src/privileged/shieldUtils/schema.json",
     "test-addon:run": "cd test-addon && web-ext run --no-reload"
   }
 }
diff --git a/schema.json → webExtensionApi/schema.json b/schema.json → webExtensionApi/schema.json
diff --git a/src/index.js → webExtensionApi/src/index.js b/src/index.js → webExtensionApi/src/index.js
diff --git a/src/schemas/index.js → webExtensionApi/src/schemas/index.js b/src/schemas/index.js → webExtensionApi/src/schemas/index.js
diff --git a/src/schemas/schema.studySetup.json → ...ionApi/src/schemas/schema.studySetup.json b/src/schemas/schema.studySetup.json → ...ionApi/src/schemas/schema.studySetup.json
diff --git a/src/schemas/schema.webExtensionMsg.json → ...i/src/schemas/schema.webExtensionMsg.json b/src/schemas/schema.webExtensionMsg.json → ...i/src/schemas/schema.webExtensionMsg.json
diff --git a/src/schemas/schema.weightedVariations.json → ...rc/schemas/schema.weightedVariations.json b/src/schemas/schema.weightedVariations.json → ...rc/schemas/schema.weightedVariations.json
diff --git a/src/studyUtils.js → webExtensionApi/src/studyUtils.js b/src/studyUtils.js → webExtensionApi/src/studyUtils.js
@@ -18,7 +18,7 @@
 */
 const EXPORTED_SYMBOLS = ["studyUtils"];
 
-const UTILS_VERSION = require("../package.json").version;
+const UTILS_VERSION = require("../../package.json").version;
 const PACKET_VERSION = 3;
 
 const { utils: Cu } = Components;

diff --git a/src/studyUtilsBootstrap.js → webExtensionApi/src/studyUtilsBootstrap.js b/src/studyUtilsBootstrap.js → webExtensionApi/src/studyUtilsBootstrap.js
diff --git a/webpack.config.js b/webpack.config.js
@@ -2,9 +2,9 @@
 const path = require("path");
 
 module.exports = {
-  entry: "./src/index.js",
+  entry: "./webExtensionApi/src/index.js",
   output: {
-    path: path.resolve(__dirname, "dist"),
+    path: path.resolve(__dirname, "webExtensionApi/dist"),
     filename: "api.js",
     libraryTarget: "this", // Possible value - amd, commonjs, commonjs2, commonjs-module, this, var
   },