chore: plugin-tools 2.2.1

Author: NathanWalker

apps/demo-angular/package.json

@@ -4,7 +4,7 @@
     "@nativescript/core": "file:../../node_modules/@nativescript/core"
   },
   "devDependencies": {
-    "@nativescript/android": "8.0.0",
-    "@nativescript/ios": "8.0.0"
+    "@nativescript/android": "~8.1.1",
+    "@nativescript/ios": "~8.1.0"
   }
-}
+}

apps/demo/package.json

@@ -7,7 +7,7 @@
     "@nativescript/core": "file:../../node_modules/@nativescript/core"
   },
   "devDependencies": {
-    "@nativescript/android": "8.0.0",
-    "@nativescript/ios": "8.0.0"
+    "@nativescript/android": "~8.1.1",
+    "@nativescript/ios": "~8.1.0"
   }
-}
+}

jest.config.js

@@ -1,9 +1,3 @@
-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'],
-};
+const { getJestProjects } = require('@nrwl/jest');
+
+module.exports = { projects: [...getJestProjects()] };

package.json

@@ -27,21 +27,21 @@
     "@angular/router": "^12.0.0",
     "@nativescript/angular": "^12.0.0",
     "@nativescript/core": "^8.0.0",
-    "@nativescript/plugin-tools": "2.0.4",
+    "@nativescript/plugin-tools": "2.2.1",
     "@nativescript/types": "^8.0.0",
-    "@nativescript/webpack": "beta",
+    "@nativescript/webpack": "~5.0.0",
     "@ngtools/webpack": "^12.0.0",
     "husky": "^5.1.3",
     "nativescript-vue": "~2.9.0",
     "nativescript-vue-template-compiler": "~2.9.0",
     "ng-packagr": "^12.0.0",
     "rxjs": "~6.6.0",
-    "typescript": "~4.2.0",
+    "typescript": "~4.3.5",
     "zone.js": "~0.11.1"
   },
   "lint-staged": {
     "**/*.{js,ts,scss,json,html}": [
       "npx prettier --write"
     ]
   }
-}
+}

tools/scripts/build-finish.ts

@@ -11,43 +11,47 @@ const cmdArgs = process.argv.slice(2);
 const packageName = cmdArgs[0];
 const publish = cmdArgs[1] === 'publish';
 
-console.log(`Building ${npmScope}/${packageName}...${publish ? 'and publishing.' : ''}`);
+const packagePath = path.join('packages', packageName, 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packagePath));
+const npmPackageName = packageJson.name;
+console.log(`Building ${npmPackageName}...${publish ? 'and publishing.' : ''}`);
 
 // build angular package
 function buildAngular() {
-	ngPackage
-		.ngPackagr()
-		.forProject(path.join('packages', packageName, 'angular', 'package.json'))
-		.withTsConfig(path.join('packages', packageName, 'angular', 'tsconfig.angular.json'))
-		.build()
-		.then(() => {
-			copyAngularDist();
-		})
-		.catch((error) => {
-			console.error(error);
-			process.exit(1);
-		});
+  ngPackage
+    .ngPackagr()
+    .forProject(path.join('packages', packageName, 'angular', 'package.json'))
+    .withTsConfig(path.join('packages', packageName, 'angular', 'tsconfig.angular.json'))
+    .build()
+    .then(() => {
+      copyAngularDist();
+    })
+    .catch((error) => {
+      console.error(error);
+      process.exit(1);
+    });
 }
 
 // copy angular ng-packagr output to dist/packages/{name}
 function copyAngularDist() {
-	fs.copy(path.join('packages', packageName, 'angular', 'dist'), path.join('dist', 'packages', packageName, 'angular'))
-		.then(() => {
-			console.log(`${packageName} angular built successfully.`);
-			finishPreparation();
-		})
-		.catch((err) => console.error(err));
+  fs.copy(path.join('packages', packageName, 'angular', 'dist'), path.join('dist', 'packages', packageName, 'angular'))
+    .then(() => {
+      console.log(`${npmPackageName} angular built successfully.`);
+      // buildNativeSrc();
+      finishPreparation();
+    })
+    .catch((err) => console.error(err));
 }
 
 function finishPreparation() {
-	fs.copy(path.join('tools', 'assets', 'publishing'), path.join('dist', 'packages', packageName))
-		.then(() => console.log(`${npmScope}/${packageName} ready to publish.`))
-		.catch((err) => console.error(err));
+  fs.copy(path.join('tools', 'assets', 'publishing'), path.join('dist', 'packages', packageName))
+    .then(() => console.log(`${npmPackageName} ready to publish.`))
+    .catch((err) => console.error(err));
 }
 
 if (fs.existsSync(path.join(rootDir, 'packages', packageName, 'angular'))) {
-	// package has angular specific src, build it first
-	buildAngular();
+  // package has angular specific src, build it first
+  buildAngular();
 } else {
-	finishPreparation();
+  finishPreparation();
 }

workspace.json

@@ -74,8 +74,8 @@
       }
     },
     "all": {
-      "root": "packages/",
-      "projectType": "library",
+      "root": "",
+      "projectType": "application",
       "targets": {
         "build": {
           "outputs": [
@@ -99,10 +99,11 @@
           },
           "executor": "@nrwl/workspace:run-commands"
         }
-      }
+      },
+      "sourceRoot": ""
     }
   },
   "cli": {
     "defaultCollection": "@nrwl/workspace"
   }
-}
+}