Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit build to correct webpack imports #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules/
dist/
lib/

.idea/
yarn.lock
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
assets
deploy
docs
node_modules
9 changes: 0 additions & 9 deletions index.js

This file was deleted.

22 changes: 9 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"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"
Expand All @@ -31,20 +28,19 @@
},
"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",
"vinyl-buffer": "^1.0.0",
"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"
}
Expand Down
6 changes: 6 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const Instascan = {
Scanner: require('./scanner'),
Camera: require('./camera')
};

module.exports = Instascan;
2 changes: 1 addition & 1 deletion src/scanner.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
File renamed without changes.