@nrwl/react 14.8.8 → 14.9.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/LICENSE +22 -22
- package/README.md +5 -26
- package/babel.d.ts +16 -1
- package/babel.js +4 -3
- package/babel.js.map +1 -1
- package/executors.json +10 -0
- package/generators.json +14 -0
- package/index.d.ts +4 -1
- package/index.js +8 -1
- package/index.js.map +1 -1
- package/migrations.json +160 -0
- package/module-federation.d.ts +2 -2
- package/module-federation.js +4 -4
- package/module-federation.js.map +1 -1
- package/package.json +9 -26
- package/plugins/bundle-rollup.js +20 -0
- package/plugins/bundle-rollup.js.map +1 -1
- package/plugins/component-testing/index.d.ts +13 -5
- package/plugins/component-testing/index.js +31 -44
- package/plugins/component-testing/index.js.map +1 -1
- package/plugins/component-testing/webpack-fallback.js +2 -2
- package/plugins/component-testing/webpack-fallback.js.map +1 -1
- package/plugins/jest.js +10 -6
- package/plugins/jest.js.map +1 -1
- package/plugins/storybook/index.d.ts +0 -4
- package/plugins/storybook/index.js +24 -74
- package/plugins/storybook/index.js.map +1 -1
- package/plugins/storybook/merge-plugins.d.ts +2 -2
- package/plugins/storybook/merge-plugins.js.map +1 -1
- package/plugins/webpack.d.ts +3 -2
- package/plugins/webpack.js +10 -72
- package/plugins/webpack.js.map +1 -1
- package/plugins/with-react.d.ts +12 -0
- package/plugins/with-react.js +82 -0
- package/plugins/with-react.js.map +1 -0
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts +6 -2
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +11 -7
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/executors/module-federation-dev-server/schema.json +18 -4
- package/src/executors/module-federation-ssr-dev-server/compat.d.ts +2 -0
- package/src/executors/module-federation-ssr-dev-server/compat.js +6 -0
- package/src/executors/module-federation-ssr-dev-server/compat.js.map +1 -0
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.d.ts +9 -0
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +71 -0
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js.map +1 -0
- package/src/executors/module-federation-ssr-dev-server/schema.json +48 -0
- package/src/generators/application/application.js +85 -25
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/base-vite/index.html__tmpl__ +16 -0
- package/src/generators/application/files/base-vite/src/app/__fileName__.spec.tsx__tmpl__ +10 -0
- package/src/generators/application/files/{common → base-vite}/tsconfig.app.json__tmpl__ +2 -2
- package/src/generators/application/files/base-webpack/src/app/__fileName__.spec.tsx__tmpl__ +10 -0
- package/src/generators/application/files/base-webpack/src/environments/environment.prod.ts__tmpl__ +3 -0
- package/src/generators/application/files/base-webpack/src/environments/environment.ts__tmpl__ +6 -0
- package/src/generators/application/files/base-webpack/src/favicon.ico +0 -0
- package/src/generators/application/files/base-webpack/src/main.tsx__tmpl__ +10 -0
- package/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__ +14 -0
- package/src/generators/application/files/base-webpack/webpack.config.js__tmpl__ +9 -0
- package/src/generators/application/files/{common → nx-welcome}/src/app/nx-welcome.tsx +30 -8
- package/src/generators/application/files/{css-module → style-css-module}/src/app/__fileName__.tsx__tmpl__ +11 -0
- package/src/generators/application/files/{global-css → style-global-css}/src/app/__fileName__.tsx__tmpl__ +11 -0
- package/src/generators/application/files/{none → style-none}/src/app/__fileName__.tsx__tmpl__ +11 -0
- package/src/generators/application/files/{styled-jsx → style-styled-jsx}/src/app/__fileName__.tsx__tmpl__ +4 -1
- package/src/generators/application/files/{styled-module → style-styled-module}/src/app/__fileName__.tsx__tmpl__ +11 -0
- package/src/generators/application/lib/add-cypress.d.ts +1 -1
- package/src/generators/application/lib/add-cypress.js +4 -2
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-jest.d.ts +2 -2
- package/src/generators/application/lib/add-jest.js +4 -2
- package/src/generators/application/lib/add-jest.js.map +1 -1
- package/src/generators/application/lib/add-project.js +13 -8
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/add-routing.js +10 -3
- package/src/generators/application/lib/add-routing.js.map +1 -1
- package/src/generators/application/lib/create-application-files.d.ts +1 -1
- package/src/generators/application/lib/create-application-files.js +21 -18
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/get-app-tests.d.ts +2 -0
- package/src/generators/application/lib/get-app-tests.js +22 -0
- package/src/generators/application/lib/get-app-tests.js.map +1 -0
- package/src/generators/application/lib/install-common-dependencies.d.ts +3 -0
- package/src/generators/application/lib/install-common-dependencies.js +29 -0
- package/src/generators/application/lib/install-common-dependencies.js.map +1 -0
- package/src/generators/application/lib/normalize-options.d.ts +1 -1
- package/src/generators/application/lib/normalize-options.js +28 -14
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/set-defaults.js +11 -9
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/application/lib/update-jest-config.d.ts +1 -1
- package/src/generators/application/lib/update-jest-config.js +7 -4
- package/src/generators/application/lib/update-jest-config.js.map +1 -1
- package/src/generators/application/schema.d.ts +9 -4
- package/src/generators/application/schema.json +42 -10
- package/src/generators/component/component.js +15 -7
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/files/__fileName__.spec.tsx__tmpl__ +1 -4
- package/src/generators/component/files/__fileName__.tsx__tmpl__ +4 -2
- package/src/generators/component/get-component-tests.d.ts +2 -0
- package/src/generators/component/get-component-tests.js +13 -0
- package/src/generators/component/get-component-tests.js.map +1 -0
- package/src/generators/component/noramlized-schema.d.ts +8 -0
- package/src/generators/component/noramlized-schema.js +3 -0
- package/src/generators/component/noramlized-schema.js.map +1 -0
- package/src/generators/component/schema.d.ts +1 -0
- package/src/generators/component/schema.json +13 -4
- package/src/generators/component-cypress-spec/component-cypress-spec.d.ts +1 -1
- package/src/generators/component-cypress-spec/component-cypress-spec.js +12 -5
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-cypress-spec/schema.json +4 -2
- package/src/generators/component-story/component-story.d.ts +1 -1
- package/src/generators/component-story/component-story.js +6 -2
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/component-story/files/__componentFileName__.stories.__fileExt__ +6 -7
- package/src/generators/component-story/schema.json +4 -2
- package/src/generators/component-test/component-test.d.ts +1 -1
- package/src/generators/component-test/component-test.js +21 -12
- package/src/generators/component-test/component-test.js.map +1 -1
- package/src/generators/component-test/files/__fileName__.cy__ext__ +2 -3
- package/src/generators/component-test/schema.json +6 -3
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +5 -4
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__ +42 -0
- package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +3 -1
- package/src/generators/cypress-component-configuration/lib/add-files.d.ts +2 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +52 -16
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/update-configs.d.ts +6 -2
- package/src/generators/cypress-component-configuration/lib/update-configs.js +8 -4
- package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
- package/src/generators/cypress-component-configuration/schema.d.ts +1 -0
- package/src/generators/cypress-component-configuration/schema.json +15 -4
- package/src/generators/hook/hook.js +6 -2
- package/src/generators/hook/hook.js.map +1 -1
- package/src/generators/hook/schema.json +7 -4
- package/src/generators/host/files/common/src/app/__fileName__.tsx__tmpl__ +4 -0
- package/src/generators/host/files/module-federation/module-federation.config.js__tmpl__ +5 -12
- package/src/generators/host/files/module-federation/webpack.config.js__tmpl__ +7 -8
- package/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ +11 -12
- package/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__ +13 -0
- package/src/generators/host/files/module-federation-ssr/server.ts__tmpl__ +28 -0
- package/src/generators/host/files/module-federation-ssr/tsconfig.server.json__tmpl__ +15 -0
- package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ +12 -0
- package/src/generators/host/host.d.ts +2 -2
- package/src/generators/host/host.js +21 -2
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/lib/add-module-federation-files.js +1 -1
- package/src/generators/host/lib/add-module-federation-files.js.map +1 -1
- package/src/generators/host/lib/setup-ssr-for-host.d.ts +6 -0
- package/src/generators/host/lib/setup-ssr-for-host.js +27 -0
- package/src/generators/host/lib/setup-ssr-for-host.js.map +1 -0
- package/src/generators/host/schema.d.ts +16 -14
- package/src/generators/host/schema.json +27 -8
- package/src/generators/init/init.js +45 -22
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +6 -1
- package/src/generators/init/schema.json +16 -0
- package/src/generators/library/files/common/src/index.ts__tmpl__ +0 -0
- package/src/generators/library/files/common/tsconfig.lib.json__tmpl__ +14 -0
- package/src/generators/library/files/vite/README.md +7 -0
- package/src/generators/library/files/vite/package.json__tmpl__ +12 -0
- package/src/generators/library/files/{lib → vite}/tsconfig.lib.json__tmpl__ +1 -1
- package/src/generators/library/lib/add-linting.d.ts +3 -0
- package/src/generators/library/lib/add-linting.js +37 -0
- package/src/generators/library/lib/add-linting.js.map +1 -0
- package/src/generators/library/lib/add-rollup-build-target.d.ts +3 -0
- package/src/generators/library/lib/add-rollup-build-target.js +59 -0
- package/src/generators/library/lib/add-rollup-build-target.js.map +1 -0
- package/src/generators/library/lib/create-files.d.ts +3 -0
- package/src/generators/library/lib/create-files.js +26 -0
- package/src/generators/library/lib/create-files.js.map +1 -0
- package/src/generators/library/lib/install-common-dependencies.d.ts +3 -0
- package/src/generators/library/lib/install-common-dependencies.js +30 -0
- package/src/generators/library/lib/install-common-dependencies.js.map +1 -0
- package/src/generators/library/lib/maybe-js.d.ts +2 -0
- package/src/generators/library/lib/maybe-js.js +10 -0
- package/src/generators/library/lib/maybe-js.js.map +1 -0
- package/src/generators/library/lib/normalize-options.d.ts +3 -0
- package/src/generators/library/lib/normalize-options.js +57 -0
- package/src/generators/library/lib/normalize-options.js.map +1 -0
- package/src/generators/library/lib/set-defaults.d.ts +3 -0
- package/src/generators/library/lib/set-defaults.js +16 -0
- package/src/generators/library/lib/set-defaults.js.map +1 -0
- package/src/generators/library/lib/update-app-routes.d.ts +3 -0
- package/src/generators/library/lib/update-app-routes.js +63 -0
- package/src/generators/library/lib/update-app-routes.js.map +1 -0
- package/src/generators/library/library.d.ts +0 -10
- package/src/generators/library/library.js +76 -214
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +34 -16
- package/src/generators/library/schema.json +41 -10
- package/src/generators/redux/redux.js +13 -6
- package/src/generators/redux/redux.js.map +1 -1
- package/src/generators/redux/schema.json +6 -3
- package/src/generators/remote/files/module-federation/module-federation.config.js__tmpl__ +1 -8
- package/src/generators/remote/files/module-federation/webpack.config.js__tmpl__ +7 -8
- package/src/generators/remote/files/module-federation-ssr/module-federation.server.config.js__tmpl__ +6 -0
- package/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__ +45 -0
- package/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__ +12 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.d.ts +4 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.js +32 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.js.map +1 -0
- package/src/generators/remote/lib/update-host-with-remote.js +8 -4
- package/src/generators/remote/lib/update-host-with-remote.js.map +1 -1
- package/src/generators/remote/remote.d.ts +2 -2
- package/src/generators/remote/remote.js +20 -3
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.d.ts +14 -13
- package/src/generators/remote/schema.json +22 -8
- package/src/generators/setup-ssr/files/server.ts__tmpl__ +28 -0
- package/src/generators/setup-ssr/files/src/main.server.tsx__tmpl__ +47 -0
- package/src/generators/setup-ssr/files/tsconfig.server.json__tmpl__ +15 -0
- package/src/generators/setup-ssr/schema.d.ts +7 -0
- package/src/generators/setup-ssr/schema.json +48 -0
- package/src/generators/setup-ssr/setup-ssr.d.ts +5 -0
- package/src/generators/setup-ssr/setup-ssr.js +162 -0
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js +2 -2
- package/src/generators/setup-tailwind/schema.json +8 -4
- package/src/generators/setup-tailwind/setup-tailwind.js +1 -2
- package/src/generators/setup-tailwind/setup-tailwind.js.map +1 -1
- package/src/generators/stories/schema.json +4 -2
- package/src/generators/stories/stories.d.ts +1 -1
- package/src/generators/stories/stories.js +29 -21
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.d.ts +1 -1
- package/src/generators/storybook-configuration/configuration.js +24 -6
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +2 -0
- package/src/generators/storybook-configuration/schema.json +25 -8
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js +3 -3
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +1 -1
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +3 -3
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -1
- package/src/migrations/update-14-1-0/update-external-emotion-jsx-runtime.js +1 -1
- package/src/migrations/update-14-1-0/update-external-emotion-jsx-runtime.js.map +1 -1
- package/src/migrations/update-14-6-0/add-preset-jest-config.js +1 -1
- package/src/migrations/update-14-6-0/add-preset-jest-config.js.map +1 -1
- package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.d.ts +3 -0
- package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.js +39 -0
- package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.js.map +1 -0
- package/src/migrations/update-15-3-0/update-rollup-executor.d.ts +3 -0
- package/src/migrations/update-15-3-0/update-rollup-executor.js +17 -0
- package/src/migrations/update-15-3-0/update-rollup-executor.js.map +1 -0
- package/src/migrations/update-15-6-3/webpack-config-setup.d.ts +2 -0
- package/src/migrations/update-15-6-3/webpack-config-setup.js +108 -0
- package/src/migrations/update-15-6-3/webpack-config-setup.js.map +1 -0
- package/src/module-federation/ast-utils.d.ts +1 -1
- package/src/module-federation/ast-utils.js +10 -6
- package/src/module-federation/ast-utils.js.map +1 -1
- package/src/module-federation/load-config.js +1 -1
- package/src/module-federation/load-config.js.map +1 -1
- package/src/module-federation/models.d.ts +4 -4
- package/src/module-federation/utils.d.ts +10 -0
- package/src/module-federation/utils.js +38 -0
- package/src/module-federation/utils.js.map +1 -0
- package/src/module-federation/with-module-federation-ssr.d.ts +2 -0
- package/src/module-federation/with-module-federation-ssr.js +48 -0
- package/src/module-federation/with-module-federation-ssr.js.map +1 -0
- package/src/module-federation/with-module-federation.d.ts +7 -2
- package/src/module-federation/with-module-federation.js +15 -158
- package/src/module-federation/with-module-federation.js.map +1 -1
- package/src/rules/update-module-federation-project.d.ts +2 -2
- package/src/rules/update-module-federation-project.js +2 -0
- package/src/rules/update-module-federation-project.js.map +1 -1
- package/src/utils/ast-utils.d.ts +2 -1
- package/src/utils/ast-utils.js +132 -65
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/component-props.d.ts +1 -1
- package/src/utils/component-props.js +13 -6
- package/src/utils/component-props.js.map +1 -1
- package/src/utils/create-ts-config.d.ts +9 -0
- package/src/utils/create-ts-config.js +64 -0
- package/src/utils/create-ts-config.js.map +1 -0
- package/src/utils/get-in-source-vitest-tests-template.d.ts +1 -0
- package/src/utils/get-in-source-vitest-tests-template.js +22 -0
- package/src/utils/get-in-source-vitest-tests-template.js.map +1 -0
- package/src/utils/lint.d.ts +26 -0
- package/src/utils/lint.js +10 -1
- package/src/utils/lint.js.map +1 -1
- package/src/utils/versions.d.ts +32 -18
- package/src/utils/versions.js +36 -19
- package/src/utils/versions.js.map +1 -1
- package/tailwind.js +1 -1
- package/tailwind.js.map +1 -1
- package/src/generators/application/files/common/.browserslistrc__tmpl__ +0 -16
- package/src/generators/application/files/common/src/app/__fileName__.spec.tsx__tmpl__ +0 -26
- package/src/generators/application/files/common/src/polyfills.ts__tmpl__ +0 -7
- package/src/generators/application/files/common/tsconfig.json__tmpl__ +0 -17
- package/src/generators/library/files/lib/tsconfig.json__tmpl__ +0 -17
- package/src/migrations/utils/rules.d.ts +0 -2
- package/src/migrations/utils/rules.js +0 -15
- package/src/migrations/utils/rules.js.map +0 -1
- package/src/migrations/utils/testing.d.ts +0 -6
- package/src/migrations/utils/testing.js +0 -76
- package/src/migrations/utils/testing.js.map +0 -1
- package/src/module-federation/webpack-utils.d.ts +0 -9
- package/src/module-federation/webpack-utils.js +0 -76
- package/src/module-federation/webpack-utils.js.map +0 -1
- package/src/utils/async-iterator.d.ts +0 -5
- package/src/utils/async-iterator.js +0 -76
- package/src/utils/async-iterator.js.map +0 -1
- /package/src/generators/application/files/{common/src → base-vite/public}/favicon.ico +0 -0
- /package/src/generators/application/files/{common → base-vite}/src/assets/.gitkeep +0 -0
- /package/src/generators/application/files/{common → base-vite}/src/environments/environment.prod.ts__tmpl__ +0 -0
- /package/src/generators/application/files/{common → base-vite}/src/environments/environment.ts__tmpl__ +0 -0
- /package/src/generators/application/files/{common → base-vite}/src/main.tsx__tmpl__ +0 -0
- /package/src/generators/application/files/{common → base-webpack}/.babelrc__tmpl__ +0 -0
- /package/src/generators/{library/files/lib/src/index.ts__tmpl__ → application/files/base-webpack/src/assets/.gitkeep} +0 -0
- /package/src/generators/application/files/{common → base-webpack}/src/index.html +0 -0
- /package/src/generators/application/files/{css-module → style-css-module}/src/app/__fileName__.module.__style__ +0 -0
- /package/src/generators/application/files/{css-module → style-css-module}/src/styles.__style__ +0 -0
- /package/src/generators/application/files/{global-css → style-global-css}/src/app/__fileName__.__style__ +0 -0
- /package/src/generators/application/files/{global-css → style-global-css}/src/styles.__style__ +0 -0
- /package/src/generators/library/files/{lib → common}/.babelrc__tmpl__ +0 -0
- /package/src/generators/library/files/{lib → common}/README.md +0 -0
- /package/src/generators/library/files/{lib → common}/package.json__tmpl__ +0 -0
|
@@ -5,8 +5,9 @@ const assertion_1 = require("../../../utils/assertion");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const find_free_port_1 = require("./find-free-port");
|
|
7
7
|
function normalizeDirectory(options) {
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
9
|
+
return projectDirectory
|
|
10
|
+
? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
|
|
10
11
|
: (0, devkit_1.names)(options.name).fileName;
|
|
11
12
|
}
|
|
12
13
|
exports.normalizeDirectory = normalizeDirectory;
|
|
@@ -15,12 +16,17 @@ function normalizeProjectName(options) {
|
|
|
15
16
|
}
|
|
16
17
|
exports.normalizeProjectName = normalizeProjectName;
|
|
17
18
|
function normalizeOptions(host, options) {
|
|
18
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
19
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
19
20
|
const appDirectory = normalizeDirectory(options);
|
|
20
21
|
const appProjectName = normalizeProjectName(options);
|
|
21
|
-
const e2eProjectName =
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
const e2eProjectName = options.rootProject
|
|
23
|
+
? 'e2e'
|
|
24
|
+
: `${(0, devkit_1.names)(options.name).fileName}-e2e`;
|
|
25
|
+
const { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
26
|
+
const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
|
|
27
|
+
const appProjectRoot = options.rootProject
|
|
28
|
+
? '.'
|
|
29
|
+
: (0, devkit_1.normalizePath)(`${appsDir}/${appDirectory}`);
|
|
24
30
|
const parsedTags = options.tags
|
|
25
31
|
? options.tags.split(',').map((s) => s.trim())
|
|
26
32
|
: [];
|
|
@@ -29,18 +35,26 @@ function normalizeOptions(host, options) {
|
|
|
29
35
|
? null
|
|
30
36
|
: options.style;
|
|
31
37
|
(0, assertion_1.assertValidStyle)(options.style);
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
options.e2eTestRunner = (_e = options.e2eTestRunner) !== null && _e !== void 0 ? _e : 'cypress';
|
|
37
|
-
options.compiler = (_f = options.compiler) !== null && _f !== void 0 ? _f : 'babel';
|
|
38
|
-
(_g = options.devServerPort) !== null && _g !== void 0 ? _g : (options.devServerPort = (0, find_free_port_1.findFreePort)(host));
|
|
39
|
-
return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
|
|
38
|
+
if (options.bundler === 'vite') {
|
|
39
|
+
options.unitTestRunner = 'vitest';
|
|
40
|
+
}
|
|
41
|
+
const normalized = Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
|
|
40
42
|
e2eProjectName,
|
|
41
43
|
parsedTags,
|
|
42
44
|
fileName,
|
|
43
45
|
styledModule, hasStyles: options.style !== 'none' });
|
|
46
|
+
normalized.routing = (_a = normalized.routing) !== null && _a !== void 0 ? _a : false;
|
|
47
|
+
normalized.strict = (_b = normalized.strict) !== null && _b !== void 0 ? _b : true;
|
|
48
|
+
normalized.classComponent = (_c = normalized.classComponent) !== null && _c !== void 0 ? _c : false;
|
|
49
|
+
normalized.compiler = (_d = normalized.compiler) !== null && _d !== void 0 ? _d : 'babel';
|
|
50
|
+
normalized.bundler = (_e = normalized.bundler) !== null && _e !== void 0 ? _e : 'webpack';
|
|
51
|
+
normalized.unitTestRunner =
|
|
52
|
+
(_f = normalized.unitTestRunner) !== null && _f !== void 0 ? _f : (normalized.bundler === 'vite' ? 'vitest' : 'jest');
|
|
53
|
+
normalized.e2eTestRunner = (_g = normalized.e2eTestRunner) !== null && _g !== void 0 ? _g : 'cypress';
|
|
54
|
+
normalized.inSourceTests = normalized.minimal || normalized.inSourceTests;
|
|
55
|
+
(_h = normalized.devServerPort) !== null && _h !== void 0 ? _h : (normalized.devServerPort = (0, find_free_port_1.findFreePort)(host));
|
|
56
|
+
normalized.minimal = (_j = normalized.minimal) !== null && _j !== void 0 ? _j : false;
|
|
57
|
+
return normalized;
|
|
44
58
|
}
|
|
45
59
|
exports.normalizeOptions = normalizeOptions;
|
|
46
60
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,wDAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,16 +6,18 @@ function setDefaults(host, options) {
|
|
|
6
6
|
if (options.skipWorkspaceJson) {
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
|
-
const
|
|
10
|
-
if (
|
|
11
|
-
|
|
9
|
+
const nxJson = (0, devkit_1.readNxJson)(host);
|
|
10
|
+
if (options.rootProject) {
|
|
11
|
+
nxJson.defaultProject = options.projectName;
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
(
|
|
13
|
+
nxJson.generators = nxJson.generators || {};
|
|
14
|
+
nxJson.generators['@nrwl/react'] = nxJson.generators['@nrwl/react'] || {};
|
|
15
|
+
const prev = Object.assign({}, nxJson.generators['@nrwl/react']);
|
|
16
|
+
const appDefaults = Object.assign({ style: options.style, linter: options.linter, bundler: options.bundler }, prev.application);
|
|
17
|
+
const componentDefaults = Object.assign({ style: options.style }, prev.component);
|
|
18
|
+
const libDefaults = Object.assign({ style: options.style, linter: options.linter }, prev.library);
|
|
19
|
+
nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@nrwl/react': Object.assign(Object.assign({}, prev), { application: appDefaults, component: componentDefaults, library: libDefaults }) });
|
|
20
|
+
(0, devkit_1.updateNxJson)(host, nxJson);
|
|
19
21
|
}
|
|
20
22
|
exports.setDefaults = setDefaults;
|
|
21
23
|
//# sourceMappingURL=set-defaults.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAG9D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,OAAO,CAAC,iBAAiB,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KAC7C;IAED,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE1E,MAAM,IAAI,qBAAQ,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAErD,MAAM,WAAW,mBACf,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,OAAO,IACrB,IAAI,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,iBAAiB,mBACrB,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,IAAI,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,WAAW,mBACf,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,OAAO,CAChB,CAAC;IAEF,MAAM,CAAC,UAAU,mCACZ,MAAM,CAAC,UAAU,KACpB,aAAa,kCACR,IAAI,KACP,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,WAAW,MAEvB,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AA3CD,kCA2CC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.updateSpecConfig = void 0;
|
|
4
4
|
const jest_utils_1 = require("../../../utils/jest-utils");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
function
|
|
7
|
-
if (options.unitTestRunner
|
|
6
|
+
function updateSpecConfig(host, options) {
|
|
7
|
+
if (options.unitTestRunner === 'none') {
|
|
8
8
|
return;
|
|
9
9
|
}
|
|
10
10
|
(0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.spec.json`, (json) => {
|
|
@@ -18,10 +18,13 @@ function updateJestConfig(host, options) {
|
|
|
18
18
|
}
|
|
19
19
|
return json;
|
|
20
20
|
});
|
|
21
|
+
if (options.unitTestRunner !== 'jest') {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
21
24
|
const configPath = `${options.appProjectRoot}/jest.config.${options.js ? 'js' : 'ts'}`;
|
|
22
25
|
const originalContent = host.read(configPath, 'utf-8');
|
|
23
26
|
const content = (0, jest_utils_1.updateJestConfigContent)(originalContent);
|
|
24
27
|
host.write(configPath, content);
|
|
25
28
|
}
|
|
26
|
-
exports.
|
|
29
|
+
exports.updateSpecConfig = updateSpecConfig;
|
|
27
30
|
//# sourceMappingURL=update-jest-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,0DAAoE;AAEpE,yCAAgE;AAEhE,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,GAAG;YACX,GAAG,MAAM,iDAAiD;YAC1D,GAAG,MAAM,6CAA6C;SACvD,CAAC;QACF,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;YAClC,IAAI,CAAC,KAAK,CAAC,OAAO,CAChB,GAAG,MAAM,kDAAkD,CAC5D,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,gBAC1C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IACtB,EAAE,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,IAAA,oCAAuB,EAAC,eAAe,CAAC,CAAC;IACzD,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,0DAAoE;AAEpE,yCAAgE;AAEhE,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,GAAG;YACX,GAAG,MAAM,iDAAiD;YAC1D,GAAG,MAAM,6CAA6C;SACvD,CAAC;QACF,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;YAClC,IAAI,CAAC,KAAK,CAAC,OAAO,CAChB,GAAG,MAAM,kDAAkD,CAC5D,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,gBAC1C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IACtB,EAAE,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,IAAA,oCAAuB,EAAC,eAAe,CAAC,CAAC;IACzD,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AA7BD,4CA6BC"}
|
|
@@ -4,10 +4,11 @@ import { SupportedStyles } from '../../../typings/style';
|
|
|
4
4
|
export interface Schema {
|
|
5
5
|
name: string;
|
|
6
6
|
style: SupportedStyles;
|
|
7
|
-
skipFormat
|
|
7
|
+
skipFormat?: boolean;
|
|
8
8
|
directory?: string;
|
|
9
9
|
tags?: string;
|
|
10
|
-
unitTestRunner
|
|
10
|
+
unitTestRunner?: 'jest' | 'vitest' | 'none';
|
|
11
|
+
inSourceTests?: boolean;
|
|
11
12
|
/**
|
|
12
13
|
* @deprecated
|
|
13
14
|
*/
|
|
@@ -26,10 +27,13 @@ export interface Schema {
|
|
|
26
27
|
compiler?: 'babel' | 'swc';
|
|
27
28
|
remotes?: string[];
|
|
28
29
|
devServerPort?: number;
|
|
29
|
-
|
|
30
|
+
skipPackageJson?: boolean;
|
|
31
|
+
rootProject?: boolean;
|
|
32
|
+
bundler?: 'webpack' | 'vite';
|
|
33
|
+
minimal?: boolean;
|
|
30
34
|
}
|
|
31
35
|
|
|
32
|
-
export interface NormalizedSchema extends Schema {
|
|
36
|
+
export interface NormalizedSchema<T extends Schema = Schema> extends T {
|
|
33
37
|
projectName: string;
|
|
34
38
|
appProjectRoot: string;
|
|
35
39
|
e2eProjectName: string;
|
|
@@ -37,4 +41,5 @@ export interface NormalizedSchema extends Schema {
|
|
|
37
41
|
fileName: string;
|
|
38
42
|
styledModule: null | SupportedStyles;
|
|
39
43
|
hasStyles: boolean;
|
|
44
|
+
unitTestRunner: 'jest' | 'vitest' | 'none';
|
|
40
45
|
}
|
|
@@ -28,12 +28,14 @@
|
|
|
28
28
|
"index": 0
|
|
29
29
|
},
|
|
30
30
|
"x-prompt": "What name would you like to use for the application?",
|
|
31
|
-
"pattern": "^[a-zA-Z].*$"
|
|
31
|
+
"pattern": "^[a-zA-Z].*$",
|
|
32
|
+
"x-priority": "important"
|
|
32
33
|
},
|
|
33
34
|
"directory": {
|
|
34
35
|
"description": "The directory of the new application.",
|
|
35
36
|
"type": "string",
|
|
36
|
-
"alias": "dir"
|
|
37
|
+
"alias": "dir",
|
|
38
|
+
"x-priority": "important"
|
|
37
39
|
},
|
|
38
40
|
"style": {
|
|
39
41
|
"description": "The file extension to be used for style files.",
|
|
@@ -82,7 +84,7 @@
|
|
|
82
84
|
"linter": {
|
|
83
85
|
"description": "The tool to use for running lint checks.",
|
|
84
86
|
"type": "string",
|
|
85
|
-
"enum": ["eslint", "
|
|
87
|
+
"enum": ["eslint", "none"],
|
|
86
88
|
"default": "eslint"
|
|
87
89
|
},
|
|
88
90
|
"routing": {
|
|
@@ -94,19 +96,26 @@
|
|
|
94
96
|
"skipFormat": {
|
|
95
97
|
"description": "Skip formatting files.",
|
|
96
98
|
"type": "boolean",
|
|
97
|
-
"default": false
|
|
99
|
+
"default": false,
|
|
100
|
+
"x-priority": "internal"
|
|
98
101
|
},
|
|
99
102
|
"skipWorkspaceJson": {
|
|
100
103
|
"description": "Skip updating `workspace.json` with default options based on values provided to this app (e.g. babel, style).",
|
|
101
104
|
"type": "boolean",
|
|
102
|
-
"default": false
|
|
105
|
+
"default": false,
|
|
106
|
+
"x-priority": "internal"
|
|
103
107
|
},
|
|
104
108
|
"unitTestRunner": {
|
|
105
109
|
"type": "string",
|
|
106
|
-
"enum": ["jest", "none"],
|
|
110
|
+
"enum": ["jest", "vitest", "none"],
|
|
107
111
|
"description": "Test runner to use for unit tests.",
|
|
108
112
|
"default": "jest"
|
|
109
113
|
},
|
|
114
|
+
"inSourceTests": {
|
|
115
|
+
"type": "boolean",
|
|
116
|
+
"default": false,
|
|
117
|
+
"description": "When using Vitest, separate spec files will not be generated and instead will be included within the source files. Read more on the Vitest docs site: https://vitest.dev/guide/in-source.html"
|
|
118
|
+
},
|
|
110
119
|
"e2eTestRunner": {
|
|
111
120
|
"type": "string",
|
|
112
121
|
"enum": ["cypress", "none"],
|
|
@@ -152,7 +161,9 @@
|
|
|
152
161
|
},
|
|
153
162
|
"standaloneConfig": {
|
|
154
163
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
155
|
-
"type": "boolean"
|
|
164
|
+
"type": "boolean",
|
|
165
|
+
"default": true,
|
|
166
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
|
156
167
|
},
|
|
157
168
|
"compiler": {
|
|
158
169
|
"type": "string",
|
|
@@ -160,11 +171,32 @@
|
|
|
160
171
|
"enum": ["babel", "swc"],
|
|
161
172
|
"default": "babel"
|
|
162
173
|
},
|
|
163
|
-
"
|
|
164
|
-
"description": "
|
|
174
|
+
"skipPackageJson": {
|
|
175
|
+
"description": "Do not add dependencies to `package.json`.",
|
|
176
|
+
"type": "boolean",
|
|
177
|
+
"default": false,
|
|
178
|
+
"x-priority": "internal"
|
|
179
|
+
},
|
|
180
|
+
"rootProject": {
|
|
181
|
+
"description": "Create a application at the root of the workspace",
|
|
182
|
+
"type": "boolean",
|
|
183
|
+
"default": false,
|
|
184
|
+
"hidden": true
|
|
185
|
+
},
|
|
186
|
+
"bundler": {
|
|
187
|
+
"description": "The bundler to use.",
|
|
188
|
+
"type": "string",
|
|
189
|
+
"enum": ["vite", "webpack"],
|
|
190
|
+
"x-prompt": "Which bundler do you want to use to build the application?",
|
|
191
|
+
"default": "webpack",
|
|
192
|
+
"x-priority": "important"
|
|
193
|
+
},
|
|
194
|
+
"minimal": {
|
|
195
|
+
"description": "Generate a React app with a minimal setup, no separate test files.",
|
|
165
196
|
"type": "boolean",
|
|
166
197
|
"default": false
|
|
167
198
|
}
|
|
168
199
|
},
|
|
169
|
-
"required": []
|
|
200
|
+
"required": [],
|
|
201
|
+
"examplesFile": "../../../docs/application-examples.md"
|
|
170
202
|
}
|
|
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.componentSchematic = exports.componentGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
7
|
-
const ts = require("typescript");
|
|
8
6
|
const add_styled_dependencies_1 = require("../../rules/add-styled-dependencies");
|
|
9
7
|
const assertion_1 = require("../../utils/assertion");
|
|
10
8
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
9
|
+
const get_in_source_vitest_tests_template_1 = require("../../utils/get-in-source-vitest-tests-template");
|
|
11
10
|
const versions_1 = require("../../utils/versions");
|
|
11
|
+
const get_component_tests_1 = require("./get-component-tests");
|
|
12
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
12
13
|
function componentGenerator(host, schema) {
|
|
13
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
15
|
const options = yield normalizeOptions(host, schema);
|
|
@@ -22,16 +23,18 @@ function componentGenerator(host, schema) {
|
|
|
22
23
|
tasks.push(routingTask);
|
|
23
24
|
}
|
|
24
25
|
yield (0, devkit_1.formatFiles)(host);
|
|
25
|
-
return (0,
|
|
26
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
29
|
exports.componentGenerator = componentGenerator;
|
|
29
30
|
function createComponentFiles(host, options) {
|
|
30
31
|
const componentDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
|
|
31
|
-
|
|
32
|
+
const componentTests = (0, get_component_tests_1.getComponentTests)(options);
|
|
33
|
+
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), componentDir, Object.assign(Object.assign({}, options), { componentTests, inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(componentTests), tmpl: '' }));
|
|
32
34
|
for (const c of host.listChanges()) {
|
|
33
35
|
let deleteFile = false;
|
|
34
|
-
if (options.skipTests
|
|
36
|
+
if ((options.skipTests || options.inSourceTests) &&
|
|
37
|
+
/.*spec.tsx/.test(c.path)) {
|
|
35
38
|
deleteFile = true;
|
|
36
39
|
}
|
|
37
40
|
if ((options.styledModule || !options.hasStyles) &&
|
|
@@ -53,21 +56,25 @@ function createComponentFiles(host, options) {
|
|
|
53
56
|
(0, devkit_1.toJS)(host);
|
|
54
57
|
}
|
|
55
58
|
}
|
|
59
|
+
let tsModule;
|
|
56
60
|
function addExportsToBarrel(host, options) {
|
|
61
|
+
if (!tsModule) {
|
|
62
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
63
|
+
}
|
|
57
64
|
const workspace = (0, devkit_1.getProjects)(host);
|
|
58
65
|
const isApp = workspace.get(options.project).projectType === 'application';
|
|
59
66
|
if (options.export && !isApp) {
|
|
60
67
|
const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
|
|
61
68
|
const indexSource = host.read(indexFilePath, 'utf-8');
|
|
62
69
|
if (indexSource !== null) {
|
|
63
|
-
const indexSourceFile =
|
|
70
|
+
const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);
|
|
64
71
|
const changes = (0, devkit_1.applyChangesToString)(indexSource, (0, ast_utils_1.addImport)(indexSourceFile, `export * from './${options.directory}/${options.fileName}';`));
|
|
65
72
|
host.write(indexFilePath, changes);
|
|
66
73
|
}
|
|
67
74
|
}
|
|
68
75
|
}
|
|
69
76
|
function normalizeOptions(host, options) {
|
|
70
|
-
var _a, _b, _c, _d;
|
|
77
|
+
var _a, _b, _c, _d, _e;
|
|
71
78
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
79
|
assertValidOptions(options);
|
|
73
80
|
const { className, fileName } = (0, devkit_1.names)(options.name);
|
|
@@ -88,6 +95,7 @@ function normalizeOptions(host, options) {
|
|
|
88
95
|
options.classComponent = (_b = options.classComponent) !== null && _b !== void 0 ? _b : false;
|
|
89
96
|
options.routing = (_c = options.routing) !== null && _c !== void 0 ? _c : false;
|
|
90
97
|
options.globalCss = (_d = options.globalCss) !== null && _d !== void 0 ? _d : false;
|
|
98
|
+
options.inSourceTests = (_e = options.inSourceTests) !== null && _e !== void 0 ? _e : false;
|
|
91
99
|
return Object.assign(Object.assign({}, options), { directory,
|
|
92
100
|
styledModule, hasStyles: options.style !== 'none', className, fileName: componentFileName, projectSourceRoot });
|
|
93
101
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,5 @@ import { render } from '@testing-library/react';
|
|
|
3
3
|
import <%= className %> from './<%= fileName %>';
|
|
4
4
|
|
|
5
5
|
describe('<%= className %>', () => {
|
|
6
|
-
|
|
7
|
-
const { baseElement } = render(< <%= className %> />);
|
|
8
|
-
expect(baseElement).toBeTruthy();
|
|
9
|
-
});
|
|
6
|
+
<%- componentTests %>
|
|
10
7
|
});
|
|
@@ -14,7 +14,7 @@ import { Route, Link } from 'react-router-dom';
|
|
|
14
14
|
import styled from '<%= styledModule %>';
|
|
15
15
|
<% } else {
|
|
16
16
|
var wrapper = 'div';
|
|
17
|
-
var extras = globalCss ? '' : " className={styles['container']}";
|
|
17
|
+
var extras = globalCss || styledModule === 'styled-jsx' ? '' : " className={styles['container']}";
|
|
18
18
|
%>
|
|
19
19
|
<%- style !== 'styled-jsx' ? globalCss ? `import './${fileName}.${style}';` : `import styles from './${fileName}.module.${style}';`: '' %>
|
|
20
20
|
<% }
|
|
@@ -34,7 +34,7 @@ const Styled<%= className %> = styled.div`
|
|
|
34
34
|
<% }%>
|
|
35
35
|
<% if (classComponent) { %>
|
|
36
36
|
export class <%= className %> extends Component<<%= className %>Props> {
|
|
37
|
-
render() {
|
|
37
|
+
override render() {
|
|
38
38
|
return (
|
|
39
39
|
<<%= wrapper %><%- extras %>>
|
|
40
40
|
<%= styledModule === 'styled-jsx' ? `<style jsx>{\`div { color: pink; }\`}</style>` : `` %>
|
|
@@ -67,3 +67,5 @@ export function <%= className %>(props: <%= className %>Props) {
|
|
|
67
67
|
<% } %>
|
|
68
68
|
|
|
69
69
|
export default <%= className %>;
|
|
70
|
+
|
|
71
|
+
<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getComponentTests = void 0;
|
|
4
|
+
function getComponentTests(schema) {
|
|
5
|
+
return `
|
|
6
|
+
it('should render successfully', () => {
|
|
7
|
+
const { baseElement } = render(<${schema.className} />);
|
|
8
|
+
expect(baseElement).toBeTruthy();
|
|
9
|
+
});
|
|
10
|
+
`;
|
|
11
|
+
}
|
|
12
|
+
exports.getComponentTests = getComponentTests;
|
|
13
|
+
//# sourceMappingURL=get-component-tests.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-component-tests.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/get-component-tests.ts"],"names":[],"mappings":";;;AAEA,SAAgB,iBAAiB,CAAC,MAAwB;IACxD,OAAO;;sCAE6B,MAAM,CAAC,SAAS;;;GAGnD,CAAC;AACJ,CAAC;AAPD,8CAOC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"noramlized-schema.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/noramlized-schema.ts"],"names":[],"mappings":""}
|
|
@@ -23,7 +23,8 @@
|
|
|
23
23
|
"$default": {
|
|
24
24
|
"$source": "projectName"
|
|
25
25
|
},
|
|
26
|
-
"x-prompt": "What is the name of the project for this component?"
|
|
26
|
+
"x-prompt": "What is the name of the project for this component?",
|
|
27
|
+
"x-priority": "important"
|
|
27
28
|
},
|
|
28
29
|
"name": {
|
|
29
30
|
"type": "string",
|
|
@@ -32,7 +33,8 @@
|
|
|
32
33
|
"$source": "argv",
|
|
33
34
|
"index": 0
|
|
34
35
|
},
|
|
35
|
-
"x-prompt": "What name would you like to use for the component?"
|
|
36
|
+
"x-prompt": "What name would you like to use for the component?",
|
|
37
|
+
"x-priority": "important"
|
|
36
38
|
},
|
|
37
39
|
"style": {
|
|
38
40
|
"description": "The file extension to be used for style files.",
|
|
@@ -83,12 +85,14 @@
|
|
|
83
85
|
"skipTests": {
|
|
84
86
|
"type": "boolean",
|
|
85
87
|
"description": "When true, does not create `spec.ts` test files for the new component.",
|
|
86
|
-
"default": false
|
|
88
|
+
"default": false,
|
|
89
|
+
"x-priority": "internal"
|
|
87
90
|
},
|
|
88
91
|
"directory": {
|
|
89
92
|
"type": "string",
|
|
90
93
|
"description": "Create the component under this directory (can be nested).",
|
|
91
|
-
"alias": "dir"
|
|
94
|
+
"alias": "dir",
|
|
95
|
+
"x-priority": "important"
|
|
92
96
|
},
|
|
93
97
|
"flat": {
|
|
94
98
|
"type": "boolean",
|
|
@@ -132,6 +136,11 @@
|
|
|
132
136
|
"fileName": {
|
|
133
137
|
"type": "string",
|
|
134
138
|
"description": "Create a component with this file name."
|
|
139
|
+
},
|
|
140
|
+
"inSourceTests": {
|
|
141
|
+
"type": "boolean",
|
|
142
|
+
"default": false,
|
|
143
|
+
"description": "When using Vitest, separate spec files will not be generated and instead will be included within the source files. Read more on the Vitest docs site: https://vitest.dev/guide/in-source.html"
|
|
135
144
|
}
|
|
136
145
|
},
|
|
137
146
|
"required": ["name", "project"]
|
|
@@ -3,18 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.componentCypressSchematic = exports.createComponentSpecFile = exports.getArgsDefaultValue = exports.componentCypressGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
|
+
let tsModule;
|
|
8
9
|
function componentCypressGenerator(host, schema) {
|
|
9
10
|
createComponentSpecFile(host, schema);
|
|
10
11
|
}
|
|
11
12
|
exports.componentCypressGenerator = componentCypressGenerator;
|
|
12
13
|
// TODO: candidate to refactor with the angular component story
|
|
13
14
|
function getArgsDefaultValue(property) {
|
|
15
|
+
if (!tsModule) {
|
|
16
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
17
|
+
}
|
|
14
18
|
const typeNameToDefault = {
|
|
15
|
-
[
|
|
16
|
-
[
|
|
17
|
-
[
|
|
19
|
+
[tsModule.SyntaxKind.StringKeyword]: '',
|
|
20
|
+
[tsModule.SyntaxKind.NumberKeyword]: 0,
|
|
21
|
+
[tsModule.SyntaxKind.BooleanKeyword]: false,
|
|
18
22
|
};
|
|
19
23
|
const resolvedValue = typeNameToDefault[property];
|
|
20
24
|
if (typeof resolvedValue === undefined) {
|
|
@@ -29,6 +33,9 @@ function getArgsDefaultValue(property) {
|
|
|
29
33
|
}
|
|
30
34
|
exports.getArgsDefaultValue = getArgsDefaultValue;
|
|
31
35
|
function createComponentSpecFile(tree, { project, componentPath, js, cypressProject }) {
|
|
36
|
+
if (!tsModule) {
|
|
37
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
38
|
+
}
|
|
32
39
|
const e2eProjectName = cypressProject || `${project}-e2e`;
|
|
33
40
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
34
41
|
const e2eProject = projects.get(e2eProjectName);
|
|
@@ -46,7 +53,7 @@ function createComponentSpecFile(tree, { project, componentPath, js, cypressProj
|
|
|
46
53
|
if (contents === null) {
|
|
47
54
|
throw new Error(`Failed to read ${componentFilePath}`);
|
|
48
55
|
}
|
|
49
|
-
const sourceFile =
|
|
56
|
+
const sourceFile = tsModule.createSourceFile(componentFilePath, contents, tsModule.ScriptTarget.Latest, true);
|
|
50
57
|
const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
|
|
51
58
|
if (!cmpDeclaration) {
|
|
52
59
|
const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAAsC;
|
|
1
|
+
{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":"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"}
|