From 4fb576687766473728cb7d213569a0ca42d6ad87 Mon Sep 17 00:00:00 2001 From: Paco Date: Mon, 24 Jul 2017 19:08:35 +0200 Subject: [PATCH 1/2] Edit build to correct webpack imports --- .gitignore | 2 +- .npmignore | 4 ++++ index.js | 9 --------- package.json | 24 ++++++++++-------------- src/index.js | 6 ++++++ src/scanner.js | 2 +- {src => vendor}/zxing.js | 0 7 files changed, 22 insertions(+), 25 deletions(-) create mode 100644 .npmignore delete mode 100644 index.js create mode 100644 src/index.js rename {src => vendor}/zxing.js (100%) diff --git a/.gitignore b/.gitignore index 84c0a57d..7a8b401b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ node_modules/ -dist/ +lib/ .idea/ yarn.lock diff --git a/.npmignore b/.npmignore new file mode 100644 index 00000000..60ffa775 --- /dev/null +++ b/.npmignore @@ -0,0 +1,4 @@ +assets +deploy +docs +node_modules diff --git a/index.js b/index.js deleted file mode 100644 index 128d4fc5..00000000 --- a/index.js +++ /dev/null @@ -1,9 +0,0 @@ -require('babel-polyfill'); -require('webrtc-adapter'); - -var Instascan = { - Scanner: require('./src/scanner'), - Camera: require('./src/camera') -}; - -module.exports = Instascan; diff --git a/package.json b/package.json index 87e86c81..761c3005 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,15 @@ { "name": "instascan", - "version": "1.0.0", + "version": "1.0.1", "description": "Webcam-driven QR code scanner.", - "main": "index.js", + "main": "lib/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "babel --plugins transform-runtime --no-babelrc src --out-dir lib --presets=env" }, - "files": [ - "src/", - "index.js" - ], "repository": { "type": "git", - "url": "git+https://github.com/schmich/instascan.git" + "url": "git+https://github.com/pakokrew/instascan.git" }, "keywords": [ "qr", @@ -31,11 +28,7 @@ }, "homepage": "https://github.com/schmich/instascan", "devDependencies": { - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-plugin-transform-regenerator": "^6.9.0", - "babel-preset-es2015": "^6.9.0", - "babelify": "^7.3.0", - "browserify": "^13.0.1", + "babel-plugin-transform-runtime": "^6.23.0", "gulp": "^3.9.1", "gulp-rename": "^1.2.2", "gulp-uglify": "^1.5.4", @@ -43,8 +36,11 @@ "vinyl-source-stream": "^1.1.0" }, "dependencies": { - "babel-polyfill": "^6.9.1", + "babel-cli": "^6.24.1", + "babel-preset-env": "^1.6.0", + "babel-runtime": "^6.23.0", "fsm-as-promised": "^0.13.0", + "regenerator-runtime": "^0.10.5", "visibilityjs": "^1.2.3", "webrtc-adapter": "^1.4.0" } diff --git a/src/index.js b/src/index.js new file mode 100644 index 00000000..c5cf2372 --- /dev/null +++ b/src/index.js @@ -0,0 +1,6 @@ +const Instascan = { + Scanner: require('./scanner'), + Camera: require('./camera') +}; + +module.exports = Instascan; diff --git a/src/scanner.js b/src/scanner.js index 1e2f169f..ca7bb3a4 100644 --- a/src/scanner.js +++ b/src/scanner.js @@ -1,5 +1,5 @@ const EventEmitter = require('events'); -const ZXing = require('./zxing')(); +const ZXing = require('../vendor/zxing')(); const Visibility = require('visibilityjs'); const StateMachine = require('fsm-as-promised'); diff --git a/src/zxing.js b/vendor/zxing.js similarity index 100% rename from src/zxing.js rename to vendor/zxing.js From be864591a0cc8b2e0e536145da91e46e564c1d3f Mon Sep 17 00:00:00 2001 From: Paco Date: Mon, 24 Jul 2017 19:10:21 +0200 Subject: [PATCH 2/2] back to good repo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 761c3005..ae2cb430 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/pakokrew/instascan.git" + "url": "git+https://github.com/schmich/instascan.git" }, "keywords": [ "qr",