Skip to content

Commit

Permalink
Renaming build to tools as conventional.
Browse files Browse the repository at this point in the history
Including addons in npm and bower package.json
WIP for improved bower experience of #185
  • Loading branch information
dfahlander committed Mar 17, 2016
1 parent 355a712 commit f5eacd0
Show file tree
Hide file tree
Showing 18 changed files with 142 additions and 107 deletions.
6 changes: 1 addition & 5 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
addons/
build/
test/
**/tmp/
samples/
src/
dist/README.md
*.njsproj
.*
4 changes: 1 addition & 3 deletions addons/Dexie.Observable/.npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
src/
test/
build/
tools/tmp
.*
4 changes: 1 addition & 3 deletions addons/Dexie.Observable/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
"license": "Apache-2.0",
"ignore": [
"**/.*",
"src/",
"test/",
"build/"
"tools/tmp"
]
}
4 changes: 2 additions & 2 deletions addons/Dexie.Observable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {build} from '../../../build/build-utils';
import {build} from '../../../tools/build-utils';

console.log("Building...");

Expand All @@ -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(()=> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {buildAndWatch} from '../../../build/build-utils';
import {buildAndWatch} from '../../../tools/build-utils';

console.log("Building...");

Expand All @@ -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(()=> {
Expand Down
4 changes: 1 addition & 3 deletions addons/Dexie.Syncable/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
"license": "Apache-2.0",
"ignore": [
"**/.*",
"src/",
"test/",
"build/"
"tools/tmp"
]
}
4 changes: 2 additions & 2 deletions addons/Dexie.Syncable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {build} from '../../../build/build-utils';
import {build} from '../../../tools/build-utils';

console.log("Building...");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {buildAndWatch} from '../../../build/build-utils';
import {buildAndWatch} from '../../../tools/build-utils';

console.log("Building...");

Expand Down
6 changes: 2 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
"license": "Apache-2.0",
"ignore": [
"**/.*",
"src/",
"test/",
"**/tmp/",
"addons/*/bower.json",
"samples/",
"build/",
"addons/",
"*.njsproj"
]
}
40 changes: 0 additions & 40 deletions build/build.js

This file was deleted.

33 changes: 0 additions & 33 deletions build/watch.js

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
File renamed without changes.
70 changes: 70 additions & 0 deletions tools/build.js
Original file line number Diff line number Diff line change
@@ -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);
});
1 change: 1 addition & 0 deletions build/release.sh → tools/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 53 additions & 0 deletions tools/watch.js
Original file line number Diff line number Diff line change
@@ -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);
});

0 comments on commit f5eacd0

Please sign in to comment.