feat(core): support Nx 10.2.x and tsconfig.base.json (#215)

nstudio · Sep 25, 2020 · b336329 · b336329
1 parent bb6f26e
commit b336329
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 71 deletions.
diff --git a/package.json b/package.json
@@ -52,13 +52,13 @@
     "@angular/service-worker": "~10.1.0",
     "@angular/upgrade": "~10.1.0",
     "@cypress/webpack-preprocessor": "^5.4.2",
-    "@nrwl/angular": "~10.1.0",
-    "@nrwl/express": "~10.1.0",
-    "@nrwl/nest": "~10.1.0",
-    "@nrwl/node": "~10.1.0",
-    "@nrwl/react": "~10.1.0",
-    "@nrwl/web": "~10.1.0",
-    "@nrwl/workspace": "~10.1.0",
+    "@nrwl/angular": "~10.2.0",
+    "@nrwl/express": "~10.2.0",
+    "@nrwl/nest": "~10.2.0",
+    "@nrwl/node": "~10.2.0",
+    "@nrwl/react": "~10.2.0",
+    "@nrwl/web": "~10.2.0",
+    "@nrwl/workspace": "~10.2.0",
     "@schematics/angular": "~10.1.0",
     "@types/express": "~4.17.0",
     "@types/jasmine": "~3.5.11",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -29,7 +29,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "^10.1.0"
+    "@nrwl/angular": "^10.2.0"
   },
   "peerDependencies": {
     "@nstudio/xplat": "*"

diff --git a/packages/angular/src/schematics/application/index.spec.ts b/packages/angular/src/schematics/application/index.spec.ts
@@ -1,6 +1,6 @@
 import { Tree } from '@angular-devkit/schematics';
 import { Schema } from './schema';
-import { jsonParse } from '@nstudio/xplat-utils';
+import { getRootTsConfigPath, jsonParse } from '@nstudio/xplat-utils';
 import { createEmptyWorkspace, getFileContent } from '@nstudio/xplat/testing';
 import { runSchematic } from '../../utils/testing';
 
@@ -55,20 +55,25 @@ describe('app', () => {
     expect(files.indexOf('/apps/foo-web/tsconfig.json')).toBeGreaterThanOrEqual(
       0
     );
+    let checkPath = getRootTsConfigPath();
+    let checkFile = getFileContent(tree, checkPath);
+    // console.log('tsconfig.base:', checkFile);
+    expect(files.indexOf(checkPath)).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/tsconfig.json')).toBeGreaterThanOrEqual(0);
     expect(files.indexOf('/apps/foo-web/src/main.ts')).toBeGreaterThanOrEqual(
       0
     );
     expect(
       files.indexOf('/apps/foo-web/src/app/app.module.ts')
     ).toBeGreaterThanOrEqual(0);
 
-    let checkPath = '/apps/foo-web/src/app/app.component.html';
+    checkPath = '/apps/foo-web/src/app/app.component.html';
     expect(files.indexOf(checkPath)).toBeGreaterThanOrEqual(0);
 
     checkPath = '/package.json';
     expect(files.indexOf(checkPath)).toBeGreaterThanOrEqual(0);
 
-    let checkFile = getFileContent(tree, checkPath);
+    checkFile = getFileContent(tree, checkPath);
     // console.log(checkFile);
     const packageData: any = jsonParse(checkFile);
     expect(packageData.scripts['start.foo.web']).toBeDefined();

diff --git a/packages/angular/src/schematics/application/index.ts b/packages/angular/src/schematics/application/index.ts
@@ -31,6 +31,7 @@ import {
   getJsonFromFile,
   updateJsonFile,
   supportedPlatforms,
+  checkRootTsConfig,
 } from '@nstudio/xplat-utils';
 import { Schema } from './schema';
 
@@ -105,6 +106,11 @@ export default function (options: Schema) {
       scripts[`start.${platformApp}`] = `nx serve ${options.name}`;
       return updatePackageScripts(tree, scripts);
     },
+    (tree: Tree) => {
+      // make sure tsconfig exists at root
+      // we do this here because Nrwl with 10.1 was actually removing it
+      checkRootTsConfig(tree);
+    },
     <any>formatFiles({ skipFormat: options.skipFormat }),
   ]);
 }

diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts
@@ -1,5 +1,5 @@
 export const xplatVersion = '*';
-export const nxVersion = '~10.1.0';
+export const nxVersion = '~10.2.0';
 export const angularVersion = '~10.1.0';
 export const angularDevkitVersion = '~0.1001.0';
 export const ngxTranslateVersion = '~13.0.0';

diff --git a/packages/electron-angular/src/schematics/xplat/index.spec.ts b/packages/electron-angular/src/schematics/xplat/index.spec.ts
@@ -1,6 +1,6 @@
 import { Tree } from '@angular-devkit/schematics';
 
-import { setTest, jsonParse } from '@nstudio/xplat-utils';
+import { setTest, jsonParse, getRootTsConfigPath } from '@nstudio/xplat-utils';
 import { XplatHelpers } from '@nstudio/xplat';
 import { createEmptyWorkspace, getFileContent } from '@nstudio/xplat/testing';
 import { runSchematic } from '../../utils/testing';
@@ -40,7 +40,7 @@ describe('xplat schematic', () => {
     expect(hasNativeScript).toBeUndefined();
     const hasElectron = packageFile.devDependencies[`electron`];
     expect(hasElectron).toBeDefined();
-    let filePath = '/tsconfig.json';
+    let filePath = '/tsconfig.base.json';
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(fileContent.compilerOptions.paths['@testing/electron']).toBeTruthy();
@@ -60,7 +60,7 @@ describe('xplat schematic', () => {
 
     const tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/electron-angular/index.ts')).toBeTruthy();
-    const filePath = '/tsconfig.json';
+    const filePath = getRootTsConfigPath();
     const fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(
@@ -79,7 +79,7 @@ describe('xplat schematic', () => {
 
     let tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/electron/index.ts')).toBeTruthy();
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(fileContent.compilerOptions.paths['@testing/electron']).toBeTruthy();

diff --git a/packages/electron-angular/src/utils/versions.ts b/packages/electron-angular/src/utils/versions.ts
@@ -1,2 +1,2 @@
 export const xplatVersion = '*';
-export const nxVersion = '~10.1.0';
+export const nxVersion = '~10.2.0';
diff --git a/packages/ionic-angular/src/schematics/xplat/index.spec.ts b/packages/ionic-angular/src/schematics/xplat/index.spec.ts
@@ -1,5 +1,10 @@
 import { Tree } from '@angular-devkit/schematics';
-import { supportedPlatforms, setTest, jsonParse } from '@nstudio/xplat-utils';
+import {
+  supportedPlatforms,
+  setTest,
+  jsonParse,
+  getRootTsConfigPath,
+} from '@nstudio/xplat-utils';
 import { XplatHelpers } from '@nstudio/xplat';
 import { createEmptyWorkspace, getFileContent } from '@nstudio/xplat/testing';
 import { runSchematic } from '../../utils/testing';
@@ -37,7 +42,7 @@ describe('xplat ionic angular', () => {
     // should not include these root packages
     const hasNativeScript = packageFile.dependencies[`nativescript-angular`];
     expect(hasNativeScript).toBeUndefined();
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(fileContent.compilerOptions.paths['@testing/ionic']).toBeTruthy();
@@ -55,7 +60,7 @@ describe('xplat ionic angular', () => {
 
     const tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/ionic-angular/index.ts')).toBeTruthy();
-    const filePath = '/tsconfig.json';
+    const filePath = getRootTsConfigPath();
     const fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(
@@ -74,7 +79,7 @@ describe('xplat ionic angular', () => {
 
     let tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/ionic/index.ts')).toBeTruthy();
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(fileContent.compilerOptions.paths['@testing/ionic']).toBeTruthy();

diff --git a/packages/nativescript-angular/src/schematics/application/index.ts b/packages/nativescript-angular/src/schematics/application/index.ts
@@ -151,36 +151,18 @@ export default function (options: Schema) {
           },
         },
         architect: {
-          serve: {
-            builder: '@nrwl/workspace:run-commands',
-            options: {
-              commands: [
-                {
-                  command: `yarn start.${platformApp}.preview`,
-                },
-              ],
-            },
-          },
           ios: {
             builder: '@nrwl/workspace:run-commands',
             options: {
-              commands: [
-                {
-                  command: 'ns debug ios --no-hmr',
-                },
-              ],
+              commands: ['ns debug ios --no-hmr'],
               cwd: `apps/${directory}${options.name}`,
               parallel: false,
             },
           },
           android: {
             builder: '@nrwl/workspace:run-commands',
             options: {
-              commands: [
-                {
-                  command: 'ns debug android --no-hmr',
-                },
-              ],
+              commands: ['ns debug android --no-hmr'],
               cwd: `apps/${directory}${options.name}`,
               parallel: false,
             },
@@ -189,16 +171,9 @@ export default function (options: Schema) {
             builder: '@nrwl/workspace:run-commands',
             options: {
               commands: [
-                {
-                  command:
-                    'npx rimraf -- hooks node_modules platforms package-lock.json',
-                },
-                {
-                  command: 'npm i',
-                },
-                {
-                  command: 'npx rimraf -- package-lock.json',
-                },
+                'npx rimraf hooks node_modules platforms package-lock.json',
+                'npm i',
+                'npx rimraf package-lock.json',
               ],
               cwd: `apps/${directory}${options.name}`,
               parallel: false,

diff --git a/packages/nativescript-angular/src/schematics/xplat/index.spec.ts b/packages/nativescript-angular/src/schematics/xplat/index.spec.ts
@@ -1,5 +1,10 @@
 import { Tree } from '@angular-devkit/schematics';
-import { supportedPlatforms, setTest, jsonParse } from '@nstudio/xplat-utils';
+import {
+  supportedPlatforms,
+  setTest,
+  jsonParse,
+  getRootTsConfigPath,
+} from '@nstudio/xplat-utils';
 import { XplatHelpers } from '@nstudio/xplat';
 import { createEmptyWorkspace, getFileContent } from '@nstudio/xplat/testing';
 import { runSchematic } from '../../utils/testing';
@@ -43,7 +48,7 @@ describe('xplat schematic', () => {
     expect(
       packageFile.devDependencies[`@nativescript/types`]
     ).not.toBeUndefined();
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(
@@ -68,7 +73,7 @@ describe('xplat schematic', () => {
     expect(tree.exists('/libs/core/index.ts')).toBeTruthy();
     expect(tree.exists('/libs/scss/_index.scss')).toBeTruthy();
     expect(tree.exists('/xplat/nativescript-angular/index.ts')).toBeTruthy();
-    const filePath = '/tsconfig.json';
+    const filePath = getRootTsConfigPath();
     const fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(
@@ -87,7 +92,7 @@ describe('xplat schematic', () => {
 
     let tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/nativescript/index.ts')).toBeTruthy();
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(

diff --git a/packages/nativescript/src/schematics/helpers/index.spec.ts b/packages/nativescript/src/schematics/helpers/index.spec.ts
@@ -1,6 +1,6 @@
 import { Tree } from '@angular-devkit/schematics';
 import { Schema } from '../application/schema';
-import { setTest, jsonParse } from '@nstudio/xplat-utils';
+import { setTest, jsonParse, getRootTsConfigPath } from '@nstudio/xplat-utils';
 import { IHelperSchema, stringUtils } from '@nstudio/xplat';
 import {
   createXplatWithApps,
@@ -40,7 +40,7 @@ describe('helpers schematic', () => {
     ).toBeGreaterThanOrEqual(0);
 
     // should update tsconfig files
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(fileContent.compilerOptions.paths['@nativescript/*'][0]).toBe(

diff --git a/packages/schematics/package.json b/packages/schematics/package.json
@@ -70,7 +70,7 @@
     "migrations": "./migrations/migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "~10.1.0",
+    "@nrwl/angular": "~10.2.0",
     "@nstudio/xplat-utils": "*"
   },
   "devDependencies": {

diff --git a/packages/web-angular/src/schematics/xplat/index.spec.ts b/packages/web-angular/src/schematics/xplat/index.spec.ts
@@ -1,5 +1,10 @@
 import { Tree } from '@angular-devkit/schematics';
-import { supportedPlatforms, setTest, jsonParse } from '@nstudio/xplat-utils';
+import {
+  supportedPlatforms,
+  setTest,
+  jsonParse,
+  getRootTsConfigPath,
+} from '@nstudio/xplat-utils';
 import { XplatHelpers } from '@nstudio/xplat';
 import { createEmptyWorkspace, getFileContent } from '@nstudio/xplat/testing';
 import { runSchematic } from '../../utils/testing';
@@ -24,7 +29,7 @@ describe('xplat schematic', () => {
     const tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/web/index.ts')).toBeTruthy();
     expect(tree.exists('/xplat/nativescript/index.ts')).toBeFalsy();
-    let filePath = '/tsconfig.json';
+    let filePath = getRootTsConfigPath();
     let fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(fileContent.compilerOptions.paths['@testing/web']).toBeTruthy();
@@ -49,7 +54,7 @@ describe('xplat schematic', () => {
 
     const tree = await runSchematic('xplat', options, appTree);
     expect(tree.exists('/xplat/web-angular/index.ts')).toBeTruthy();
-    const filePath = '/tsconfig.json';
+    const filePath = getRootTsConfigPath();
     const fileContent = jsonParse(getFileContent(tree, filePath));
     // console.log(fileContent);
     expect(

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -30,7 +30,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/web": "^10.1.0"
+    "@nrwl/web": "^10.2.0"
   },
   "peerDependencies": {
     "@nstudio/xplat": "*"

diff --git a/packages/xplat-utils/package.json b/packages/xplat-utils/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@angular-devkit/core": "~10.1.0",
     "@angular-devkit/schematics": "~10.1.0",
-    "@nrwl/workspace": "~10.1.0",
+    "@nrwl/workspace": "~10.2.0",
     "chalk": "~4.1.0",
     "strip-json-comments": "~3.1.1"
   },

diff --git a/packages/xplat-utils/src/utils/utils.ts b/packages/xplat-utils/src/utils/utils.ts
@@ -14,7 +14,7 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as stripJsonComments from 'strip-json-comments';
-import { serializeJson } from '@nrwl/workspace';
+import { createOrUpdate, serializeJson } from '@nrwl/workspace';
 
 export const supportedPlatforms: Array<PlatformTypes> = [
   'web',
@@ -148,12 +148,36 @@ export const copy = (tree: Tree, from: string, to: string) => {
   tree.create(to, file.content);
 };
 
+export function getRootTsConfigPath() {
+  return '/tsconfig.base.json';
+}
+
+export function checkRootTsConfig(tree: Tree) {
+  if (!tree.exists('/tsconfig.json') && tree.exists('/tsconfig.base.json')) {
+    // to support Nx 10.1+
+    // NOTE: We may end up creating tsconfig's at libs and xplat levels in future
+    // This allows ts resolution to work as normal
+    tree.create(
+      '/tsconfig.json',
+      JSON.stringify(
+        {
+          extends: `.${getRootTsConfigPath()}`,
+        },
+        null,
+        2
+      )
+    );
+  }
+  return tree;
+}
+
 export function prerun(options?: any, init?: boolean) {
   return (tree: Tree) => {
     const nxJson = getNxWorkspaceConfig(tree);
     if (nxJson) {
       npmScope = nxJson.npmScope || 'workspace';
     }
+    tree = checkRootTsConfig(tree);
     // console.log('npmScope:', npmScope);
     const packageJson = getJsonFromFile(tree, 'package.json');
 

diff --git a/packages/xplat/migrations.json b/packages/xplat/migrations.json
@@ -1,3 +1,9 @@
 {
-  "schematics": {}
+  "schematics": {
+    "update-to-10.2.0": {
+      "version": "10.2.0",
+      "description": "Migrate workspace to 10.2.0",
+      "factory": "./migrations/update-10-2-0/update-10-2-0"
+    }
+  }
 }