Merge pull request #14535 from FrozenPandaz/tech/nx-tooling-2

Build: Add NX bootstrap optimization
storybookjs · Apr 27, 2021 · eedf6c7 · eedf6c7
2 parents 4818dae + b7c9fa7
commit eedf6c7
Show file tree

Hide file tree

Showing 8 changed files with 891 additions and 52 deletions.
diff --git a/app/angular/package.json b/app/angular/package.json
@@ -81,7 +81,7 @@
     "@angular/forms": "^11.2.0",
     "@angular/platform-browser": "^11.2.0",
     "@angular/platform-browser-dynamic": "^11.2.0",
-    "@nrwl/workspace": "^11.1.5",
+    "@nrwl/workspace": "^11.6.3",
     "@types/autoprefixer": "^9.7.2",
     "@types/jest": "^26.0.16",
     "@webcomponents/custom-elements": "^1.4.3",

diff --git a/app/angular/src/server/angular-read-workspace.ts b/app/angular/src/server/angular-read-workspace.ts
@@ -24,6 +24,7 @@ export const readAngularWorkspaceConfig = async (
 
     const nxWorkspace = require('@nrwl/workspace').readWorkspaceConfig({
       format: 'angularCli',
+      path: dirToSearch,
     });
 
     // Use the workspace version of nx when angular looks for the angular.json file

diff --git a/lib/core-server/src/core-presets.test.ts b/lib/core-server/src/core-presets.test.ts
@@ -9,9 +9,13 @@ import { executor as managerExecutor } from './manager/builder';
 import { buildDevStandalone } from './build-dev';
 import { buildStaticStandalone } from './build-static';
 
+// nx-ignore-next-line
 import reactOptions from '../../../app/react/src/server/options';
+// nx-ignore-next-line
 import vue3Options from '../../../app/vue3/src/server/options';
+// nx-ignore-next-line
 import htmlOptions from '../../../app/html/src/server/options';
+// nx-ignore-next-line
 import webComponentsOptions from '../../../app/web-components/src/server/options';
 import { outputStats } from './utils/output-stats';
 

diff --git a/nx.json b/nx.json
@@ -0,0 +1,303 @@
+{
+  "npmScope": "storybook",
+  "implicitDependencies": {
+    "package.json": {
+      "dependencies": "*",
+      "devDependencies": "*"
+    }
+  },
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "@nrwl/nx-cloud",
+      "options": {
+        "cacheableOperations": [
+          "build",
+          "test",
+          "lint",
+          "package",
+          "prepare"
+        ],
+        "strictlyOrderedTargets": [
+          "build",
+          "package",
+          "prepare"
+        ],
+        "accessToken": "NzM2ODA4OTYtZGYyMi00MmVlLTgxNmEtODU1NGMwNjk0M2EzfHJlYWQtd3JpdGU=",
+        "canTrackAnalytics": false,
+        "showUsageWarnings": true
+      }
+    }
+  },
+  "projects": {
+    "@storybook/addon-a11y": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-actions": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-backgrounds": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-controls": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-cssresources": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-design-assets": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-docs": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-essentials": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-events": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-google-analytics": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-graphql": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-jest": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-knobs": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-links": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-queryparams": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-storyshots": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-storyshots-puppeteer": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-storysource": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-toolbars": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-viewport": {
+      "implicitDependencies": []
+    },
+    "@storybook/angular": {
+      "implicitDependencies": []
+    },
+    "@storybook/aurelia": {
+      "implicitDependencies": []
+    },
+    "@storybook/ember": {
+      "implicitDependencies": []
+    },
+    "@storybook/html": {
+      "implicitDependencies": []
+    },
+    "@storybook/marionette": {
+      "implicitDependencies": []
+    },
+    "@storybook/marko": {
+      "implicitDependencies": []
+    },
+    "@storybook/mithril": {
+      "implicitDependencies": []
+    },
+    "@storybook/preact": {
+      "implicitDependencies": []
+    },
+    "@storybook/rax": {
+      "implicitDependencies": []
+    },
+    "@storybook/react": {
+      "implicitDependencies": []
+    },
+    "@storybook/riot": {
+      "implicitDependencies": []
+    },
+    "@storybook/server": {
+      "implicitDependencies": []
+    },
+    "@storybook/svelte": {
+      "implicitDependencies": []
+    },
+    "@storybook/vue": {
+      "implicitDependencies": []
+    },
+    "@storybook/vue3": {
+      "implicitDependencies": []
+    },
+    "@storybook/web-components": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-decorator": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-parameter": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-preview-wrapper": {
+      "implicitDependencies": []
+    },
+    "@storybook/addon-roundtrip": {
+      "implicitDependencies": []
+    },
+    "angular-cli": {
+      "implicitDependencies": []
+    },
+    "aurelia-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "cra-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "cra-react15": {
+      "implicitDependencies": []
+    },
+    "cra-ts-essentials": {
+      "implicitDependencies": []
+    },
+    "cra-ts-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "@storybook/example-devkits": {
+      "implicitDependencies": []
+    },
+    "ember-example": {
+      "implicitDependencies": []
+    },
+    "html-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "marko-cli": {
+      "implicitDependencies": []
+    },
+    "mithril-example": {
+      "implicitDependencies": []
+    },
+    "official-storybook": {
+      "implicitDependencies": []
+    },
+    "preact-example": {
+      "implicitDependencies": []
+    },
+    "rax-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "@storybook/example-react-ts": {
+      "implicitDependencies": []
+    },
+    "@storybook/example-react-ts-webpack4": {
+      "implicitDependencies": []
+    },
+    "riot-example": {
+      "implicitDependencies": []
+    },
+    "server-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "standalone-preview": {
+      "implicitDependencies": []
+    },
+    "svelte-example": {
+      "implicitDependencies": []
+    },
+    "vue-3-cli-example": {
+      "implicitDependencies": []
+    },
+    "vue-cli-example": {
+      "implicitDependencies": []
+    },
+    "vue-example": {
+      "implicitDependencies": []
+    },
+    "web-components-kitchen-sink": {
+      "implicitDependencies": []
+    },
+    "@storybook/addons": {
+      "implicitDependencies": []
+    },
+    "@storybook/api": {
+      "implicitDependencies": []
+    },
+    "@storybook/builder-webpack4": {
+      "implicitDependencies": []
+    },
+    "@storybook/builder-webpack5": {
+      "implicitDependencies": []
+    },
+    "@storybook/channel-postmessage": {
+      "implicitDependencies": []
+    },
+    "@storybook/channel-websocket": {
+      "implicitDependencies": []
+    },
+    "@storybook/channels": {
+      "implicitDependencies": []
+    },
+    "@storybook/cli": {
+      "implicitDependencies": []
+    },
+    "sb": {
+      "implicitDependencies": []
+    },
+    "storybook": {
+      "implicitDependencies": []
+    },
+    "@storybook/client-api": {
+      "implicitDependencies": []
+    },
+    "@storybook/client-logger": {
+      "implicitDependencies": []
+    },
+    "@storybook/codemod": {
+      "implicitDependencies": []
+    },
+    "@storybook/components": {
+      "implicitDependencies": []
+    },
+    "@storybook/core": {
+      "implicitDependencies": []
+    },
+    "@storybook/core-client": {
+      "implicitDependencies": []
+    },
+    "@storybook/core-common": {
+      "implicitDependencies": []
+    },
+    "@storybook/core-events": {
+      "implicitDependencies": []
+    },
+    "@storybook/core-server": {
+      "implicitDependencies": []
+    },
+    "@storybook/node-logger": {
+      "implicitDependencies": []
+    },
+    "@storybook/postinstall": {
+      "implicitDependencies": []
+    },
+    "@storybook/router": {
+      "implicitDependencies": []
+    },
+    "@storybook/source-loader": {
+      "implicitDependencies": []
+    },
+    "@storybook/theming": {
+      "implicitDependencies": []
+    },
+    "@storybook/ui": {
+      "implicitDependencies": []
+    }
+  },
+  "affected": {
+    "defaultBase": "next"
+  }
+}
diff --git a/package.json b/package.json
@@ -117,6 +117,10 @@
     "@compodoc/compodoc": "^1.1.11",
     "@emotion/snapshot-serializer": "^0.8.2",
     "@nicolo-ribaudo/chokidar-2": "^2.1.8",
+    "@nrwl/cli": "12.0.7",
+    "@nrwl/nx-cloud": "11.2.0",
+    "@nrwl/tao": "12.0.7",
+    "@nrwl/workspace": "12.0.7",
     "@storybook/addon-a11y": "workspace:*",
     "@storybook/addon-actions": "workspace:*",
     "@storybook/addon-backgrounds": "workspace:*",

diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
@@ -95,8 +95,8 @@ function run() {
       command: () => {
         log.info(prefix, 'prepare');
         spawn(
-          `lerna run prepare ${
-            process.env.CI ? `--concurrency ${maxConcurrentTasks} --stream` : ''
+          `nx run-many --target=prepare --all --parallel ${
+            process.env.CI ? `--max-parallel=${maxConcurrentTasks}` : ''
           }`
         );
       },