fix: npm 7 compat and updated workspace to Nx 12

Author: NathanWalker

package-lock.json

@@ -27,31 +27,30 @@
     "workspace-generator": "nx workspace-generator"
   },
   "private": true,
-  "dependencies": {},
   "devDependencies": {
     "@angular-devkit/architect": "~0.1102.6",
     "@angular-devkit/core": "^11.2.6",
     "@angular-devkit/schematics": "^11.2.6",
-    "@nrwl/cli": "11.5.2",
-    "@nrwl/eslint-plugin-nx": "11.5.2",
-    "@nrwl/jest": "11.5.2",
-    "@nrwl/nx-plugin": "11.5.2",
-    "@nrwl/tao": "11.5.2",
-    "@nrwl/workspace": "11.5.2",
+    "@nrwl/cli": "12.0.7",
+    "@nrwl/eslint-plugin-nx": "12.0.7",
+    "@nrwl/jest": "12.0.7",
+    "@nrwl/nx-plugin": "12.0.7",
+    "@nrwl/tao": "12.0.7",
+    "@nrwl/workspace": "12.0.7",
     "@types/jest": "26.0.8",
-    "@types/node": "12.12.38",
-    "@typescript-eslint/eslint-plugin": "4.3.0",
-    "@typescript-eslint/parser": "4.3.0",
+    "@types/node": "14.14.33",
+    "@typescript-eslint/eslint-plugin": "4.19.0",
+    "@typescript-eslint/parser": "4.19.0",
     "doctoc": "^1.4.0",
-    "dotenv": "6.2.0",
-    "eslint": "7.10.0",
+    "dotenv": "8.2.0",
+    "eslint": "7.22.0",
     "eslint-config-prettier": "8.1.0",
     "jest": "26.2.2",
     "prettier": "2.2.1",
     "strip-json-comments": "^3.1.1",
     "ts-jest": "26.4.0",
     "ts-node": "9.1.1",
     "tslint": "6.1.3",
-    "typescript": "~4.0.3"
+    "typescript": "4.1.4"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/nx",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "NativeScript Plugin for Nx",
   "repository": {
     "type": "git",
@@ -36,6 +36,6 @@
     "fs-extra": "~9.1.0",
     "ignore": "^5.1.8",
     "node-fetch": "~2.6.1",
-    "strip-json-comments": "~3.1.1"
+    "strip-json-comments": "2.0.1"
   }
 }

packages/nx/package.json

@@ -3,7 +3,7 @@ import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import { NxJson, readJsonInTree } from '@nrwl/workspace';
 import { createEmptyWorkspace } from '@nrwl/workspace/testing';
 import { runSchematic } from '../../utils/testing';
-import { angularVersion, nsAngularVersion, nsRxjs, nsZonejs } from '../../utils/versions';
+import { angularVersion, nsAngularVersion, rxjsVersion, zonejsVersion } from '../../utils/versions';
 
 describe('app', () => {
   let appTree: Tree;
@@ -99,8 +99,8 @@ describe('app', () => {
     expect(packageJson['dependencies']['@angular/platform-browser']).toEqual(angularVersion);
     expect(packageJson['dependencies']['@angular/platform-browser-dynamic']).toEqual(angularVersion);
     expect(packageJson['dependencies']['@angular/router']).toEqual(angularVersion);
-    expect(packageJson['dependencies']['rxjs']).toEqual(nsRxjs);
-    expect(packageJson['dependencies']['zone.js']).toEqual(nsZonejs);
+    expect(packageJson['dependencies']['rxjs']).toEqual(rxjsVersion);
+    expect(packageJson['dependencies']['zone.js']).toEqual(zonejsVersion);
     expect(packageJson['dependencies']['@nativescript/angular']).toEqual(nsAngularVersion);
   });
 

packages/nx/src/schematics/application/application.spec.ts

@@ -1,7 +1,7 @@
 import { apply, branchAndMerge, chain, externalSchematic, mergeWith, move, noop, Rule, SchematicContext, SchematicsException, template, Tree, url } from '@angular-devkit/schematics';
 import { updateWorkspace } from '@nrwl/workspace';
 import { getAppName, getDefaultTemplateOptions, getFrontendFramework, getPrefix, missingArgument, PluginHelpers, prerun, updateNxProjects, updatePackageScripts } from '../../utils';
-import { angularVersion, nsAngularVersion, nsWebpackVersion, nsNgToolsVersion, nsCoreVersion } from '../../utils/versions';
+import { angularVersion, nsAngularVersion, nsWebpackVersion, nsNgToolsVersion, nsCoreVersion, typescriptVersion, rxjsVersion, zonejsVersion } from '../../utils/versions';
 import { Schema } from './schema';
 
 export default function (options: Schema) {
@@ -142,6 +142,9 @@ function addAppFiles(options: Schema, appName: string, extra: string = ''): Rule
           nsCoreVersion,
           nsWebpackVersion,
           nsNgToolsVersion,
+          rxjsVersion,
+          zonejsVersion,
+          typescriptVersion
         }),
         move(`apps/${directory}${appName}`),
       ])

packages/nx/src/schematics/application/application.ts

@@ -19,14 +19,13 @@
     "@nativescript/angular": "<%= nsAngularVersion %>",
     "@nativescript/core": "<%= nsCoreVersion %>",
     "nativescript-theme-core": "file:<%= pathOffset %>node_modules/nativescript-theme-core",
-    "rxjs": "file:<%= pathOffset %>node_modules/rxjs",
-    "zone.js": "file:<%= pathOffset %>node_modules/zone.js"
+    "rxjs": "<%= rxjsVersion %>",
+    "zone.js": "<%= zonejsVersion %>"
   },
   "devDependencies": {
     "@angular/compiler-cli": "<%= angularVersion %>",
-    "@nativescript/types": "file:<%= pathOffset %>node_modules/@nativescript/types",
     "@nativescript/webpack": "<%= nsWebpackVersion %>",
     "@ngtools/webpack": "<%= angularVersion %>",
-    "typescript": "file:<%= pathOffset %>node_modules/typescript"
+    "typescript": "<%= typescriptVersion %>"
   }
 }

packages/nx/src/schematics/application/files_angular/package.json

@@ -22,7 +22,7 @@ import {
   supportedSandboxPlatforms,
   updateJsonFile,
 } from './general';
-import { sassVersion, angularVersion, nsAngularVersion, nsTypesVersion, nsCoreVersion, nsNgToolsVersion, nsNxPluginVersion, nsRxjs, nsThemeVersion, nsZonejs } from './versions';
+import { sassVersion, angularVersion, nsAngularVersion, nsTypesVersion, nsCoreVersion, nsNgToolsVersion, nsNxPluginVersion, rxjsVersion, nsThemeVersion, zonejsVersion } from './versions';
 
 export namespace PluginHelpers {
   export interface Schema {
@@ -106,8 +106,8 @@ export namespace PluginHelpers {
           frameworkDependencies['@angular/platform-browser'] = angularVersion;
           frameworkDependencies['@angular/platform-browser-dynamic'] = angularVersion;
           frameworkDependencies['@angular/router'] = angularVersion;
-          frameworkDependencies['rxjs'] = nsRxjs;
-          frameworkDependencies['zone.js'] = nsZonejs;
+          frameworkDependencies['rxjs'] = rxjsVersion;
+          frameworkDependencies['zone.js'] = zonejsVersion;
 
           // devDep
           frameworkDevDependencies['@angular/compiler-cli'] = angularVersion;

packages/nx/src/utils/helpers.ts

@@ -1,15 +1,16 @@
-export const nxVersion = '~11.5.0';
+export const nxVersion = '~12.0.0';
 
 export const nsNxPluginVersion = '~1.0.0';
 export const nsCoreVersion = '~8.0.0';
 export const nsTypesVersion = '~8.0.0';
 export const nsThemeVersion = '~1.0.4';
-export const nsWebpackVersion = '~5.0.0-beta.0';
+export const nsWebpackVersion = 'beta';
 export const sassVersion = '~1.32.0';
 
 // Frontend frameworks
 export const angularVersion = '~11.2.0';
 export const nsAngularVersion = 'ns8';
 export const nsNgToolsVersion = '~11.2.0';
-export const nsRxjs = '~6.6.0';
-export const nsZonejs = '^0.11.1';
+export const rxjsVersion = '~6.6.0';
+export const zonejsVersion = '^0.11.1';
+export const typescriptVersion = '~4.1.0';