Skip to content

Commit

Permalink
chore: update to angular 4 final & fix animations
Browse files Browse the repository at this point in the history 
Fix #1880
  • Loading branch information
@mgechev
mgechev committed Mar 24, 2017
1 parent 20e68d5 commit bdb0e1d
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 55 deletions.
28 changes: 14 additions & 14 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"author": "Minko Gechev <mgechev>",
"license": "MIT",
"devDependencies": {
"@angular/compiler-cli": "^4.0.0-rc.2",
"@angular/platform-server": "^4.0.0-rc.2",
"@angular/compiler-cli": "^4.0.0",
"@angular/platform-server": "^4.0.0",
"@types/async": "^2.0.32",
"@types/browser-sync": "^0.0.34",
"@types/express": "^4.0.33",
Expand Down Expand Up @@ -80,9 +80,9 @@
"gulp-cached": "^1.1.0",
"gulp-concat": "^2.6.0",
"gulp-concat-css": "^2.3.0",
"gulp-filter": "^4.0.0-rc.2",
"gulp-filter": "^4.0.0",
"gulp-inject": "^4.1.0",
"gulp-inline-ng2-template": "^4.0.0-rc.2",
"gulp-inline-ng2-template": "^4.0.0",
"gulp-load-plugins": "^1.3.0",
"gulp-plumber": "~1.1.0",
"gulp-postcss": "^6.2.0",
Expand All @@ -92,7 +92,7 @@
"gulp-replace": "^0.5.4",
"gulp-sass": "^3.0.0",
"gulp-sourcemaps": "2.2.0",
"gulp-template": "^4.0.0-rc.2",
"gulp-template": "^4.0.0",
"gulp-tslint": "7.0.1",
"gulp-typescript": "^3.0.2",
"gulp-uglify": "^2.0.0",
Expand Down Expand Up @@ -133,15 +133,15 @@
"yargs": "^6.0.0"
},
"dependencies": {
"@angular/animations": "^4.0.0-rc.2",
"@angular/common": "^4.0.0-rc.2",
"@angular/compiler": "^4.0.0-rc.2",
"@angular/core": "^4.0.0-rc.2",
"@angular/forms": "^4.0.0-rc.2",
"@angular/http": "^4.0.0-rc.2",
"@angular/platform-browser": "^4.0.0-rc.2",
"@angular/platform-browser-dynamic": "^4.0.0-rc.2",
"@angular/router": "^4.0.0-rc.2",
"@angular/animations": "^4.0.0",
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/http": "^4.0.0",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"@angular/service-worker": "^1.0.0-beta.6",
"core-js": "^2.4.1",
"intl": "^1.2.5",
Expand Down
1 change: 1 addition & 0 deletions src/client/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { AboutModule } from './about/about.module';
import { HomeModule } from './home/home.module';
import { SharedModule } from './shared/shared.module';


@NgModule({
imports: [BrowserModule, HttpModule, AppRoutingModule, AboutModule, HomeModule, SharedModule.forRoot()],
declarations: [AppComponent],
Expand Down
2 changes: 1 addition & 1 deletion tools/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*.js
*.js.map

env/env-config.interface.metadata.json
2 changes: 2 additions & 0 deletions tools/config/seed.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ export class SeedConfig {
'@angular/platform-browser': 'node_modules/@angular/platform-browser/bundles/platform-browser.umd.js',
'@angular/platform-browser-dynamic': 'node_modules/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'@angular/router': 'node_modules/@angular/router/bundles/router.umd.js',
'@angular/animations/browser': 'node_modules/@angular/animations/bundles/animations-browser.umd.js',

'@angular/common/testing': 'node_modules/@angular/common/bundles/common-testing.umd.js',
'@angular/compiler/testing': 'node_modules/@angular/compiler/bundles/compiler-testing.umd.js',
Expand Down Expand Up @@ -421,6 +422,7 @@ export class SeedConfig {
// `src/client`.
[join(this.TMP_DIR, this.BOOTSTRAP_DIR, '*')]: `${this.TMP_DIR}/${this.BOOTSTRAP_DIR}/*`,
'@angular/platform-browser/animations': 'node_modules/@angular/platform-browser/bundles/platform-browser-animations.umd.js',
'@angular/animations/browser': 'node_modules/@angular/animations/bundles/animations-browser.umd.js',
'dist/tmp/node_modules/*': 'dist/tmp/node_modules/*',
'node_modules/*': 'node_modules/*',
'*': 'node_modules/*'
Expand Down
80 changes: 40 additions & 40 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,56 @@
# yarn lockfile v1


"@angular/animations@^4.0.0-rc.2":
version "4.0.0-rc.3"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.0.0-rc.3.tgz#e294cbc6b3a9404811377c537aad478ad953b7b8"
"@angular/animations@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.0.0.tgz#f6efb67ca3f3816d2dbf19b8f570371f2d205edc"

"@angular/common@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.0.0-rc.2.tgz#69f68639270d71b2e8c552e4fa939975fcb88304"
"@angular/common@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.0.0.tgz#ca18983222fdab4ecaa7a8b99eda6ff661e6dc92"

"@angular/compiler-cli@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.0.0-rc.2.tgz#49730cb232d48aba25d68541eb9166bf5330dd2b"
"@angular/compiler-cli@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.0.0.tgz#35b2d40cd35135aecec4be659532148f5ac67da6"
dependencies:
"@angular/tsc-wrapped" "4.0.0-rc.2"
"@angular/tsc-wrapped" "4.0.0"
minimist "^1.2.0"
reflect-metadata "^0.1.2"

"@angular/compiler@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.0.0-rc.2.tgz#643e199e6792413f42cf149a9cf1672284787c11"
"@angular/compiler@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.0.0.tgz#e1aa061a6f8ef269f9748af1a7bc290f9d37ed6c"

"@angular/core@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.0.0-rc.2.tgz#59535050e5d0e6141417186eee571296f8e9c3d0"
"@angular/core@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.0.0.tgz#fd877e074b29dfa9c63b96a21995fc7556d423a3"

"@angular/forms@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.0.0-rc.2.tgz#6d9df97783b6023d652d97369db13d6ad6c7fa9e"
"@angular/forms@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.0.0.tgz#03163047a2e84af42106270da2e1f47ab0fafc37"

"@angular/http@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.0.0-rc.2.tgz#145ecd17f483b97e7750bb9e00b60e48ff82b67a"
"@angular/http@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.0.0.tgz#45a538eac42a0b13f3744c7e8bafeb17d58da31c"

"@angular/platform-browser-dynamic@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.0.0-rc.2.tgz#f2bbab322706dc6361d46647e1e2b7c26f036a1c"
"@angular/platform-browser-dynamic@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.0.0.tgz#d1d9de80fe1e02735be89f512e0faf5a80d57fa5"

"@angular/platform-browser@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.0.0-rc.2.tgz#bcca05ce85d320ee0b257640f15479b59fed20f0"
"@angular/platform-browser@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.0.0.tgz#512ae9ab19ccc25fa79027f44e291bcee236cd2b"

"@angular/platform-server@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-4.0.0-rc.2.tgz#3b09f4e2f2dc1b7d723fbbdc6b99117019c0f9de"
"@angular/platform-server@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-4.0.0.tgz#d76d61787cd3be3ce8ed46043d6a8c82572f567d"
dependencies:
parse5 "^3.0.1"
xhr2 "^0.1.4"

"@angular/router@^4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.0.0-rc.2.tgz#66fc5be012caa38441314d0a0b9c9b6a723c471a"
"@angular/router@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.0.0.tgz#f4a2dc83b44e023db1d6f2c12ca5a37a22c66afc"

"@angular/service-worker@^1.0.0-beta.6":
version "1.0.0-beta.7"
Expand All @@ -60,9 +60,9 @@
base64-js "^1.1.2"
jshashes "^1.0.5"

"@angular/tsc-wrapped@4.0.0-rc.2":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.0.0-rc.2.tgz#d7023d93f4576b6f776ffc7175ff760e7e133705"
"@angular/tsc-wrapped@4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.0.0.tgz#ea91eeda98029cdb0a4ac37d5e25d9d12a4333c1"
dependencies:
tsickle "^0.21.0"

Expand Down Expand Up @@ -2438,7 +2438,7 @@ gulp-concat@^2.6.0:
through2 "^2.0.0"
vinyl "^2.0.0"

gulp-filter@^4.0.0-rc.2:
gulp-filter@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-4.0.0.tgz#395f58a256c559cdb9e0d157f1caaf5248a38dcb"
dependencies:
Expand All @@ -2458,7 +2458,7 @@ gulp-inject@^4.1.0:
stream-to-array "^2.3.0"
through2 "^2.0.1"

gulp-inline-ng2-template@^4.0.0-rc.2:
gulp-inline-ng2-template@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/gulp-inline-ng2-template/-/gulp-inline-ng2-template-4.0.0.tgz#a145f216f79a0da6c9c6b17bce47e199018cd838"
dependencies:
Expand Down Expand Up @@ -2562,7 +2562,7 @@ gulp-sourcemaps@2.2.0:
through2 "2.X"
vinyl "1.X"

gulp-template@^4.0.0-rc.2:
gulp-template@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/gulp-template/-/gulp-template-4.0.0.tgz#05de36808c6fb9966578d5a94ee72cee08cdc53b"
dependencies:
Expand Down

0 comments on commit bdb0e1d

Please sign in to comment.