-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from pofider/master
migrate to jsreport 1.0
- Loading branch information
Showing
12 changed files
with
110 additions
and
336 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
{ | ||
"stage": 0, | ||
"loose": "all" | ||
"presets": ["es2015", "stage-0"], | ||
"plugins": [ | ||
"add-module-exports" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,4 +34,7 @@ bower_components | |
# compiled es5 code | ||
lib | ||
|
||
public/js/main.js | ||
studio/main.js | ||
studio/main.js.map | ||
|
||
.idea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,12 +6,12 @@ | |
"scripts": { | ||
"clean": "rimraf lib", | ||
"build": "babel src --out-dir lib", | ||
"optimize": "node node_modules/jsreport-express/tools/optimize.js", | ||
"build-studio": "jsreport-studio-build", | ||
"lint": "eslint src test", | ||
"install-electron-prebuilt": "npm install [email protected]", | ||
"pretest": "npm-run-all build", | ||
"test": "mocha test/test.js --timeout 7000", | ||
"prepublish": "npm-run-all lint clean optimize build" | ||
"test": "mocha test/test.js --timeout 7000 --compilers js:babel-register", | ||
"prepublish": "in-publish && jsreport-studio-build || not-in-publish && npm-run-all lint clean build" | ||
}, | ||
"author": { | ||
"name": "BJR Matos", | ||
|
@@ -31,21 +31,24 @@ | |
"dependencies": { | ||
"bluebird": "3.4.0", | ||
"electron-html-to": "2.1.1", | ||
"in-publish": "2.0.0", | ||
"lodash.pick": "4.2.1", | ||
"stream-to-array": "2.3.0" | ||
}, | ||
"devDependencies": { | ||
"babel": "5.8.34", | ||
"babel-cli": "6.10.1", | ||
"babel-plugin-add-module-exports": "0.2.1", | ||
"babel-preset-es2015": "6.9.0", | ||
"babel-preset-stage-0": "6.5.0", | ||
"babel-register": "6.9.0", | ||
"electron-prebuilt": "1.2.1", | ||
"eslint": "2.11.1", | ||
"eslint-config-airbnb-base": "3.0.1", | ||
"eslint-plugin-import": "1.8.1", | ||
"jsreport-core": "0.6.4", | ||
"jsreport-express": "0.3.2", | ||
"jsreport-templates": "0.3.0", | ||
"jsreport-core": "1.0.5", | ||
"jsreport-studio-dev": "1.0.0", | ||
"mocha": "2.5.3", | ||
"npm-run-all": "2.1.1", | ||
"requirejs": "2.2.0", | ||
"rimraf": "2.5.2", | ||
"should": "9.0.0" | ||
} | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
Oops, something went wrong.