Skip to content

Commit 2f59605

Browse files
committedNov 14, 2017
development mode works without ./temp
1 parent f5ceb4b commit 2f59605

File tree

5 files changed

+30
-35
lines changed

5 files changed

+30
-35
lines changed
 

‎.gitignore

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
.idea
2-
public
31
node_modules
42
temp
5-
/nbproject/private/
6-
*.log
3+
*.log
4+
.idea

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"prod-test": "karma start test/config/karma.conf.js",
2424
"dev-build": "webpack --config webpack/config.js",
2525
"dev-test": "karma start test/config/karma.conf.js",
26-
"test": "concurrently --kill-others --raw \"npm run dev-build\" \"npm run dev-test\"",
26+
"test": "npm run dev-test",
2727
"build": "npm run prod-build && npm run prod-test"
2828
},
2929
"devDependencies": {
@@ -41,6 +41,7 @@
4141
"karma-firefox-launcher": "^1.0.1",
4242
"karma-ie-launcher": "^1.0.0",
4343
"karma-jasmine": "^1.1.0",
44+
"karma-sourcemap-loader": "^0.3.7",
4445
"karma-webpack": "^2.0.6",
4546
"webpack": "^3.8.1"
4647
},

‎test/config/karma.conf.files.js

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
var scrollerPath = '../../temp/'
2-
3-
var files = [
1+
const files = [
42
'https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js',
53
'https://ajax.googleapis.com/ajax/libs/angularjs/1.6.5/angular.js',
64
'https://ajax.googleapis.com/ajax/libs/angularjs/1.6.5/angular-mocks.js',
@@ -10,20 +8,18 @@ var files = [
108
'../*Spec.js'
119
];
1210

13-
module.exports.development = files.concat([
14-
'../../temp/ui-scroll.js',
15-
'../../temp/ui-scroll-grid.js',
16-
{
17-
pattern: '../../temp/*.js.map',
18-
included: false
19-
}
20-
]);
11+
module.exports.development = [
12+
...files,
13+
'../../src/ui-scroll.js',
14+
'../../src/ui-scroll-grid.js'
15+
];
2116

22-
module.exports.production = files.concat([
17+
module.exports.production = [
18+
...files,
2319
'../../dist/ui-scroll.min.js',
2420
'../../dist/ui-scroll-grid.min.js',
2521
{
2622
pattern: '../../dist/*.js.map',
2723
included: false
2824
}
29-
]);
25+
];

‎test/config/karma.conf.js

+11-16
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,24 @@ const ie = 'IE';
44

55
const ENV = (process.env.npm_lifecycle_event.indexOf('dev') === 0) ? 'development' : 'production';
66

7+
const webpackSettings = ENV === 'development' ? {
8+
preprocessors: {
9+
'../../src/ui-scroll*.js': ['webpack', 'sourcemap']
10+
},
11+
webpack: require('../../webpack/config.js')
12+
} : {};
13+
714
module.exports = function (config) {
8-
config.set({
15+
config.set(Object.assign({
916

1017
basePath: '',
1118

1219
frameworks: ['jasmine'],
1320

1421
files: [
15-
...require('./karma.conf.files.js')[ENV],
16-
{
17-
pattern: '../../src/*.js',
18-
watched: true,
19-
served: false
20-
}
22+
...require('./karma.conf.files.js')[ENV]
2123
],
2224

23-
preprocessors: {
24-
'../../src/*.js': ['webpack']
25-
},
26-
27-
webpack: {},
28-
2925
exclude: [],
3026

3127
reporters: ['dots'],
@@ -46,8 +42,7 @@ module.exports = function (config) {
4642

4743
captureTimeout: 60000,
4844

49-
singleRun: ENV !== 'development',
45+
singleRun: ENV !== 'development'
5046

51-
// restartOnFileChange: true
52-
});
47+
}, webpackSettings));
5348
};

‎webpack/config.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const getBanner = function (compressing) {
1313
};
1414

1515
const ENV = (process.env.npm_lifecycle_event.indexOf('dev') === 0) ? 'development' : 'production';
16+
console.log('********** webpack runs in ' + ENV + ' environment **********\n');
1617

1718
let configEnv = {};
1819

@@ -22,6 +23,8 @@ if (ENV === 'development') {
2223

2324
compressing: false,
2425

26+
devtool: 'inline-source-map',
27+
2528
entry: {},
2629

2730
plugins: [],
@@ -36,6 +39,8 @@ if (ENV === 'production') {
3639

3740
compressing: true,
3841

42+
devtool: 'source-map',
43+
3944
entry: {
4045
'ui-scroll.min': path.resolve(__dirname, '../src/ui-scroll.js'),
4146
'ui-scroll-grid.min': path.resolve(__dirname, '../src/ui-scroll-grid.js')
@@ -75,7 +80,7 @@ module.exports = {
7580

7681
cache: false,
7782

78-
devtool: 'source-map',
83+
devtool: configEnv.devtool,
7984

8085
module: {
8186
rules: [

0 commit comments

Comments
 (0)
Please sign in to comment.