@nx/react 17.0.0-beta.2 → 17.0.0-beta.5

package/executors.json

@@ -1,16 +1,4 @@
 {
-  "builders": {
-    "module-federation-dev-server": {
-      "implementation": "./src/executors/module-federation-dev-server/compat",
-      "schema": "./src/executors/module-federation-dev-server/schema.json",
-      "description": "Serve a host or remote application."
-    },
-    "module-federation-ssr-dev-server": {
-      "implementation": "./src/executors/module-federation-ssr-dev-server/compat",
-      "schema": "./src/executors/module-federation-ssr-dev-server/schema.json",
-      "description": "Serve a host application along with it's known remotes."
-    }
-  },
   "executors": {
     "module-federation-dev-server": {
       "implementation": "./src/executors/module-federation-dev-server/module-federation-dev-server.impl",

package/generators.json

@@ -2,115 +2,6 @@
   "name": "Nx React",
   "version": "0.1",
   "extends": ["@nx/workspace"],
-  "schematics": {
-    "init": {
-      "factory": "./src/generators/init/init#reactInitSchematic",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nrwl/react` plugin.",
-      "aliases": ["ng-add"],
-      "hidden": true
-    },
-
-    "application": {
-      "factory": "./src/generators/application/application#applicationSchematic",
-      "schema": "./src/generators/application/schema.json",
-      "aliases": ["app"],
-      "x-type": "application",
-      "description": "Create a React application."
-    },
-
-    "library": {
-      "factory": "./src/generators/library/library#librarySchematic",
-      "schema": "./src/generators/library/schema.json",
-      "aliases": ["lib"],
-      "x-type": "library",
-      "description": "Create a React library."
-    },
-
-    "component": {
-      "factory": "./src/generators/component/component#componentSchematic",
-      "schema": "./src/generators/component/schema.json",
-      "description": "Create a React component.",
-      "aliases": ["c"]
-    },
-
-    "redux": {
-      "factory": "./src/generators/redux/redux#reduxSchematic",
-      "schema": "./src/generators/redux/schema.json",
-      "description": "Create a Redux slice for a project.",
-      "aliases": ["slice"]
-    },
-
-    "storybook-configuration": {
-      "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationSchematic",
-      "schema": "./src/generators/storybook-configuration/schema.json",
-      "description": "Set up storybook for a React app or library.",
-      "hidden": false
-    },
-
-    "component-story": {
-      "factory": "./src/generators/component-story/component-story#componentStorySchematic",
-      "schema": "./src/generators/component-story/schema.json",
-      "description": "Generate storybook story for a React component.",
-      "hidden": false
-    },
-
-    "stories": {
-      "factory": "./src/generators/stories/stories#storiesSchematic",
-      "schema": "./src/generators/stories/schema.json",
-      "description": "Create stories/specs for all components declared in an app or library.",
-      "hidden": false
-    },
-
-    "component-cypress-spec": {
-      "factory": "./src/generators/component-cypress-spec/component-cypress-spec#componentCypressSchematic",
-      "schema": "./src/generators/component-cypress-spec/schema.json",
-      "description": "Create a Cypress spec for a UI component that has a story.",
-      "hidden": false
-    },
-
-    "hook": {
-      "factory": "./src/generators/hook/hook#hookSchematic",
-      "schema": "./src/generators/hook/schema.json",
-      "description": "Create a hook.",
-      "aliases": ["h"]
-    },
-
-    "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigGenerator",
-      "schema": "./src/generators/cypress-component-configuration/schema.json",
-      "description": "Setup Cypress component testing for a React project.",
-      "hidden": false
-    },
-
-    "component-test": {
-      "factory": "./src/generators/component-test/component-test#componentTestGenerator",
-      "schema": "./src/generators/component-test/schema.json",
-      "description": "Generate a Cypress component test for a React component.",
-      "hidden": false
-    },
-
-    "setup-tailwind": {
-      "factory": "./src/generators/setup-tailwind/setup-tailwind#setupTailwindSchematic",
-      "schema": "./src/generators/setup-tailwind/schema.json",
-      "description": "Set up Tailwind configuration for a project.",
-      "hidden": false
-    },
-
-    "setup-ssr": {
-      "factory": "./src/generators/setup-ssr/setup-ssr#setupSsrSchematic",
-      "schema": "./src/generators/setup-ssr/schema.json",
-      "description": "Set up SSR configuration for a project.",
-      "hidden": false
-    },
-
-    "federate-module": {
-      "factory": "./src/generators/federate-module/federate-module#federateModuleSchematic",
-      "schema": "./src/generators/federate-module/schema.json",
-      "description": "Federate a module.",
-      "hidden": false
-    }
-  },
   "generators": {
     "init": {
       "factory": "./src/generators/init/init#reactInitGenerator",
@@ -119,7 +10,6 @@
       "aliases": ["ng-add"],
       "hidden": true
     },
-
     "application": {
       "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
@@ -127,7 +17,6 @@
       "x-type": "application",
       "description": "Create a React application."
     },
-
     "library": {
       "factory": "./src/generators/library/library#libraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
@@ -135,98 +24,84 @@
       "x-type": "library",
       "description": "Create a React library."
     },
-
     "component": {
       "factory": "./src/generators/component/component#componentGenerator",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a React component.",
       "aliases": ["c"]
     },
-
     "redux": {
       "factory": "./src/generators/redux/redux#reduxGenerator",
       "schema": "./src/generators/redux/schema.json",
       "description": "Create a Redux slice for a project.",
       "aliases": ["slice"]
     },
-
     "storybook-configuration": {
       "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGenerator",
       "schema": "./src/generators/storybook-configuration/schema.json",
       "description": "Set up storybook for a React app or library.",
       "hidden": false
     },
-
     "component-story": {
       "factory": "./src/generators/component-story/component-story#componentStoryGenerator",
       "schema": "./src/generators/component-story/schema.json",
       "description": "Generate storybook story for a React component",
       "hidden": false
     },
-
     "stories": {
       "factory": "./src/generators/stories/stories#storiesGenerator",
       "schema": "./src/generators/stories/schema.json",
       "description": "Create stories/specs for all components declared in an app or library.",
       "hidden": false
     },
-
     "component-cypress-spec": {
       "factory": "./src/generators/component-cypress-spec/component-cypress-spec#componentCypressGenerator",
       "schema": "./src/generators/component-cypress-spec/schema.json",
       "description": "Create a Cypress spec for a UI component that has a story.",
       "hidden": false
     },
-
     "hook": {
       "factory": "./src/generators/hook/hook#hookGenerator",
       "schema": "./src/generators/hook/schema.json",
       "description": "Create a hook.",
       "aliases": ["c"]
     },
-
     "host": {
       "factory": "./src/generators/host/host#hostGeneratorInternal",
       "schema": "./src/generators/host/schema.json",
       "x-type": "application",
       "description": "Generate a host react application"
     },
-
     "remote": {
       "factory": "./src/generators/remote/remote#remoteGeneratorInternal",
       "schema": "./src/generators/remote/schema.json",
       "x-type": "application",
       "description": "Generate a remote react application"
     },
-
     "cypress-component-configuration": {
       "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigGenerator",
       "schema": "./src/generators/cypress-component-configuration/schema.json",
       "description": "Setup Cypress component testing for a React project",
       "hidden": false
     },
-
     "component-test": {
       "factory": "./src/generators/component-test/component-test#componentTestGenerator",
       "schema": "./src/generators/component-test/schema.json",
       "description": "Generate a Cypress component test for a React component",
       "hidden": false
     },
-
     "setup-tailwind": {
       "factory": "./src/generators/setup-tailwind/setup-tailwind#setupTailwindGenerator",
       "schema": "./src/generators/setup-tailwind/schema.json",
       "description": "Set up Tailwind configuration for a project.",
       "hidden": false
     },
-
     "setup-ssr": {
       "factory": "./src/generators/setup-ssr/setup-ssr#setupSsrGenerator",
       "schema": "./src/generators/setup-ssr/schema.json",
       "description": "Set up SSR configuration for a project.",
       "hidden": false
     },
-
     "federate-module": {
       "factory": "./src/generators/federate-module/federate-module#federateModuleGenerator",
       "schema": "./src/generators/federate-module/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.0.0-beta.2",
+  "version": "17.0.0-beta.5",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -24,8 +24,8 @@
     "url": "https://github.com/nrwl/nx/issues"
   },
   "homepage": "https://nx.dev",
-  "builders": "./executors.json",
-  "schematics": "./generators.json",
+  "executors": "./executors.json",
+  "generators": "./generators.json",
   "ng-update": {
     "requirements": {},
     "migrations": "./migrations.json"
@@ -37,11 +37,11 @@
     "file-loader": "^6.2.0",
     "minimatch": "3.0.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.2",
-    "@nx/js": "17.0.0-beta.2",
-    "@nx/linter": "17.0.0-beta.2",
-    "@nx/web": "17.0.0-beta.2",
-    "@nrwl/react": "17.0.0-beta.2"
+    "@nx/devkit": "17.0.0-beta.5",
+    "@nx/js": "17.0.0-beta.5",
+    "@nx/linter": "17.0.0-beta.5",
+    "@nx/web": "17.0.0-beta.5",
+    "@nrwl/react": "17.0.0-beta.5"
   },
   "publishConfig": {
     "access": "public"

package/plugins/component-testing/index.js

@@ -145,7 +145,9 @@ function buildTargetWebpack(ctx, buildTarget, componentTestingProjectName) {
     const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.root, buildableProjectConfig.sourceRoot);
     let customWebpack;
     if (options.webpackConfig) {
-        customWebpack = resolveCustomWebpackConfig(options.webpackConfig, options.tsConfig);
+        customWebpack = resolveCustomWebpackConfig(options.webpackConfig, options.tsConfig.startsWith(context.root)
+            ? options.tsConfig
+            : (0, path_1.join)(context.root, options.tsConfig));
     }
     return async () => {
         customWebpack = await customWebpack;

package/plugins/component-testing/webpack-fallback.js

@@ -90,7 +90,7 @@ const commonLoaders = [
     },
 ];
 const CSS_MODULES_LOADER = {
-    test: /\.css$|\.scss$|\.sass$|\.less$|\.styl$/,
+    test: /\.css$|\.scss$|\.sass$|\.less$/,
     oneOf: [
         {
             test: /\.module\.css$/,
@@ -121,14 +121,5 @@ const CSS_MODULES_LOADER = {
                 },
             ],
         },
-        {
-            test: /\.module\.styl$/,
-            use: [
-                ...commonLoaders,
-                {
-                    loader: require.resolve('stylus-loader'),
-                },
-            ],
-        },
     ],
 };

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -22,9 +22,12 @@ function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot) {
     const moduleFederationConfigPathTS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.ts');
     let moduleFederationConfigPath = moduleFederationConfigPathJS;
     // create a no-op so this can be called with issue
+    const fullTSconfigPath = tsconfigPath.startsWith(workspaceRoot)
+        ? tsconfigPath
+        : (0, path_1.join)(workspaceRoot, tsconfigPath);
     let cleanupTranspiler = () => { };
     if ((0, fs_1.existsSync)(moduleFederationConfigPathTS)) {
-        cleanupTranspiler = (0, internal_1.registerTsProject)((0, path_1.join)(workspaceRoot, tsconfigPath));
+        cleanupTranspiler = (0, internal_1.registerTsProject)(fullTSconfigPath);
         moduleFederationConfigPath = moduleFederationConfigPathTS;
     }
     try {

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -6,18 +6,42 @@ const path_1 = require("path");
 const chalk = require("chalk");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const child_process_1 = require("child_process");
-async function* moduleFederationSsrDevServer(options, context) {
-    let iter = (0, ssr_dev_server_impl_1.default)(options, context);
-    const p = context.projectsConfigurations.projects[context.projectName];
-    const moduleFederationConfigPath = (0, path_1.join)(context.root, p.root, 'module-federation.config.js');
-    let moduleFederationConfig;
+const fs_1 = require("fs");
+const internal_1 = require("@nx/js/src/internal");
+function getBuildOptions(buildTarget, context) {
+    const target = (0, devkit_1.parseTargetString)(buildTarget, context);
+    const buildOptions = (0, devkit_1.readTargetOptions)(target, context);
+    return {
+        ...buildOptions,
+    };
+}
+function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot) {
+    const moduleFederationConfigPathJS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.js');
+    const moduleFederationConfigPathTS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.ts');
+    let moduleFederationConfigPath = moduleFederationConfigPathJS;
+    const fullTSconfigPath = tsconfigPath.startsWith(workspaceRoot)
+        ? tsconfigPath
+        : (0, path_1.join)(workspaceRoot, tsconfigPath);
+    // create a no-op so this can be called with issue
+    let cleanupTranspiler = () => { };
+    if ((0, fs_1.existsSync)(moduleFederationConfigPathTS)) {
+        cleanupTranspiler = (0, internal_1.registerTsProject)(fullTSconfigPath);
+        moduleFederationConfigPath = moduleFederationConfigPathTS;
+    }
     try {
-        moduleFederationConfig = require(moduleFederationConfigPath);
+        const config = require(moduleFederationConfigPath);
+        cleanupTranspiler();
+        return config.default || config;
     }
     catch {
-        // TODO(jack): Add a link to guide
-        throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`);
+        throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?\nSee: https://nx.dev/concepts/more-concepts/faster-builds-with-module-federation`);
     }
+}
+async function* moduleFederationSsrDevServer(options, context) {
+    let iter = (0, ssr_dev_server_impl_1.default)(options, context);
+    const p = context.projectsConfigurations.projects[context.projectName];
+    const buildOptions = getBuildOptions(options.browserTarget, context);
+    const moduleFederationConfig = getModuleFederationConfig(buildOptions.tsConfig, context.root, p.root);
     const remotesToSkip = new Set(options.skipRemotes ?? []);
     const remotesNotInWorkspace = [];
     const knownRemotes = (moduleFederationConfig.remotes ?? []).filter((r) => {
@@ -54,7 +78,7 @@ async function* moduleFederationSsrDevServer(options, context) {
             }, context)
             : (0, async_iterable_1.mapAsyncIterable)((0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
                 const remoteProject = context.projectsConfigurations.projects[appName];
-                const remoteServerOutput = (0, path_1.join)(devkit_1.workspaceRoot, remoteProject.targets.server.options.outputPath, 'main.js');
+                const remoteServerOutput = (0, path_1.join)(devkit_1.workspaceRoot, remoteProject.targets.server.options.outputPath, remoteProject.targets.server.options.outputFileName);
                 const pm = (0, devkit_1.getPackageManagerCommand)();
                 (0, child_process_1.execSync)(`${pm.exec} nx run ${appName}:server${context.configurationName ? `:${context.configurationName}` : ''}`, { stdio: 'inherit' });
                 const child = (0, child_process_1.fork)(remoteServerOutput, {

package/src/generators/application/application.d.ts

@@ -3,4 +3,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 export declare function applicationGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function applicationGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;
-export declare const applicationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/application.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
+exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const lint_1 = require("../../utils/lint");
 const create_application_files_1 = require("./lib/create-application-files");
 const update_jest_config_1 = require("./lib/update-jest-config");
@@ -208,4 +208,3 @@ async function applicationGeneratorInternal(host, schema) {
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;
-exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);

package/src/generators/application/lib/install-common-dependencies.js

@@ -15,9 +15,6 @@ function installCommonDependencies(host, options) {
             case 'less':
                 devDependencies['less'] = versions_1.lessVersion;
                 break;
-            case 'styl': // @TODO(17): deprecated, going to be removed in Nx 17
-                devDependencies['stylus'] = versions_1.stylusVersion;
-                break;
         }
     }
     if (options.bundler === 'webpack') {

package/src/generators/application/lib/normalize-options.js

@@ -34,7 +34,7 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const fileName = options.pascalCaseFiles ? 'App' : 'app';
-    const styledModule = /^(css|scss|less|styl|none)$/.test(options.style)
+    const styledModule = /^(css|scss|less|none)$/.test(options.style)
         ? null
         : options.style;
     (0, assertion_1.assertValidStyle)(options.style);

package/src/generators/application/schema.json

@@ -77,10 +77,6 @@
           {
             "value": "none",
             "label": "None"
-          },
-          {
-            "value": "styl",
-            "label": "Stylus(.styl)     [ http://stylus-lang.com                   ] (DEPRECATED)"
           }
         ]
       }

package/src/generators/component/component.d.ts

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function componentGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default componentGenerator;
-export declare const componentSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/component/component.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentSchematic = exports.componentGenerator = void 0;
+exports.componentGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const add_styled_dependencies_1 = require("../../rules/add-styled-dependencies");
 const assertion_1 = require("../../utils/assertion");
@@ -89,7 +89,7 @@ async function normalizeOptions(host, options) {
     }
     const { sourceRoot: projectSourceRoot, projectType } = project;
     const directory = await getDirectory(host, options);
-    const styledModule = /^(css|scss|less|styl|none)$/.test(options.style)
+    const styledModule = /^(css|scss|less|none)$/.test(options.style)
         ? null
         : options.style;
     if (options.export && projectType === 'application') {
@@ -142,4 +142,3 @@ function assertValidOptions(options) {
     });
 }
 exports.default = componentGenerator;
-exports.componentSchematic = (0, devkit_1.convertNxGenerator)(componentGenerator);

package/src/generators/component/schema.json

@@ -69,10 +69,6 @@
           {
             "value": "none",
             "label": "None"
-          },
-          {
-            "value": "styl",
-            "label": "Stylus(.styl)     [ http://stylus-lang.com        ] (DEPRECATED)"
           }
         ]
       }

package/src/generators/component-cypress-spec/component-cypress-spec.d.ts

@@ -11,4 +11,3 @@ export declare function componentCypressGenerator(host: Tree, schema: CreateComp
 export declare function getArgsDefaultValue(property: ts.SyntaxKind): string;
 export declare function createComponentSpecFile(tree: Tree, { project, componentPath, js, cypressProject }: CreateComponentSpecFileSchema): void;
 export default componentCypressGenerator;
-export declare const componentCypressSchematic: (generatorOptions: CreateComponentSpecFileSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/component-cypress-spec/component-cypress-spec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentCypressSchematic = exports.createComponentSpecFile = exports.getArgsDefaultValue = exports.componentCypressGenerator = void 0;
+exports.createComponentSpecFile = exports.getArgsDefaultValue = exports.componentCypressGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -98,4 +98,3 @@ function findPropsAndGenerateFileForCypress(tree, sourceFile, cmpDeclaration, e2
     });
 }
 exports.default = componentCypressGenerator;
-exports.componentCypressSchematic = (0, devkit_1.convertNxGenerator)(componentCypressGenerator);

package/src/generators/component-story/component-story.d.ts

@@ -10,4 +10,3 @@ export declare function createComponentStoriesFile(host: Tree, { project, compon
 export declare function findPropsAndGenerateFile(host: Tree, sourceFile: ts.SourceFile, cmpDeclaration: ts.Node, componentDirectory: string, name: string, interactionTests: boolean, isPlainJs: boolean, fromNodeArray?: boolean): void;
 export declare function componentStoryGenerator(host: Tree, schema: CreateComponentStoriesFileSchema): Promise<void>;
 export default componentStoryGenerator;
-export declare const componentStorySchematic: (generatorOptions: CreateComponentStoriesFileSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/component-story/component-story.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentStorySchematic = exports.componentStoryGenerator = exports.findPropsAndGenerateFile = exports.createComponentStoriesFile = void 0;
+exports.componentStoryGenerator = exports.findPropsAndGenerateFile = exports.createComponentStoriesFile = void 0;
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
@@ -70,4 +70,3 @@ async function componentStoryGenerator(host, schema) {
 }
 exports.componentStoryGenerator = componentStoryGenerator;
 exports.default = componentStoryGenerator;
-exports.componentStorySchematic = (0, devkit_1.convertNxGenerator)(componentStoryGenerator);

package/src/generators/federate-module/federate-module.d.ts

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function federateModuleGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default federateModuleGenerator;
-export declare const federateModuleSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/federate-module/federate-module.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.federateModuleSchematic = exports.federateModuleGenerator = void 0;
+exports.federateModuleGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const remote_1 = require("../remote/remote");
 const utils_1 = require("./lib/utils");
@@ -55,4 +55,3 @@ async function federateModuleGenerator(tree, schema) {
 }
 exports.federateModuleGenerator = federateModuleGenerator;
 exports.default = federateModuleGenerator;
-exports.federateModuleSchematic = (0, devkit_1.convertNxGenerator)(federateModuleGenerator);

package/src/generators/federate-module/lib/utils.js

@@ -16,7 +16,9 @@ if (!tsModule) {
  * @param modulePath The path to the module to expose (e.g. './src/my-lib/my-lib.ts')
  */
 function addPathToExposes(tree, projectPath, moduleName, modulePath) {
-    const moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(projectPath, 'module-federation.config.js');
+    const moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(projectPath, tree.exists((0, devkit_1.joinPathFragments)(projectPath, 'module-federation.config.ts'))
+        ? 'module-federation.config.ts'
+        : 'module-federation.config.js');
     updateExposesProperty(tree, moduleFederationConfigPath, moduleName, modulePath);
 }
 exports.addPathToExposes = addPathToExposes;
@@ -29,7 +31,8 @@ function checkRemoteExists(tree, remoteName) {
     const remote = getRemote(tree, remoteName);
     if (!remote)
         return false;
-    const hasModuleFederationConfig = tree.exists((0, devkit_1.joinPathFragments)(remote.root, 'module-federation.config.js'));
+    const hasModuleFederationConfig = tree.exists((0, devkit_1.joinPathFragments)(remote.root, 'module-federation.config.js')) ||
+        tree.exists((0, devkit_1.joinPathFragments)(remote.root, 'module-federation.config.ts'));
     return hasModuleFederationConfig ? remote : false;
 }
 exports.checkRemoteExists = checkRemoteExists;

package/src/generators/hook/hook.d.ts

@@ -2,4 +2,3 @@ import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function hookGenerator(host: Tree, schema: Schema): Promise<void>;
 export default hookGenerator;
-export declare const hookSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/hook/hook.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hookSchematic = exports.hookGenerator = void 0;
+exports.hookGenerator = void 0;
 // TODO(jack): Remove inline renderHook function when RTL releases with its own version
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -115,4 +115,3 @@ function assertValidOptions(options) {
     });
 }
 exports.default = hookGenerator;
-exports.hookSchematic = (0, devkit_1.convertNxGenerator)(hookGenerator);

package/src/generators/host/files/module-federation-ssr/tsconfig.server.json__tmpl__

@@ -4,7 +4,9 @@
     "outDir": "../../out-tsc/server",
     "target": "es2019",
     "types": [
-      "node"
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
     ]
   },
   "include": [

package/src/generators/host/files/module-federation-ssr-ts/tsconfig.server.json__tmpl__

@@ -4,7 +4,9 @@
     "outDir": "../../out-tsc/server",
     "target": "es2019",
     "types": [
-      "node"
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
     ]
   },
   "include": [

package/src/generators/host/host.js

@@ -39,7 +39,7 @@ async function hostGeneratorInternal(host, schema) {
         for (const remote of schema.remotes) {
             const remoteName = await (0, normalize_remote_1.normalizeRemoteName)(host, remote, options);
             remotesWithPorts.push({ name: remoteName, port: remotePort });
-            await (0, remote_1.default)(host, {
+            const remoteTask = await (0, remote_1.default)(host, {
                 name: remote,
                 directory: (0, normalize_remote_1.normalizeRemoteDirectory)(remote, options),
                 style: options.style,
@@ -52,6 +52,7 @@ async function hostGeneratorInternal(host, schema) {
                 projectNameAndRootFormat: options.projectNameAndRootFormat,
                 typescriptConfiguration: options.typescriptConfiguration,
             });
+            tasks.push(remoteTask);
             remotePort++;
         }
     }

package/src/generators/host/schema.json

@@ -64,10 +64,6 @@
           {
             "value": "none",
             "label": "None"
-          },
-          {
-            "value": "styl",
-            "label": "Stylus(.styl)     [ http://stylus-lang.com                   ] (DEPRECATED)"
           }
         ]
       }
@@ -170,7 +166,7 @@
     "typescriptConfiguration": {
       "type": "boolean",
       "description": "Whether the module federation configuration and webpack configuration files should use TS.",
-      "default": false
+      "default": true
     }
   },
   "required": ["name"],

package/src/generators/init/init.d.ts

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import { InitSchema } from './schema';
 export declare function reactInitGenerator(host: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default reactInitGenerator;
-export declare const reactInitSchematic: (generatorOptions: InitSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactInitSchematic = exports.reactInitGenerator = void 0;
+exports.reactInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
@@ -60,4 +60,3 @@ async function reactInitGenerator(host, schema) {
 }
 exports.reactInitGenerator = reactInitGenerator;
 exports.default = reactInitGenerator;
-exports.reactInitSchematic = (0, devkit_1.convertNxGenerator)(reactInitGenerator);

package/src/generators/library/lib/install-common-dependencies.js

@@ -18,9 +18,6 @@ function installCommonDependencies(host, options) {
             case 'less':
                 devDependencies['less'] = versions_1.lessVersion;
                 break;
-            case 'styl': // @TODO(17): deprecated, going to be removed in Nx 17
-                devDependencies['stylus'] = versions_1.stylusVersion;
-                break;
         }
     }
     const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, {

package/src/generators/library/library.d.ts

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 export declare function libraryGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function libraryGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;
-export declare const librarySchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
+exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
@@ -177,4 +177,3 @@ async function libraryGeneratorInternal(host, schema) {
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;
-exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);

package/src/generators/library/schema.json

@@ -71,10 +71,6 @@
           {
             "value": "none",
             "label": "None"
-          },
-          {
-            "value": "styl",
-            "label": "Stylus(.styl)     [ http://stylus-lang.com        ] (DEPRECATED)"
           }
         ]
       }

package/src/generators/redux/redux.d.ts

@@ -2,4 +2,3 @@ import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function reduxGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default reduxGenerator;
-export declare const reduxSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/redux/redux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduxSchematic = exports.reduxGenerator = void 0;
+exports.reduxGenerator = void 0;
 const path = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const versions_1 = require("../../utils/versions");
@@ -122,4 +122,3 @@ function normalizeOptions(host, options) {
     };
 }
 exports.default = reduxGenerator;
-exports.reduxSchematic = (0, devkit_1.convertNxGenerator)(reduxGenerator);

package/src/generators/remote/schema.json

@@ -61,10 +61,6 @@
             "value": "styled-jsx",
             "label": "styled-jsx        [ https://www.npmjs.com/package/styled-jsx ]"
           },
-          {
-            "value": "styl",
-            "label": "DEPRECATD: Stylus(.styl) [ http://stylus-lang.com            ]"
-          },
           {
             "value": "none",
             "label": "None"
@@ -168,7 +164,7 @@
     "typescriptConfiguration": {
       "type": "boolean",
       "description": "Whether the module federation configuration and webpack configuration files should use TS.",
-      "default": false
+      "default": true
     }
   },
   "required": ["name"],

package/src/generators/setup-ssr/files/tsconfig.server.json__tmpl__

@@ -4,7 +4,9 @@
     "outDir": "../../out-tsc/server",
     "target": "es2019",
     "types": [
-      "node"
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
     ]
   },
   "include": [

package/src/generators/setup-ssr/setup-ssr.d.ts

@@ -2,4 +2,3 @@ import { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function setupSsrGenerator(tree: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default setupSsrGenerator;
-export declare const setupSsrSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/setup-ssr/setup-ssr.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupSsrSchematic = exports.setupSsrGenerator = void 0;
+exports.setupSsrGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const versions_1 = require("../../utils/versions");
@@ -165,4 +165,3 @@ async function setupSsrGenerator(tree, options) {
 }
 exports.setupSsrGenerator = setupSsrGenerator;
 exports.default = setupSsrGenerator;
-exports.setupSsrSchematic = (0, devkit_1.convertNxGenerator)(setupSsrGenerator);

package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js

@@ -6,12 +6,10 @@ const knownLocations = [
     // Plain React
     'src/styles.css',
     'src/styles.scss',
-    'src/styles.styl',
     'src/styles.less',
     // Next.js
     'pages/styles.css',
     'pages/styles.scss',
-    'pages/styles.styl',
     'pages/styles.less',
 ];
 function addTailwindStyleImports(tree, project, _options) {

package/src/generators/setup-tailwind/setup-tailwind.d.ts

@@ -2,4 +2,3 @@ import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { SetupTailwindOptions } from './schema';
 export declare function setupTailwindGenerator(tree: Tree, options: SetupTailwindOptions): Promise<GeneratorCallback>;
 export default setupTailwindGenerator;
-export declare const setupTailwindSchematic: (generatorOptions: SetupTailwindOptions) => (tree: any, context: any) => Promise<any>;

package/src/generators/setup-tailwind/setup-tailwind.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupTailwindSchematic = exports.setupTailwindGenerator = void 0;
+exports.setupTailwindGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const add_tailwind_style_imports_1 = require("./lib/add-tailwind-style-imports");
@@ -33,4 +33,3 @@ async function setupTailwindGenerator(tree, options) {
 }
 exports.setupTailwindGenerator = setupTailwindGenerator;
 exports.default = setupTailwindGenerator;
-exports.setupTailwindSchematic = (0, devkit_1.convertNxGenerator)(setupTailwindGenerator);

package/src/generators/stories/stories.d.ts

@@ -13,4 +13,3 @@ export declare function containsComponentDeclaration(tree: Tree, componentPath:
 export declare function createAllStories(tree: Tree, projectName: string, interactionTests: boolean, js: boolean, projects: Map<string, ProjectConfiguration>, projectConfiguration: ProjectConfiguration, generateCypressSpecs?: boolean, cypressProject?: string, ignorePaths?: string[]): Promise<void>;
 export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<GeneratorCallback>;
 export default storiesGenerator;
-export declare const storiesSchematic: (generatorOptions: StorybookStoriesSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/stories/stories.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storiesSchematic = exports.storiesGenerator = exports.createAllStories = exports.containsComponentDeclaration = exports.projectRootPath = void 0;
+exports.storiesGenerator = exports.createAllStories = exports.containsComponentDeclaration = exports.projectRootPath = void 0;
 const component_story_1 = require("../component-story/component-story");
 const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -116,4 +116,3 @@ async function storiesGenerator(host, schema) {
 }
 exports.storiesGenerator = storiesGenerator;
 exports.default = storiesGenerator;
-exports.storiesSchematic = (0, devkit_1.convertNxGenerator)(storiesGenerator);

package/src/generators/storybook-configuration/configuration.d.ts

@@ -2,4 +2,3 @@ import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;
-export declare const storybookConfigurationSchematic: (generatorOptions: StorybookConfigureSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/storybook-configuration/configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storybookConfigurationSchematic = exports.storybookConfigurationGenerator = void 0;
+exports.storybookConfigurationGenerator = void 0;
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
@@ -50,4 +50,3 @@ async function storybookConfigurationGenerator(host, schema) {
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 exports.default = storybookConfigurationGenerator;
-exports.storybookConfigurationSchematic = (0, devkit_1.convertNxGenerator)(storybookConfigurationGenerator);

package/src/utils/assertion.js

@@ -5,7 +5,6 @@ const VALID_STYLES = [
     'css',
     'scss',
     'less',
-    'styl',
     'styled-components',
     '@emotion/styled',
     'styled-jsx',

package/src/utils/versions.d.ts

@@ -39,7 +39,6 @@ export declare const typesCorsVersion = "~2.8.12";
 export declare const moduleFederationNodeVersion = "~0.9.9";
 export declare const lessVersion = "3.12.2";
 export declare const sassVersion = "^1.55.0";
-export declare const stylusVersion = "^0.59.0";
 export declare const rollupPluginUrlVersion = "^7.0.0";
 export declare const svgrRollupVersion = "^8.0.1";
 export declare const swcPluginStyledJsxVersion = "^1.5.67";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.stylusVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelCoreVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
+exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelCoreVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 // Always pull the latest version until we merge rspack plugin into the repo.
 exports.nxRspackVersion = '*';
@@ -46,7 +46,6 @@ exports.moduleFederationNodeVersion = '~0.9.9';
 // style preprocessors
 exports.lessVersion = '3.12.2';
 exports.sassVersion = '^1.55.0';
-exports.stylusVersion = '^0.59.0';
 // rollup plugins (if needed)
 exports.rollupPluginUrlVersion = '^7.0.0';
 exports.svgrRollupVersion = '^8.0.1';

package/typings/cssmodule.d.ts

@@ -17,8 +17,3 @@ declare module '*.module.less' {
   const classes: { readonly [key: string]: string };
   export default classes;
 }
-
-declare module '*.module.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}

package/typings/style.d.ts

@@ -1,7 +1,6 @@
 export type SupportedStyles =
   | 'css'
   | 'scss'
-  | 'styl' // @TODO(17): deprecated, going to be removed in Nx 17
   | 'less'
   | 'styled-components'
   | '@emotion/styled'

package/src/executors/module-federation-dev-server/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/module-federation-dev-server/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const module_federation_dev_server_impl_1 = require("./module-federation-dev-server.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(module_federation_dev_server_impl_1.default);

package/src/executors/module-federation-ssr-dev-server/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/module-federation-ssr-dev-server/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const module_federation_ssr_dev_server_impl_1 = require("./module-federation-ssr-dev-server.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(module_federation_ssr_dev_server_impl_1.default);