update to Nx v10.3.0

.eslintrc → .eslintrc.json

@@ -31,7 +31,8 @@
           }
         ]
       }
-    ]
+    ],
+    "@typescript-eslint/explicit-module-boundary-types": "off"
   },
   "overrides": [
     {

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "ms-vscode.vscode-typescript-tslint-plugin",
-    "esbenp.prettier-vscode"
+    "esbenp.prettier-vscode",
+    "firsttris.vscode-jest-runner"
   ]
 }

apps/docusaurus-e2e/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  name: 'docusaurus-e2e',
-  preset: '../../jest.config.js',
+  displayName: 'docusaurus-e2e',
+  preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/apps/docusaurus-e2e',
 };

apps/nuxt-e2e/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  name: 'nuxt-e2e',
-  preset: '../../jest.config.js',
+  displayName: 'nuxt-e2e',
+  preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/apps/nuxt-e2e',
 };

apps/nuxt-e2e/tests/nuxt.test.ts

@@ -4,6 +4,7 @@ import {
   ensureNxProject,
   runNxCommandAsync,
   uniq,
+  updateFile,
 } from '@nrwl/nx-plugin/testing';
 describe('nuxt e2e', () => {
   it('should generate app', async (done) => {
@@ -50,6 +51,24 @@ describe('nuxt e2e', () => {
     done();
   }, 300000);
 
+  it('should report lint error in index.vue', async (done) => {
+    const appName = uniq('app');
+    ensureNxProject('@nx-plus/nuxt', 'dist/libs/nuxt');
+    await runNxCommandAsync(`generate @nx-plus/nuxt:app ${appName}`);
+
+    updateFile(
+      `apps/${appName}/pages/index.vue`,
+      '<script lang="ts">{}</script>'
+    );
+
+    const result = await runNxCommandAsync(`lint ${appName}`, {
+      silenceError: true,
+    });
+    expect(result.stderr).toContain('Lint errors found in the listed files.');
+
+    done();
+  }, 300000);
+
   describe('--directory subdir', () => {
     it('should generate app', async (done) => {
       const appName = uniq('app');

apps/vue-e2e/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  name: 'vue-e2e',
-  preset: '../../jest.config.js',
+  displayName: 'vue-e2e',
+  preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/apps/vue-e2e',
 };

apps/vue-e2e/tests/vue.test.ts

@@ -5,6 +5,7 @@ import {
   runNxCommandAsync,
   tmpProjPath,
   uniq,
+  updateFile,
 } from '@nrwl/nx-plugin/testing';
 import * as cp from 'child_process';
 
@@ -152,6 +153,24 @@ describe('vue e2e', () => {
       done();
     }, 300000);
 
+    it('should report lint error in App.vue', async (done) => {
+      const appName = uniq('app');
+      ensureNxProject('@nx-plus/vue', 'dist/libs/vue');
+      await runNxCommandAsync(`generate @nx-plus/vue:app ${appName}`);
+
+      updateFile(
+        `apps/${appName}/src/App.vue`,
+        '<script lang="ts">{}</script>'
+      );
+
+      const result = await runNxCommandAsync(`lint ${appName}`, {
+        silenceError: true,
+      });
+      expect(result.stderr).toContain('Lint errors found in the listed files.');
+
+      done();
+    }, 300000);
+
     describe('--directory subdir', () => {
       it('should generate app', async (done) => {
         const appName = uniq('app');

jest.config.js

@@ -1,9 +1,7 @@
 module.exports = {
-  testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-  transform: {
-    '^.+\\.(ts|js|html)$': 'ts-jest',
-  },
-  resolver: '@nrwl/jest/plugins/resolver',
-  moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageReporters: ['html'],
+  projects: [
+    '<rootDir>/libs/docusaurus',
+    '<rootDir>/libs/vue',
+    '<rootDir>/libs/nuxt',
+  ],
 };

jest.preset.js

@@ -0,0 +1,3 @@
+const nxPreset = require('@nrwl/jest/preset');
+
+module.exports = { ...nxPreset };

libs/docusaurus/.eslintrc → libs/docusaurus/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../.eslintrc",
+  "extends": "../../.eslintrc.json",
   "rules": {},
   "ignorePatterns": ["!**/*"]
 }

libs/docusaurus/jest.config.js

@@ -1,10 +1,10 @@
 module.exports = {
-  name: 'docusaurus',
-  preset: '../../jest.config.js',
+  preset: '../../jest.preset.js',
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   coverageDirectory: '../../coverage/libs/docusaurus',
   globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'docusaurus',
 };

libs/docusaurus/package.json

@@ -28,11 +28,11 @@
     "@nrwl/workspace": "^10.0.0"
   },
   "dependencies": {
-    "@angular-devkit/architect": "0.1000.7",
-    "@angular-devkit/core": "10.0.7",
-    "@angular-devkit/schematics": "10.0.7",
+    "@angular-devkit/architect": "0.1001.4",
+    "@angular-devkit/core": "10.1.4",
+    "@angular-devkit/schematics": "10.1.4",
     "rxjs": "6.5.5",
-    "typescript": "3.9.7"
+    "typescript": "4.0.3"
   },
   "ng-update": {
     "migrations": "./migrations.json"

libs/nuxt/.eslintrc → libs/nuxt/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../.eslintrc",
+  "extends": "../../.eslintrc.json",
   "rules": {},
   "ignorePatterns": ["!**/*"]
 }

libs/nuxt/jest.config.js

@@ -1,10 +1,10 @@
 module.exports = {
-  name: 'nuxt',
-  preset: '../../jest.config.js',
+  preset: '../../jest.preset.js',
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   coverageDirectory: '../../coverage/libs/nuxt',
   globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'nuxt',
 };

libs/nuxt/package.json

@@ -30,9 +30,9 @@
     "@nrwl/workspace": "^10.0.0"
   },
   "dependencies": {
-    "@angular-devkit/architect": "0.1000.7",
-    "@angular-devkit/core": "10.0.7",
-    "@angular-devkit/schematics": "10.0.7",
+    "@angular-devkit/architect": "0.1001.4",
+    "@angular-devkit/core": "10.1.4",
+    "@angular-devkit/schematics": "10.1.4",
     "@nrwl/cypress": "^10.0.0",
     "@nrwl/jest": "^10.0.0",
     "@nrwl/linter": "^10.0.0",

libs/nuxt/src/schematics/application/schematic.spec.ts

@@ -45,7 +45,7 @@ describe('nuxt schematic', () => {
       browserTarget: 'my-app:build:production',
       dev: false,
     });
-    expect(lint.builder).toBe('@nrwl/linter:lint');
+    expect(lint.builder).toBe('@nrwl/linter:eslint');
     expect(test.builder).toBe('@nrwl/jest:jest');
 
     expect(workspaceJson.projects['my-app-e2e']).toBeDefined();
@@ -71,7 +71,7 @@ describe('nuxt schematic', () => {
 
     const eslintConfig = tree.readContent('apps/my-app/.eslintrc.js');
     expect(eslintConfig).toContain(`extends: [
-    '../../.eslintrc',
+    '../../.eslintrc.json',
     '@nuxtjs/eslint-config-typescript',
     'plugin:nuxt/recommended',
     'prettier',
@@ -167,7 +167,7 @@ describe('nuxt schematic', () => {
 
       const eslintConfig = tree.readContent('apps/subdir/my-app/.eslintrc.js');
       expect(eslintConfig).toContain(`extends: [
-    '../../../.eslintrc',
+    '../../../.eslintrc.json',
     '@nuxtjs/eslint-config-typescript',
     'plugin:nuxt/recommended',
     'prettier',

libs/nuxt/src/schematics/application/schematic.ts

@@ -92,6 +92,9 @@ function addEsLint(options: NormalizedSchema): Rule {
       'prettier',
       'prettier/@typescript-eslint',
     ],
+    parserOptions: {
+      extraFileExtensions: ['.vue'],
+    },
     rules: {},
   };
 
@@ -103,24 +106,27 @@ function addEsLint(options: NormalizedSchema): Rule {
         ...generateProjectLint(
           options.projectRoot,
           `${options.projectRoot}/tsconfig.json`,
-          Linter.EsLint
+          Linter.EsLint,
+          [`${options.projectRoot}/**/*.{ts,js,vue}`]
         ),
       });
     }),
     addLintFiles(options.projectRoot, Linter.EsLint, {
       localConfig: eslintConfig,
     }),
-    // Extending the root ESLint config should be the first value in the
-    // app's local ESLint config extends array.
-    updateJsonInTree(`${options.projectRoot}/.eslintrc`, (json) => {
+    updateJsonInTree(`${options.projectRoot}/.eslintrc.json`, (json) => {
+      // Extending the root ESLint config should be the first value in the
+      // app's local ESLint config extends array.
       json.extends.unshift(json.extends.pop());
+      json.ignorePatterns = [...(json.ignorePatterns || []), '.eslintrc.js'];
       return json;
     }),
     (tree: Tree) => {
-      const configPath = `${options.projectRoot}/.eslintrc`;
+      const configPath = `${options.projectRoot}/.eslintrc.json`;
       const content = tree.read(configPath).toString('utf-8').trim();
-      tree.rename(configPath, `${configPath}.js`);
-      tree.overwrite(`${configPath}.js`, `module.exports = ${content};`);
+      const newConfigPath = configPath.slice(0, -2);
+      tree.rename(configPath, newConfigPath);
+      tree.overwrite(newConfigPath, `module.exports = ${content};`);
     },
   ]);
 }
@@ -149,8 +155,8 @@ function addJest(options: NormalizedSchema): Rule {
     (tree: Tree) => {
       const content = tags.stripIndent`
         module.exports = {
-          name: '${options.projectName}',
-          preset: '${offsetFromRoot(options.projectRoot)}jest.config.js',
+          displayName: '${options.projectName}',
+          preset: '${offsetFromRoot(options.projectRoot)}jest.preset.js',
           transform: {
             '.*\\.(vue)$': 'vue-jest',
             '^.+\\.ts$': 'ts-jest',

libs/vue/.eslintrc → libs/vue/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../.eslintrc",
+  "extends": "../../.eslintrc.json",
   "rules": {},
   "ignorePatterns": ["!**/*"]
 }

libs/vue/jest.config.js

@@ -1,10 +1,10 @@
 module.exports = {
-  name: 'vue',
-  preset: '../../jest.config.js',
+  preset: '../../jest.preset.js',
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   coverageDirectory: '../../coverage/libs/vue',
   globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'vue',
 };

libs/vue/package.json

@@ -30,9 +30,9 @@
     "@nrwl/workspace": "^10.0.0"
   },
   "dependencies": {
-    "@angular-devkit/architect": "0.1000.7",
-    "@angular-devkit/core": "10.0.7",
-    "@angular-devkit/schematics": "10.0.7",
+    "@angular-devkit/architect": "0.1001.4",
+    "@angular-devkit/core": "10.1.4",
+    "@angular-devkit/schematics": "10.1.4",
     "@nrwl/cypress": "^10.0.0",
     "@nrwl/jest": "^10.0.0",
     "@nrwl/linter": "^10.0.0",
@@ -46,7 +46,7 @@
     "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
     "tsconfig-paths-webpack-plugin": "3.3.0",
-    "typescript": "3.9.7"
+    "typescript": "4.0.3"
   },
   "ng-update": {
     "migrations": "./migrations.json"

libs/vue/src/builders/browser/schema.d.ts

@@ -16,8 +16,10 @@ export interface BrowserBuilderSchema extends JsonObject {
   productionSourceMap: boolean;
   css: {
     requireModuleExtension: boolean;
+    // eslint-disable-next-line @typescript-eslint/ban-types
     extract: boolean | object;
     sourceMap: boolean;
+    // eslint-disable-next-line @typescript-eslint/ban-types
     loaderOptions: object;
   };
   stdin: boolean;

libs/vue/src/builders/dev-server/schema.d.ts

@@ -15,9 +15,12 @@ export interface DevServerBuilderSchema extends JsonObject {
   publicPath?: string;
   css: {
     requireModuleExtension?: boolean;
+    // eslint-disable-next-line @typescript-eslint/ban-types
     extract?: boolean | object;
     sourceMap?: boolean;
+    // eslint-disable-next-line @typescript-eslint/ban-types
     loaderOptions: object;
   };
+  // eslint-disable-next-line @typescript-eslint/ban-types
   devServer: object;
 }

libs/vue/src/builders/library/schema.d.ts

@@ -12,8 +12,10 @@ export interface LibraryBuilderSchema extends JsonObject {
   inlineVue: boolean;
   css: {
     requireModuleExtension: boolean;
+    // eslint-disable-next-line @typescript-eslint/ban-types
     extract: boolean | object;
     sourceMap: boolean;
+    // eslint-disable-next-line @typescript-eslint/ban-types
     loaderOptions: object;
   };
   formats: string;

libs/vue/src/schematics/application/schematic.spec.ts

@@ -60,7 +60,7 @@ describe('application schematic', () => {
     expect(serve.configurations.production).toEqual({
       browserTarget: 'my-app:build:production',
     });
-    expect(lint.builder).toBe('@nrwl/linter:lint');
+    expect(lint.builder).toBe('@nrwl/linter:eslint');
     expect(test.builder).toBe('@nrwl/jest:jest');
 
     expect(workspaceJson.projects['my-app-e2e']).toBeDefined();
@@ -94,7 +94,7 @@ describe('application schematic', () => {
 
     const eslintConfig = tree.readContent('apps/my-app/.eslintrc.js');
     expect(eslintConfig).toContain(`extends: [
-    '../../.eslintrc',
+    '../../.eslintrc.json',
     'plugin:vue/essential',
     '@vue/typescript/recommended',
     'prettier',
@@ -402,7 +402,7 @@ describe('application schematic', () => {
 
       const eslintConfig = tree.readContent('apps/subdir/my-app/.eslintrc.js');
       expect(eslintConfig).toContain(`extends: [
-    '../../../.eslintrc',
+    '../../../.eslintrc.json',
     'plugin:vue/essential',
     '@vue/typescript/recommended',
     'prettier',