Skip to content

Commit dc4d28c

Browse files
Merge pull request antonybudianto#127 from antonybudianto/update-dep
updatedep
2 parents 4a9748f + 9f1eac5 commit dc4d28c

File tree

6 files changed

+411
-353
lines changed

6 files changed

+411
-353
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ before_install:
55
language: node_js
66
node_js:
77
- "7.0"
8-
- "6.0"
9-
- "5.10"
10-
- "4.7"
8+
- "6.9"
119
script:
1210
- cp config/internal/.env.travis .env
1311
- npm run stat

config/webpack/webpack.core.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ module.exports = {
3232
$: 'jquery',
3333
jquery: 'jquery'
3434
}),
35-
new webpack.ContextReplacementPlugin(
36-
// The (\\|\/) piece accounts for path separators in *nix and Windows
37-
constants.CONTEXT_REPLACE_REGEX,
38-
helpers.root('./src') // location of your src
39-
)
35+
// new webpack.ContextReplacementPlugin(
36+
// // The (\\|\/) piece accounts for path separators in *nix and Windows
37+
// constants.CONTEXT_REPLACE_REGEX,
38+
// helpers.root('./src') // location of your src
39+
// )
4040
]
4141
};

config/webpack/webpack.dev.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ module.exports = webpackMerge(commonConfig, {
8686

8787
devServer: {
8888
hot: true,
89+
overlay: true,
8990
contentBase: './src/public',
9091
historyApiFallback: true,
9192
stats: 'minimal'

e2e/home/home.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { browser, by, element } from 'protractor';
2+
13
describe('Home page', () => {
24
beforeAll(done => {
35
browser.get('/')

package.json

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-webpack-starter",
3-
"version": "2.0.0-rc.1",
3+
"version": "2.0.0",
44
"author": "Antony Budianto",
55
"description": "Angular Webpack Starter with extensible features",
66
"main": "src/app/main.ts",
@@ -9,7 +9,7 @@
99
"url": "https://github.com/antonybudianto/angular-webpack-starter.git"
1010
},
1111
"engines": {
12-
"node": ">=4.7",
12+
"node": ">=6.9",
1313
"npm": "~3.0.0"
1414
},
1515
"scripts": {
@@ -64,66 +64,64 @@
6464
"@angular/platform-browser": "2.4.7",
6565
"@angular/platform-browser-dynamic": "2.4.7",
6666
"@angular/router": "3.4.7",
67-
"@ngtools/webpack": "1.2.4",
67+
"@ngtools/webpack": "1.2.11",
6868
"@types/core-js": "0.9.35",
69-
"@types/jasmine": "2.5.41",
70-
"@types/lodash": "4.14.52",
69+
"@types/jasmine": "2.5.43",
70+
"@types/lodash": "4.14.53",
7171
"@types/node": "7.0.5",
7272
"angular-router-loader": "^0.5.0",
7373
"angular2-template-loader": "0.6.2",
74-
"awesome-typescript-loader": "3.0.3",
74+
"awesome-typescript-loader": "3.0.8",
7575
"bootstrap": "^3.3.7",
7676
"chalk": "^1.1.3",
7777
"codelyzer": "2.0.0",
7878
"compression-webpack-plugin": "0.3.2",
7979
"copy-webpack-plugin": "^4.0.1",
8080
"core-js": "^2.4.1",
81-
"css-loader": "^0.26.1",
81+
"css-loader": "^0.26.2",
8282
"dotenv": "^4.0.0",
83-
"extract-text-webpack-plugin": "2.0.0-rc.3",
84-
"file-loader": "^0.10.0",
83+
"extract-text-webpack-plugin": "2.0.0",
84+
"file-loader": "^0.10.1",
8585
"font-awesome": "^4.7.0",
86-
"html-loader": "^0.4.4",
86+
"html-loader": "^0.4.5",
8787
"html-webpack-plugin": "^2.28.0",
8888
"istanbul-instrumenter-loader": "2.0.0",
8989
"jasmine-core": "~2.5.2",
9090
"jquery": "^3.1.1",
91-
"karma": "~1.4.1",
91+
"karma": "~1.5.0",
9292
"karma-coverage": "~1.1.1",
9393
"karma-jasmine": "~1.1.0",
9494
"karma-phantomjs-launcher": "~1.0.2",
9595
"karma-remap-coverage": "0.1.4",
9696
"karma-sourcemap-loader": "^0.3.7",
9797
"karma-webpack": "2.0.2",
9898
"lodash": "^4.17.4",
99-
"npm-run-all": "^4.0.1",
99+
"npm-run-all": "^4.0.2",
100100
"null-loader": "^0.1.1",
101101
"phantomjs-prebuilt": "^2.1.14",
102102
"postcss-cssnext": "^2.9.0",
103-
"postcss-loader": "^1.2.2",
103+
"postcss-loader": "^1.3.2",
104104
"precss": "^1.4.0",
105105
"raw-loader": "^0.5.1",
106-
"rimraf": "^2.5.4",
107-
"rxjs": "5.1.0",
108-
"style-loader": "^0.13.1",
106+
"rimraf": "^2.6.1",
107+
"rxjs": "5.2.0",
108+
"style-loader": "^0.13.2",
109109
"tslint": "4.4.2",
110-
"tslint-loader": "^3.3.0",
111-
"typescript": "2.1.6",
110+
"tslint-loader": "^3.4.2",
111+
"typescript": "2.2.1",
112112
"webpack": "2.2.1",
113-
"webpack-merge": "2.6.1",
114-
"zone.js": "^0.7.6"
113+
"webpack-merge": "3.0.0",
114+
"zone.js": "^0.7.7"
115115
},
116116
"devDependencies": {
117117
"@angularclass/hmr": "^1.2.2",
118118
"@angularclass/hmr-loader": "^3.0.2",
119-
"@types/protractor": "1.5.20",
120-
"@types/selenium-webdriver": "2.44.28",
121119
"add-asset-html-webpack-plugin": "^1.0.2",
122120
"compression": "^1.6.2",
123121
"lite-server": "^2.2.2",
124-
"protractor": "4.0.14",
122+
"protractor": "5.1.1",
125123
"ts-node": "^2.1.0",
126124
"webpack-dashboard": "^0.3.0",
127-
"webpack-dev-server": "2.3.0"
125+
"webpack-dev-server": "2.4.1"
128126
}
129127
}

0 commit comments

Comments
 (0)