update nx

Author: salamaashoush

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+"recommendations": [
+"nrwl.angular-console",
+"ms-vscode.vscode-typescript-tslint-plugin",
+"esbenp.prettier-vscode",
+"angular.ng-template"
+]
+
+}

angular.json

@@ -11,7 +11,8 @@
           "builder": "@nrwl/angular:package",
           "options": {
             "tsConfig": "libs/gridjs-angular/tsconfig.lib.json",
-            "project": "libs/gridjs-angular/ng-package.json"
+            "project": "libs/gridjs-angular/ng-package.json",
+            "buildableProjectDepsInPackageJsonType": "dependencies"
           },
           "configurations": {
             "production": {
@@ -39,7 +40,10 @@
             "tsConfig": "libs/gridjs-angular/tsconfig.spec.json",
             "passWithNoTests": true,
             "setupFile": "libs/gridjs-angular/src/test-setup.ts"
-          }
+          },
+          "outputs": [
+            "coverage/libs/gridjs-angular"
+          ]
         },
         "storybook": {
           "builder": "@nrwl/storybook:storybook",
@@ -69,7 +73,10 @@
             "ci": {
               "quiet": true
             }
-          }
+          },
+          "outputs": [
+            "{options.outputPath}"
+          ]
         }
       },
       "schematics": {

decorate-angular-cli.js

@@ -21,35 +21,16 @@
  * - Delete and reinstall your node_modules
  */
 
-const fs = require("fs");
-const os = require("os");
-const cp = require("child_process");
-const isWindows = os.platform() === "win32";
-const { output } = require("@nrwl/workspace");
-
-/**
- * Paths to files being patched
- */
-const angularCLIInitPath = "node_modules/@angular/cli/lib/cli/index.js";
-
-/**
- * Patch index.js to warn you if you invoke the undecorated Angular CLI.
- */
-function patchAngularCLI(initPath) {
-  const angularCLIInit = fs.readFileSync(initPath, "utf-8").toString();
-
-  if (!angularCLIInit.includes("NX_CLI_SET")) {
-    fs.writeFileSync(
-      initPath,
-      `
-if (!process.env['NX_CLI_SET']) {
-  const { output } = require('@nrwl/workspace');
-  output.warn({ title: 'The Angular CLI was invoked instead of the Nx CLI. Use "npx ng [command]" or "nx [command]" instead.' });
-}
-${angularCLIInit}
-    `
-    );
-  }
+const fs = require('fs');
+const os = require('os');
+const cp = require('child_process');
+const isWindows = os.platform() === 'win32';
+let output;
+try {
+  output = require('@nrwl/workspace').output;
+} catch (e) {
+  console.warn('Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.');
+  process.exit(0);
 }
 
 /**
@@ -58,39 +39,31 @@ ${angularCLIInit}
  */
 function symlinkNgCLItoNxCLI() {
   try {
-    const ngPath = "./node_modules/.bin/ng";
-    const nxPath = "./node_modules/.bin/nx";
+    const ngPath = './node_modules/.bin/ng';
+    const nxPath = './node_modules/.bin/nx';
     if (isWindows) {
       /**
        * This is the most reliable way to create symlink-like behavior on Windows.
        * Such that it works in all shells and works with npx.
        */
-      ["", ".cmd", ".ps1"].forEach((ext) => {
-        if (fs.existsSync(nxPath + ext))
-          fs.writeFileSync(ngPath + ext, fs.readFileSync(nxPath + ext));
+      ['', '.cmd', '.ps1'].forEach(ext => {
+        if (fs.existsSync(nxPath + ext)) fs.writeFileSync(ngPath + ext, fs.readFileSync(nxPath + ext));
       });
     } else {
       // If unix-based, symlink
       cp.execSync(`ln -sf ./nx ${ngPath}`);
     }
-  } catch (e) {
-    output.error({
-      title:
-        "Unable to create a symlink from the Angular CLI to the Nx CLI:" +
-        e.message,
-    });
+  }
+  catch(e) {
+    output.error({ title: 'Unable to create a symlink from the Angular CLI to the Nx CLI:' + e.message });
     throw e;
   }
 }
 
 try {
   symlinkNgCLItoNxCLI();
-  patchAngularCLI(angularCLIInitPath);
-  output.log({
-    title: "Angular CLI has been decorated to enable computation caching.",
-  });
-} catch (e) {
-  output.error({
-    title: "Decoration of the Angular CLI did not complete successfully",
-  });
+  require('@nrwl/cli/lib/decorate-cli').decorateCli();
+  output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
+} catch(e) {
+  output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });
 }