Skip to content

Commit 24b77ae

Browse files
committed
1 parent 84444e0 commit 24b77ae

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

karma.conf.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function (config) {
1414
webpack: {
1515
resolve: {
1616
root: __dirname,
17-
extensions: ['', '.ts', '.js', '.json'],
17+
extensions: ['', '.js', '.ts', '.json'],
1818
alias: {
1919
'app': 'src/app',
2020
'common': 'src/common'
@@ -35,7 +35,8 @@ module.exports = function (config) {
3535
]
3636
},
3737
exclude: [
38-
/\.min\.js$/
38+
/\.min\.js$/,
39+
/node_modules/
3940
]
4041
},
4142
{test: /reflect-metadata/, loader: "imports?require=>false"},

scripts/push-to-ghpages.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ "$TRAVIS_BRANCH" != "master" ]; then
55
fi
66

77
rm -rf out || exit 0;
8-
NODE_ENV=production npm run build
8+
NODE_ENV=production npm run build || exit 1;
99
cp -rf __build__ out
1010

1111
(

webpack.config.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var config = {
6868

6969
resolve: {
7070
root: __dirname,
71-
extensions: ['', '.ts', '.js', '.json'],
71+
extensions: ['', '.js', '.ts', '.json'],
7272
alias: {
7373
'app': 'src/app'
7474
}
@@ -106,7 +106,8 @@ var config = {
106106
},
107107
exclude: [
108108
/\.min\.js$/,
109-
/\.spec\.ts$/
109+
/\.spec\.ts$/,
110+
/node_modules/
110111
]
111112
},
112113
{

0 commit comments

Comments
 (0)