chore(repo): update nx to 14.2.0-rc.1 (#202)

TransmitSecurity · Jun 3, 2022 · 620de87 · 620de87
1 parent 62bd007
commit 620de87
Show file tree

Hide file tree

Showing 65 changed files with 2,294 additions and 1,587 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/repo
   docker:
-    - image: circleci/node:12-browsers
+    - image: circleci/node:lts-browsers
 
 set_env: &set_env
   name: Setup Environment Variables

diff --git a/apps/cart-e2e/project.json b/apps/cart-e2e/project.json
@@ -1,5 +1,5 @@
 {
-  "root": "apps/cart-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/cart-e2e/src",
   "projectType": "application",
   "targets": {

diff --git a/apps/cart-e2e/src/integration/app.spec.ts b/apps/cart-e2e/src/integration/app.spec.ts
@@ -10,9 +10,7 @@ describe('cart', () => {
   });
 
   it('should display products', () => {
-    getPage()
-      .get('li figure')
-      .should('have.length', 5);
+    getPage().get('li figure').should('have.length', 5);
   });
 
   it('should have the total price', () => {
@@ -22,10 +20,7 @@ describe('cart', () => {
   });
 
   it('should update total price', () => {
-    getPage()
-      .get('li select')
-      .first()
-      .select('3');
+    getPage().get('li select').first().select('3');
     getPage()
       .get('li:last-of-type nx-example-product-price')
       .contains('$700.00');

diff --git a/apps/cart/jest.config.ts b/apps/cart/jest.config.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
@@ -7,5 +7,5 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
   displayName: 'cart',
-  preset: '../../jest.preset.ts',
+  preset: '../../jest.preset.js',
 };
diff --git a/apps/cart/project.json b/apps/cart/project.json
@@ -1,5 +1,5 @@
 {
-  "root": "apps/cart",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/cart/src",
   "projectType": "application",
   "generators": {},

diff --git a/apps/cart/src/environments/environment.prod.ts b/apps/cart/src/environments/environment.prod.ts
@@ -1,3 +1,3 @@
 export const environment = {
-  production: true
+  production: true,
 };
diff --git a/apps/cart/src/environments/environment.ts b/apps/cart/src/environments/environment.ts
@@ -2,5 +2,5 @@
 // When building for production, this file is replaced with `environment.prod.ts`.
 
 export const environment = {
-  production: false
+  production: false,
 };
diff --git a/apps/products-e2e/project.json b/apps/products-e2e/project.json
@@ -1,5 +1,5 @@
 {
-  "root": "apps/products-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/products-e2e/src",
   "projectType": "application",
   "targets": {

diff --git a/apps/products-e2e/src/integration/app.spec.ts b/apps/products-e2e/src/integration/app.spec.ts
@@ -10,16 +10,11 @@ describe('products', () => {
   });
 
   it('should display products', () => {
-    getPage()
-      .get('li figure')
-      .should('have.length', 5);
+    getPage().get('li figure').should('have.length', 5);
   });
 
   it('should navigate to product details', () => {
-    getPage()
-      .get('li a')
-      .first()
-      .click();
+    getPage().get('li a').first().click();
 
     cy.url().should('include', '/product/1');
   });

diff --git a/apps/products/jest.config.ts b/apps/products/jest.config.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   coverageDirectory: '../../coverage/apps/products',
 
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
@@ -19,5 +19,5 @@ module.exports = {
     'jest-preset-angular/build/serializers/html-comment',
   ],
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
-  preset: '../../jest.preset.ts',
+  preset: '../../jest.preset.js',
 };
diff --git a/apps/products/project.json b/apps/products/project.json
@@ -1,11 +1,11 @@
 {
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "generators": {
     "@nrwl/workspace:component": {
       "style": "scss"
     }
   },
-  "root": "apps/products",
   "sourceRoot": "apps/products/src",
   "prefix": "nx-example",
   "targets": {

diff --git a/apps/products/src/app/app.component.spec.ts b/apps/products/src/app/app.component.spec.ts
@@ -11,7 +11,7 @@ describe('AppComponent', () => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule],
       declarations: [AppComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
     fixture = TestBed.createComponent(AppComponent);
 

diff --git a/apps/products/src/app/app.component.ts b/apps/products/src/app/app.component.ts
@@ -5,6 +5,6 @@ import '@nx-example/shared/header';
 @Component({
   selector: 'nx-example-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  styleUrls: ['./app.component.scss'],
 })
 export class AppComponent {}
diff --git a/apps/products/src/app/app.module.ts b/apps/products/src/app/app.module.ts
@@ -27,7 +27,7 @@ import { AppComponent } from './app.component';
             ),
         },
       ],
-      { initialNavigation: 'enabled', relativeLinkResolution: 'legacy' }
+      { initialNavigation: 'enabledBlocking', relativeLinkResolution: 'legacy' }
     ),
     StoreModule.forRoot({}),
   ],

diff --git a/apps/products/src/environments/environment.prod.ts b/apps/products/src/environments/environment.prod.ts
@@ -1,3 +1,3 @@
 export const environment = {
-  production: true
+  production: true,
 };
diff --git a/apps/products/src/environments/environment.ts b/apps/products/src/environments/environment.ts
@@ -3,7 +3,7 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-  production: false
+  production: false,
 };
 
 /*

diff --git a/apps/products/src/main.ts b/apps/products/src/main.ts
@@ -10,4 +10,4 @@ if (environment.production) {
 
 platformBrowserDynamic()
   .bootstrapModule(AppModule)
-  .catch(err => console.error(err));
+  .catch((err) => console.error(err));
diff --git a/apps/products/tsconfig.json b/apps/products/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "target": "es2020"
   },
   "include": [],
   "files": [],

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,3 +1,3 @@
 const { getJestProjects } = require('@nrwl/jest');
 
-module.exports = { projects: getJestProjects() };
+export default { projects: getJestProjects() };
diff --git a/jest.preset.ts → jest.preset.js b/jest.preset.ts → jest.preset.js
@@ -1,4 +1,4 @@
-const nxPreset = require('@nrwl/jest/preset');
+const nxPreset = require('@nrwl/jest/preset').default;
 module.exports = {
   ...nxPreset,
   testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

diff --git a/libs/cart/cart-page/jest.config.ts b/libs/cart/cart-page/jest.config.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
@@ -7,5 +7,5 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
   displayName: 'cart-cart-page',
-  preset: '../../../jest.preset.ts',
+  preset: '../../../jest.preset.js',
 };
diff --git a/libs/cart/cart-page/project.json b/libs/cart/cart-page/project.json
@@ -1,5 +1,5 @@
 {
-  "root": "libs/cart/cart-page",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/cart/cart-page/src",
   "projectType": "library",
   "generators": {},

diff --git a/libs/products/home-page/jest.config.ts b/libs/products/home-page/jest.config.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   coverageDirectory: '../../../coverage/libs/products/home-page',
 
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
@@ -19,5 +19,5 @@ module.exports = {
     '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
-  preset: '../../../jest.preset.ts',
+  preset: '../../../jest.preset.js',
 };
diff --git a/libs/products/home-page/project.json b/libs/products/home-page/project.json
@@ -1,6 +1,6 @@
 {
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
-  "root": "libs/products/home-page",
   "sourceRoot": "libs/products/home-page/src",
   "prefix": "nx-example",
   "targets": {

diff --git a/libs/products/home-page/src/lib/home-page/home-page.component.spec.ts b/libs/products/home-page/src/lib/home-page/home-page.component.spec.ts
@@ -17,10 +17,10 @@ describe('HomePageComponent', () => {
       imports: [
         StoreModule.forRoot({}),
         RouterTestingModule,
-        SharedProductStateModule
+        SharedProductStateModule,
       ],
       declarations: [HomePageComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 

diff --git a/libs/products/home-page/src/lib/products-home-page.module.spec.ts b/libs/products/home-page/src/lib/products-home-page.module.spec.ts
@@ -4,7 +4,7 @@ import { ProductsHomePageModule } from './products-home-page.module';
 describe('ProductsHomePageModule', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [ProductsHomePageModule]
+      imports: [ProductsHomePageModule],
     }).compileComponents();
   }));
 

diff --git a/libs/products/home-page/src/lib/products-home-page.module.ts b/libs/products/home-page/src/lib/products-home-page.module.ts
@@ -15,11 +15,11 @@ import { HomePageComponent } from './home-page/home-page.component';
       {
         path: '',
         pathMatch: 'full',
-        component: HomePageComponent
-      }
-    ])
+        component: HomePageComponent,
+      },
+    ]),
   ],
   declarations: [HomePageComponent],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class ProductsHomePageModule {}
diff --git a/libs/products/home-page/tsconfig.json b/libs/products/home-page/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "target": "es2020"
   },
   "include": [],
   "files": [],

diff --git a/libs/products/product-detail-page/jest.config.ts b/libs/products/product-detail-page/jest.config.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   coverageDirectory: '../../../coverage/libs/products/product-detail-page',
 
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
@@ -19,5 +19,5 @@ module.exports = {
     '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
-  preset: '../../../jest.preset.ts',
+  preset: '../../../jest.preset.js',
 };
diff --git a/libs/products/product-detail-page/project.json b/libs/products/product-detail-page/project.json
@@ -1,6 +1,6 @@
 {
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
-  "root": "libs/products/product-detail-page",
   "sourceRoot": "libs/products/product-detail-page/src",
   "prefix": "nx-example",
   "targets": {

diff --git a/...cts/product-detail-page/src/lib/product-detail-page/product-detail-page.component.spec.ts b/...cts/product-detail-page/src/lib/product-detail-page/product-detail-page.component.spec.ts
@@ -10,9 +10,7 @@ import { SharedProductStateModule } from '@nx-example/shared/product/state';
 import { ProductDetailPageComponent } from './product-detail-page.component';
 
 class MockActivatedRoute {
-  paramMap = of(
-    new Map<string, string>([['productId', '1']])
-  );
+  paramMap = of(new Map<string, string>([['productId', '1']]));
 }
 
 describe('ProductDetailPageComponent', () => {
@@ -25,11 +23,11 @@ describe('ProductDetailPageComponent', () => {
       providers: [
         {
           provide: ActivatedRoute,
-          useClass: MockActivatedRoute
-        }
+          useClass: MockActivatedRoute,
+        },
       ],
       declarations: [ProductDetailPageComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 

diff --git a/libs/products/product-detail-page/src/lib/products-product-detail-page.module.spec.ts b/libs/products/product-detail-page/src/lib/products-product-detail-page.module.spec.ts
@@ -4,7 +4,7 @@ import { ProductsProductDetailPageModule } from './products-product-detail-page.
 describe('ProductsProductDetailPageModule', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [ProductsProductDetailPageModule]
+      imports: [ProductsProductDetailPageModule],
     }).compileComponents();
   }));
 

diff --git a/libs/products/product-detail-page/src/lib/products-product-detail-page.module.ts b/libs/products/product-detail-page/src/lib/products-product-detail-page.module.ts
@@ -12,10 +12,10 @@ import { ProductDetailPageComponent } from './product-detail-page/product-detail
     SharedProductStateModule,
 
     RouterModule.forChild([
-      { path: ':productId', component: ProductDetailPageComponent }
-    ])
+      { path: ':productId', component: ProductDetailPageComponent },
+    ]),
   ],
   declarations: [ProductDetailPageComponent],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class ProductsProductDetailPageModule {}
diff --git a/libs/products/product-detail-page/tsconfig.json b/libs/products/product-detail-page/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "target": "es2020"
   },
   "include": [],
   "files": [],

diff --git a/libs/shared/assets/project.json b/libs/shared/assets/project.json
@@ -1,5 +1,5 @@
 {
-  "root": "libs/shared/assets",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/shared/assets/src",
   "projectType": "library",
   "generators": {},

diff --git a/libs/shared/cart/state/jest.config.ts b/libs/shared/cart/state/jest.config.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   coverageDirectory: '../../../../coverage/libs/shared/cart/state',
 
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
@@ -19,5 +19,5 @@ module.exports = {
     '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
-  preset: '../../../../jest.preset.ts',
+  preset: '../../../../jest.preset.js',
 };
diff --git a/libs/shared/cart/state/project.json b/libs/shared/cart/state/project.json
@@ -1,6 +1,6 @@
 {
+  "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
-  "root": "libs/shared/cart/state",
   "sourceRoot": "libs/shared/cart/state/src",
   "prefix": "nx-example",
   "targets": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ import { AppComponent } from './app.component'; @@
                 ),
             },
           ],
-          { initialNavigation: 'enabled', relativeLinkResolution: 'legacy' }
+          { initialNavigation: 'enabledBlocking', relativeLinkResolution: 'legacy' }
         ),
         StoreModule.forRoot({}),
       ],
@@ Expand Down @@