Skip to content
This repository has been archived by the owner on Aug 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1 from Plum-Crazy/angular-4.0.2
Browse files Browse the repository at this point in the history
Upgrading Angular to version 4.0.2, as well as a few other packages.
  • Loading branch information
Plum-Crazy committed Apr 19, 2017
2 parents 73eac95 + 12b047a commit 9c96c6f
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 43 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Angular2 Seed Project
## Angular 4 Seed Project

A basic Angular2 seed project utilizing the following technologies:
A basic Angular 4 seed project utilizing the following technologies:

* Angular 2.4.5
* TypeScript 2+
* Angular 4.0.2
* TypeScript 2.2
* Karma/Jasmine (unit testing)
* Codelyzer & TSLint (code linting)
* PugJS (template engine)
Expand Down
6 changes: 3 additions & 3 deletions config/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"suppressImplicitAnyIndexErrors": true,
"typeRoots": [
"../node_modules/@types"
],
"types": [
"node", "jasmine"
]
},
"exclude": [
"../node_modules"
],
"include": [
"../**/*"
]
}
10 changes: 6 additions & 4 deletions config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
},
{
test: /\.pug$/,
use: "pug-html-loader"
use: [ "raw-loader", "pug-html-loader" ]
},
{
test: /\.scss$/,
Expand Down Expand Up @@ -63,9 +63,11 @@ module.exports = {

// Workaround for Angular-SystemJS-Webpack(2) WARNINGS
new webpack.ContextReplacementPlugin(
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
helpers.root("src"),
{}
/angular(\\|\/)core(\\|\/)@angular/,
helpers.root('src'), // location of your src
{
// your Angular Async Route paths relative to this root directory
}
)
]
};
10 changes: 6 additions & 4 deletions config/webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
},
{
test: /\.pug$/,
use: "pug-html-loader"
use: [ "raw-loader", "pug-html-loader" ]
},
{
test: /\.scss$/,
Expand All @@ -47,9 +47,11 @@ module.exports = {
plugins: [
// Workaround for Angular-SystemJS-Webpack(2) WARNINGS
new webpack.ContextReplacementPlugin(
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
helpers.root("src"),
{}
/angular(\\|\/)core(\\|\/)@angular/,
helpers.root('src'), // location of your src
{
// your Angular Async Route paths relative to this root directory
}
)
]
};
37 changes: 18 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-seed",
"version": "1.0.0-beta.0",
"description": "Angular 2 Seed",
"version": "1.1.0",
"description": "Angular Seed",
"license": "GPL-3.0",
"repository": {
"type": "GIT",
Expand All @@ -15,23 +15,23 @@
"build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail"
},
"dependencies": {
"@angular/common": "2.4.5",
"@angular/compiler": "2.4.5",
"@angular/core": "2.4.5",
"@angular/forms": "2.4.5",
"@angular/http": "2.4.5",
"@angular/platform-browser": "2.4.5",
"@angular/platform-browser-dynamic": "2.4.5",
"@angular/router": "3.4.5",
"@angular/common": "^4.0.2",
"@angular/compiler": "^4.0.2",
"@angular/core": "^4.0.2",
"@angular/forms": "^4.0.2",
"@angular/http": "^4.0.2",
"@angular/platform-browser": "^4.0.2",
"@angular/platform-browser-dynamic": "^4.0.2",
"@angular/router": "^4.0.2",
"core-js": "^2.4.1",
"rxjs": "5.0.1",
"zone.js": "^0.7.2"
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@types/jasmine": "^2.5.38",
"@types/node": "^6.0.46",
"angular2-template-loader": "^0.4.0",
"codelyzer": "2.0.0-beta.4",
"codelyzer": "~2.0.0",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.23.1",
"extract-text-webpack-plugin": "^2.0.0-beta.5",
Expand All @@ -48,17 +48,16 @@
"node-sass": "^3.10.0",
"null-loader": "^0.1.1",
"phantomjs-prebuilt": "^2.1.7",
"pug": "^2.0.0-beta6",
"pug-html-loader": "^1.0.8",
"pug-loader": "^2.3.0",
"pug": "^2.0.0-beta12",
"pug-html-loader": "^1.1.4",
"raw-loader": "^0.5.1",
"reflect-metadata": "^0.1.8",
"rimraf": "^2.5.2",
"sass-loader": "^4.0.2",
"style-loader": "^0.13.1",
"ts-loader": "~1.3.3",
"tslint": "4.0.2",
"typescript": "2.0.10",
"ts-loader": "~2.0.3",
"tslint": "~4.5.0",
"typescript": "~2.2.0",
"webpack": "~2.2.0",
"webpack-dev-server": "~2.2.0",
"webpack-merge": "~2.4.0"
Expand Down
10 changes: 1 addition & 9 deletions src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
import "core-js/es6";
import "core-js/es7/reflect";
require("zone.js/dist/zone");

if(process.env.ENV === "production") {
// Production
} else {
// Development
Error["stackTraceLimit"] = Infinity;
require("zone.js/dist/long-stack-trace-zone");
}
require("zone.js/dist/zone");

0 comments on commit 9c96c6f

Please sign in to comment.