Skip to content

Commit

Permalink
update to next version of nx (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrozenPandaz
FrozenPandaz authored Feb 18, 2020
1 parent 3915a43 commit 0ecc080
Show file tree
Hide file tree
Showing 9 changed files with 825 additions and 771 deletions.
32 changes: 23 additions & 9 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/apps/products",
"index": "apps/products/src/index.html",
"main": "apps/products/src/main.ts",
Expand Down Expand Up @@ -64,6 +65,10 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
Expand Down Expand Up @@ -101,7 +106,8 @@
"options": {
"jestConfig": "apps/products/jest.config.js",
"tsConfig": "apps/products/tsconfig.spec.json",
"setupFile": "apps/products/src/test-setup.ts"
"setupFile": "apps/products/src/test-setup.ts",
"passWithNoTests": true
}
},
"deploy": {
Expand Down Expand Up @@ -230,7 +236,8 @@
"options": {
"jestConfig": "apps/cart/jest.config.js",
"tsConfig": "apps/cart/tsconfig.spec.json",
"setupFile": "apps/cart/src/test-setup.ts"
"setupFile": "apps/cart/src/test-setup.ts",
"passWithNoTests": true
}
},
"deploy": {
Expand Down Expand Up @@ -323,7 +330,8 @@
"options": {
"jestConfig": "libs/shared/product/ui/jest.config.js",
"tsConfig": "libs/shared/product/ui/tsconfig.spec.json",
"setupFile": "libs/shared/product/ui/src/test-setup.ts"
"setupFile": "libs/shared/product/ui/src/test-setup.ts",
"passWithNoTests": true
}
}
}
Expand All @@ -349,7 +357,8 @@
"options": {
"jestConfig": "libs/products/home-page/jest.config.js",
"tsConfig": "libs/products/home-page/tsconfig.spec.json",
"setupFile": "libs/products/home-page/src/test-setup.ts"
"setupFile": "libs/products/home-page/src/test-setup.ts",
"passWithNoTests": true
}
}
},
Expand Down Expand Up @@ -380,7 +389,8 @@
"options": {
"jestConfig": "libs/cart/cart-page/jest.config.js",
"tsConfig": "libs/cart/cart-page/tsconfig.spec.json",
"setupFile": "libs/cart/cart-page/src/test-setup.ts"
"setupFile": "libs/cart/cart-page/src/test-setup.ts",
"passWithNoTests": true
}
}
}
Expand Down Expand Up @@ -436,7 +446,8 @@
"options": {
"jestConfig": "libs/shared/cart/state/jest.config.js",
"tsConfig": "libs/shared/cart/state/tsconfig.spec.json",
"setupFile": "libs/shared/cart/state/src/test-setup.ts"
"setupFile": "libs/shared/cart/state/src/test-setup.ts",
"passWithNoTests": true
}
}
},
Expand Down Expand Up @@ -467,7 +478,8 @@
"options": {
"jestConfig": "libs/shared/product/state/jest.config.js",
"tsConfig": "libs/shared/product/state/tsconfig.spec.json",
"setupFile": "libs/shared/product/state/src/test-setup.ts"
"setupFile": "libs/shared/product/state/src/test-setup.ts",
"passWithNoTests": true
}
}
},
Expand Down Expand Up @@ -505,7 +517,8 @@
"options": {
"jestConfig": "libs/shared/header/jest.config.js",
"tsConfig": "libs/shared/header/tsconfig.spec.json",
"setupFile": "libs/shared/header/src/test-setup.ts"
"setupFile": "libs/shared/header/src/test-setup.ts",
"passWithNoTests": true
}
}
}
Expand Down Expand Up @@ -534,7 +547,8 @@
"options": {
"jestConfig": "libs/products/product-detail-page/jest.config.js",
"tsConfig": "libs/products/product-detail-page/tsconfig.spec.json",
"setupFile": "libs/products/product-detail-page/src/test-setup.ts"
"setupFile": "libs/products/product-detail-page/src/test-setup.ts",
"passWithNoTests": true
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions apps/products/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module.exports = {
preset: '../../jest.config.js',
coverageDirectory: '../../coverage/apps/products',
snapshotSerializers: [
'jest-preset-angular/AngularSnapshotSerializer.js',
'jest-preset-angular/HTMLCommentSerializer.js'
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
]
};
9 changes: 3 additions & 6 deletions apps/products/tsconfig.app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
"outDir": "../../dist/out-tsc",
"types": []
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": [
"**/*.ts",
"**/*.d.ts",
"../../libs/products/home-page/src/index.ts",
"../../libs/products/product-detail-page/src/index.ts"
],
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"angularCompilerOptions": {
"enableIvy": true
}
]
}
5 changes: 3 additions & 2 deletions libs/products/home-page/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module.exports = {
preset: '../../../jest.config.js',
coverageDirectory: '../../../coverage/libs/products/home-page',
snapshotSerializers: [
'jest-preset-angular/AngularSnapshotSerializer.js',
'jest-preset-angular/HTMLCommentSerializer.js'
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
]
};
5 changes: 3 additions & 2 deletions libs/products/product-detail-page/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module.exports = {
preset: '../../../jest.config.js',
coverageDirectory: '../../../coverage/libs/products/product-detail-page',
snapshotSerializers: [
'jest-preset-angular/AngularSnapshotSerializer.js',
'jest-preset-angular/HTMLCommentSerializer.js'
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
]
};
5 changes: 3 additions & 2 deletions libs/shared/cart/state/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module.exports = {
preset: '../../../../jest.config.js',
coverageDirectory: '../../../../coverage/libs/shared/cart/state',
snapshotSerializers: [
'jest-preset-angular/AngularSnapshotSerializer.js',
'jest-preset-angular/HTMLCommentSerializer.js'
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
]
};
5 changes: 3 additions & 2 deletions libs/shared/product/state/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module.exports = {
preset: '../../../../jest.config.js',
coverageDirectory: '../../../../coverage/libs/shared/product/state',
snapshotSerializers: [
'jest-preset-angular/AngularSnapshotSerializer.js',
'jest-preset-angular/HTMLCommentSerializer.js'
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
]
};
50 changes: 26 additions & 24 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,26 @@
"workspace-schematic": "nx workspace-schematic",
"dep-graph": "nx dep-graph",
"help": "nx help",
"nx": "nx"
"nx": "nx",
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
},
"private": true,
"dependencies": {
"@angular/animations": "8.2.14",
"@angular/common": "8.2.14",
"@angular/compiler": "8.2.14",
"@angular/core": "8.2.14",
"@angular/forms": "8.2.14",
"@angular/platform-browser": "8.2.14",
"@angular/platform-browser-dynamic": "8.2.14",
"@angular/router": "8.2.14",
"@angular/animations": "9.0.1",
"@angular/common": "9.0.1",
"@angular/compiler": "9.0.1",
"@angular/core": "9.0.1",
"@angular/forms": "9.0.1",
"@angular/platform-browser": "9.0.1",
"@angular/platform-browser-dynamic": "9.0.1",
"@angular/router": "9.0.1",
"@emotion/core": "10.0.27",
"@emotion/styled": "10.0.27",
"@ngrx/effects": "8.3.0",
"@ngrx/entity": "8.3.0",
"@ngrx/router-store": "8.3.0",
"@ngrx/store": "8.3.0",
"@nrwl/angular": "8.12.0",
"@nrwl/angular": "9.0.1",
"core-js": "^2.5.4",
"document-register-element": "1.13.1",
"firebase": ">= 5.5.7 <7",
Expand All @@ -52,28 +53,29 @@
"react-dom": "16.12.0",
"react-router-dom": "5.1.2",
"rxjs": "~6.5.3",
"zone.js": "^0.9.1"
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.803.23",
"@angular/cli": "8.3.23",
"@angular/compiler-cli": "8.2.14",
"@angular/language-service": "8.2.14",
"@angular-devkit/build-angular": "~0.900.2",
"@angular/cli": "~9.0.1",
"@angular/compiler-cli": "9.0.1",
"@angular/language-service": "9.0.1",
"@babel/preset-react": "7.0.0",
"@ngrx/store-devtools": "8.3.0",
"@nrwl/cypress": "8.12.0",
"@nrwl/cypress": "9.0.1",
"@nrwl/insights": "^8.12.3",
"@nrwl/jest": "8.12.0",
"@nrwl/react": "8.12.0",
"@nrwl/web": "8.12.0",
"@nrwl/workspace": "8.12.0",
"@nrwl/jest": "9.0.1",
"@nrwl/react": "9.0.1",
"@nrwl/web": "9.0.1",
"@nrwl/workspace": "9.0.1",
"@testing-library/react": "9.4.0",
"@types/jest": "24.0.9",
"@types/node": "~8.9.4",
"@types/node": "^12.11.1",
"@types/react": "16.9.17",
"@types/react-dom": "16.9.4",
"@types/react-router-dom": "5.1.3",
"codelyzer": "~5.0.1",
"codelyzer": "^5.1.2",
"cypress": "^3.8.2",
"dotenv": "6.2.0",
"firebase-tools": "^7.2.2",
Expand All @@ -82,12 +84,12 @@
"inquirer-autocomplete-prompt": "^1.0.1",
"jest": "24.1.0",
"jest-environment-jsdom-fourteen": "^0.1.0",
"jest-preset-angular": "7.0.0",
"jest-preset-angular": "8.0.0",
"netlify": "^2.4.8",
"prettier": "1.19.1",
"ts-jest": "24.0.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"typescript": "~3.5.3"
"typescript": "~3.7.5"
}
}
Loading

0 comments on commit 0ecc080

Please sign in to comment.