update nx to 13.2.0-rc.4 (#176)

.circleci/config.yml

@@ -118,7 +118,7 @@ jobs:
           <<: *set_env
       - restore_cache:
           <<: *yarn_cache
-      - run: yarn affected:e2e -- ${AFFECTED_ARGS} --configuration production -- --headless
+      - run: yarn affected:e2e -- ${AFFECTED_ARGS} --configuration production --parallel false -- --headless
       - store_artifacts:
           path: dist/cypress
 

.gitignore

@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

apps/cart/tsconfig.app.json

@@ -4,7 +4,7 @@
     "outDir": "../../dist/out-tsc",
     "types": []
   },
-  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
   "files": [
     "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",

apps/cart/tsconfig.spec.json

@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ],
   "files": [

apps/products/jest.config.js

@@ -10,11 +10,14 @@ module.exports = {
       tsconfig: '<rootDir>/tsconfig.spec.json',
     },
   },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
   displayName: 'products',
   snapshotSerializers: [
     'jest-preset-angular/build/serializers/no-ng-attributes',
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };

apps/products/src/polyfills.ts

@@ -18,16 +18,6 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

apps/products/tsconfig.spec.json

@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }

libs/cart/cart-page/src/lib/cart-cart-page/cart-cart-page.tsx

@@ -10,12 +10,12 @@ import {
   getItemCost,
   getTotalCost,
   SetQuantity,
-} from '@nx-example/shared/cart/state';
+} from '@nx-example/shared/cart/state/react';
 import {
   getProduct,
   initialState,
   productsReducer,
-} from '@nx-example/shared/product/state';
+} from '@nx-example/shared/product/state/react';
 
 const StyledUl = styled.ul`
   display: flex;

libs/cart/cart-page/tsconfig.lib.json

@@ -4,6 +4,6 @@
     "outDir": "../../../dist/out-tsc",
     "types": []
   },
-  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.ts", "**/*.tsx"]
 }

libs/cart/cart-page/tsconfig.spec.json

@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }

libs/products/home-page/jest.config.js

@@ -16,5 +16,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };

libs/products/home-page/tsconfig.lib.json

@@ -16,6 +16,6 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }

libs/products/home-page/tsconfig.spec.json

@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }

libs/products/product-detail-page/jest.config.js

@@ -16,5 +16,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };

libs/products/product-detail-page/tsconfig.lib.json

@@ -16,6 +16,6 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }

libs/products/product-detail-page/tsconfig.spec.json

@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }

libs/shared/cart/state/jest.config.js

@@ -16,5 +16,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };

libs/shared/cart/state/src/lib/+state/cart.actions.ts

@@ -1,4 +1,4 @@
-import { Action } from '@ngrx/store';
+import type { Action } from '@ngrx/store';
 
 export enum CartActionTypes {
   /* eslint-disable @typescript-eslint/no-shadow */

libs/shared/cart/state/src/lib/+state/cart.selectors.ts

@@ -1,4 +1,7 @@
-import { getProduct, ProductsState } from '@nx-example/shared/product/state';
+import {
+  getProduct,
+  ProductsState,
+} from '@nx-example/shared/product/state/react';
 import { CartItem, CartState } from './cart.reducer';
 
 // Lookup the 'Cart' feature state managed by NgRx

libs/shared/cart/state/src/react.ts

@@ -0,0 +1,3 @@
+export * from './lib/+state/cart.actions';
+export * from './lib/+state/cart.reducer';
+export * from './lib/+state/cart.selectors';

libs/shared/cart/state/tsconfig.lib.json

@@ -16,6 +16,6 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }

libs/shared/cart/state/tsconfig.spec.json

@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }

libs/shared/header/tsconfig.lib.json

@@ -4,6 +4,6 @@
     "outDir": "../../../dist/out-tsc",
     "types": []
   },
-  "exclude": ["**/*.spec.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }

libs/shared/header/tsconfig.spec.json

@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }

libs/shared/product/state/jest.config.js

@@ -16,5 +16,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };

libs/shared/product/state/src/index.ts

@@ -1,3 +1,7 @@
+import { createFeatureSelector } from '@ngrx/store';
+import { PRODUCTS_FEATURE_KEY } from './lib/+state/products.reducer';
+
 export * from './lib/+state/products.reducer';
 export * from './lib/+state/products.selectors';
+export const getProductsState = createFeatureSelector(PRODUCTS_FEATURE_KEY);
 export * from './lib/shared-product-state.module';

libs/shared/product/state/src/lib/+state/products.selectors.ts

@@ -1,8 +1,4 @@
-import { createFeatureSelector } from '@ngrx/store';
-
-import { ProductsState, PRODUCTS_FEATURE_KEY } from './products.reducer';
-
-export const getProductsState = createFeatureSelector(PRODUCTS_FEATURE_KEY);
+import { ProductsState } from './products.reducer';
 
 export const getProducts = ({ products }: ProductsState) => products;
 

libs/shared/product/state/src/react.ts

@@ -0,0 +1,2 @@
+export * from './lib/+state/products.reducer';
+export * from './lib/+state/products.selectors';

libs/shared/product/state/tsconfig.lib.json

@@ -16,6 +16,6 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }

libs/shared/product/state/tsconfig.spec.json

@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }

libs/shared/product/ui/tsconfig.lib.json

@@ -4,6 +4,6 @@
     "outDir": "../../../../dist/out-tsc",
     "types": []
   },
-  "exclude": ["**/*.spec.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }

libs/shared/product/ui/tsconfig.spec.json

@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }

package.json

@@ -28,23 +28,23 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "12.2.4",
-    "@angular/common": "12.2.4",
-    "@angular/compiler": "12.2.4",
-    "@angular/core": "12.2.4",
-    "@angular/forms": "12.2.4",
-    "@angular/platform-browser": "12.2.4",
-    "@angular/platform-browser-dynamic": "12.2.4",
-    "@angular/router": "12.2.4",
+    "@angular/animations": "13.0.2",
+    "@angular/common": "13.0.2",
+    "@angular/compiler": "13.0.2",
+    "@angular/core": "13.0.2",
+    "@angular/forms": "13.0.2",
+    "@angular/platform-browser": "13.0.2",
+    "@angular/platform-browser-dynamic": "13.0.2",
+    "@angular/router": "13.0.2",
     "@emotion/babel-plugin": "11.2.0",
     "@emotion/react": "11.1.5",
     "@emotion/styled": "11.1.5",
-    "@ngrx/component-store": "12.5.0",
-    "@ngrx/effects": "12.5.0",
-    "@ngrx/entity": "12.5.0",
-    "@ngrx/router-store": "12.5.0",
-    "@ngrx/store": "12.5.0",
-    "@nrwl/angular": "13.0.0-rc.1",
+    "@ngrx/component-store": "13.0.1",
+    "@ngrx/effects": "13.0.1",
+    "@ngrx/entity": "13.0.1",
+    "@ngrx/router-store": "13.0.1",
+    "@ngrx/store": "13.0.1",
+    "@nrwl/angular": "13.2.0-rc.4",
     "core-js": "^2.5.4",
     "document-register-element": "1.13.1",
     "normalize.css": "^8.0.1",
@@ -56,24 +56,24 @@
     "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "12.2.4",
-    "@angular-eslint/eslint-plugin": "12.3.1",
-    "@angular-eslint/eslint-plugin-template": "12.3.1",
-    "@angular-eslint/template-parser": "12.3.1",
-    "@angular/cli": "12.2.4",
-    "@angular/compiler-cli": "12.2.4",
-    "@angular/language-service": "12.2.4",
-    "@ngrx/store-devtools": "12.5.0",
-    "@nrwl/cli": "13.0.0-rc.1",
-    "@nrwl/cypress": "13.0.0-rc.1",
-    "@nrwl/eslint-plugin-nx": "13.0.0-rc.1",
-    "@nrwl/jest": "13.0.0-rc.1",
-    "@nrwl/linter": "13.0.0-rc.1",
-    "@nrwl/nx-cloud": "12.5.0",
-    "@nrwl/react": "13.0.0-rc.1",
-    "@nrwl/tao": "13.0.0-rc.1",
-    "@nrwl/web": "13.0.0-rc.1",
-    "@nrwl/workspace": "13.0.0-rc.1",
+    "@angular-devkit/build-angular": "13.0.3",
+    "@angular-eslint/eslint-plugin": "12.6.1",
+    "@angular-eslint/eslint-plugin-template": "12.6.1",
+    "@angular-eslint/template-parser": "12.6.1",
+    "@angular/cli": "13.0.3",
+    "@angular/compiler-cli": "13.0.2",
+    "@angular/language-service": "13.0.2",
+    "@ngrx/store-devtools": "13.0.1",
+    "@nrwl/cli": "13.2.0-rc.4",
+    "@nrwl/cypress": "13.2.0-rc.4",
+    "@nrwl/eslint-plugin-nx": "13.2.0-rc.4",
+    "@nrwl/jest": "13.2.0-rc.4",
+    "@nrwl/linter": "13.2.0-rc.4",
+    "@nrwl/nx-cloud": "12.5.4",
+    "@nrwl/react": "13.2.0-rc.4",
+    "@nrwl/tao": "13.2.0-rc.4",
+    "@nrwl/web": "13.2.0-rc.4",
+    "@nrwl/workspace": "13.2.0-rc.4",
     "@testing-library/react": "11.2.6",
     "@types/jest": "27.0.2",
     "@types/node": "14.14.33",
@@ -95,11 +95,11 @@
     "inquirer": "^6.2.2",
     "inquirer-autocomplete-prompt": "^1.0.1",
     "jest": "27.2.3",
-    "jest-preset-angular": "10.0.1",
+    "jest-preset-angular": "11.0.0",
     "netlify": "^2.4.8",
     "prettier": "2.3.2",
     "ts-jest": "27.0.5",
     "ts-node": "9.1.1",
-    "typescript": "4.3.5"
+    "typescript": "4.4.4"
   }
 }