diff --git a/code/.env b/code/.env new file mode 100644 index 000000000000..11ed57e43222 --- /dev/null +++ b/code/.env @@ -0,0 +1,4 @@ +# Nx 18 enables using plugins to infer targets by default +# This is disabled for existing workspaces to maintain compatibility +# For more info, see: https://nx.dev/concepts/inferred-tasks +NX_ADD_PLUGINS=false \ No newline at end of file diff --git a/code/.nxignore b/code/.nxignore new file mode 100644 index 000000000000..80ff0032a217 --- /dev/null +++ b/code/.nxignore @@ -0,0 +1,6 @@ +# Seems like NX get confused as our gitignore directory is not in the NX root +dist +node_modules +storybook-static +tsconfig.tsbuildinfo +coverage diff --git a/code/addons/a11y/project.json b/code/addons/a11y/project.json index 428e18f5328d..98da7062ef27 100644 --- a/code/addons/a11y/project.json +++ b/code/addons/a11y/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-a11y", + "name": "addon-a11y", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/actions/project.json b/code/addons/actions/project.json index 6273cd00e547..57d4778f8a3a 100644 --- a/code/addons/actions/project.json +++ b/code/addons/actions/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-actions", + "name": "addon-actions", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/backgrounds/project.json b/code/addons/backgrounds/project.json index 3763e8624950..7815c5f54104 100644 --- a/code/addons/backgrounds/project.json +++ b/code/addons/backgrounds/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-backgrounds", + "name": "addon-backgrounds", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/controls/project.json b/code/addons/controls/project.json index cb77a9715c32..19b0f96443d7 100644 --- a/code/addons/controls/project.json +++ b/code/addons/controls/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-controls", + "name": "addon-controls", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/docs/project.json b/code/addons/docs/project.json index f443604afd91..db814958c87f 100644 --- a/code/addons/docs/project.json +++ b/code/addons/docs/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-docs", + "name": "addon-docs", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/essentials/project.json b/code/addons/essentials/project.json index 1b9b2bcccf44..64bf44d21170 100644 --- a/code/addons/essentials/project.json +++ b/code/addons/essentials/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-essentials", + "name": "addon-essentials", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/gfm/project.json b/code/addons/gfm/project.json index 1bf614901430..7b76bc6cfc96 100644 --- a/code/addons/gfm/project.json +++ b/code/addons/gfm/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-mdx-gfm", + "name": "addon-mdx-gfm", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/highlight/project.json b/code/addons/highlight/project.json index 265b2e60b213..47ff68d932f4 100644 --- a/code/addons/highlight/project.json +++ b/code/addons/highlight/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-highlight", + "name": "addon-highlight", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/highlight/tsconfig.json b/code/addons/highlight/tsconfig.json index 62565c6b8712..e0354bb7bcc7 100644 --- a/code/addons/highlight/tsconfig.json +++ b/code/addons/highlight/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["webpack-env"], "strict": true }, diff --git a/code/addons/interactions/project.json b/code/addons/interactions/project.json index 892b104dd10f..06476e0eaf4a 100644 --- a/code/addons/interactions/project.json +++ b/code/addons/interactions/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-interactions", + "name": "addon-interactions", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/jest/project.json b/code/addons/jest/project.json index d60b3b690dba..fcd31e372c2b 100644 --- a/code/addons/jest/project.json +++ b/code/addons/jest/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-jest", + "name": "addon-jest", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/links/project.json b/code/addons/links/project.json index 1433da28d4c0..0fc3b8e9c288 100644 --- a/code/addons/links/project.json +++ b/code/addons/links/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-links", + "name": "addon-links", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/measure/project.json b/code/addons/measure/project.json index 0b3b1ccf7d26..5b3799fa18f0 100644 --- a/code/addons/measure/project.json +++ b/code/addons/measure/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-measure", + "name": "addon-measure", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/onboarding/project.json b/code/addons/onboarding/project.json index 1c9bf19c6931..02e2d8bb6d11 100644 --- a/code/addons/onboarding/project.json +++ b/code/addons/onboarding/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-onboarding", + "name": "addon-onboarding", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/outline/project.json b/code/addons/outline/project.json index d3994b04cf16..10a2bd4634c7 100644 --- a/code/addons/outline/project.json +++ b/code/addons/outline/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-outline", + "name": "addon-outline", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/storysource/project.json b/code/addons/storysource/project.json index 5889f68cbd76..2577f5347879 100644 --- a/code/addons/storysource/project.json +++ b/code/addons/storysource/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-storysource", + "name": "addon-storysource", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/themes/project.json b/code/addons/themes/project.json index 73d07c1e71a6..66d9105921c1 100644 --- a/code/addons/themes/project.json +++ b/code/addons/themes/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-themes", + "name": "addon-themes", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/toolbars/project.json b/code/addons/toolbars/project.json index 13a3d1157135..0c4bc0133e5d 100644 --- a/code/addons/toolbars/project.json +++ b/code/addons/toolbars/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-toolbars", + "name": "addon-toolbars", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/addons/viewport/project.json b/code/addons/viewport/project.json index aab9231a5aa3..8b9a0f8008ac 100644 --- a/code/addons/viewport/project.json +++ b/code/addons/viewport/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/addon-viewport", + "name": "addon-viewport", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/builders/builder-manager/project.json b/code/builders/builder-manager/project.json index c7fdff5619d5..a7f3b620789f 100644 --- a/code/builders/builder-manager/project.json +++ b/code/builders/builder-manager/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/builder-manager", + "name": "builder-manager", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/builders/builder-vite/project.json b/code/builders/builder-vite/project.json index 67660e20238f..94e4f821dd45 100644 --- a/code/builders/builder-vite/project.json +++ b/code/builders/builder-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/builder-vite", + "name": "builder-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/builders/builder-webpack5/project.json b/code/builders/builder-webpack5/project.json index 84c2f8213bff..0ee2f864f2d7 100644 --- a/code/builders/builder-webpack5/project.json +++ b/code/builders/builder-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/builder-webpack5", + "name": "builder-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/angular/project.json b/code/frameworks/angular/project.json index 91ede389f1f0..77917986a818 100644 --- a/code/frameworks/angular/project.json +++ b/code/frameworks/angular/project.json @@ -1,6 +1,21 @@ { - "name": "@storybook/angular", + "name": "angular", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {}, + "check": { + "executor": "nx:run-commands", + "options": { + "command": "echo 'angular only does check with the flag -c production'", + "description": "See code/storybook/storybook/scripts/prepare/check.ts" + }, + "configurations": { + "production": { + "cwd": "{projectRoot}", + "command": "yarn check" + } + } + } + } } diff --git a/code/frameworks/angular/tsconfig.build.json b/code/frameworks/angular/tsconfig.build.json index 75efd9abab35..48cdde928b98 100644 --- a/code/frameworks/angular/tsconfig.build.json +++ b/code/frameworks/angular/tsconfig.build.json @@ -4,7 +4,6 @@ "compilerOptions": { "target": "ES2020", "module": "CommonJS", - "lib": ["es2020", "dom", "dom.iterable"], "experimentalDecorators": true, "emitDecoratorMetadata": true, "declaration": true, diff --git a/code/frameworks/ember/project.json b/code/frameworks/ember/project.json index 4c5333f818de..207df9f333e0 100644 --- a/code/frameworks/ember/project.json +++ b/code/frameworks/ember/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/ember", + "name": "ember", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/html-vite/project.json b/code/frameworks/html-vite/project.json index 46380f53f092..deecb5a37e4c 100644 --- a/code/frameworks/html-vite/project.json +++ b/code/frameworks/html-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/html-vite", + "name": "html-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/html-vite/tsconfig.json b/code/frameworks/html-vite/tsconfig.json index 145cb7320607..f6662521b4f8 100644 --- a/code/frameworks/html-vite/tsconfig.json +++ b/code/frameworks/html-vite/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "resolveJsonModule": true, "strict": true diff --git a/code/frameworks/html-webpack5/project.json b/code/frameworks/html-webpack5/project.json index 17e0ec8bcff9..40bde48ff676 100644 --- a/code/frameworks/html-webpack5/project.json +++ b/code/frameworks/html-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/html-webpack5", + "name": "html-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/nextjs/project.json b/code/frameworks/nextjs/project.json index e02c9ac14d96..076c9cf52dcb 100644 --- a/code/frameworks/nextjs/project.json +++ b/code/frameworks/nextjs/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/nextjs", + "name": "nextjs", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/preact-vite/project.json b/code/frameworks/preact-vite/project.json index f016d6f56e8b..fe34fe8cb36f 100644 --- a/code/frameworks/preact-vite/project.json +++ b/code/frameworks/preact-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preact-vite", + "name": "preact-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/preact-vite/tsconfig.json b/code/frameworks/preact-vite/tsconfig.json index 4f493067c0f5..e7898e836acd 100644 --- a/code/frameworks/preact-vite/tsconfig.json +++ b/code/frameworks/preact-vite/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "resolveJsonModule": true, "jsx": "react-jsx", diff --git a/code/frameworks/preact-webpack5/project.json b/code/frameworks/preact-webpack5/project.json index 5053b334ea5d..154dafbbc8a2 100644 --- a/code/frameworks/preact-webpack5/project.json +++ b/code/frameworks/preact-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preact-webpack5", + "name": "preact-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/react-vite/project.json b/code/frameworks/react-vite/project.json index bf721e4251d0..add152fb70be 100644 --- a/code/frameworks/react-vite/project.json +++ b/code/frameworks/react-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/react-vite", + "name": "react-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/react-vite/tsconfig.json b/code/frameworks/react-vite/tsconfig.json index 3bfb79fdded7..856fcd5a621a 100644 --- a/code/frameworks/react-vite/tsconfig.json +++ b/code/frameworks/react-vite/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "resolveJsonModule": true, "strict": true diff --git a/code/frameworks/react-webpack5/project.json b/code/frameworks/react-webpack5/project.json index b90f5253f722..c378a45f775a 100644 --- a/code/frameworks/react-webpack5/project.json +++ b/code/frameworks/react-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/react-webpack5", + "name": "react-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/server-webpack5/project.json b/code/frameworks/server-webpack5/project.json index d55abfe258a5..826dfede4b62 100644 --- a/code/frameworks/server-webpack5/project.json +++ b/code/frameworks/server-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/server-webpack5", + "name": "server-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/svelte-vite/project.json b/code/frameworks/svelte-vite/project.json index f6d589841609..1eac4bb170fc 100644 --- a/code/frameworks/svelte-vite/project.json +++ b/code/frameworks/svelte-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/svelte-vite", + "name": "svelte-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/svelte-vite/tsconfig.json b/code/frameworks/svelte-vite/tsconfig.json index 3bfb79fdded7..856fcd5a621a 100644 --- a/code/frameworks/svelte-vite/tsconfig.json +++ b/code/frameworks/svelte-vite/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "resolveJsonModule": true, "strict": true diff --git a/code/frameworks/svelte-webpack5/project.json b/code/frameworks/svelte-webpack5/project.json index fab32063c0cc..bed0c9fa8f29 100644 --- a/code/frameworks/svelte-webpack5/project.json +++ b/code/frameworks/svelte-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/svelte-webpack5", + "name": "svelte-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/sveltekit/project.json b/code/frameworks/sveltekit/project.json index 77f5993cfa03..f4ce85280fec 100644 --- a/code/frameworks/sveltekit/project.json +++ b/code/frameworks/sveltekit/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/sveltekit", + "name": "sveltekit", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/sveltekit/tsconfig.json b/code/frameworks/sveltekit/tsconfig.json index 3bfb79fdded7..856fcd5a621a 100644 --- a/code/frameworks/sveltekit/tsconfig.json +++ b/code/frameworks/sveltekit/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "resolveJsonModule": true, "strict": true diff --git a/code/frameworks/vue3-vite/project.json b/code/frameworks/vue3-vite/project.json index 58776bde9770..a235841276be 100644 --- a/code/frameworks/vue3-vite/project.json +++ b/code/frameworks/vue3-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/vue3-vite", + "name": "vue3-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/vue3-vite/tsconfig.json b/code/frameworks/vue3-vite/tsconfig.json index bbd5d9a38f99..688235b039c8 100644 --- a/code/frameworks/vue3-vite/tsconfig.json +++ b/code/frameworks/vue3-vite/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "skipLibCheck": true, "resolveJsonModule": true, diff --git a/code/frameworks/vue3-webpack5/project.json b/code/frameworks/vue3-webpack5/project.json index 114081563645..35db7a7be82a 100644 --- a/code/frameworks/vue3-webpack5/project.json +++ b/code/frameworks/vue3-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/vue3-webpack5", + "name": "vue3-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/web-components-vite/project.json b/code/frameworks/web-components-vite/project.json index a2a569209b0f..79af543db2ed 100644 --- a/code/frameworks/web-components-vite/project.json +++ b/code/frameworks/web-components-vite/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/web-components-vite", + "name": "web-components-vite", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/frameworks/web-components-vite/tsconfig.json b/code/frameworks/web-components-vite/tsconfig.json index 3bfb79fdded7..856fcd5a621a 100644 --- a/code/frameworks/web-components-vite/tsconfig.json +++ b/code/frameworks/web-components-vite/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["node"], "resolveJsonModule": true, "strict": true diff --git a/code/frameworks/web-components-webpack5/project.json b/code/frameworks/web-components-webpack5/project.json index 238bfaac73e3..afcd628474a7 100644 --- a/code/frameworks/web-components-webpack5/project.json +++ b/code/frameworks/web-components-webpack5/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/web-components-webpack5", + "name": "web-components-webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/channels/project.json b/code/lib/channels/project.json index a8f0f05a40aa..49b0f5b43a2b 100644 --- a/code/lib/channels/project.json +++ b/code/lib/channels/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/channels", + "name": "channels", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/cli-sb/project.json b/code/lib/cli-sb/project.json index 67bd73d3942f..d2d20b31de55 100644 --- a/code/lib/cli-sb/project.json +++ b/code/lib/cli-sb/project.json @@ -1,6 +1,6 @@ { "name": "sb", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": {} } diff --git a/code/lib/cli-storybook/project.json b/code/lib/cli-storybook/project.json index 2da44126ed0a..dcaeb1c72846 100644 --- a/code/lib/cli-storybook/project.json +++ b/code/lib/cli-storybook/project.json @@ -1,6 +1,6 @@ { "name": "storybook", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": {} } diff --git a/code/lib/cli/project.json b/code/lib/cli/project.json index 14ed0d61cddc..543e7d25faba 100644 --- a/code/lib/cli/project.json +++ b/code/lib/cli/project.json @@ -1,6 +1,6 @@ { - "name": "@storybook/cli", + "name": "cli", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": {} } diff --git a/code/lib/client-logger/project.json b/code/lib/client-logger/project.json index daee79bb4fed..457a937f74c3 100644 --- a/code/lib/client-logger/project.json +++ b/code/lib/client-logger/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/client-logger", + "name": "client-logger", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/codemod/project.json b/code/lib/codemod/project.json index a5b5bbcf214b..8f4912e601b7 100644 --- a/code/lib/codemod/project.json +++ b/code/lib/codemod/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/codemod", + "name": "codemod", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/codemod/tsconfig.json b/code/lib/codemod/tsconfig.json index 0e884ab34b9d..ed0add7af03a 100644 --- a/code/lib/codemod/tsconfig.json +++ b/code/lib/codemod/tsconfig.json @@ -4,7 +4,6 @@ "skipLibCheck": true, "allowJs": true, "strict": true, - "lib": ["ES2021.String"] }, "include": ["src/**/*"], "exclude": ["node_modules", "__testfixtures__", "__tests__"] diff --git a/code/lib/core-common/project.json b/code/lib/core-common/project.json index f949971cab2e..4852fec699e5 100644 --- a/code/lib/core-common/project.json +++ b/code/lib/core-common/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/core-common", + "name": "core-common", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/core-events/project.json b/code/lib/core-events/project.json index 76048c77fae8..da3bc30f1b96 100644 --- a/code/lib/core-events/project.json +++ b/code/lib/core-events/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/core-events", + "name": "core-events", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/core-server/project.json b/code/lib/core-server/project.json index c06711f64c7a..121efbced4b8 100644 --- a/code/lib/core-server/project.json +++ b/code/lib/core-server/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/core-server", + "name": "core-server", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/core-webpack/project.json b/code/lib/core-webpack/project.json index 2c409d1cbc7a..c6dd4c0e4263 100644 --- a/code/lib/core-webpack/project.json +++ b/code/lib/core-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/core-webpack", + "name": "core-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/csf-plugin/project.json b/code/lib/csf-plugin/project.json index 249a88a4cf06..b2433f3cba6b 100644 --- a/code/lib/csf-plugin/project.json +++ b/code/lib/csf-plugin/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/csf-plugin", + "name": "csf-plugin", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/csf-tools/project.json b/code/lib/csf-tools/project.json index 8178703f4c9d..5572e378dff2 100644 --- a/code/lib/csf-tools/project.json +++ b/code/lib/csf-tools/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/csf-tools", + "name": "csf-tools", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/docs-tools/project.json b/code/lib/docs-tools/project.json index fefc219c6b2f..a3489f9256ce 100644 --- a/code/lib/docs-tools/project.json +++ b/code/lib/docs-tools/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/docs-tools", + "name": "docs-tools", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/instrumenter/project.json b/code/lib/instrumenter/project.json index 56b4432fe445..7b8d7fb87459 100644 --- a/code/lib/instrumenter/project.json +++ b/code/lib/instrumenter/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/instrumenter", + "name": "instrumenter", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/manager-api/project.json b/code/lib/manager-api/project.json index df51baa819c2..286c640b4e0d 100644 --- a/code/lib/manager-api/project.json +++ b/code/lib/manager-api/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/manager-api", + "name": "manager-api", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/node-logger/project.json b/code/lib/node-logger/project.json index 59dea9acd773..c42085076e8a 100644 --- a/code/lib/node-logger/project.json +++ b/code/lib/node-logger/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/node-logger", + "name": "node-logger", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/preview-api/project.json b/code/lib/preview-api/project.json index 5bc4751d01c0..97ca39040294 100644 --- a/code/lib/preview-api/project.json +++ b/code/lib/preview-api/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preview-api", + "name": "preview-api", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/preview/project.json b/code/lib/preview/project.json index d3f3e67413c1..793acf151189 100644 --- a/code/lib/preview/project.json +++ b/code/lib/preview/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preview", + "name": "preview", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/react-dom-shim/project.json b/code/lib/react-dom-shim/project.json index 2c211e46ff45..d3c6fff1e26e 100644 --- a/code/lib/react-dom-shim/project.json +++ b/code/lib/react-dom-shim/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/react-dom-shim", + "name": "react-dom-shim", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/router/project.json b/code/lib/router/project.json index 890a0df7acf4..b23db88a5aaa 100644 --- a/code/lib/router/project.json +++ b/code/lib/router/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/router", + "name": "router", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/source-loader/project.json b/code/lib/source-loader/project.json index f619784d0d2c..9c8b096331f0 100644 --- a/code/lib/source-loader/project.json +++ b/code/lib/source-loader/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/source-loader", + "name": "source-loader", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/telemetry/project.json b/code/lib/telemetry/project.json index 1690b602ebc9..3f6ef7bd3c82 100644 --- a/code/lib/telemetry/project.json +++ b/code/lib/telemetry/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/telemetry", + "name": "telemetry", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/test/project.json b/code/lib/test/project.json index 68c18c664fd3..50045527e461 100644 --- a/code/lib/test/project.json +++ b/code/lib/test/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/test", + "name": "test", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/theming/project.json b/code/lib/theming/project.json index 5d7f9b7d1797..82df649a9091 100644 --- a/code/lib/theming/project.json +++ b/code/lib/theming/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/theming", + "name": "theming", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/lib/types/project.json b/code/lib/types/project.json index 0050ecb649aa..fbd4dc6e2dd9 100644 --- a/code/lib/types/project.json +++ b/code/lib/types/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/types", + "name": "types", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/migrations.json b/code/migrations.json index 6a886c649dcc..7581c9bc77a7 100644 --- a/code/migrations.json +++ b/code/migrations.json @@ -2,42 +2,20 @@ "migrations": [ { "cli": "nx", - "version": "16.6.0-beta.6", - "description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed", - "implementation": "./src/migrations/update-15-0-0/prefix-outputs", + "version": "17.3.0-beta.6", + "description": "Updates the nx wrapper.", + "implementation": "./src/migrations/update-17-3-0/update-nxw", "package": "nx", - "name": "16.6.0-prefix-outputs" + "name": "17.3.0-update-nx-wrapper" }, { "cli": "nx", - "version": "16.8.0-beta.3", - "description": "Escape $ in env variables", - "implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables", + "version": "18.0.0-beta.2", + "description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace", + "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces", + "x-repair-skip": true, "package": "nx", - "name": "16.8.0-escape-dollar-sign-env" - }, - { - "cli": "nx", - "version": "17.0.0-beta.1", - "description": "Updates the default cache directory to .nx/cache", - "implementation": "./src/migrations/update-17-0-0/move-cache-directory", - "package": "nx", - "name": "17.0.0-move-cache-directory" - }, - { - "cli": "nx", - "version": "17.0.0-beta.3", - "description": "Use minimal config for tasksRunnerOptions", - "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options", - "package": "nx", - "name": "17.0.0-use-minimal-config-for-tasks-runner-options" - }, - { - "version": "17.0.0-rc.1", - "description": "Migration for v17.0.0-rc.1", - "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope", - "package": "nx", - "name": "rm-default-collection-npm-scope" + "name": "18.0.0-disable-adding-plugins-for-existing-workspaces" } ] } diff --git a/code/nx.json b/code/nx.json index b072caaa73ab..669a8d2773fc 100644 --- a/code/nx.json +++ b/code/nx.json @@ -1,9 +1,11 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", - "pluginsConfig": { - "@nrwl/js": { - "analyzeSourceFiles": false - } + "extends": "nx/presets/npm.json", + "nxCloudAccessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=", + "defaultBase": "next", + "parallel": 8, + "cli": { + "packageManager": "yarn" }, "tasksRunnerOptions": { "default": { @@ -13,49 +15,44 @@ } } }, - "affected": { - "defaultBase": "next" - }, "targetDefaults": { "build": { - "dependsOn": [ - { - "target": "build", - "dependencies": true - } - ] - }, - "package": { - "dependsOn": [ - { - "target": "package", - "dependencies": true - } - ] - }, - "prep": { - "dependsOn": [ - { - "target": "prep", - "params": "forward", - "dependencies": true + "executor": "nx:run-commands", + "options": { + "cwd": "{projectRoot}", + "command": "yarn prep --reset" + }, + "configurations": { + "production": { + "command": "yarn prep --reset --optimized" } + }, + "inputs": [ + "production", + "{workspaceRoot}/../scripts/prepare/{bundle,addon-bundle,esm-bundle}.ts" ], - "outputs": [ - "{projectRoot}/dist" - ], + "dependsOn": [{ "target": "build", "dependencies": true }], + "outputs": ["{projectRoot}/dist"], + "cache": true + }, + "check": { + "inputs": ["default", "{workspaceRoot}/../scripts/prepare/check.ts"], + "dependsOn": ["build", "^build"], + "outputs": ["{projectRoot}/dist"], "cache": true } }, - "nxCloudAccessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=", "namedInputs": { - "default": [ - "{projectRoot}/**/*", - "sharedGlobals" - ], - "sharedGlobals": [], + "default": ["{projectRoot}/**/*", "sharedGlobals"], + "sharedGlobals": ["{workspaceRoot}/tsconfig.json"], "production": [ - "default" + "default", + "!{projectRoot}/", + "!{projectRoot}/src/**/**/*.{test,spec,stories}.?(c|m)[jt]s?(x)?(.snap),", + "!{projectRoot}/vitest.config.[jt]s", + "!{projectRoot}/README.md", + "!{projectRoot}/.eslintrc.{json,js}", + "!{projectRoot}/src/test-setup.[jt]s" ] } } diff --git a/code/package.json b/code/package.json index 071cf4a60003..3e0f7d02bced 100644 --- a/code/package.json +++ b/code/package.json @@ -87,7 +87,7 @@ "type-fest": "~2.19" }, "dependencies": { - "@nx/workspace": "17.0.2", + "@nx/workspace": "18.0.6", "@playwright/test": "1.36.0", "@storybook/addon-a11y": "workspace:*", "@storybook/addon-actions": "workspace:*", @@ -206,7 +206,7 @@ "lodash": "^4.17.21", "mock-require": "^3.0.3", "node-gyp": "^9.3.1", - "nx": "17.0.2", + "nx": "18.0.6", "prettier": "^3.1.1", "process": "^0.11.10", "raf": "^3.4.1", diff --git a/code/presets/create-react-app/project.json b/code/presets/create-react-app/project.json index b844a36b9ba1..fbb69ab62703 100644 --- a/code/presets/create-react-app/project.json +++ b/code/presets/create-react-app/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-create-react-app", + "name": "preset-create-react-app", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/presets/html-webpack/project.json b/code/presets/html-webpack/project.json index 3a2d544527be..8be254f7375d 100644 --- a/code/presets/html-webpack/project.json +++ b/code/presets/html-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-html-webpack", + "name": "preset-html-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/presets/preact-webpack/project.json b/code/presets/preact-webpack/project.json index 50f688eb5a23..7def5384b2bf 100644 --- a/code/presets/preact-webpack/project.json +++ b/code/presets/preact-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-preact-webpack", + "name": "preset-preact-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/presets/react-webpack/project.json b/code/presets/react-webpack/project.json index 91b2f876797a..6caf05c7bf34 100644 --- a/code/presets/react-webpack/project.json +++ b/code/presets/react-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-react-webpack", + "name": "preset-react-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/presets/server-webpack/project.json b/code/presets/server-webpack/project.json index 43debf73d758..be8c884dee1e 100644 --- a/code/presets/server-webpack/project.json +++ b/code/presets/server-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-server-webpack", + "name": "preset-server-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/presets/svelte-webpack/project.json b/code/presets/svelte-webpack/project.json index 5b050845438a..c04dc5743c60 100644 --- a/code/presets/svelte-webpack/project.json +++ b/code/presets/svelte-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-svelte-webpack", + "name": "preset-svelte-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/presets/vue3-webpack/project.json b/code/presets/vue3-webpack/project.json index 0042f95f9ac8..7fb2ecb48665 100644 --- a/code/presets/vue3-webpack/project.json +++ b/code/presets/vue3-webpack/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preset-vue3-webpack", + "name": "preset-vue3-webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/renderers/html/project.json b/code/renderers/html/project.json index b5b6377a320f..ce25242e7e06 100644 --- a/code/renderers/html/project.json +++ b/code/renderers/html/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/html", + "name": "html", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/renderers/preact/project.json b/code/renderers/preact/project.json index 4e2d39b3943a..0de3c995ca76 100644 --- a/code/renderers/preact/project.json +++ b/code/renderers/preact/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/preact", + "name": "preact", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/renderers/react/project.json b/code/renderers/react/project.json index 8a11b7d6b907..fa660ae0bbae 100644 --- a/code/renderers/react/project.json +++ b/code/renderers/react/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/react", + "name": "react", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/renderers/server/project.json b/code/renderers/server/project.json index 7ff722d8e165..18ea1d598f06 100644 --- a/code/renderers/server/project.json +++ b/code/renderers/server/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/server", + "name": "server", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/renderers/svelte/project.json b/code/renderers/svelte/project.json index 007cca6238f1..1e0b82ad3eef 100644 --- a/code/renderers/svelte/project.json +++ b/code/renderers/svelte/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/svelte", + "name": "svelte", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/renderers/vue3/project.json b/code/renderers/vue3/project.json index fe2e7b7651ae..d540150f9dd2 100644 --- a/code/renderers/vue3/project.json +++ b/code/renderers/vue3/project.json @@ -1,6 +1,21 @@ { - "name": "@storybook/vue3", + "name": "vue3", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {}, + "check": { + "executor": "nx:run-commands", + "options": { + "command": "echo 'vue3 only does check when -c production'", + "description": "See code/storybook/storybook/scripts/prepare/check.ts" + }, + "configurations": { + "production": { + "cwd": "{projectRoot}", + "command": "yarn check" + } + } + } + } } diff --git a/code/renderers/web-components/project.json b/code/renderers/web-components/project.json index 924f62217802..649fd26f702f 100644 --- a/code/renderers/web-components/project.json +++ b/code/renderers/web-components/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/web-components", + "name": "web-components", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/ui/blocks/project.json b/code/ui/blocks/project.json index f8388f309046..ef85735a1797 100644 --- a/code/ui/blocks/project.json +++ b/code/ui/blocks/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/blocks", + "name": "blocks", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/ui/blocks/tsconfig.json b/code/ui/blocks/tsconfig.json index 061b6a531157..714d36153aa5 100644 --- a/code/ui/blocks/tsconfig.json +++ b/code/ui/blocks/tsconfig.json @@ -3,7 +3,6 @@ "compilerOptions": { "module": "esnext", "skipLibCheck": true, - "rootDir": "./src", "strict": false }, "include": ["src/**/*"] diff --git a/code/ui/components/project.json b/code/ui/components/project.json index 0896257e7981..74e7ab408035 100644 --- a/code/ui/components/project.json +++ b/code/ui/components/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/components", + "name": "components", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/ui/manager/project.json b/code/ui/manager/project.json index e4b9df3f5d1d..1b9ba3e93a6b 100644 --- a/code/ui/manager/project.json +++ b/code/ui/manager/project.json @@ -1,6 +1,8 @@ { - "name": "@storybook/manager", + "name": "manager", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "implicitDependencies": [], - "type": "library" + "type": "library", + "targets": { + "build": {} + } } diff --git a/code/ui/manager/tsconfig.json b/code/ui/manager/tsconfig.json index a6f65038a17b..15a4d71bb96e 100644 --- a/code/ui/manager/tsconfig.json +++ b/code/ui/manager/tsconfig.json @@ -4,5 +4,6 @@ "skipLibCheck": true, "strict": false }, - "include": ["src/**/*"] + "include": ["src/**/*"], + } diff --git a/code/yarn.lock b/code/yarn.lock index c0338dabe0c4..1ebd618cef76 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -3949,135 +3949,136 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:17.0.2": - version: 17.0.2 - resolution: "@nrwl/devkit@npm:17.0.2" +"@nrwl/devkit@npm:18.0.6": + version: 18.0.6 + resolution: "@nrwl/devkit@npm:18.0.6" dependencies: - "@nx/devkit": "npm:17.0.2" - checksum: cceba705b7c1f9e6575f08db37550cf2383f2750da46e07152728b85b9d79967eff1590f5b1b29224d3d13f02adcd6293d1209bf788a0e337f1ad8e38fbe7d5b + "@nx/devkit": "npm:18.0.6" + checksum: 70e02f256216fe11392e2d12a692ddc76acb28140246dfabeac59d3c7a1d8ee1c811e4bcaa6e879a610a7ba7d4669850469676508e8f333e6d42ee487b2ce279 languageName: node linkType: hard -"@nrwl/tao@npm:17.0.2": - version: 17.0.2 - resolution: "@nrwl/tao@npm:17.0.2" +"@nrwl/tao@npm:18.0.6": + version: 18.0.6 + resolution: "@nrwl/tao@npm:18.0.6" dependencies: - nx: "npm:17.0.2" + nx: "npm:18.0.6" tslib: "npm:^2.3.0" bin: tao: index.js - checksum: b9124c6b0817db71ea2155d6c48bd86870f7e536b002220af42dec6844b5828feb6e581161dd32da78e535da16e66eed6449196c0129b65ee5b794b66ac6c1c1 + checksum: f11f0f579dcfb59c501308a9143844785d5aa63c8cca97e5adc6f8faa51468b3105a99ac421b3e5a241001fdfe319a675b586afff1ef3f5d42301994c38da202 languageName: node linkType: hard -"@nrwl/workspace@npm:17.0.2": - version: 17.0.2 - resolution: "@nrwl/workspace@npm:17.0.2" +"@nrwl/workspace@npm:18.0.6": + version: 18.0.6 + resolution: "@nrwl/workspace@npm:18.0.6" dependencies: - "@nx/workspace": "npm:17.0.2" - checksum: fc723340bbda476390432b185bcc1531f567e4dcfebf0d77b6f679651bddccbd8d0c74a22a20c1c3564b207a420ac54c84654e61fa25fd9c685fb2e6e963b457 + "@nx/workspace": "npm:18.0.6" + checksum: 0cf5ec95c036fd98269d9e746ab08f578d793011667823053aecfb062337a9b0bd98def282acf7fba453930537d5adb7c2d5284b5faebe676f22717a1a7040c1 languageName: node linkType: hard -"@nx/devkit@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/devkit@npm:17.0.2" +"@nx/devkit@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/devkit@npm:18.0.6" dependencies: - "@nrwl/devkit": "npm:17.0.2" + "@nrwl/devkit": "npm:18.0.6" ejs: "npm:^3.1.7" enquirer: "npm:~2.3.6" ignore: "npm:^5.0.4" - semver: "npm:7.5.3" + semver: "npm:^7.5.3" tmp: "npm:~0.2.1" tslib: "npm:^2.3.0" + yargs-parser: "npm:21.1.1" peerDependencies: nx: ">= 16 <= 18" - checksum: 78a6e643ae46de83d4435a91b17ca44e73fde2ed99ba8416b96ff0af37fd8686aea7f58e14146b806f03602670f6485ed48ae7ba4bf2a4538dad091b1ddc7334 + checksum: 1645003b800475257fce500802ce99acc35490c73161896247f7e2747a0160c47a40245b17daf568b6d05f66ddf55097772e2ab8ba895a286f8b544af1b51c44 languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-darwin-arm64@npm:17.0.2" +"@nx/nx-darwin-arm64@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-darwin-arm64@npm:18.0.6" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-darwin-x64@npm:17.0.2" +"@nx/nx-darwin-x64@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-darwin-x64@npm:18.0.6" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-freebsd-x64@npm:17.0.2" +"@nx/nx-freebsd-x64@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-freebsd-x64@npm:18.0.6" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:17.0.2" +"@nx/nx-linux-arm-gnueabihf@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.0.6" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-arm64-gnu@npm:17.0.2" +"@nx/nx-linux-arm64-gnu@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-arm64-gnu@npm:18.0.6" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-arm64-musl@npm:17.0.2" +"@nx/nx-linux-arm64-musl@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-arm64-musl@npm:18.0.6" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-x64-gnu@npm:17.0.2" +"@nx/nx-linux-x64-gnu@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-x64-gnu@npm:18.0.6" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-x64-musl@npm:17.0.2" +"@nx/nx-linux-x64-musl@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-x64-musl@npm:18.0.6" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-win32-arm64-msvc@npm:17.0.2" +"@nx/nx-win32-arm64-msvc@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-win32-arm64-msvc@npm:18.0.6" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-win32-x64-msvc@npm:17.0.2" +"@nx/nx-win32-x64-msvc@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-win32-x64-msvc@npm:18.0.6" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nx/workspace@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/workspace@npm:17.0.2" +"@nx/workspace@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/workspace@npm:18.0.6" dependencies: - "@nrwl/workspace": "npm:17.0.2" - "@nx/devkit": "npm:17.0.2" + "@nrwl/workspace": "npm:18.0.6" + "@nx/devkit": "npm:18.0.6" chalk: "npm:^4.1.0" enquirer: "npm:~2.3.6" - nx: "npm:17.0.2" + nx: "npm:18.0.6" tslib: "npm:^2.3.0" yargs-parser: "npm:21.1.1" - checksum: a0bb97a7062cec677a164d87976e9442bfa8fa97d5d7df6c1d7f3d5d288d5bf38e5d46cfba9e0416534840c84d427f911b5fb37844ca5d8669773829de13f352 + checksum: bd01b6b28fbe0c783a9c37bfdf0a01846df4ef46f366f6596e586063dff06d87761c35b06819839fefdf66a9c32947697db7ecc21b2933a06a633693a962272c languageName: node linkType: hard @@ -6565,7 +6566,7 @@ __metadata: resolution: "@storybook/root@workspace:." dependencies: "@chromaui/addon-visual-tests": "npm:^0.0.124" - "@nx/workspace": "npm:17.0.2" + "@nx/workspace": "npm:18.0.6" "@playwright/test": "npm:1.36.0" "@storybook/addon-a11y": "workspace:*" "@storybook/addon-actions": "workspace:*" @@ -6684,7 +6685,7 @@ __metadata: lodash: "npm:^4.17.21" mock-require: "npm:^3.0.3" node-gyp: "npm:^9.3.1" - nx: "npm:17.0.2" + nx: "npm:18.0.6" prettier: "npm:^3.1.1" process: "npm:^0.11.10" raf: "npm:^3.4.1" @@ -10280,7 +10281,18 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.5.1, axios@npm:^1.6.1": +"axios@npm:^1.6.0": + version: 1.6.7 + resolution: "axios@npm:1.6.7" + dependencies: + follow-redirects: "npm:^1.15.4" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d + languageName: node + linkType: hard + +"axios@npm:^1.6.1": version: 1.6.2 resolution: "axios@npm:1.6.2" dependencies: @@ -15704,6 +15716,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.4": + version: 1.15.5 + resolution: "follow-redirects@npm:1.15.5" + peerDependenciesMeta: + debug: + optional: true + checksum: 418d71688ceaf109dfd6f85f747a0c75de30afe43a294caa211def77f02ef19865b547dfb73fde82b751e1cc507c06c754120b848fe5a7400b0a669766df7615 + languageName: node + linkType: hard + "for-each@npm:^0.3.3": version: 0.3.3 resolution: "for-each@npm:0.3.3" @@ -16401,20 +16423,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.4": - version: 7.1.4 - resolution: "glob@npm:7.1.4" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.0.4" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 7f6fcbf600eb2298cce34c65f6d8bbe6933ddd4f88aa5b38a9c6feec82b615bb33b63b120725303e89c4b50284413c21d2ff883414717a5c7d0c9f7cd7a0e5fe - languageName: node - linkType: hard - "glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.10": version: 10.3.10 resolution: "glob@npm:10.3.10" @@ -19726,7 +19734,7 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:^4.1.0": +"log-symbols@npm:^4.0.0, log-symbols@npm:^4.1.0": version: 4.1.0 resolution: "log-symbols@npm:4.1.0" dependencies: @@ -21322,15 +21330,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:3.0.5": - version: 3.0.5 - resolution: "minimatch@npm:3.0.5" - dependencies: - brace-expansion: "npm:^1.1.7" - checksum: f398652d0d260137c289c270a4ac98ebe0a27cd316fa0fac72b096e96cbdc89f71d80d47ac7065c716ba3b0b730783b19180bd85a35f9247535d2adfe96bba76 - languageName: node - linkType: hard - "minimatch@npm:9.0.1": version: 9.0.1 resolution: "minimatch@npm:9.0.1" @@ -22255,25 +22254,25 @@ __metadata: languageName: node linkType: hard -"nx@npm:17.0.2": - version: 17.0.2 - resolution: "nx@npm:17.0.2" - dependencies: - "@nrwl/tao": "npm:17.0.2" - "@nx/nx-darwin-arm64": "npm:17.0.2" - "@nx/nx-darwin-x64": "npm:17.0.2" - "@nx/nx-freebsd-x64": "npm:17.0.2" - "@nx/nx-linux-arm-gnueabihf": "npm:17.0.2" - "@nx/nx-linux-arm64-gnu": "npm:17.0.2" - "@nx/nx-linux-arm64-musl": "npm:17.0.2" - "@nx/nx-linux-x64-gnu": "npm:17.0.2" - "@nx/nx-linux-x64-musl": "npm:17.0.2" - "@nx/nx-win32-arm64-msvc": "npm:17.0.2" - "@nx/nx-win32-x64-msvc": "npm:17.0.2" +"nx@npm:18.0.6": + version: 18.0.6 + resolution: "nx@npm:18.0.6" + dependencies: + "@nrwl/tao": "npm:18.0.6" + "@nx/nx-darwin-arm64": "npm:18.0.6" + "@nx/nx-darwin-x64": "npm:18.0.6" + "@nx/nx-freebsd-x64": "npm:18.0.6" + "@nx/nx-linux-arm-gnueabihf": "npm:18.0.6" + "@nx/nx-linux-arm64-gnu": "npm:18.0.6" + "@nx/nx-linux-arm64-musl": "npm:18.0.6" + "@nx/nx-linux-x64-gnu": "npm:18.0.6" + "@nx/nx-linux-x64-musl": "npm:18.0.6" + "@nx/nx-win32-arm64-msvc": "npm:18.0.6" + "@nx/nx-win32-x64-msvc": "npm:18.0.6" "@yarnpkg/lockfile": "npm:^1.1.0" "@yarnpkg/parsers": "npm:3.0.0-rc.46" "@zkochan/js-yaml": "npm:0.0.6" - axios: "npm:^1.5.1" + axios: "npm:^1.6.0" chalk: "npm:^4.1.0" cli-cursor: "npm:3.1.0" cli-spinners: "npm:2.6.1" @@ -22284,28 +22283,27 @@ __metadata: figures: "npm:3.2.0" flat: "npm:^5.0.2" fs-extra: "npm:^11.1.0" - glob: "npm:7.1.4" ignore: "npm:^5.0.4" jest-diff: "npm:^29.4.1" js-yaml: "npm:4.1.0" jsonc-parser: "npm:3.2.0" lines-and-columns: "npm:~2.0.3" - minimatch: "npm:3.0.5" + minimatch: "npm:9.0.3" node-machine-id: "npm:1.1.12" npm-run-path: "npm:^4.0.1" open: "npm:^8.4.0" - semver: "npm:7.5.3" + ora: "npm:5.3.0" + semver: "npm:^7.5.3" string-width: "npm:^4.2.3" strong-log-transformer: "npm:^2.1.0" tar-stream: "npm:~2.2.0" tmp: "npm:~0.2.1" tsconfig-paths: "npm:^4.1.2" tslib: "npm:^2.3.0" - v8-compile-cache: "npm:2.3.0" yargs: "npm:^17.6.2" yargs-parser: "npm:21.1.1" peerDependencies: - "@swc-node/register": ^1.6.7 + "@swc-node/register": ^1.8.0 "@swc/core": ^1.3.85 dependenciesMeta: "@nx/nx-darwin-arm64": @@ -22336,7 +22334,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: b22843663a1c45e4b8abd28a4e8d7e8d140a4f1de119f02c6a91a9de1682f3f52de4af6e458f77b2f5756ec32231fb4e992787f848b3502d773067221eef5840 + checksum: 608ffda300706d8cf067428921a76d62157b20131796c006258d96b493efba7618572c7dfa8cdab4b7dfb47a8adbcacd65fb69d03dc7480d8229236a1f2cc881 languageName: node linkType: hard @@ -22600,6 +22598,22 @@ __metadata: languageName: node linkType: hard +"ora@npm:5.3.0": + version: 5.3.0 + resolution: "ora@npm:5.3.0" + dependencies: + bl: "npm:^4.0.3" + chalk: "npm:^4.1.0" + cli-cursor: "npm:^3.1.0" + cli-spinners: "npm:^2.5.0" + is-interactive: "npm:^1.0.0" + log-symbols: "npm:^4.0.0" + strip-ansi: "npm:^6.0.0" + wcwidth: "npm:^1.0.1" + checksum: 30d5f3218eb75b0a2028c5fb9aa88e83e38a2f1745ab56839abb06c3ba31bae35f768f4e72c4f9e04e2a66be6a898e9312e8cf85c9333e1e3613eabb8c7cdf57 + languageName: node + linkType: hard + "ora@npm:5.4.1, ora@npm:^5.4.1": version: 5.4.1 resolution: "ora@npm:5.4.1" @@ -26233,17 +26247,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.3": - version: 7.5.3 - resolution: "semver@npm:7.5.3" - dependencies: - lru-cache: "npm:^6.0.0" - bin: - semver: bin/semver.js - checksum: 4cf3bab7e8cf8c2ae521fc4bcc50a4d6912a836360796b23b9f1c26f45d27a73f870e47664df4770bde0dd60dc4d4781a05fd49fe91d72376ea5519b9e791459 - languageName: node - linkType: hard - "semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.2.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" @@ -29352,13 +29355,6 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:2.3.0": - version: 2.3.0 - resolution: "v8-compile-cache@npm:2.3.0" - checksum: b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688 - languageName: node - linkType: hard - "v8-compile-cache@npm:^2.0.3": version: 2.4.0 resolution: "v8-compile-cache@npm:2.4.0" diff --git a/scripts/check-package.ts b/scripts/check-package.ts index 6248ad54797a..a2aa69d75bc7 100644 --- a/scripts/check-package.ts +++ b/scripts/check-package.ts @@ -1,3 +1,6 @@ +// This script makes sure that we can support type checking, +// without having to build dts files for all packages in the monorepo. +// It is not implemented yet for angular, svelte and vue. import { resolve } from 'path'; import { readJSON } from 'fs-extra'; import prompts from 'prompts'; @@ -18,10 +21,16 @@ async function run() { helpText: `check only the ${pkg.name} package`, }; }) - .reduce((acc, next) => { - acc[next.name] = next; - return acc; - }, {} as Record); + .reduce( + (acc, next) => { + acc[next.name] = next; + return acc; + }, + {} as Record< + string, + { name: string; defaultValue: boolean; suffix: string; helpText: string } + > + ); const tasks: Record< string, diff --git a/scripts/package.json b/scripts/package.json index 52d2013ec288..59cb2884eb33 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -73,7 +73,7 @@ "@babel/preset-typescript": "^7.23.2", "@babel/types": "^7.23.0", "@google-cloud/bigquery": "^6.2.0", - "@nx/workspace": "17.0.2", + "@nx/workspace": "18.0.6", "@octokit/graphql": "^5.0.5", "@octokit/request": "^8.1.2", "@storybook/eslint-config-storybook": "^4.0.0", @@ -145,7 +145,7 @@ "node-fetch": "^2.6.1", "node-gyp": "^9.3.1", "npmlog": "^5.0.1", - "nx": "17.0.2", + "nx": "18.0.6", "ora": "^5.4.1", "p-limit": "^3.1.0", "p-retry": "^5.1.2", @@ -176,7 +176,7 @@ "ts-dedent": "^2.0.0", "tsup": "^6.7.0", "type-fest": "~2.19", - "typescript": "^5.3.2", + "typescript": "5.3.3", "util": "^0.12.4", "uuid": "^9.0.0", "vitest": "^1.2.2", diff --git a/scripts/tasks/check.ts b/scripts/tasks/check.ts index 9e8d9ce01867..113f6281d97f 100644 --- a/scripts/tasks/check.ts +++ b/scripts/tasks/check.ts @@ -4,8 +4,8 @@ import { maxConcurrentTasks } from '../utils/maxConcurrentTasks'; const parallel = process.env.CI ? 8 : maxConcurrentTasks; -const linkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular`; -const nolinkCommand = `nx run-many --target="check" --all --parallel=${parallel}`; +const linkCommand = `nx affected -t check --parallel=${parallel} --exclude=angular,svelte,vue3`; +const nolinkCommand = `nx affected -t check -c production --parallel=${parallel}`; export const check: Task = { description: 'Typecheck the source code of the monorepo', @@ -18,8 +18,8 @@ export const check: Task = { link ? linkCommand : nolinkCommand, { cwd: codeDir }, { - startMessage: '🥾 Checking types validity', - errorMessage: '❌ Unsound types detected', + startMessage: '🥾 Checking for TS errors', + errorMessage: '❌ TS errprs detected', dryRun, debug, } diff --git a/scripts/tasks/compile.ts b/scripts/tasks/compile.ts index 1d6c2678ce12..498ce3cdabee 100644 --- a/scripts/tasks/compile.ts +++ b/scripts/tasks/compile.ts @@ -5,11 +5,11 @@ import { maxConcurrentTasks } from '../utils/maxConcurrentTasks'; import { exec } from '../utils/exec'; import type { Task } from '../task'; +const parallel = process.env.CI ? 8 : maxConcurrentTasks; + const linkedContents = `export * from '../src/index';`; -const linkCommand = `nx run-many --target="prep" --all --parallel --max-parallel=${maxConcurrentTasks} -- --reset`; -const noLinkCommand = `nx run-many --target="prep" --all --parallel=8 ${ - process.env.CI ? `--max-parallel=${maxConcurrentTasks}` : '' -} -- --reset --optimized`; +const linkCommand = `nx run-many -t build --parallel=${parallel}`; +const noLinkCommand = `nx run-many -t build -c production --parallel=${parallel}`; export const compile: Task = { description: 'Compile the source code of the monorepo', diff --git a/scripts/yarn.lock b/scripts/yarn.lock index fd8ab47be372..3865cf1ee73c 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2068,135 +2068,136 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:17.0.2": - version: 17.0.2 - resolution: "@nrwl/devkit@npm:17.0.2" +"@nrwl/devkit@npm:18.0.6": + version: 18.0.6 + resolution: "@nrwl/devkit@npm:18.0.6" dependencies: - "@nx/devkit": "npm:17.0.2" - checksum: cceba705b7c1f9e6575f08db37550cf2383f2750da46e07152728b85b9d79967eff1590f5b1b29224d3d13f02adcd6293d1209bf788a0e337f1ad8e38fbe7d5b + "@nx/devkit": "npm:18.0.6" + checksum: 70e02f256216fe11392e2d12a692ddc76acb28140246dfabeac59d3c7a1d8ee1c811e4bcaa6e879a610a7ba7d4669850469676508e8f333e6d42ee487b2ce279 languageName: node linkType: hard -"@nrwl/tao@npm:17.0.2": - version: 17.0.2 - resolution: "@nrwl/tao@npm:17.0.2" +"@nrwl/tao@npm:18.0.6": + version: 18.0.6 + resolution: "@nrwl/tao@npm:18.0.6" dependencies: - nx: "npm:17.0.2" + nx: "npm:18.0.6" tslib: "npm:^2.3.0" bin: tao: index.js - checksum: b9124c6b0817db71ea2155d6c48bd86870f7e536b002220af42dec6844b5828feb6e581161dd32da78e535da16e66eed6449196c0129b65ee5b794b66ac6c1c1 + checksum: f11f0f579dcfb59c501308a9143844785d5aa63c8cca97e5adc6f8faa51468b3105a99ac421b3e5a241001fdfe319a675b586afff1ef3f5d42301994c38da202 languageName: node linkType: hard -"@nrwl/workspace@npm:17.0.2": - version: 17.0.2 - resolution: "@nrwl/workspace@npm:17.0.2" +"@nrwl/workspace@npm:18.0.6": + version: 18.0.6 + resolution: "@nrwl/workspace@npm:18.0.6" dependencies: - "@nx/workspace": "npm:17.0.2" - checksum: fc723340bbda476390432b185bcc1531f567e4dcfebf0d77b6f679651bddccbd8d0c74a22a20c1c3564b207a420ac54c84654e61fa25fd9c685fb2e6e963b457 + "@nx/workspace": "npm:18.0.6" + checksum: 0cf5ec95c036fd98269d9e746ab08f578d793011667823053aecfb062337a9b0bd98def282acf7fba453930537d5adb7c2d5284b5faebe676f22717a1a7040c1 languageName: node linkType: hard -"@nx/devkit@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/devkit@npm:17.0.2" +"@nx/devkit@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/devkit@npm:18.0.6" dependencies: - "@nrwl/devkit": "npm:17.0.2" + "@nrwl/devkit": "npm:18.0.6" ejs: "npm:^3.1.7" enquirer: "npm:~2.3.6" ignore: "npm:^5.0.4" - semver: "npm:7.5.3" + semver: "npm:^7.5.3" tmp: "npm:~0.2.1" tslib: "npm:^2.3.0" + yargs-parser: "npm:21.1.1" peerDependencies: nx: ">= 16 <= 18" - checksum: 78a6e643ae46de83d4435a91b17ca44e73fde2ed99ba8416b96ff0af37fd8686aea7f58e14146b806f03602670f6485ed48ae7ba4bf2a4538dad091b1ddc7334 + checksum: 1645003b800475257fce500802ce99acc35490c73161896247f7e2747a0160c47a40245b17daf568b6d05f66ddf55097772e2ab8ba895a286f8b544af1b51c44 languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-darwin-arm64@npm:17.0.2" +"@nx/nx-darwin-arm64@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-darwin-arm64@npm:18.0.6" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-darwin-x64@npm:17.0.2" +"@nx/nx-darwin-x64@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-darwin-x64@npm:18.0.6" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-freebsd-x64@npm:17.0.2" +"@nx/nx-freebsd-x64@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-freebsd-x64@npm:18.0.6" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:17.0.2" +"@nx/nx-linux-arm-gnueabihf@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.0.6" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-arm64-gnu@npm:17.0.2" +"@nx/nx-linux-arm64-gnu@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-arm64-gnu@npm:18.0.6" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-arm64-musl@npm:17.0.2" +"@nx/nx-linux-arm64-musl@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-arm64-musl@npm:18.0.6" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-x64-gnu@npm:17.0.2" +"@nx/nx-linux-x64-gnu@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-x64-gnu@npm:18.0.6" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-linux-x64-musl@npm:17.0.2" +"@nx/nx-linux-x64-musl@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-linux-x64-musl@npm:18.0.6" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-win32-arm64-msvc@npm:17.0.2" +"@nx/nx-win32-arm64-msvc@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-win32-arm64-msvc@npm:18.0.6" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/nx-win32-x64-msvc@npm:17.0.2" +"@nx/nx-win32-x64-msvc@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/nx-win32-x64-msvc@npm:18.0.6" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nx/workspace@npm:17.0.2": - version: 17.0.2 - resolution: "@nx/workspace@npm:17.0.2" +"@nx/workspace@npm:18.0.6": + version: 18.0.6 + resolution: "@nx/workspace@npm:18.0.6" dependencies: - "@nrwl/workspace": "npm:17.0.2" - "@nx/devkit": "npm:17.0.2" + "@nrwl/workspace": "npm:18.0.6" + "@nx/devkit": "npm:18.0.6" chalk: "npm:^4.1.0" enquirer: "npm:~2.3.6" - nx: "npm:17.0.2" + nx: "npm:18.0.6" tslib: "npm:^2.3.0" yargs-parser: "npm:21.1.1" - checksum: a0bb97a7062cec677a164d87976e9442bfa8fa97d5d7df6c1d7f3d5d288d5bf38e5d46cfba9e0416534840c84d427f911b5fb37844ca5d8669773829de13f352 + checksum: bd01b6b28fbe0c783a9c37bfdf0a01846df4ef46f366f6596e586063dff06d87761c35b06819839fefdf66a9c32947697db7ecc21b2933a06a633693a962272c languageName: node linkType: hard @@ -2712,7 +2713,7 @@ __metadata: "@babel/preset-typescript": "npm:^7.23.2" "@babel/types": "npm:^7.23.0" "@google-cloud/bigquery": "npm:^6.2.0" - "@nx/workspace": "npm:17.0.2" + "@nx/workspace": "npm:18.0.6" "@octokit/graphql": "npm:^5.0.5" "@octokit/request": "npm:^8.1.2" "@storybook/eslint-config-storybook": "npm:^4.0.0" @@ -2785,7 +2786,7 @@ __metadata: node-fetch: "npm:^2.6.1" node-gyp: "npm:^9.3.1" npmlog: "npm:^5.0.1" - nx: "npm:17.0.2" + nx: "npm:18.0.6" ora: "npm:^5.4.1" p-limit: "npm:^3.1.0" p-retry: "npm:^5.1.2" @@ -2817,7 +2818,7 @@ __metadata: ts-loader: "npm:^9.4.2" tsup: "npm:^6.7.0" type-fest: "npm:~2.19" - typescript: "npm:^5.3.2" + typescript: "npm:5.3.3" util: "npm:^0.12.4" uuid: "npm:^9.0.0" verdaccio: "npm:^5.19.1" @@ -4626,14 +4627,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.5.1": - version: 1.6.2 - resolution: "axios@npm:1.6.2" +"axios@npm:^1.6.0": + version: 1.6.7 + resolution: "axios@npm:1.6.7" dependencies: - follow-redirects: "npm:^1.15.0" + follow-redirects: "npm:^1.15.4" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 9b77e030e85e4f9cbcba7bb52fbff67d6ce906c92d213e0bd932346a50140faf83733bf786f55bd58301bd92f9973885c7b87d6348023e10f7eaf286d0791a1d + checksum: 131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d languageName: node linkType: hard @@ -7560,7 +7561,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9": version: 1.15.3 resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: @@ -7570,6 +7571,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.4": + version: 1.15.5 + resolution: "follow-redirects@npm:1.15.5" + peerDependenciesMeta: + debug: + optional: true + checksum: 418d71688ceaf109dfd6f85f747a0c75de30afe43a294caa211def77f02ef19865b547dfb73fde82b751e1cc507c06c754120b848fe5a7400b0a669766df7615 + languageName: node + linkType: hard + "for-each@npm:^0.3.3": version: 0.3.3 resolution: "for-each@npm:0.3.3" @@ -7952,20 +7963,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.4": - version: 7.1.4 - resolution: "glob@npm:7.1.4" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.0.4" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 7f6fcbf600eb2298cce34c65f6d8bbe6933ddd4f88aa5b38a9c6feec82b615bb33b63b120725303e89c4b50284413c21d2ff883414717a5c7d0c9f7cd7a0e5fe - languageName: node - linkType: hard - "glob@npm:7.1.6": version: 7.1.6 resolution: "glob@npm:7.1.6" @@ -10963,15 +10960,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:3.0.5": - version: 3.0.5 - resolution: "minimatch@npm:3.0.5" - dependencies: - brace-expansion: "npm:^1.1.7" - checksum: f398652d0d260137c289c270a4ac98ebe0a27cd316fa0fac72b096e96cbdc89f71d80d47ac7065c716ba3b0b730783b19180bd85a35f9247535d2adfe96bba76 - languageName: node - linkType: hard - "minimatch@npm:7.4.6": version: 7.4.6 resolution: "minimatch@npm:7.4.6" @@ -11472,25 +11460,25 @@ __metadata: languageName: node linkType: hard -"nx@npm:17.0.2": - version: 17.0.2 - resolution: "nx@npm:17.0.2" - dependencies: - "@nrwl/tao": "npm:17.0.2" - "@nx/nx-darwin-arm64": "npm:17.0.2" - "@nx/nx-darwin-x64": "npm:17.0.2" - "@nx/nx-freebsd-x64": "npm:17.0.2" - "@nx/nx-linux-arm-gnueabihf": "npm:17.0.2" - "@nx/nx-linux-arm64-gnu": "npm:17.0.2" - "@nx/nx-linux-arm64-musl": "npm:17.0.2" - "@nx/nx-linux-x64-gnu": "npm:17.0.2" - "@nx/nx-linux-x64-musl": "npm:17.0.2" - "@nx/nx-win32-arm64-msvc": "npm:17.0.2" - "@nx/nx-win32-x64-msvc": "npm:17.0.2" +"nx@npm:18.0.6": + version: 18.0.6 + resolution: "nx@npm:18.0.6" + dependencies: + "@nrwl/tao": "npm:18.0.6" + "@nx/nx-darwin-arm64": "npm:18.0.6" + "@nx/nx-darwin-x64": "npm:18.0.6" + "@nx/nx-freebsd-x64": "npm:18.0.6" + "@nx/nx-linux-arm-gnueabihf": "npm:18.0.6" + "@nx/nx-linux-arm64-gnu": "npm:18.0.6" + "@nx/nx-linux-arm64-musl": "npm:18.0.6" + "@nx/nx-linux-x64-gnu": "npm:18.0.6" + "@nx/nx-linux-x64-musl": "npm:18.0.6" + "@nx/nx-win32-arm64-msvc": "npm:18.0.6" + "@nx/nx-win32-x64-msvc": "npm:18.0.6" "@yarnpkg/lockfile": "npm:^1.1.0" "@yarnpkg/parsers": "npm:3.0.0-rc.46" "@zkochan/js-yaml": "npm:0.0.6" - axios: "npm:^1.5.1" + axios: "npm:^1.6.0" chalk: "npm:^4.1.0" cli-cursor: "npm:3.1.0" cli-spinners: "npm:2.6.1" @@ -11501,28 +11489,27 @@ __metadata: figures: "npm:3.2.0" flat: "npm:^5.0.2" fs-extra: "npm:^11.1.0" - glob: "npm:7.1.4" ignore: "npm:^5.0.4" jest-diff: "npm:^29.4.1" js-yaml: "npm:4.1.0" jsonc-parser: "npm:3.2.0" lines-and-columns: "npm:~2.0.3" - minimatch: "npm:3.0.5" + minimatch: "npm:9.0.3" node-machine-id: "npm:1.1.12" npm-run-path: "npm:^4.0.1" open: "npm:^8.4.0" - semver: "npm:7.5.3" + ora: "npm:5.3.0" + semver: "npm:^7.5.3" string-width: "npm:^4.2.3" strong-log-transformer: "npm:^2.1.0" tar-stream: "npm:~2.2.0" tmp: "npm:~0.2.1" tsconfig-paths: "npm:^4.1.2" tslib: "npm:^2.3.0" - v8-compile-cache: "npm:2.3.0" yargs: "npm:^17.6.2" yargs-parser: "npm:21.1.1" peerDependencies: - "@swc-node/register": ^1.6.7 + "@swc-node/register": ^1.8.0 "@swc/core": ^1.3.85 dependenciesMeta: "@nx/nx-darwin-arm64": @@ -11553,7 +11540,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: b22843663a1c45e4b8abd28a4e8d7e8d140a4f1de119f02c6a91a9de1682f3f52de4af6e458f77b2f5756ec32231fb4e992787f848b3502d773067221eef5840 + checksum: 608ffda300706d8cf067428921a76d62157b20131796c006258d96b493efba7618572c7dfa8cdab4b7dfb47a8adbcacd65fb69d03dc7480d8229236a1f2cc881 languageName: node linkType: hard @@ -11755,6 +11742,22 @@ __metadata: languageName: node linkType: hard +"ora@npm:5.3.0": + version: 5.3.0 + resolution: "ora@npm:5.3.0" + dependencies: + bl: "npm:^4.0.3" + chalk: "npm:^4.1.0" + cli-cursor: "npm:^3.1.0" + cli-spinners: "npm:^2.5.0" + is-interactive: "npm:^1.0.0" + log-symbols: "npm:^4.0.0" + strip-ansi: "npm:^6.0.0" + wcwidth: "npm:^1.0.1" + checksum: 30d5f3218eb75b0a2028c5fb9aa88e83e38a2f1745ab56839abb06c3ba31bae35f768f4e72c4f9e04e2a66be6a898e9312e8cf85c9333e1e3613eabb8c7cdf57 + languageName: node + linkType: hard + "ora@npm:^5.4.1": version: 5.4.1 resolution: "ora@npm:5.4.1" @@ -13606,17 +13609,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.3": - version: 7.5.3 - resolution: "semver@npm:7.5.3" - dependencies: - lru-cache: "npm:^6.0.0" - bin: - semver: bin/semver.js - checksum: 4cf3bab7e8cf8c2ae521fc4bcc50a4d6912a836360796b23b9f1c26f45d27a73f870e47664df4770bde0dd60dc4d4781a05fd49fe91d72376ea5519b9e791459 - languageName: node - linkType: hard - "semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" @@ -14962,7 +14954,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.3.2": +"typescript@npm:5.3.3": version: 5.3.3 resolution: "typescript@npm:5.3.3" bin: @@ -14972,7 +14964,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^5.3.2#optional!builtin": +"typescript@patch:typescript@npm%3A5.3.3#optional!builtin": version: 5.3.3 resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" bin: @@ -15498,13 +15490,6 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:2.3.0": - version: 2.3.0 - resolution: "v8-compile-cache@npm:2.3.0" - checksum: b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688 - languageName: node - linkType: hard - "v8-to-istanbul@npm:^9.2.0": version: 9.2.0 resolution: "v8-to-istanbul@npm:9.2.0"