Drop browser-specific packages (OctoLinker#395)

* Drop browser-specific manifest.json * Drop browser-specific package
DevhanDod · Nov 8, 2017 · cc62ef3 · cc62ef3
1 parent 5c8c1b1
commit cc62ef3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,7 +22,7 @@ test_script:
   - node --version
   - npm --version
   # Make sure build works on Windows
-  - npm run package-all
+  - npm run package
   # run tests
   - set PHANTOMJS_BIN=C:\ProgramData\chocolatey\bin\phantomjs.exe
   - appveyor-retry call npm test

diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
   - export PATH=$HOME/.yarn/bin:$PATH
 before_script:
   - ./packages/blob-reader/scripts/update-fixtures.sh
-  - npm run package-all
+  - npm run package
 script:
   - travis_retry npm test
 deploy:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ To build and run the extension follow these steps.
    * Chrome (Quickstart):
      1. `yarn chrome-open`
    * Chrome (Long Version):
-     1. To build the extension once run `yarn chrome-build` or `yarn chrome-watch` during development.
+     1. To build the extension once run `yarn build` or `yarn watch` during development.
      1. Load extension https://developer.chrome.com/extensions/getstarted#unpacked.
 
 [CSS]: https://github.com/OctoLinker/browser-extension/commit/ccbefb7

diff --git a/package.json b/package.json
@@ -11,19 +11,13 @@
     "test": "karma start",
     "test:watch": "karma start --no-single-run --auto-watch",
     "version": "json -I -f assets/manifest.json -e \"this.version='`json -f package.json version`'\" && git add assets/manifest.json",
-    "package-all": "npm-run-all chrome-pack firefox-pack && cp out/chrome-octolinker-$npm_package_version.zip out/opera-octolinker-$npm_package_version.zip",
-    "release": "webstore upload --source out/chrome-octolinker-$npm_package_version.zip --auto-publish",
-    "chrome-manifest": "mkdirp dist && json -e \"delete this.applications;\" < assets/manifest.json > dist/manifest.json",
-    "chrome-build": "npm run chrome-manifest && webpack",
-    "chrome-watch": "npm run chrome-manifest && webpack --watch",
-    "chrome-pack": "npm run chrome-build && mkdirp out && zip -rj out/chrome-octolinker-$npm_package_version.zip dist",
-    "chrome-open": "npm run chrome-build && npm run chrome-launch --",
+    "package": "npm run build && web-ext build --source-dir dist --artifacts-dir out --overwrite-dest",
+    "release": "webstore upload --source dist --auto-publish",
+    "build": "webpack",
+    "watch": "webpack --watch",
+    "chrome-open": "npm run build && npm run chrome-launch --",
     "chrome-launch": "./scripts/chrome-launch.js",
-    "firefox-manifest": "mkdirp dist && cp assets/manifest.json dist/manifest.json",
-    "firefox-build": "npm run firefox-manifest && webpack",
-    "firefox-watch": "npm run firefox-manifest && webpack --watch",
-    "firefox-pack": "npm run firefox-build && mkdirp out && zip -rj out/firefox-octolinker-$npm_package_version.zip dist/",
-    "firefox-open": "npm run firefox-build && npm run firefox-launch --",
+    "firefox-open": "npm run build && npm run firefox-launch --",
     "firefox-launch": "web-ext run --source-dir dist --pref startup.homepage_welcome_url=https://github.com/OctoLinker/browser-extension/blob/master/package.json"
   },
   "dependencies": {

diff --git a/webpack.config.js b/webpack.config.js
@@ -12,11 +12,7 @@ module.exports = {
     path: path.resolve(__dirname, 'dist'),
     filename: '[name].js',
   },
-  plugins: [
-    new CopyWebpackPlugin([{ from: 'assets' }], {
-      ignore: ['manifest.json'],
-    }),
-  ],
+  plugins: [new CopyWebpackPlugin([{ from: 'assets' }])],
   module: {
     rules: [
       {