Skip to content

Commit 03ab724

Browse files
committed
replace browserify es6->es5 compiling with webpack
1 parent 0c2f1cb commit 03ab724

File tree

4 files changed

+45
-25
lines changed

4 files changed

+45
-25
lines changed

Gruntfile.js

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Build configurations.
22
module.exports = function (grunt) {
33
grunt.loadNpmTasks('grunt-karma');
4-
grunt.loadNpmTasks('grunt-browserify');
54
grunt.loadNpmTasks('grunt-contrib-connect');
65
grunt.loadNpmTasks('grunt-contrib-watch');
76
grunt.loadNpmTasks('grunt-contrib-jshint');
87
grunt.loadNpmTasks('grunt-contrib-concat');
98
grunt.loadNpmTasks('grunt-contrib-uglify');
9+
grunt.loadNpmTasks('grunt-webpack');
1010

1111
grunt.initConfig({
1212
packageBower: grunt.file.readJSON('./bower.json'),
@@ -58,26 +58,13 @@ module.exports = function (grunt) {
5858
}
5959
}
6060
},
61-
browserify: {
62-
dist: {
63-
options: {
64-
transform: [
65-
["babelify", {
66-
loose: "all"
67-
}]
68-
]
69-
},
70-
files: {
71-
"./temp/ui-scroll-jqlite.js": ["./src/ui-scroll-jqlite.js"],
72-
"./temp/ui-scroll.js": ["./src/ui-scroll.js"],
73-
"./temp/ui-scroll-grid.js": ["./src/ui-scroll-grid.js"]
74-
}
75-
}
61+
webpack: {
62+
dist: require("./webpack.config.js")
7663
},
7764
concat: {
7865
options: {
79-
banner: '<%= releaseData %> \n\n (function () {\n',
80-
footer: '}());',
66+
banner: '<%= releaseData %> \n',
67+
footer: '',
8168
stripBanners: true,
8269
process: function (src, filepath) {
8370
var singleQuotes, strings;
@@ -174,26 +161,26 @@ module.exports = function (grunt) {
174161
grunt.registerTask('default', ['server']);
175162

176163
grunt.registerTask('test', [
177-
'browserify',
164+
'webpack',
178165
'karma:unit'
179166
]);
180167

181168
grunt.registerTask('buildWatcher', [
182-
'browserify',
169+
'webpack',
183170
'concat'
184171
]);
185172

186173
grunt.registerTask('build', [
187174
'jshint:test',
188175
'jshint:src',
189-
'browserify',
176+
'webpack',
190177
'karma:travis',
191178
'concat',
192179
'uglify:common'
193180
]);
194181

195182
grunt.registerTask('travis', [
196-
'browserify',
183+
'webpack',
197184
'karma:travis'
198185
]);
199186
};

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,27 @@
2222
"test": "grunt test"
2323
},
2424
"devDependencies": {
25+
"babel": "^6.5.2",
26+
"babel-core": "^6.21.0",
27+
"babel-loader": "^6.2.10",
2528
"babel-preset-es2015": "^6.5.0",
2629
"babelify": "^6.1.0",
2730
"express": "~3.4.8",
2831
"grunt": "~0.4.5",
29-
"grunt-browserify": "^3.8.0",
3032
"grunt-contrib-concat": "~0.5.1",
3133
"grunt-contrib-connect": "~0.10.1",
3234
"grunt-contrib-jshint": "~1.0.0",
3335
"grunt-contrib-uglify": "0.9.1",
3436
"grunt-contrib-watch": "~0.6.1",
3537
"grunt-karma": "~0.12.0",
38+
"grunt-webpack": "^1.0.18",
3639
"jasmine-core": "^2.4.1",
3740
"karma": "~0.13",
3841
"karma-chrome-launcher": "~0.2",
3942
"karma-firefox-launcher": "~0.1",
4043
"karma-ie-launcher": "~0.2",
41-
"karma-jasmine": "~0.3"
44+
"karma-jasmine": "~0.3",
45+
"webpack": "^1.14.0"
4246
},
4347
"keywords": [
4448
"angular",

test/karma.conf.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ module.exports = function (config) {
2323
'../temp/ui-scroll-grid.js',
2424
'datasources.js',
2525
'scaffolding.js',
26-
'**/*Spec.js'
26+
'**/*Spec.js',
27+
{
28+
pattern: '../temp/*.js.map',
29+
included: false
30+
}
2731
],
2832

2933
// list of files to exclude

webpack.config.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
var path = require('path');
2+
module.exports = {
3+
entry: {
4+
'ui-scroll': './src/ui-scroll.js',
5+
'ui-scroll-grid': './src/ui-scroll-grid.js',
6+
'ui-scroll-jqlite': './src/ui-scroll-jqlite.js'
7+
},
8+
output: {
9+
path: path.join(__dirname, 'temp'),
10+
filename: '[name].js'
11+
},
12+
devtool: 'source-map',
13+
module: {
14+
loaders: [
15+
{
16+
test: /\.js$/,
17+
exclude: /node_modules/,
18+
loader: 'babel-loader',
19+
query: {
20+
presets: ['es2015']
21+
}
22+
}
23+
]
24+
}
25+
};

0 commit comments

Comments
 (0)