Skip to content

Commit 9c96c6f

Browse files
authored
Merge pull request #1 from Plum-Crazy/angular-4.0.2
Upgrading Angular to version 4.0.2, as well as a few other packages.
2 parents 73eac95 + 12b047a commit 9c96c6f

File tree

6 files changed

+38
-43
lines changed

6 files changed

+38
-43
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
## Angular2 Seed Project
1+
## Angular 4 Seed Project
22

3-
A basic Angular2 seed project utilizing the following technologies:
3+
A basic Angular 4 seed project utilizing the following technologies:
44

5-
* Angular 2.4.5
6-
* TypeScript 2+
5+
* Angular 4.0.2
6+
* TypeScript 2.2
77
* Karma/Jasmine (unit testing)
88
* Codelyzer & TSLint (code linting)
99
* PugJS (template engine)

config/tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"suppressImplicitAnyIndexErrors": true,
1212
"typeRoots": [
1313
"../node_modules/@types"
14-
],
15-
"types": [
16-
"node", "jasmine"
1714
]
1815
},
1916
"exclude": [
2017
"../node_modules"
18+
],
19+
"include": [
20+
"../**/*"
2121
]
2222
}

config/webpack.common.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
},
2929
{
3030
test: /\.pug$/,
31-
use: "pug-html-loader"
31+
use: [ "raw-loader", "pug-html-loader" ]
3232
},
3333
{
3434
test: /\.scss$/,
@@ -63,9 +63,11 @@ module.exports = {
6363

6464
// Workaround for Angular-SystemJS-Webpack(2) WARNINGS
6565
new webpack.ContextReplacementPlugin(
66-
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
67-
helpers.root("src"),
68-
{}
66+
/angular(\\|\/)core(\\|\/)@angular/,
67+
helpers.root('src'), // location of your src
68+
{
69+
// your Angular Async Route paths relative to this root directory
70+
}
6971
)
7072
]
7173
};

config/webpack.test.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
},
2121
{
2222
test: /\.pug$/,
23-
use: "pug-html-loader"
23+
use: [ "raw-loader", "pug-html-loader" ]
2424
},
2525
{
2626
test: /\.scss$/,
@@ -47,9 +47,11 @@ module.exports = {
4747
plugins: [
4848
// Workaround for Angular-SystemJS-Webpack(2) WARNINGS
4949
new webpack.ContextReplacementPlugin(
50-
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
51-
helpers.root("src"),
52-
{}
50+
/angular(\\|\/)core(\\|\/)@angular/,
51+
helpers.root('src'), // location of your src
52+
{
53+
// your Angular Async Route paths relative to this root directory
54+
}
5355
)
5456
]
5557
};

package.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-seed",
3-
"version": "1.0.0-beta.0",
4-
"description": "Angular 2 Seed",
3+
"version": "1.1.0",
4+
"description": "Angular Seed",
55
"license": "GPL-3.0",
66
"repository": {
77
"type": "GIT",
@@ -15,23 +15,23 @@
1515
"build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail"
1616
},
1717
"dependencies": {
18-
"@angular/common": "2.4.5",
19-
"@angular/compiler": "2.4.5",
20-
"@angular/core": "2.4.5",
21-
"@angular/forms": "2.4.5",
22-
"@angular/http": "2.4.5",
23-
"@angular/platform-browser": "2.4.5",
24-
"@angular/platform-browser-dynamic": "2.4.5",
25-
"@angular/router": "3.4.5",
18+
"@angular/common": "^4.0.2",
19+
"@angular/compiler": "^4.0.2",
20+
"@angular/core": "^4.0.2",
21+
"@angular/forms": "^4.0.2",
22+
"@angular/http": "^4.0.2",
23+
"@angular/platform-browser": "^4.0.2",
24+
"@angular/platform-browser-dynamic": "^4.0.2",
25+
"@angular/router": "^4.0.2",
2626
"core-js": "^2.4.1",
27-
"rxjs": "5.0.1",
28-
"zone.js": "^0.7.2"
27+
"rxjs": "^5.1.0",
28+
"zone.js": "^0.8.4"
2929
},
3030
"devDependencies": {
3131
"@types/jasmine": "^2.5.38",
3232
"@types/node": "^6.0.46",
3333
"angular2-template-loader": "^0.4.0",
34-
"codelyzer": "2.0.0-beta.4",
34+
"codelyzer": "~2.0.0",
3535
"copy-webpack-plugin": "^4.0.1",
3636
"css-loader": "^0.23.1",
3737
"extract-text-webpack-plugin": "^2.0.0-beta.5",
@@ -48,17 +48,16 @@
4848
"node-sass": "^3.10.0",
4949
"null-loader": "^0.1.1",
5050
"phantomjs-prebuilt": "^2.1.7",
51-
"pug": "^2.0.0-beta6",
52-
"pug-html-loader": "^1.0.8",
53-
"pug-loader": "^2.3.0",
51+
"pug": "^2.0.0-beta12",
52+
"pug-html-loader": "^1.1.4",
5453
"raw-loader": "^0.5.1",
5554
"reflect-metadata": "^0.1.8",
5655
"rimraf": "^2.5.2",
5756
"sass-loader": "^4.0.2",
5857
"style-loader": "^0.13.1",
59-
"ts-loader": "~1.3.3",
60-
"tslint": "4.0.2",
61-
"typescript": "2.0.10",
58+
"ts-loader": "~2.0.3",
59+
"tslint": "~4.5.0",
60+
"typescript": "~2.2.0",
6261
"webpack": "~2.2.0",
6362
"webpack-dev-server": "~2.2.0",
6463
"webpack-merge": "~2.4.0"

src/polyfills.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
import "core-js/es6";
22
import "core-js/es7/reflect";
3-
require("zone.js/dist/zone");
4-
5-
if(process.env.ENV === "production") {
6-
// Production
7-
} else {
8-
// Development
9-
Error["stackTraceLimit"] = Infinity;
10-
require("zone.js/dist/long-stack-trace-zone");
11-
}
3+
require("zone.js/dist/zone");

0 commit comments

Comments
 (0)