From f5eacd0e070d2ae6ea579f89fa978b5d52b7df3f Mon Sep 17 00:00:00 2001 From: David Fahlander Date: Thu, 17 Mar 2016 11:26:57 +0100 Subject: [PATCH] Renaming build to tools as conventional. Including addons in npm and bower package.json WIP for improved bower experience of #185 --- .npmignore | 6 +- addons/Dexie.Observable/.npmignore | 4 +- addons/Dexie.Observable/bower.json | 4 +- addons/Dexie.Observable/package.json | 4 +- .../{build => tools}/build.js | 6 +- .../{build => tools}/watch.js | 6 +- addons/Dexie.Syncable/bower.json | 4 +- addons/Dexie.Syncable/package.json | 4 +- .../Dexie.Syncable/{build => tools}/build.js | 2 +- .../Dexie.Syncable/{build => tools}/watch.js | 2 +- bower.json | 6 +- build/build.js | 40 ----------- build/watch.js | 33 --------- package.json | 4 +- {build => tools}/build-utils.js | 0 tools/build.js | 70 +++++++++++++++++++ {build => tools}/release.sh | 1 + tools/watch.js | 53 ++++++++++++++ 18 files changed, 142 insertions(+), 107 deletions(-) rename addons/Dexie.Observable/{build => tools}/build.js (65%) rename addons/Dexie.Observable/{build => tools}/watch.js (66%) rename addons/Dexie.Syncable/{build => tools}/build.js (90%) rename addons/Dexie.Syncable/{build => tools}/watch.js (89%) delete mode 100644 build/build.js delete mode 100644 build/watch.js rename {build => tools}/build-utils.js (100%) create mode 100644 tools/build.js rename {build => tools}/release.sh (99%) create mode 100644 tools/watch.js diff --git a/.npmignore b/.npmignore index d92e62db0..b9ae3e242 100644 --- a/.npmignore +++ b/.npmignore @@ -1,8 +1,4 @@ -addons/ -build/ -test/ +**/tmp/ samples/ -src/ -dist/README.md *.njsproj .* diff --git a/addons/Dexie.Observable/.npmignore b/addons/Dexie.Observable/.npmignore index 0b713e3d6..4c097fd3b 100644 --- a/addons/Dexie.Observable/.npmignore +++ b/addons/Dexie.Observable/.npmignore @@ -1,4 +1,2 @@ -src/ -test/ -build/ +tools/tmp .* diff --git a/addons/Dexie.Observable/bower.json b/addons/Dexie.Observable/bower.json index 2b2dbf8dd..1f5096d45 100644 --- a/addons/Dexie.Observable/bower.json +++ b/addons/Dexie.Observable/bower.json @@ -29,8 +29,6 @@ "license": "Apache-2.0", "ignore": [ "**/.*", - "src/", - "test/", - "build/" + "tools/tmp" ] } diff --git a/addons/Dexie.Observable/package.json b/addons/Dexie.Observable/package.json index 2e24ba622..45bfff74b 100644 --- a/addons/Dexie.Observable/package.json +++ b/addons/Dexie.Observable/package.json @@ -24,8 +24,8 @@ "url": "https://github.com/dfahlander/Dexie.js/issues" }, "scripts": { - "build": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator build/build.js", - "watch": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator build/watch.js" + "build": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator tools/build.js", + "watch": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator tools/watch.js" }, "homepage": "http://dexie.org", "dependencies": { diff --git a/addons/Dexie.Observable/build/build.js b/addons/Dexie.Observable/tools/build.js similarity index 65% rename from addons/Dexie.Observable/build/build.js rename to addons/Dexie.Observable/tools/build.js index ec27cc03f..2410b9acd 100644 --- a/addons/Dexie.Observable/build/build.js +++ b/addons/Dexie.Observable/tools/build.js @@ -1,4 +1,4 @@ -import {build} from '../../../build/build-utils'; +import {build} from '../../../tools/build-utils'; console.log("Building..."); @@ -9,9 +9,7 @@ build([{ "dist/dexie-observable.js", "dist/dexie-observable.js.map", "dist/dexie-observable.min.js", - "dist/dexie-observable.min.js.map", - "dist/dexie-observable.es6.js", - "dist/dexie-observable.es6.js.map" + "dist/dexie-observable.min.js.map" ] } }]).then(()=> { diff --git a/addons/Dexie.Observable/build/watch.js b/addons/Dexie.Observable/tools/watch.js similarity index 66% rename from addons/Dexie.Observable/build/watch.js rename to addons/Dexie.Observable/tools/watch.js index 4eb412775..321980342 100644 --- a/addons/Dexie.Observable/build/watch.js +++ b/addons/Dexie.Observable/tools/watch.js @@ -1,4 +1,4 @@ -import {buildAndWatch} from '../../../build/build-utils'; +import {buildAndWatch} from '../../../tools/build-utils'; console.log("Building..."); @@ -9,9 +9,7 @@ buildAndWatch([{ "dist/dexie-observable.js", "dist/dexie-observable.js.map", "dist/dexie-observable.min.js", - "dist/dexie-observable.min.js.map", - "dist/dexie-observable.es6.js", - "dist/dexie-observable.es6.js.map" + "dist/dexie-observable.min.js.map" ] } }]).then(()=> { diff --git a/addons/Dexie.Syncable/bower.json b/addons/Dexie.Syncable/bower.json index 91fa6b711..59b4920ef 100644 --- a/addons/Dexie.Syncable/bower.json +++ b/addons/Dexie.Syncable/bower.json @@ -30,8 +30,6 @@ "license": "Apache-2.0", "ignore": [ "**/.*", - "src/", - "test/", - "build/" + "tools/tmp" ] } diff --git a/addons/Dexie.Syncable/package.json b/addons/Dexie.Syncable/package.json index 4899acf87..691302116 100644 --- a/addons/Dexie.Syncable/package.json +++ b/addons/Dexie.Syncable/package.json @@ -25,8 +25,8 @@ "url": "https://github.com/dfahlander/Dexie.js/issues" }, "scripts": { - "build": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator build/build.js", - "watch": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator build/watch.js" + "build": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator tools/build.js", + "watch": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator tools/watch.js" }, "homepage": "http://dexie.org", "dependencies": { diff --git a/addons/Dexie.Syncable/build/build.js b/addons/Dexie.Syncable/tools/build.js similarity index 90% rename from addons/Dexie.Syncable/build/build.js rename to addons/Dexie.Syncable/tools/build.js index b5515e712..6ff8cec81 100644 --- a/addons/Dexie.Syncable/build/build.js +++ b/addons/Dexie.Syncable/tools/build.js @@ -1,4 +1,4 @@ -import {build} from '../../../build/build-utils'; +import {build} from '../../../tools/build-utils'; console.log("Building..."); diff --git a/addons/Dexie.Syncable/build/watch.js b/addons/Dexie.Syncable/tools/watch.js similarity index 89% rename from addons/Dexie.Syncable/build/watch.js rename to addons/Dexie.Syncable/tools/watch.js index 0e0e19b97..cd247e367 100644 --- a/addons/Dexie.Syncable/build/watch.js +++ b/addons/Dexie.Syncable/tools/watch.js @@ -1,4 +1,4 @@ -import {buildAndWatch} from '../../../build/build-utils'; +import {buildAndWatch} from '../../../tools/build-utils'; console.log("Building..."); diff --git a/bower.json b/bower.json index 50b5b7a6a..6dbc9422e 100644 --- a/bower.json +++ b/bower.json @@ -20,11 +20,9 @@ "license": "Apache-2.0", "ignore": [ "**/.*", - "src/", - "test/", + "**/tmp/", + "addons/*/bower.json", "samples/", - "build/", - "addons/", "*.njsproj" ] } diff --git a/build/build.js b/build/build.js deleted file mode 100644 index 1bc0d1d0c..000000000 --- a/build/build.js +++ /dev/null @@ -1,40 +0,0 @@ -import {build} from './build-utils'; - -console.log("Building..."); - -build([{ - dirs: ["src/"], - bundles: { - "src/Dexie.js": [ - "dist/dexie.js", - "dist/dexie.js.map", - "dist/dexie.min.js", - "dist/dexie.min.js.map", - "dist/dexie.min.js.gz", - "dist/dexie.es6.js", - "dist/dexie.es6.js.map" - ], - "src/Dexie.d.ts": [ - "dist/dexie.d.ts" - ] - } -},{ - dirs: ["test/"], - bundles: { - "test/tests-all.js": [ - "test/bundle.js", - "test/bundle.js.map" - ] - }, - excludes: [ - "test/worker.js", - "test/karma-env.js", - "test/karma.conf.js", - "test/require.js", - "test/qunit.js" - ] -}]).then(()=> { - console.log("All files successfully built."); -}).catch(err => { - console.error(err); -}); diff --git a/build/watch.js b/build/watch.js deleted file mode 100644 index 4be6c3881..000000000 --- a/build/watch.js +++ /dev/null @@ -1,33 +0,0 @@ -import {buildAndWatch} from './build-utils'; - -console.log("Building..."); - -buildAndWatch([{ - - dirs: ["src/"], - bundles: { - "src/Dexie.js": [ - "dist/dexie.js", - "dist/dexie.js.map" - ], - "src/Dexie.d.ts": [ - "dist/dexie.d.ts" - ] - } - -},{ - - dirs: ["test/"], - bundles: { - "test/tests-all.js": [ - "test/bundle.js", - "test/bundle.js.map" - ] - }, - excludes: ["test/worker.js", "test/karma-env.js", "test/require.js", "test/qunit.js"] - -}]).then(()=>{ - console.log("Done building. Now watching...") -}).catch(err => { - console.error(err); -}); diff --git a/package.json b/package.json index 5134f3342..15ce41905 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "url": "https://github.com/dfahlander/Dexie.js/issues" }, "scripts": { - "build": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator build/build.js", - "watch": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator build/watch.js", + "build": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator tools/build.js", + "watch": "babel-node --presets es2015 --plugins syntax-async-functions,transform-regenerator tools/watch.js", "test": "node_modules/.bin/karma start test/karma.conf.js --single-run --browsers Chrome", "test:debug": "node_modules/.bin/karma start test/karma.conf.js --browsers Chrome" }, diff --git a/build/build-utils.js b/tools/build-utils.js similarity index 100% rename from build/build-utils.js rename to tools/build-utils.js diff --git a/tools/build.js b/tools/build.js new file mode 100644 index 000000000..44d798449 --- /dev/null +++ b/tools/build.js @@ -0,0 +1,70 @@ +import {build} from './build-utils'; + +console.log("Building..."); + +build([{ + // + // Dexie.js + // + dirs: ["src/"], + bundles: { + "src/Dexie.js": [ + "dist/dexie.js", + "dist/dexie.js.map", + "dist/dexie.min.js", + "dist/dexie.min.js.map", + "dist/dexie.min.js.gz" + ], + "src/Dexie.d.ts": [ + "dist/dexie.d.ts" + ] + } +},{ + // + // Tests + // + dirs: ["test/"], + bundles: { + "test/tests-all.js": [ + "test/bundle.js", + "test/bundle.js.map" + ] + }, + excludes: [ + "test/worker.js", + "test/karma-env.js", + "test/karma.conf.js", + "test/require.js", + "test/qunit.js" + ] +}, { + // + // addons/Dexie.Observable + // + dirs: ["addons/Dexie.Observable/src"], + bundles: { + "addons/Dexie.Observable/src/Dexie.Observable.js": [ + "addons/Dexie.Observable/dist/dexie-observable.js", + "addons/Dexie.Observable/dist/dexie-observable.js.map", + "addons/Dexie.Observable/dist/dexie-observable.min.js", + "addons/Dexie.Observable/dist/dexie-observable.min.js.map" + ] + } +}, { + // + // addons/Dexie.Syncable + // + dirs: ["addons/Dexie.Syncable/src"], + bundles: { + "addons/Dexie.Syncable/src/Dexie.Syncable.js": [ + "addons/Dexie.Syncable/dist/dexie-observable.js", + "addons/Dexie.Syncable/dist/dexie-observable.js.map", + "addons/Dexie.Syncable/dist/dexie-observable.min.js", + "addons/Dexie.Syncable/dist/dexie-observable.min.js.map" + ] + } +}]).then(()=> { + console.log("All files successfully built."); +}).catch(err => { + console.error(err); +}); diff --git a/build/release.sh b/tools/release.sh similarity index 99% rename from build/release.sh rename to tools/release.sh index af41247fc..d6ae8dbab 100644 --- a/build/release.sh +++ b/tools/release.sh @@ -54,6 +54,7 @@ npm test # Force adding/removing dist files git add -A --no-ignore-removal -f dist/ 2>/dev/null + # Commit all changes (still locally) git commit -am "Build output" 2>/dev/null # Tag the release diff --git a/tools/watch.js b/tools/watch.js new file mode 100644 index 000000000..ce10fb681 --- /dev/null +++ b/tools/watch.js @@ -0,0 +1,53 @@ +import {buildAndWatch} from './build-utils'; + +console.log("Building..."); + +buildAndWatch([{ + + dirs: ["src/"], + bundles: { + "src/Dexie.js": [ + "dist/dexie.js", + "dist/dexie.js.map" + ], + "src/Dexie.d.ts": [ + "dist/dexie.d.ts" + ] + } +},{ + dirs: ["test/"], + bundles: { + "test/tests-all.js": [ + "test/bundle.js", + "test/bundle.js.map" + ] + }, + excludes: [ + "test/worker.js", + "test/karma-env.js", + "test/karma.conf.js", + "test/require.js", + "test/qunit.js" + ] + +}, { + dirs: [], + bundles: { + "addons/Dexie.Observable/src/Dexie.Observable.js": [ + "addons/Dexie.Observable/dist/dexie-observable.js", + "addons/Dexie.Observable/dist/dexie-observable.js.map" + ] + } +}, { + dirs: [], + bundles: { + "addons/Dexie.Syncable/src/Dexie.Syncable.js": [ + "addons/Dexie.Syncable/dist/dexie-observable.js", + "addons/Dexie.Syncable/dist/dexie-observable.js.map" + ] + } +}]).then(()=>{ + console.log("Done building. Now watching...") +}).catch(err => { + console.error(err); +});