Skip to content

Commit

Permalink
Merge pull request #4 from pofider/master
Browse files Browse the repository at this point in the history
migrate to jsreport 1.0
  • Loading branch information
bjrmatos authored Jul 2, 2016
2 parents c04709b + f7eece4 commit 0e1652a
Show file tree
Hide file tree
Showing 12 changed files with 110 additions and 336 deletions.
6 changes: 4 additions & 2 deletions .babelrc
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"
]
}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ bower_components
# compiled es5 code
lib

public/js/main.js
studio/main.js
studio/main.js.map

.idea
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
Expand Down
105 changes: 0 additions & 105 deletions public/js/electron.template.model.js

This file was deleted.

20 changes: 0 additions & 20 deletions public/js/electron.template.view.js

This file was deleted.

35 changes: 0 additions & 35 deletions public/js/main_dev.js

This file was deleted.

42 changes: 0 additions & 42 deletions public/js/main_embed_dev.js

This file was deleted.

62 changes: 0 additions & 62 deletions public/templates/electron-template.html

This file was deleted.

61 changes: 0 additions & 61 deletions public/templates/embed-electron-template.html

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 0e1652a

Please sign in to comment.