feat(tools): update to Nrwl Nx 10.3.x and TS 4

Author: NathanWalker

package.json

@@ -23,13 +23,13 @@
     "contributors": "githubcontrib --owner NativeScript --repo $(basename $(pwd)) --cols 6 --showlogin true --sortOrder desc | pbcopy"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~10.0.0",
-    "@angular-devkit/schematics": "~10.0.0",
-    "@nrwl/eslint-plugin-nx": "~10.1.0",
-    "@nrwl/jest": "~10.1.0",
-    "@nrwl/node": "~10.1.0",
-    "@nrwl/workspace": "~10.1.0",
-    "@nstudio/focus": "~10.1.1",
+    "@angular-devkit/core": "~10.1.0",
+    "@angular-devkit/schematics": "~10.1.0",
+    "@nrwl/eslint-plugin-nx": "~10.3.0",
+    "@nrwl/jest": "~10.3.0",
+    "@nrwl/node": "~10.3.0",
+    "@nrwl/workspace": "~10.3.0",
+    "@nstudio/focus": "~10.3.0",
     "@types/jasmine": "~3.5.11",
     "@types/jasminewd2": "~2.0.3",
     "@types/jest": "~26.0.7",
@@ -58,17 +58,17 @@
     "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
     "jasmine-spec-reporter": "~5.0.2",
-    "jest": "~26.1.0",
-    "jest-jasmine2": "~26.1.0",
-    "jest-preset-angular": "~8.2.1",
-    "jest-worker": "~26.1.0",
+    "jest": "~26.5.0",
+    "jest-jasmine2": "~26.5.0",
+    "jest-preset-angular": "~8.3.1",
+    "jest-worker": "~26.5.0",
     "ng-packagr": "~10.1.0",
     "npm-run-all": "~4.1.5",
     "opn": "~6.0.0",
     "parse-version-string": "^1.0.1",
     "precise-commits": "~1.0.2",
-    "prettier": "~2.0.0",
-    "release-it": "~13.6.6",
+    "prettier": "~2.1.0",
+    "release-it": "~14.0.4",
     "rxjs": "~6.6.0",
     "semver": "~7.3.0",
     "shelljs": "~0.8.4",
@@ -77,15 +77,15 @@
     "tmp": "~0.2.1",
     "tree-kill": "~1.2.2",
     "ts-loader": "~8.0.1",
-    "ts-node": "~8.10.2",
-    "tsickle": "~0.38.1",
+    "ts-node": "~9.0.0",
+    "tsickle": "~0.39.1",
     "tslib": "~2.0.0",
     "tslint": "~6.1.2",
-    "typescript": "~3.9.0",
+    "typescript": "~4.0.3",
     "verdaccio": "~4.8.0",
     "xml2js": "~0.4.23",
-    "yargs": "~15.4.0",
-    "yargs-parser": "~18.1.3",
+    "yargs": "~16.0.3",
+    "yargs-parser": "~20.2.1",
     "zone.js": "~0.11.1"
   },
   "jest": {

packages/plugin-tools/migrations.json

@@ -1,3 +1,9 @@
 {
-  "schematics": {}
+  "schematics": {
+    "update-to-1.0.6": {
+      "version": "1.0.6",
+      "description": "Migrate tools to 1.0.6",
+      "factory": "./migrations/update-1-0-6/update-1-0-6"
+    }
+  }
 }

packages/plugin-tools/migrations/update-1-0-6/update-1-0-6.ts

@@ -0,0 +1,18 @@
+import { chain, Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
+import { updateJsonInTree } from "@nrwl/workspace";
+
+export default function (): Rule {
+  return chain([
+    (tree: Tree, context: SchematicContext) => {
+      return updateJsonInTree('package.json', (json) => {
+        json.devDependencies = json.devDependencies || {};
+        json.devDependencies = {
+          ...json.devDependencies,
+          'typescript': '~4.0.3'
+        };
+    
+        return json;
+      })
+    },
+  ]);
+}

packages/plugin-tools/package.json

@@ -31,32 +31,32 @@
   "dependencies": {
     "strip-json-comments": "~3.1.1",
     "xml2js": "~0.4.23",
-    "@nrwl/eslint-plugin-nx": "~10.1.0",
-    "@nrwl/jest": "~10.1.0",
-    "@nrwl/node": "~10.1.0",
-    "@nrwl/workspace": "~10.1.0",
-    "@nstudio/focus": "^10.0.6",
+    "@nrwl/eslint-plugin-nx": "~10.3.0",
+    "@nrwl/jest": "~10.3.0",
+    "@nrwl/node": "~10.3.0",
+    "@nrwl/workspace": "~10.3.0",
+    "@nstudio/focus": "~10.3.0",
     "@nstudio/nps-i": "~1.1.0",
     "@types/jest": "~26.0.10",
     "@types/node": "~12.0.0",
-    "@typescript-eslint/eslint-plugin": "~3.6.0",
-    "@typescript-eslint/parser": "~3.6.0",
+    "@typescript-eslint/eslint-plugin": "~4.4.0",
+    "@typescript-eslint/parser": "~4.4.0",
     "dotenv": "~8.2.0",
-    "eslint": "~7.4.0",
-    "eslint-config-prettier": "~6.11.0",
-    "husky": "^4.2.5",
-    "jest": "~26.4.1",
-    "lint-staged": "^10.2.11",
+    "eslint": "~7.10.0",
+    "eslint-config-prettier": "~6.12.0",
+    "husky": "^4.3.0",
+    "jest": "~26.5.2",
+    "lint-staged": "^10.4.0",
     "nativescript-permissions": "^1.3.9",
     "nativescript-theme-core": "~1.0.4",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.14.0",
     "parse-version-string": "^1.0.1",
-    "prettier": "~2.0.4",
+    "prettier": "~2.1.2",
     "pretty-data": "^0.40.0",
     "reflect-metadata": "~0.1.13",
     "rimraf": "^3.0.2",
-    "ts-jest": "~26.2.0",
-    "ts-node": "~8.10.2",
+    "ts-jest": "~26.4.1",
+    "ts-node": "~9.0.0",
     "ts-patch": "^1.3.0",
     "tslint": "~6.1.2"
   }

packages/plugin-tools/src/schematics/add-angular/files/package.json

@@ -6,7 +6,7 @@
 			"umdModuleIds": {
 				"@nativescript/core": "ns-core",
 				"@nativescript/angular": "ns-angular",
-				"@nativescript/<%= name %>": "ns-<%= name %>"
+				"<%= npmScope %>/<%= name %>": "ns-<%= name %>"
 			}
 		},
 		"whitelistedNonPeerDependencies": [

packages/plugin-tools/src/schematics/add-package/files/README.md

@@ -1,4 +1,4 @@
-# Nativescript <%= name %>
+# <%= npmScope %>/<%= name %>
 
 ```javascript
 ns plugin add <%= npmScope %>/<%= name %>

packages/plugin-tools/src/schematics/publish/index.ts

@@ -112,7 +112,7 @@ export default function (schema: Schema): Rule {
                     : ''
                 }`;
               }
-              const fullPackageName = `${npmScope}/${p}`;
+              const fullPackageName = packageJson.name;
               console.log(
                 '\n\n👀 ',
                 fullPackageName,
@@ -191,11 +191,12 @@ export default function (schema: Schema): Rule {
 
               // console.log('dist path:', path.resolve(workspaceDir, 'dist', 'packages', p));
 
-              const cmdArgs = ['publish', '--access public'];
+              const cmdArgs = ['publish', '--access', 'public'];
               if (packageDetails.parsedVersion.preReleaseLabel) {
                 cmdArgs.push(
-                  `--tag ${packageDetails.parsedVersion.preReleaseType}`
+                  `--tag`
                 );
+                cmdArgs.push(packageDetails.parsedVersion.preReleaseType);
               }
               const child = spawn(`npm`, cmdArgs, {
                 cwd: path.resolve(workspaceDir, 'dist', 'packages', p),