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

Commit

Permalink
Updating to Angular 8 (#8)
Browse files Browse the repository at this point in the history
* Running ng update

* Running ncu

* Updating CI node version
  • Loading branch information
patrickhousley committed Aug 26, 2019
1 parent 766234f commit 0e29269
Show file tree
Hide file tree
Showing 11 changed files with 9,799 additions and 8,846 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
defaults: &defaults
working_directory: ~/project
docker:
- image: circleci/node:8.14
- image: circleci/node:10.16.3

version: 2
jobs:
Expand Down
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"nrwl.angular-console",
"angular.ng-template",
"esbenp.prettier-vscode"
]
}
23 changes: 17 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
"libs/core/tsconfig.lib.json",
"libs/core/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
"exclude": ["**/node_modules/**"]
}
},
"test": {
"builder": "@nrwl/builders:jest",
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/core/jest.config.js",
"tsConfig": "libs/core/tsconfig.spec.json"
Expand All @@ -43,8 +41,21 @@
"typescriptMismatch": false,
"versionMismatch": false
},
"defaultCollection": "@nrwl/schematics",
"defaultCollection": "@nrwl/angular",
"packageManager": "npm"
},
"defaultProject": "core"
"defaultProject": "core",
"schematics": {
"@nrwl/schematics:library": {
"unitTestRunner": "karma",
"framework": "angular"
},
"@nrwl/schematics:application": {
"unitTestRunner": "karma",
"e2eTestRunner": "protractor"
},
"@nrwl/schematics:node-application": {
"framework": "express"
}
}
}
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
transform: {
'^.+\\.(ts|js|html)$': 'jest-preset-angular/preprocessor.js'
'^.+\\.(ts|js|html)$': 'ts-jest'
},
resolver: '@nrwl/builders/plugins/jest/resolver',
resolver: '@nrwl/jest/plugins/resolver',
moduleFileExtensions: ['ts', 'js', 'html'],
collectCoverage: true,
coverageReporters: ['html', 'lcov'],
Expand Down
2 changes: 1 addition & 1 deletion libs/core/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc/libs/core",
"outDir": "../../dist/out-tsc",
"target": "es2015",
"module": "es2015",
"moduleResolution": "node",
Expand Down
2 changes: 1 addition & 1 deletion libs/core/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc/libs/core",
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
},
Expand Down

0 comments on commit 0e29269

Please sign in to comment.