Skip to content

Commit

Permalink
feat(dependencies): migrate to release candidates of 6 of Angular, CL…
Browse files Browse the repository at this point in the history
…I, Material, RxJS...

- adjust project structure
- adjust Angular CLI configurations
- fix regressions
- add browserlist
- update tslint rules
- ...

closes #125
  • Loading branch information
tomastrajan committed Apr 8, 2018
1 parent 3e7a621 commit 9a41534
Show file tree
Hide file tree
Showing 37 changed files with 2,141 additions and 3,045 deletions.
63 changes: 0 additions & 63 deletions .angular-cli.json

This file was deleted.

Empty file modified CHANGELOG.md
100755 → 100644
Empty file.
138 changes: 138 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
{
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"angular-ngrx-materail-starter": {

This comment has been minimized.

Copy link
@christophechevalier

christophechevalier May 25, 2018

-> "angular-ngrx-material-starter"

"root": "",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
{
"glob": "favicon.ico",
"input": "src",
"output": "/"
},
{
"glob": "**/*",
"input": "src/assets",
"output": "/assets"
}
],
"styles": [
{
"input": "src/styles.scss"
}
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"src": "src/environments/environment.ts",
"replaceWith": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "angular-ngrx-materail-starter:build"

This comment has been minimized.

Copy link
@christophechevalier

christophechevalier May 25, 2018

-> "angular-ngrx-material-starter:build"

},
"configurations": {
"production": {
"browserTarget": "angular-ngrx-materail-starter:build:production"

This comment has been minimized.

Copy link
@christophechevalier

christophechevalier May 25, 2018

-> "angular-ngrx-material-starter:build:production"

}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-ngrx-materail-starter:build"

This comment has been minimized.

Copy link
@christophechevalier

christophechevalier May 25, 2018

-> "angular-ngrx-material-starter:build"

}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
{
"input": "styles.scss"
}
],
"scripts": [],
"assets": [
{
"glob": "favicon.ico",
"input": "src/",
"output": "/"
},
{
"glob": "**/*",
"input": "src/assets",
"output": "/assets"
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"angular-ngrx-materail-starter-e2e": {

This comment has been minimized.

Copy link
@christophechevalier

christophechevalier May 25, 2018

-> "angular-ngrx-material-starter:e2e"

"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "angular-ngrx-materail-starter:serve"

This comment has been minimized.

Copy link
@christophechevalier

christophechevalier May 25, 2018

-> "angular-ngrx-material-starter:serve"

}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
}
}
File renamed without changes.
File renamed without changes.
8 changes: 6 additions & 2 deletions e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": ["jasmine", "node"]
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}
Loading

0 comments on commit 9a41534

Please sign in to comment.