diff --git a/.travis.yml b/.travis.yml index f77d06d2c..71b08a227 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: node_js +dist: trusty +addons: + chrome: stable node_js: - "6" script: diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100755 new mode 100644 diff --git a/package.json b/package.json old mode 100755 new mode 100644 index 43a409dd1..5a062251f --- a/package.json +++ b/package.json @@ -15,22 +15,22 @@ "clean": "rm -rf ./dist/", "server": "cd dist && http-server", "prod": "npm run clean && npm run build:prod && npm run server", - "ci": "npm run clean && ng lint && ng test --browsers PhantomJS --single-run --reporters spec && npm run build:travisci", + "ci": "npm run clean && ng lint && ng test --single-run --reporters spec && npm run build:travisci", "release": "standard-version && git push --follow-tags origin master" }, "private": true, "dependencies": { - "@angular/animations": "^5.0.0-beta.4", + "@angular/animations": "^5.0.0-beta.6", "@angular/cdk": "^2.0.0-beta.8", - "@angular/common": "^5.0.0-beta.4", - "@angular/compiler": "^5.0.0-beta.4", - "@angular/core": "^5.0.0-beta.4", - "@angular/forms": "^5.0.0-beta.4", - "@angular/http": "^5.0.0-beta.4", - "@angular/material": "^2.0.0-beta.8", - "@angular/platform-browser": "^5.0.0-beta.4", - "@angular/platform-browser-dynamic": "^5.0.0-beta.4", - "@angular/router": "^5.0.0-beta.4", + "@angular/common": "^5.0.0-beta.6", + "@angular/compiler": "^5.0.0-beta.6", + "@angular/core": "^5.0.0-beta.6", + "@angular/forms": "^5.0.0-beta.6", + "@angular/http": "^5.0.0-beta.6", + "@angular/material": "^2.0.0-beta.10", + "@angular/platform-browser": "^5.0.0-beta.6", + "@angular/platform-browser-dynamic": "^5.0.0-beta.6", + "@angular/router": "^5.0.0-beta.6", "@ngrx/effects": "^4.0.0", "@ngrx/router-store": "^4.0.0", "@ngrx/store": "^4.0.0", @@ -39,15 +39,14 @@ "classlist.js": "^1.1", "core-js": "^2.4.1", "hammerjs": "^2.0.8", - "intl": "^1.2.5", "node-uuid": "^1.4.8", "rxjs": "^5.4.2", "web-animations-js": "^2.2.5", "zone.js": "0.8.12" }, "devDependencies": { - "@angular/cli": "~1.4.0-beta.21", - "@angular/compiler-cli": "^5.0.0-beta.4", + "@angular/cli": "~1.4.0-rc.2", + "@angular/compiler-cli": "^5.0.0-beta.6", "@types/jasmine": "2.5.38", "@types/node": "~6.0.60", "codelyzer": "~2.0.0", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index c39002424..a0f3c64f6 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,5 +1,8 @@ import { TestBed, async } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { + NoopAnimationsModule +} from '@angular/platform-browser/animations'; import { SharedModule } from '@app/shared'; import { CoreModule } from '@app/core'; @@ -10,6 +13,7 @@ describe('AppComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ + NoopAnimationsModule, RouterTestingModule, SharedModule, CoreModule diff --git a/src/polyfills.ts b/src/polyfills.ts index 3f86f0036..0ff3138ec 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -54,19 +54,3 @@ import 'web-animations-js'; // Run `npm install --save web-animations-js`. * Zone JS is required by Angular itself. */ import 'zone.js/dist/zone'; // Included with Angular CLI. - - - -/*************************************************************************************************** - * APPLICATION IMPORTS - */ - -/** - * Date, currency, decimal and percent pipes. - * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 - */ -import 'intl'; // Run `npm install --save intl`. -/** - * Need to import at least one locale-data with intl. - */ -import 'intl/locale-data/jsonp/en';