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

Simplify build process #272

Merged
merged 4 commits into from
Jun 26, 2014
Merged
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ clean:

standalone: clean
@ mkdir -p $(BUILD_DIR)
@ node tools/standalone/build.js
@ npm run build

test: standalone
@ npm test
Expand Down
6 changes: 2 additions & 4 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module.exports = function (config) {
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots', 'progress'
// CLI --reporters progress
reporters: ['dots'],
reporters: ['progress'],

// enable / disable watching file and executing tests whenever any file changes
// CLI --auto-watch --no-auto-watch
Expand All @@ -53,8 +53,7 @@ module.exports = function (config) {
// - IE (only Windows)
// CLI --browsers Chrome, Firefox, Safari
browsers: [
'Chrome',
'Firefox'
'Chrome'
],

// If browser does not capture in given timeout [ms], kill it
Expand All @@ -71,7 +70,6 @@ module.exports = function (config) {
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-ie-launcher',
'karma-phantomjs-launcher',
'karma-safari-launcher'
]
});
Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
"version": "1.2.0",
"devDependencies": {
"karma": "<=0.11.14",
"karma-cli": "0.0.4",
"karma-jasmine": "~0.1.0",
"karma-requirejs": "~0.1.0",
"karma-chrome-launcher": "~0.1.0",
"karma-ie-launcher": "~0.1.1",
"karma-firefox-launcher": "~0.1.0",
"karma-phantomjs-launcher": "~0.1.0",
"karma-safari-launcher": "~0.1.1",
"loadbuilder": ">=0.4.2",
"uglify-js": "~2.3.6"
"webpack": "~1.3.1-beta4"
},
"scripts": {
"test": "./node_modules/karma/bin/karma start --browsers Firefox --single-run"
"build": "npm run webpack & npm run webpack-minified",
"test": "karma start --browsers Firefox --single-run",
"watch": "karma start",
"webpack": "webpack --progress --colors",
"webpack-minified": "webpack --progress --colors --optimize-minimize --output-file flight.min.js"
}
}
63 changes: 0 additions & 63 deletions tools/standalone/amd-shim.js

This file was deleted.

1 change: 0 additions & 1 deletion tools/standalone/banner.txt

This file was deleted.

31 changes: 0 additions & 31 deletions tools/standalone/build.js

This file was deleted.

16 changes: 16 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
var BannerPlugin = require('webpack/lib/BannerPlugin');
var version = require('./package.json').version;

module.exports = {
entry: './lib/index',
output: {
path: __dirname + '/build',
filename: 'flight.js',
library: 'flight',
libraryTarget: 'umd',
sourcePrefix: ''
},
plugins: [
new BannerPlugin('Flight v' + version + ' | (c) Twitter, Inc. | MIT License')
]
};