From 63021dd72a6fe85d101ff6355a00ea1512fb554d Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Wed, 15 Feb 2023 15:30:52 -0500
Subject: [PATCH 01/92] feat: add rspack plugin (#143)

---
 .eslintrc.json                                |  25 +++
 README.md                                     |  11 ++
 executors.json                                |  15 ++
 generators.json                               |  24 +++
 jest.config.ts                                |  15 ++
 package.json                                  |  24 +++
 project.json                                  |  61 +++++++
 src/executors/dev-server/dev-server.impl.ts   |  45 +++++
 src/executors/dev-server/schema.d.ts          |   5 +
 src/executors/dev-server/schema.json          |  19 ++
 src/executors/rspack/rspack.impl.ts           |  20 +++
 src/executors/rspack/schema.d.ts              |  12 ++
 src/executors/rspack/schema.json              |  95 ++++++++++
 src/generators/init/init.ts                   |  38 ++++
 src/generators/init/schema.d.ts               |   5 +
 src/generators/init/schema.json               |  20 +++
 .../preset/files/src/app/app.module.__style__ |   2 +
 .../files/src/app/app.spec.tsx__template__    |  11 ++
 .../preset/files/src/app/app.tsx__template__  |  10 ++
 .../preset/files/src/assets/.gitkeep          |   0
 src/generators/preset/files/src/favicon.ico   | Bin 0 -> 15086 bytes
 .../preset/files/src/index.html__template__   |  14 ++
 .../preset/files/src/main.tsx__template__     |  15 ++
 .../preset/files/src/styles.__style__         |   1 +
 .../files/tsconfig.app.json__template__       |  13 ++
 .../preset/files/tsconfig.json__template__    |  17 ++
 src/generators/preset/lib/add-cypress.ts      |  20 +++
 src/generators/preset/lib/add-jest.ts         |  56 ++++++
 .../preset/lib/normalize-options.ts           |  54 ++++++
 src/generators/preset/preset.ts               |  86 +++++++++
 src/generators/preset/schema.d.ts             |  15 ++
 src/generators/preset/schema.json             |  60 +++++++
 .../rspack-project/rspack-project.ts          | 168 ++++++++++++++++++
 src/generators/rspack-project/schema.d.ts     |   9 +
 src/generators/rspack-project/schema.json     |  58 ++++++
 src/index.ts                                  |   6 +
 src/utils/config.ts                           |  15 ++
 src/utils/create-compiler.ts                  |  21 +++
 src/utils/create-copy-plugin.ts               |  23 +++
 src/utils/jest-utils.ts                       |  11 ++
 src/utils/model.ts                            |   7 +
 src/utils/normalize-assets.ts                 |  50 ++++++
 src/utils/versions.ts                         |  10 ++
 src/utils/with-nx.ts                          | 122 +++++++++++++
 src/utils/with-react.ts                       |  26 +++
 src/utils/with-web.ts                         |  62 +++++++
 tsconfig.json                                 |  16 ++
 tsconfig.lib.json                             |  11 ++
 tsconfig.spec.json                            |   9 +
 49 files changed, 1432 insertions(+)
 create mode 100644 .eslintrc.json
 create mode 100644 README.md
 create mode 100644 executors.json
 create mode 100644 generators.json
 create mode 100644 jest.config.ts
 create mode 100644 package.json
 create mode 100644 project.json
 create mode 100644 src/executors/dev-server/dev-server.impl.ts
 create mode 100644 src/executors/dev-server/schema.d.ts
 create mode 100644 src/executors/dev-server/schema.json
 create mode 100644 src/executors/rspack/rspack.impl.ts
 create mode 100644 src/executors/rspack/schema.d.ts
 create mode 100644 src/executors/rspack/schema.json
 create mode 100644 src/generators/init/init.ts
 create mode 100644 src/generators/init/schema.d.ts
 create mode 100644 src/generators/init/schema.json
 create mode 100644 src/generators/preset/files/src/app/app.module.__style__
 create mode 100644 src/generators/preset/files/src/app/app.spec.tsx__template__
 create mode 100644 src/generators/preset/files/src/app/app.tsx__template__
 create mode 100644 src/generators/preset/files/src/assets/.gitkeep
 create mode 100644 src/generators/preset/files/src/favicon.ico
 create mode 100644 src/generators/preset/files/src/index.html__template__
 create mode 100644 src/generators/preset/files/src/main.tsx__template__
 create mode 100644 src/generators/preset/files/src/styles.__style__
 create mode 100644 src/generators/preset/files/tsconfig.app.json__template__
 create mode 100644 src/generators/preset/files/tsconfig.json__template__
 create mode 100644 src/generators/preset/lib/add-cypress.ts
 create mode 100644 src/generators/preset/lib/add-jest.ts
 create mode 100644 src/generators/preset/lib/normalize-options.ts
 create mode 100644 src/generators/preset/preset.ts
 create mode 100644 src/generators/preset/schema.d.ts
 create mode 100644 src/generators/preset/schema.json
 create mode 100644 src/generators/rspack-project/rspack-project.ts
 create mode 100644 src/generators/rspack-project/schema.d.ts
 create mode 100644 src/generators/rspack-project/schema.json
 create mode 100644 src/index.ts
 create mode 100644 src/utils/config.ts
 create mode 100644 src/utils/create-compiler.ts
 create mode 100644 src/utils/create-copy-plugin.ts
 create mode 100644 src/utils/jest-utils.ts
 create mode 100644 src/utils/model.ts
 create mode 100644 src/utils/normalize-assets.ts
 create mode 100644 src/utils/versions.ts
 create mode 100644 src/utils/with-nx.ts
 create mode 100644 src/utils/with-react.ts
 create mode 100644 src/utils/with-web.ts
 create mode 100644 tsconfig.json
 create mode 100644 tsconfig.lib.json
 create mode 100644 tsconfig.spec.json

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000000000..556554a7956a5
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,25 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["./package.json", "./generators.json", "./executors.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nrwl/nx/nx-plugin-checks": "error"
+      }
+    }
+  ]
+}
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000..1fda4cfdbbf06
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+# rspack
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build rspack` to build the library.
+
+## Running unit tests
+
+Run `nx test rspack` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/executors.json b/executors.json
new file mode 100644
index 0000000000000..4ec8c30095772
--- /dev/null
+++ b/executors.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "executors": {
+    "rspack": {
+      "implementation": "./src/executors/rspack/rspack.impl",
+      "schema": "./src/executors/rspack/schema.json",
+      "description": "rspack executor"
+    },
+    "dev-server": {
+      "implementation": "./src/executors/dev-server/dev-server.impl",
+      "schema": "./src/executors/dev-server/schema.json",
+      "description": "dev-server executor"
+    }
+  }
+}
diff --git a/generators.json b/generators.json
new file mode 100644
index 0000000000000..b263978a590b4
--- /dev/null
+++ b/generators.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "name": "rspack",
+  "version": "0.0.1",
+  "generators": {
+    "rspack-project": {
+      "factory": "./src/generators/rspack-project/rspack-project",
+      "schema": "./src/generators/rspack-project/schema.json",
+      "description": "rspack generator"
+    },
+    "init": {
+      "factory": "./src/generators/init/init",
+      "schema": "./src/generators/init/schema.json",
+      "description": "init generator",
+      "hidden": true
+    },
+    "preset": {
+      "factory": "./src/generators/preset/preset",
+      "schema": "./src/generators/preset/schema.json",
+      "description": "preset generator",
+      "hidden": true
+    }
+  }
+}
diff --git a/jest.config.ts b/jest.config.ts
new file mode 100644
index 0000000000000..f3a6740a8888d
--- /dev/null
+++ b/jest.config.ts
@@ -0,0 +1,15 @@
+/* eslint-disable */
+export default {
+  displayName: 'rspack',
+  preset: '../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  transform: {
+    '^.+\\.[tj]s$': 'ts-jest',
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/packages/rspack',
+};
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000000..74a68be690dbe
--- /dev/null
+++ b/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@nrwl/rspack",
+  "version": "15.7.0-beta.1",
+  "type": "commonjs",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nrwl/nx-labs.git",
+    "directory": "packages/rspack"
+  },
+  "keywords": [
+    "Monorepo",
+    "Next",
+    "Vercel"
+  ],
+  "author": "Jack Hsu",
+  "license": "MIT",
+  "homepage": "https://nx.dev",
+  "main": "src/index.js",
+  "generators": "./generators.json",
+  "executors": "./executors.json",
+  "dependencies": {
+    "copy-webpack-plugin": "^10.2.4"
+  }
+}
diff --git a/project.json b/project.json
new file mode 100644
index 0000000000000..54367c77ef2f9
--- /dev/null
+++ b/project.json
@@ -0,0 +1,61 @@
+{
+  "name": "rspack",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/rspack/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nrwl/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/packages/rspack",
+        "main": "packages/rspack/src/index.ts",
+        "tsConfig": "packages/rspack/tsconfig.lib.json",
+        "assets": [
+          "packages/rspack/*.md",
+          {
+            "input": "./packages/rspack/src",
+            "glob": "**/!(*.ts)",
+            "output": "./src"
+          },
+          {
+            "input": "./packages/rspack/src",
+            "glob": "**/*.d.ts",
+            "output": "./src"
+          },
+          {
+            "input": "./packages/rspack",
+            "glob": "generators.json",
+            "output": "."
+          },
+          {
+            "input": "./packages/rspack",
+            "glob": "executors.json",
+            "output": "."
+          }
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": [
+          "packages/rspack/**/*.ts",
+          "packages/rspack/generators.json",
+          "packages/rspack/executors.json",
+          "packages/rspack/package.json"
+        ]
+      }
+    },
+    "test": {
+      "executor": "@nrwl/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "packages/rspack/jest.config.ts",
+        "passWithNoTests": true
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
new file mode 100644
index 0000000000000..f2f724c5aec9a
--- /dev/null
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -0,0 +1,45 @@
+import {
+  ExecutorContext,
+  parseTargetString,
+  readTargetOptions,
+} from '@nrwl/devkit';
+import { createAsyncIterable } from '@nrwl/devkit/src/utils/async-iterable';
+import { RspackDevServer } from '@rspack/dev-server';
+import { createCompiler } from '../../utils/create-compiler';
+import { DevServerExecutorSchema } from './schema';
+
+export default async function* runExecutor(
+  options: DevServerExecutorSchema,
+  context: ExecutorContext
+) {
+  process.env.NODE_ENV ??= 'development';
+  const buildTarget = parseTargetString(
+    options.buildTarget,
+    context.projectGraph
+  );
+  const devServerConfig = {
+    port: options.port ?? 4200,
+    hot: true,
+  };
+  const buildOptions = readTargetOptions<any>(buildTarget, context);
+  const compiler = await createCompiler(
+    { ...buildOptions, devServer: devServerConfig },
+    context
+  );
+
+  yield* createAsyncIterable(({ next }) => {
+    const server: any = new RspackDevServer(
+      {
+        ...devServerConfig,
+        onListening: (server: any) => {
+          next({
+            success: true,
+            baseUrl: `http://localhost:${options.port ?? 4200}`,
+          });
+        },
+      } as any,
+      compiler
+    );
+    server.start();
+  });
+}
diff --git a/src/executors/dev-server/schema.d.ts b/src/executors/dev-server/schema.d.ts
new file mode 100644
index 0000000000000..66b5708123e0a
--- /dev/null
+++ b/src/executors/dev-server/schema.d.ts
@@ -0,0 +1,5 @@
+export interface DevServerExecutorSchema {
+  buildTarget: string;
+
+  port?: number;
+}
diff --git a/src/executors/dev-server/schema.json b/src/executors/dev-server/schema.json
new file mode 100644
index 0000000000000..0702e2be344c1
--- /dev/null
+++ b/src/executors/dev-server/schema.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "version": 2,
+  "cli": "nx",
+  "title": "Rspack dev-server executor",
+  "description": "",
+  "type": "object",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "The build target for rspack."
+    },
+    "port": {
+      "type": "number",
+      "description": "The port to for the dev-server to listen on."
+    }
+  },
+  "required": ["buildTarget"]
+}
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
new file mode 100644
index 0000000000000..503abed25402f
--- /dev/null
+++ b/src/executors/rspack/rspack.impl.ts
@@ -0,0 +1,20 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { createCompiler } from '../../utils/create-compiler';
+import { RspackExecutorSchema } from './schema';
+
+export default async function runExecutor(
+  options: RspackExecutorSchema,
+  context: ExecutorContext
+) {
+  process.env.NODE_ENV ??= 'production';
+
+  const compiler = await createCompiler(options, context);
+
+  return new Promise<{ success: boolean }>((res) => {
+    compiler.run(() => {
+      compiler.close((err: any) => {
+        res({ success: !err });
+      });
+    });
+  });
+}
diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
new file mode 100644
index 0000000000000..f0a7bb91a288a
--- /dev/null
+++ b/src/executors/rspack/schema.d.ts
@@ -0,0 +1,12 @@
+export interface RspackExecutorSchema {
+  target: 'web' | 'node';
+  main: string;
+  tsConfig: string;
+  outputPath: string;
+  indexHtml?: string;
+
+  rspackConfig: string;
+  optimization?: boolean;
+  sourceMap?: boolean | string;
+  assets?: any[];
+}
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
new file mode 100644
index 0000000000000..4ae0ace118527
--- /dev/null
+++ b/src/executors/rspack/schema.json
@@ -0,0 +1,95 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "version": 2,
+  "cli": "nx",
+  "title": "Rspack build executor",
+  "description": "",
+  "type": "object",
+  "properties": {
+    "target": {
+      "type": "string",
+      "description": "The platform to target (e.g. web, node).",
+      "enum": ["web", "node"]
+    },
+    "main": {
+      "type": "string",
+      "description": "The main entry file."
+    },
+    "outputPath": {
+      "type": "string",
+      "description": "The output path for the bundle."
+    },
+    "tsConfig": {
+      "type": "string",
+      "description": "The tsconfig file to build the project."
+    },
+    "indexHtml": {
+      "type": "string",
+      "description": "The path to the index.html file."
+    },
+    "rspackConfig": {
+      "type": "string",
+      "description": "The path to the rspack config file."
+    },
+    "optimization": {
+      "type": "boolean",
+      "description": "Enables optimization of the build output."
+    },
+    "sourceMap": {
+      "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
+      "default": true,
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "assets": {
+      "type": "array",
+      "description": "List of static application assets.",
+      "default": [],
+      "items": {
+        "$ref": "#/definitions/assetPattern"
+      }
+    }
+  },
+  "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
+  "definitions": {
+    "assetPattern": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "glob": {
+              "type": "string",
+              "description": "The pattern to match."
+            },
+            "input": {
+              "type": "string",
+              "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+            },
+            "ignore": {
+              "description": "An array of globs to ignore.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "output": {
+              "type": "string",
+              "description": "Absolute path within the output."
+            }
+          },
+          "additionalProperties": false,
+          "required": ["glob", "input", "output"]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    }
+  }
+}
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
new file mode 100644
index 0000000000000..a21bfa6bc1547
--- /dev/null
+++ b/src/generators/init/init.ts
@@ -0,0 +1,38 @@
+import {
+  addDependenciesToPackageJson,
+  convertNxGenerator,
+  Tree,
+} from '@nrwl/devkit';
+import {
+  rspackCoreVersion,
+  rspackDevServerVersion,
+  rspackLessLoaderVersion,
+  rspackPluginMinifyVersion,
+} from '../../utils/versions';
+import { InitGeneratorSchema } from './schema';
+
+export async function rspackInitGenerator(
+  tree: Tree,
+  schema: InitGeneratorSchema
+) {
+  const devDependencies = {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    '@nrwl/rspack': require('../../../package.json').version,
+    '@rspack/core': rspackCoreVersion,
+    '@rspack/plugin-minify': rspackPluginMinifyVersion,
+  };
+
+  if (schema.style === 'less') {
+    devDependencies['@rspack/less-loader'] = rspackLessLoaderVersion;
+  }
+
+  if (schema.uiFramework !== 'none' || schema.devServer) {
+    devDependencies['@rspack/dev-server'] = rspackDevServerVersion;
+  }
+
+  return addDependenciesToPackageJson(tree, {}, devDependencies);
+}
+
+export default rspackInitGenerator;
+
+export const rspackInitSchematic = convertNxGenerator(rspackInitGenerator);
diff --git a/src/generators/init/schema.d.ts b/src/generators/init/schema.d.ts
new file mode 100644
index 0000000000000..6025907385ef8
--- /dev/null
+++ b/src/generators/init/schema.d.ts
@@ -0,0 +1,5 @@
+export interface InitGeneratorSchema {
+  uiFramework?: 'none' | 'react' | 'web';
+  style?: 'none' | 'css' | 'scss' | 'less';
+  devServer?: boolean;
+}
diff --git a/src/generators/init/schema.json b/src/generators/init/schema.json
new file mode 100644
index 0000000000000..38e289c320fd9
--- /dev/null
+++ b/src/generators/init/schema.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "Init",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "uiFramework": {
+      "type": "string",
+      "description": "The UI framework used by the project.",
+      "enum": ["none", "react", "web"]
+    },
+    "style": {
+      "type": "string",
+      "description": "The style solution to use.",
+      "enum": ["none", "css", "scss", "less"]
+    }
+  },
+  "required": []
+}
diff --git a/src/generators/preset/files/src/app/app.module.__style__ b/src/generators/preset/files/src/app/app.module.__style__
new file mode 100644
index 0000000000000..485140808b943
--- /dev/null
+++ b/src/generators/preset/files/src/app/app.module.__style__
@@ -0,0 +1,2 @@
+.container {
+}
diff --git a/src/generators/preset/files/src/app/app.spec.tsx__template__ b/src/generators/preset/files/src/app/app.spec.tsx__template__
new file mode 100644
index 0000000000000..d229ddcff5f79
--- /dev/null
+++ b/src/generators/preset/files/src/app/app.spec.tsx__template__
@@ -0,0 +1,11 @@
+import { render } from '@testing-library/react';
+import { App } from './app';
+
+describe('App component', () => {
+  it('should render a header', () => {
+    const { getByTestId } = render(<App />);
+
+    expect(getByTestId('header')).toBeTruthy();
+  });
+
+});
diff --git a/src/generators/preset/files/src/app/app.tsx__template__ b/src/generators/preset/files/src/app/app.tsx__template__
new file mode 100644
index 0000000000000..42bd6a4df4933
--- /dev/null
+++ b/src/generators/preset/files/src/app/app.tsx__template__
@@ -0,0 +1,10 @@
+import styles from './app.module.<%= style %>';
+
+export function App() {
+  return (
+    <div className={styles['container']}>
+      <h1 data-testid="header">Welcome <%= name %></h1>
+      <p>NODE_ENV: {process.env['NODE_ENV']}</p>
+    </div>
+  );
+}
diff --git a/src/generators/preset/files/src/assets/.gitkeep b/src/generators/preset/files/src/assets/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/generators/preset/files/src/favicon.ico b/src/generators/preset/files/src/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..317ebcb2336e0833a22dddf0ab287849f26fda57
GIT binary patch
literal 15086
zcmeI332;<p632UzfWZqabw#Bx7P_!_0dhki0VLs6ku&5D2}uYcfO5%@G2s;D7LY@f
zc(GokAnWR)DHUDuUROCpjmsH4pjZ`wkZ*te^4>U^%p|z7g|#(P)qFEA@4f!_@qOK2
z_lJl}!lhL!VT_U|uN7%8B2iKH??xhDa;*`g{yjTFWHvXn;2s{4R7kH|pKGdy(7z!K
zgftM+Ku7~24TLlh(!g)gz|foI94G^t2^IO$uvX$3(OR0<_5L2sB)lMAMy|+`xodJ{
z_Uh_1m)~h?a;2W{dmhM;u!YGo=)OdmId_B<%^V^{o<UMHeV`Og=_iGE^^rgN-XH8c
zcrSonhm1cBZ!ITAw2}V7o^`H|ik40(UF5*b;bPY1iFs&D4f>vI@y`7^g1_V9G}*f#
zNzA<oVrCB$Q*?(I_ibXP4UktS^^r?_?+^Ap7=Cnb(EW*on`_5Eu9uvb8!Jzxb`g^j
zEoNy(P#NAphQ^8mTQpjkC7Y1JEKU`3KQhc4A!g=KG1%Z+_pQ=17+(MDwc$@_BPT}I
zjelf*FFBSID`t2HG2{A(S({r!|7w#;sOaIb;$obLPn|>tvou}I!W1#{M^@ROc(BZ!
z+F!!_aR&Px3_reO(EW+TwlW~tv*2zr?iP7(d~a~yA|@*a89IUke+c472NXM0wiX{-
zl`UrZC^1XYyf%1u)-Y)jj9;MZ!SLfd2Hl?o|80Su%Z?To_=^g_Jt0oa#CT*tjx>BI
z16wec&AOWNK<#i0Qd=1O$fymLRoUR*%;h@*@v7}wApDl^w*h}!sYq%kw+DKDY)@&A
z@9$ULEB3qkR#85`lb8#WZw=@})#kQig9oqy^I$dj&k4jU&^2(M3q{n1AKeGUKPFbr
z1^<)aH;VsG@J|B&l>UtU#Ejv3GIqERzYgL@UOAWtW<{p#zy`WyJgpCy8$c_e%wYJL
zyGHRRx38)HyjU3y{-4z6)pzb>&Q1pR)B&u01F-|&Gx4EZWK$nkUkOI|(D4UHOXg_-
zw{OBf!oWQUn)Pe(=f=nt=zkmdjpO^o8ZZ9o_|4tW1ni+Un9iCW47*-ut$KQOww!;u
z`0q)$s6IZO!~9$e_P9X!hqLxu`fpcL|2f^I5d4*a@Dq28;@2271v_N+5HqYZ>x;&O
z05*7JT)mUe&%S0@UD)@&8SmQrMtsDfZT;fkdA!r(S=}Oz>iP)w=W508=Rc#nNn7ym
z1;42c|8($ALY8#a({%1#IXbWn9-Y|0eDY$_L&j{63?{?AH{);Ezcqf<!MFQ9x99b^
z@1DK4rAh7R(%7o_Ukrp_*B^iXAJs(~WJSwk+1;6+e)#eKWB7lW`oH?lRCGTU-%svF
zZa{1eHiz~4`%lFm`)1d&`Q<xTH!a_>ydD$@-B`Y3<%IIj7S7rK_N}je^=dEk%JQ4c
z!tBdTPE3Tse;oYF>cnrapWq*o)m47X1`~6@(!Y29#>-#8zm&LXrXa(3=7Z)ElaQqj
z-#0JJy3Fi(C#Rx(`=VXtJ63E2_bZGCz+QRa{W0e2(m3<b<R<WQnM~H@G~%P;$A5kX
zdr~m`<Zaga!@akqca}>sI?LOcUBx)~^YCqZ{XEPX)C>G>U4tfqeH8L(3|pQR*zbL1
zT9e~4Tb5p9_G}$y4t`i*4t_Mr9QYvL9C&Ah*}t`q*}S+VYh0M6GxTTSXI)hMpMpIq
zD1ImYqJLzbj0}~EpE-aH#VCH_udYEW#`P2zYmi&xSPs_{n6tBj=MY|-XrA;SGA_>y
zGtU$?HXm$gYj*!N)_nQ59%lQdXtQZS3*#PC-{iB_sm+ytD*7j`D*k(P&IH2GHT}Eh
z5697eQECVIGQAUe#eU2I!yI<zz;0~NQr|N^PTU%|61cC99Bv=_KdCmbW0yDoS&$NL
zmX1EpEE#=)nKLrdOzGz`6PQPeUwJD36mmpxeE`0zYQ<kQhbyqvzLfS-seXqK8MUG9
zLlxLyyuL#}xjn?4!rv0%QA-Z}Ik<a5n=IY4E@=+ED3w^9C}z%Zdk>&%0CP#>%6MWV
z@zS!p@+Y1i1b^QuuEF*1<Us0cJY(4nAF}4q=qekOvJQFo807!%A>3CuB<Ol`0^E7Z
zm%Qg1;_@p_?ztejY7aAu{Qn-^!+@VXn3b3498=%1e7}?I2TQ^o*He<VKf(OR$A_%>
zu69dve5k7&Wgb+^s|UB08Dr3u`h@yM0NTj4h7MnHo-4@xmyr7(*4$rpPwsCDZ@2be
zRz9V^GnV;;?^Lk%ynzq&K(Aix`mWmW`^152Hoy<pVuSh)79DeX%8W&6LDw72`#byI
zuiwcz>$CTYVehpD-S1-W^#k#{0^L`V6CN+<CFS_e7W_3E{FnMaufOZUZ|?(su|Y>E
z!w+xte;2vu4AmVNEFUOBmrBL>6MK@!O2*N|2=d|Y;oN&A&qv=qKn73lD<dYxNnd>D
zI(+oJAdgv>Yr}8(&@ZuAZE%XUXmX(U!N+Z_sjL<1vjy1R+1IeHt`79fnYdOL{$ci7
z%3f0A*;Zt@ED&Gjm|OFTYBDe%bbo*xXAQsFz+Q`fVBH!N2)kaxN8P$c>sp~QXnv>b
zwq=W3&Mtmih7xkR$YA)1Yi?avHNR6C99!u6fh=cL|KQ&PwF!n@ud^n(HNI<nwsH(x
z4qKM9iN6x;Git-Ge<QzeYkbrg?<<GKYW(VK;@<}TE9%0}y5!azL-V9+a#Y#me~G_7
z_y$7-P`)3H<9Cg?6G#?vr1r=#4jJ;1As-p?v4v7WW|z~i2L^g~=vqhvAq|8y5YoVz
z*MPA;B4>ImHD!h87!i*t?G|p0o+eelJ?B@A64_9%SBhNaJ64EvKgD&%LjLCYnNfc;
znj?%*p@*?dq#NqcQFmmX($wms@CSAr9#>hUR^=I+=<d%GUe;81{*2u{g^cHvbvMet
zq2G9w{o5J4+rJB|kH1xKEr1^d#X#P3T8;P-`h+wP(!lRV1LVP1Lc^g%o06y@-V_L6
z|LdjRj60+cXBkqdN2S;_lHZp*_b*D3i|<dAq12rcshK6-Jy4RVdtC4Q-G78<Kj;TY
z`wo@Xp1QRZ`QN9%Igij|bgX>0B)vvGX%T&#h$kmX*s=^M2E!@N9#m?LhMvz}YB+kd
zG~mbP|D(;{s_#;hsKK9lbVK&Lo734x7SIFJ9<NU=?g-!eQa_AcHCny_gVFO3=-?Ff
zpQ!;E+ZX-$+jXg8|7WNdWKr`tkx%U-6%4aR)Tn2E2!?mH{;IuaYG~T~e~tQ?w-)OE
zPW|o6Uu!aUe`l8Oy~y1R{-0{yNNcxwV92JHv^=wh9W0$_ZxbDS$2peXzVGq<4qx4$
zomY*&*0iVxQCs)&XP+Am{{`BU)INarGA2_)&ZdSk^|op@@Y(}^)ZXuX$RD&e2j7;^
zG=Kioa;ovC-VsBs;~V9#{ao!u<I@&~EHDJ>V_}2$@q?zm^7?*XH94w5Qae{7zOMUF
z^?%F%)c1Y)Q?Iy?I>kn<wOIXdo4@ulwHK&57|S*7*E_zrF3)A2E52%lFF*bMb!l%G
zy}qa;9}evE=KA)}jOrS348HHx%0F5%s4*N@{+9gIUXlNZB|rTz?W4}2#$2t3ivPX3
z;^uwd?pi$L&=(snEZ?=}lJcEvdLR7wt}*oM{;}o3)<4b5xYVk<BCnoLswTf}|6=yn
zO{sT$qO~)vo7wi?jQuw`_Me0u)ZZQ1b=2P*rZqIXUrRoE=(D-o%D3PDQTacMe%kl<
zgvuv8S5vbJvwBt9>w*8gYW#ok|2gdS=YYZLiD=CW|Nj;n^x!<jBV+M}EHEt_<tMvs
z2W)RP+<me6;Lp)!_m%->=S#iJ#`~Ld79+xXpVmUK^B(xO_vO!btA9y7w3L3-0j-y4
z?M-V{%z;JI`bk7yFDcP}OcCd*{Q9S5$iGA7*E1@tfkyjAi!;wP^O71cZ^Ep)qrQ)N
z#wqw0_HS;T7x3y|`P==i3hEwK%|>fZ)c&@kgKO1~5<5xBSk?iZV?KI6&i72H6S9A*
z=U(*e)EqEs?Oc04)V-~K5AUmh|62H4*`UAtItO$O(q5?6jj+K<YInKHn~#h06D6E4
zGY{ug$#47Kv+%ag8gORiMr412_5ZN7{xetf3<>^oD!04r=6#dsxp?~}{`?&sXn#q2
zGuY~7>O2=!u@@Kfu7q=W*4egu@qPMRM>(eyYyaIE<|j%d=iWNdGsx%c!902v#ngNg
z@#U-O_4xN$s_9?(`{>{>7~-6FgWpBpqXb`Ydc3OFL#&I}Irse9F_8R@4zSS*Y*o*B
zXL?6*Aw!AfkNCgcr#*yj&p3ZDe2y>v$>FUdKIy_2N~}6AbHc7gA3`6$g@1o|dE>vz
z4pl(j9;kyMsjaw}lO?(?Xg%4k!5%^<zlDDcygq_<+VnZ&Gf<7VJ+h6sSQqBwlV5;i
zCw{q${^Q$V`LF*641DyQ>t#@5n=WVc&JRa+XT$~#@rldv<HlfUj4u8F@xOCIpO6NA
zy#}i448i{`KGLeNxU7{aE~DpK>N3S1rEpU$;XgxVny7mki3<w%v}zUZDd^bHQ&8C5
zbEMEH-2)Zd6o`w~DKrp8LEbvW|DiWCr<+4vh%GJ2v8))B+*#`1mn3b-AEVjNSn-{>
z-Hh|jUCHrUXuLr!)`w>wgO0N%KTB-1di>cj(x3Ba<?I9X?CUltmc0Kh`u0bO`)SUz
zI`Zt(kjD0x$i3<j4=*8~D%HKjoCGVDSMdD5bnn34<pnTY=seGJdM@*6jf=!2>v`7v
z3G7EIbU$z>`Nad7Rk_&OT-W{;qg)-GXV-aJT#(o<Y^cxkn^`Yg6Fa`(`BTK_6MC*|
zK4(2Nm)J1vqV0R$o7U>zdmnA~Rq3GQ_3mby(>q6Ocb-RgTUhTN)))x>m&eD;$J5Bg
zo&DhY36Yg=J=$Z>t}RJ>o|@hAcwWzN#r(WJ52^g$lh^!63@hh+dR$&_dEGu&^CR*<
z!oFqSqO@>xZ*nC2oiOd0eS*F^IL~W-rsrO`J`ej{=ou_q^_(<$&-3f^<pOjU!=7&~
zXC+=DZ(jt~8+`R|WB7!1Jc_^TdE2d4ZXGA{9G&SoadMXW<Ql&A*O;WS@i_a$QF<>J
z&L^MSYWIe{&pYq&9eGaArA~*kA<MSpHuZ@k$zXI7$6|f&|Gj<JTB<KKxmBbwQL-^L
X*GBfq^a!*Sks)$E_17kl@BRM)`^nwN

literal 0
HcmV?d00001

diff --git a/src/generators/preset/files/src/index.html__template__ b/src/generators/preset/files/src/index.html__template__
new file mode 100644
index 0000000000000..6cfb12408cd4d
--- /dev/null
+++ b/src/generators/preset/files/src/index.html__template__
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title><%= name %></title>
+    <base href="/" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/src/generators/preset/files/src/main.tsx__template__ b/src/generators/preset/files/src/main.tsx__template__
new file mode 100644
index 0000000000000..8506fa7ab04d2
--- /dev/null
+++ b/src/generators/preset/files/src/main.tsx__template__
@@ -0,0 +1,15 @@
+import { StrictMode } from 'react';
+import * as ReactDOM from 'react-dom/client';
+
+import './styles.<%= style %>';
+import { App } from './app/app';
+
+const root = ReactDOM.createRoot(
+  document.getElementById('root') as HTMLElement
+);
+
+root.render(
+  <StrictMode>
+    <App />
+  </StrictMode>
+);
diff --git a/src/generators/preset/files/src/styles.__style__ b/src/generators/preset/files/src/styles.__style__
new file mode 100644
index 0000000000000..90d4ee0072ce3
--- /dev/null
+++ b/src/generators/preset/files/src/styles.__style__
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/src/generators/preset/files/tsconfig.app.json__template__ b/src/generators/preset/files/tsconfig.app.json__template__
new file mode 100644
index 0000000000000..52fbcc8213f9b
--- /dev/null
+++ b/src/generators/preset/files/tsconfig.app.json__template__
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
+  ],
+  "exclude": ["jest.config.ts","src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}
diff --git a/src/generators/preset/files/tsconfig.json__template__ b/src/generators/preset/files/tsconfig.json__template__
new file mode 100644
index 0000000000000..0f7e44b9f262c
--- /dev/null
+++ b/src/generators/preset/files/tsconfig.json__template__
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": false,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    }
+  ],
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json"
+}
diff --git a/src/generators/preset/lib/add-cypress.ts b/src/generators/preset/lib/add-cypress.ts
new file mode 100644
index 0000000000000..f11126aae7132
--- /dev/null
+++ b/src/generators/preset/lib/add-cypress.ts
@@ -0,0 +1,20 @@
+import { ensurePackage, Tree } from '@nrwl/devkit';
+import { version as nxVersion } from 'nx/package.json';
+import { PresetGeneratorSchema } from '../schema';
+
+export async function addCypress(host: Tree, options: PresetGeneratorSchema) {
+  if (options.e2eTestRunner !== 'cypress') {
+    return () => {
+      //nothing
+    };
+  }
+  await ensurePackage(host, '@nrwl/cypress', nxVersion);
+  const { cypressProjectGenerator } = await import('@nrwl/cypress');
+
+  return await cypressProjectGenerator(host, {
+    ...options,
+    name: options.rootProject ? `e2e` : `${options.name}-e2e`,
+    project: options.name,
+    rootProject: options.rootProject,
+  });
+}
diff --git a/src/generators/preset/lib/add-jest.ts b/src/generators/preset/lib/add-jest.ts
new file mode 100644
index 0000000000000..2bc6c0200d9e3
--- /dev/null
+++ b/src/generators/preset/lib/add-jest.ts
@@ -0,0 +1,56 @@
+import {
+  ensurePackage,
+  offsetFromRoot,
+  readProjectConfiguration,
+  Tree,
+  updateJson,
+} from '@nrwl/devkit';
+import { version as nxVersion } from 'nx/package.json';
+import { updateJestConfigContent } from '../../../utils/jest-utils';
+import { PresetGeneratorSchema } from '../schema';
+
+export async function addJest(host: Tree, options: PresetGeneratorSchema) {
+  if (options.unitTestRunner !== 'jest') {
+    return () => {
+      // nothing
+    };
+  }
+  
+  await ensurePackage(host, '@nrwl/jest', nxVersion);
+  const { jestProjectGenerator } = await import('@nrwl/jest');
+
+  const task = await jestProjectGenerator(host, {
+    ...options,
+    project: options.name,
+    supportTsx: true,
+    skipSerializers: true,
+    setupFile: 'none',
+    compiler: 'babel', // have to use babel for React projects
+    rootProject: options.rootProject,
+  });
+
+  updateSpecConfig(host, options);
+
+  return task;
+}
+
+function updateSpecConfig(host: Tree, options: PresetGeneratorSchema) {
+  if (options.unitTestRunner !== 'jest') {
+    return;
+  }
+  const project = readProjectConfiguration(host, options.name);
+
+  updateJson(host, `${project.root}/tsconfig.spec.json`, (json) => {
+    const offset = offsetFromRoot(project.root);
+    json.files = [
+      `${offset}node_modules/@nrwl/react/typings/cssmodule.d.ts`,
+      `${offset}node_modules/@nrwl/react/typings/image.d.ts`,
+    ];
+    return json;
+  });
+
+  const configPath = `${project.root}/jest.config.ts`;
+  const originalContent = host.read(configPath, 'utf-8');
+  const content = updateJestConfigContent(originalContent);
+  host.write(configPath, content);
+}
diff --git a/src/generators/preset/lib/normalize-options.ts b/src/generators/preset/lib/normalize-options.ts
new file mode 100644
index 0000000000000..e3e121acb93c9
--- /dev/null
+++ b/src/generators/preset/lib/normalize-options.ts
@@ -0,0 +1,54 @@
+import {
+  extractLayoutDirectory,
+  getWorkspaceLayout,
+  names,
+  normalizePath,
+  Tree,
+} from '@nrwl/devkit';
+import { NormalizedSchema, PresetGeneratorSchema } from '../schema';
+
+export function normalizeDirectory(options: PresetGeneratorSchema) {
+  const { projectDirectory } = extractLayoutDirectory(options.directory);
+  return projectDirectory
+    ? `${names(projectDirectory).fileName}/${names(options.name).fileName}`
+    : names(options.name).fileName;
+}
+
+export function normalizeProjectName(options: PresetGeneratorSchema) {
+  return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
+}
+
+export function normalizeOptions(
+  host: Tree,
+  options: PresetGeneratorSchema
+): NormalizedSchema {
+  // --monorepo takes precedence over --rootProject
+  // This won't be needed once we add --bundler=rspack to the @nrwl/react:app preset
+  const rootProject = !options.monorepo && (options.rootProject ?? true);
+  const appDirectory = normalizeDirectory(options);
+  const appProjectName = normalizeProjectName(options);
+  const e2eProjectName = options.rootProject
+    ? 'e2e'
+    : `${names(options.name).fileName}-e2e`;
+
+  const { layoutDirectory } = extractLayoutDirectory(options.directory);
+  const appsDir = layoutDirectory ?? getWorkspaceLayout(host).appsDir;
+  const appProjectRoot = rootProject
+    ? '.'
+    : normalizePath(`${appsDir}/${appDirectory}`);
+
+  const normalized = {
+    ...options,
+    rootProject,
+    name: names(options.name).fileName,
+    projectName: appProjectName,
+    appProjectRoot,
+    e2eProjectName,
+    fileName: 'app',
+  } as NormalizedSchema;
+
+  normalized.unitTestRunner ??= 'jest';
+  normalized.e2eTestRunner ??= 'cypress';
+
+  return normalized;
+}
diff --git a/src/generators/preset/preset.ts b/src/generators/preset/preset.ts
new file mode 100644
index 0000000000000..f6644ea24317c
--- /dev/null
+++ b/src/generators/preset/preset.ts
@@ -0,0 +1,86 @@
+import {
+  addDependenciesToPackageJson,
+  addProjectConfiguration,
+  ensurePackage,
+  formatFiles,
+  generateFiles,
+  joinPathFragments,
+  names,
+  offsetFromRoot,
+  Tree,
+} from '@nrwl/devkit';
+import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+import { version as nxVersion } from 'nx/package.json';
+import * as path from 'path';
+
+import {
+  reactDomVersion,
+  reactVersion,
+  typesReactDomVersion,
+  typesReactVersion,
+} from '../../utils/versions';
+import projectGenerator from '../rspack-project/rspack-project';
+import { addCypress } from './lib/add-cypress';
+import { addJest } from './lib/add-jest';
+import { normalizeOptions } from './lib/normalize-options';
+import { PresetGeneratorSchema } from './schema';
+
+export default async function (tree: Tree, _options: PresetGeneratorSchema) {
+  await ensurePackage(tree, '@nrwl/react', nxVersion);
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { reactInitGenerator } = require('@nrwl/react');
+
+  const tasks = [];
+  const options = normalizeOptions(tree, _options);
+
+  options.style ??= 'css';
+
+  addProjectConfiguration(tree, options.name, {
+    root: options.appProjectRoot,
+    projectType: 'application',
+    sourceRoot: `${options.appProjectRoot}/src`,
+    targets: {},
+  });
+
+  generateFiles(tree, path.join(__dirname, 'files'), options.appProjectRoot, {
+    ...options,
+    ...names(options.name),
+    offsetFromRoot: offsetFromRoot(options.appProjectRoot),
+    template: '',
+  });
+
+  const projectTask = await projectGenerator(tree, {
+    project: options.name,
+    style: options.style,
+    devServer: true,
+    tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
+    uiFramework: 'react',
+    target: 'web',
+    main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
+  });
+  tasks.push(projectTask);
+
+  const jestTask = await addJest(tree, options);
+  tasks.push(jestTask);
+
+  const cypressTask = await addCypress(tree, options);
+  tasks.push(cypressTask);
+
+  const installTask = addDependenciesToPackageJson(
+    tree,
+    { react: reactVersion, 'react-dom': reactDomVersion },
+    {
+      '@nrwl/react': nxVersion,
+      '@types/react': typesReactVersion,
+      '@types/react-dom': typesReactDomVersion,
+    }
+  );
+  tasks.push(installTask);
+
+  const reactInitTask = await reactInitGenerator(tree, options);
+  tasks.push(reactInitTask);
+
+  await formatFiles(tree);
+
+  return runTasksInSerial(...tasks);
+}
diff --git a/src/generators/preset/schema.d.ts b/src/generators/preset/schema.d.ts
new file mode 100644
index 0000000000000..06a197b0bc29c
--- /dev/null
+++ b/src/generators/preset/schema.d.ts
@@ -0,0 +1,15 @@
+export interface PresetGeneratorSchema {
+  name: string;
+  style: 'css' | 'scss' | 'less';
+  unitTestRunner?: 'none' | 'jest';
+  e2eTestRunner?: 'none' | 'cypress';
+  directory?: string;
+  tags?: string[];
+  rootProject?: boolean;
+  monorepo?: boolean;
+}
+
+export interface NormalizedSchema extends PresetGeneratorSchema {
+  appProjectRoot: string;
+  e2eProjectName: string;
+}
diff --git a/src/generators/preset/schema.json b/src/generators/preset/schema.json
new file mode 100644
index 0000000000000..fe47740445161
--- /dev/null
+++ b/src/generators/preset/schema.json
@@ -0,0 +1,60 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "Preset",
+  "title": "Standalone preset",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "style": {
+      "type": "string",
+      "description": "The style solution to use.",
+      "enum": ["none", "css", "sass", "less"],
+      "default": "css"
+    },
+    "unitTestRunner": {
+      "type": "string",
+      "description": "The unit test runner to use.",
+      "enum": ["none", "jest"],
+      "default": "jest"
+    },
+    "e2eTestRunner": {
+      "type": "string",
+      "description": "The e2e test runner to use.",
+      "enum": ["none", "cypress"],
+      "default": "cypress"
+    },
+    "directory": {
+      "type": "string",
+      "description": "The directory to nest the app under."
+    },
+    "tags": {
+      "type": "array",
+      "description": "The tags to assign to the project.",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "monorepo": {
+      "type": "boolean",
+      "description": "Creates an integrated monorepo.",
+      "default": false,
+      "aliases": ["integrated"]
+    },
+    "rootProject": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "default": true
+    }
+  },
+  "required": ["name"]
+}
diff --git a/src/generators/rspack-project/rspack-project.ts b/src/generators/rspack-project/rspack-project.ts
new file mode 100644
index 0000000000000..f1b07635cbc82
--- /dev/null
+++ b/src/generators/rspack-project/rspack-project.ts
@@ -0,0 +1,168 @@
+import {
+  formatFiles,
+  joinPathFragments,
+  readProjectConfiguration,
+  Tree,
+  updateProjectConfiguration,
+} from '@nrwl/devkit';
+import { RspackExecutorSchema } from '../../executors/rspack/schema';
+import rspackInitGenerator from '../init/init';
+import { RspackProjectGeneratorSchema } from './schema';
+
+export async function rspackProjectGenerator(
+  tree: Tree,
+  options: RspackProjectGeneratorSchema
+) {
+  const task = await rspackInitGenerator(tree, options);
+  checkForTargetConflicts(tree, options);
+  addBuildTarget(tree, options);
+  if (options.uiFramework !== 'none' || options.devServer) {
+    addServeTarget(tree, options);
+  }
+  writeRspackConfigFile(tree, options);
+  await formatFiles(tree);
+  return task;
+}
+
+function checkForTargetConflicts(
+  tree: Tree,
+  options: RspackProjectGeneratorSchema
+) {
+  if (options.skipValidation) return;
+
+  const project = readProjectConfiguration(tree, options.project);
+
+  if (project.targets?.build) {
+    throw new Error(
+      `Project "${project.name}" already has a build target. Pass --skipValidation to ignore this error.`
+    );
+  }
+
+  if (options.devServer && project.targets?.serve) {
+    throw new Error(
+      `Project "${project.name}" already has a serve target. Pass --skipValidation to ignore this error.`
+    );
+  }
+}
+
+function determineMain(tree: Tree, options: RspackProjectGeneratorSchema) {
+  if (options.main) return options.main;
+
+  const project = readProjectConfiguration(tree, options.project);
+
+  const mainTsx = joinPathFragments(project.root, 'src/main.tsx');
+  if (tree.exists(mainTsx)) return mainTsx;
+
+  return joinPathFragments(project.root, 'src/main.ts');
+}
+
+function determineTsConfig(tree: Tree, options: RspackProjectGeneratorSchema) {
+  if (options.tsConfig) return options.tsConfig;
+
+  const project = readProjectConfiguration(tree, options.project);
+
+  const appJson = joinPathFragments(project.root, 'tsconfig.app.json');
+  if (tree.exists(appJson)) return appJson;
+
+  const libJson = joinPathFragments(project.root, 'tsconfig.lib.json');
+  if (tree.exists(libJson)) return libJson;
+
+  return joinPathFragments(project.root, 'tsconfig.json');
+}
+
+function addBuildTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
+  const project = readProjectConfiguration(tree, options.project);
+  const buildOptions: RspackExecutorSchema = {
+    target: options.target ?? 'web',
+    outputPath: joinPathFragments('dist', project.root),
+    main: determineMain(tree, options),
+    tsConfig: determineTsConfig(tree, options),
+    rspackConfig: joinPathFragments(project.root, 'rspack.config.js'),
+    assets: [
+      joinPathFragments(project.root, 'src/favicon.ico'),
+      joinPathFragments(project.root, 'src/assets'),
+    ],
+  };
+
+  updateProjectConfiguration(tree, options.project, {
+    ...project,
+    targets: {
+      ...project.targets,
+      build: {
+        executor: '@nrwl/rspack:rspack',
+        outputs: ['{options.outputPath}'],
+        defaultConfiguration: 'production',
+        options: buildOptions,
+        configurations: {
+          production: {
+            optimization: true,
+            sourceMap: false,
+          },
+        },
+      },
+    },
+  });
+}
+
+function addServeTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
+  const project = readProjectConfiguration(tree, options.project);
+  updateProjectConfiguration(tree, options.project, {
+    ...project,
+    targets: {
+      ...project.targets,
+      serve: {
+        executor: '@nrwl/rspack:dev-server',
+        options: {
+          buildTarget: `${options.project}:build`,
+        },
+        configurations: {
+          production: {
+            buildTarget: `${options.project}:build:production`,
+          },
+        },
+      },
+    },
+  });
+}
+
+function writeRspackConfigFile(
+  tree: Tree,
+  options: RspackProjectGeneratorSchema
+) {
+  const project = readProjectConfiguration(tree, options.project);
+
+  tree.write(
+    joinPathFragments(project.root, 'rspack.config.js'),
+    createConfig(options)
+  );
+}
+
+function createConfig(options: RspackProjectGeneratorSchema) {
+  if (options.uiFramework === 'react') {
+    return `
+      const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx(), withReact({ style: '${options.style}' }), (config) => {
+        return config;
+      });
+    `;
+  } else if (options.uiFramework === 'web') {
+    return `
+      const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx(), withWeb({ style: '${options.style}' }), (config) => {
+        return config;
+      });
+    `;
+  } else {
+    return `
+      const { composePlugins, withNx } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx(), (config) => {
+        return config;
+      });
+    `;
+  }
+}
+
+export default rspackProjectGenerator;
diff --git a/src/generators/rspack-project/schema.d.ts b/src/generators/rspack-project/schema.d.ts
new file mode 100644
index 0000000000000..90b381dbbae76
--- /dev/null
+++ b/src/generators/rspack-project/schema.d.ts
@@ -0,0 +1,9 @@
+import { InitGeneratorSchema } from '../init/schema';
+
+export interface RspackProjectGeneratorSchema extends InitGeneratorSchema {
+  project: string;
+  main?: string;
+  tsConfig?: string;
+  target?: 'node' | 'web';
+  skipValidation?: boolean;
+}
diff --git a/src/generators/rspack-project/schema.json b/src/generators/rspack-project/schema.json
new file mode 100644
index 0000000000000..15d64d7c4da00
--- /dev/null
+++ b/src/generators/rspack-project/schema.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "Rspack",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-dropdown": "project",
+      "x-prompt": "What is the name of the project to set up a rspack for?",
+      "x-priority": "important"
+    },
+    "main": {
+      "type": "string",
+      "description": "Path relative to the workspace root for the main entry file. Defaults to '<projectRoot>/src/main.ts'.",
+      "x-priority": "important"
+    },
+    "tsConfig": {
+      "type": "string",
+      "description": "Path relative to the workspace root for the tsconfig file to build with. Defaults to '<projectRoot>/tsconfig.app.json'.",
+      "x-priority": "important"
+    },
+    "target": {
+      "type": "string",
+      "description": "Target platform for the build, same as the rspack config option.",
+      "enum": ["node", "web"],
+      "default": "web"
+    },
+    "devServer": {
+      "type": "boolean",
+      "description": "Add a serve target to run a local rspack dev-server",
+      "default": false
+    },
+    "uiFramework": {
+      "type": "string",
+      "description": "The UI framework used by the project.",
+      "enum": ["none", "react"]
+    },
+    "style": {
+      "type": "string",
+      "description": "The style solution to use.",
+      "enum": ["none", "css", "scss", "less"]
+    },
+    "skipValidation": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not perform any validation on existing project.",
+      "x-priority": "internal"
+    }
+  },
+  "required": ["project"]
+}
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 0000000000000..e7e3031a6e588
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,6 @@
+export * from './generators/init/init';
+export * from './generators/rspack-project/rspack-project';
+export * from './utils/config';
+export * from './utils/with-nx';
+export * from './utils/with-react';
+export * from './utils/with-web';
diff --git a/src/utils/config.ts b/src/utils/config.ts
new file mode 100644
index 0000000000000..26deecabb97c7
--- /dev/null
+++ b/src/utils/config.ts
@@ -0,0 +1,15 @@
+import { Configuration } from '@rspack/core';
+import { SharedConfigContext } from './model';
+
+export function composePlugins(...plugins: any[]) {
+  return async function combined(
+    config: Configuration,
+    ctx: SharedConfigContext
+  ): Promise<Configuration> {
+    for (const plugin of plugins) {
+      const fn = await plugin;
+      config = await fn(config, ctx);
+    }
+    return config;
+  };
+}
diff --git a/src/utils/create-compiler.ts b/src/utils/create-compiler.ts
new file mode 100644
index 0000000000000..5ba7ca1442f82
--- /dev/null
+++ b/src/utils/create-compiler.ts
@@ -0,0 +1,21 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { Compiler, createCompiler as _createCompiler } from '@rspack/core';
+import * as path from 'path';
+import { RspackExecutorSchema } from '../executors/rspack/schema';
+
+export async function createCompiler(
+  options: RspackExecutorSchema,
+  context: ExecutorContext
+): Promise<Compiler> {
+  let userDefinedConfig = await import(
+    path.join(context.root, options.rspackConfig)
+  ).then((x) => x.default || x);
+
+  if (typeof userDefinedConfig.then === 'function') {
+    userDefinedConfig = await userDefinedConfig;
+  }
+
+  const config = await userDefinedConfig({}, { options, context });
+
+  return _createCompiler(config);
+}
diff --git a/src/utils/create-copy-plugin.ts b/src/utils/create-copy-plugin.ts
new file mode 100644
index 0000000000000..ba481cb2c024b
--- /dev/null
+++ b/src/utils/create-copy-plugin.ts
@@ -0,0 +1,23 @@
+import * as CopyWebpackPlugin from 'copy-webpack-plugin';
+
+export function createCopyPlugin(assets: any[]) {
+  return new CopyWebpackPlugin({
+    patterns: assets.map((asset) => {
+      return {
+        context: asset.input,
+        // Now we remove starting slash to make Webpack place it from the output root.
+        to: asset.output,
+        from: asset.glob,
+        globOptions: {
+          ignore: [
+            '.gitkeep',
+            '**/.DS_Store',
+            '**/Thumbs.db',
+            ...(asset.ignore ?? []),
+          ],
+          dot: true,
+        },
+      };
+    }),
+  });
+}
diff --git a/src/utils/jest-utils.ts b/src/utils/jest-utils.ts
new file mode 100644
index 0000000000000..c44bc73429f70
--- /dev/null
+++ b/src/utils/jest-utils.ts
@@ -0,0 +1,11 @@
+export function updateJestConfigContent(content: string) {
+  return content
+    .replace(
+      'transform: {',
+      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',"
+    )
+    .replace(
+      `'babel-jest'`,
+      `['babel-jest', { presets: ['@nrwl/react/babel'] }]`
+    );
+}
diff --git a/src/utils/model.ts b/src/utils/model.ts
new file mode 100644
index 0000000000000..999f4ef3d8421
--- /dev/null
+++ b/src/utils/model.ts
@@ -0,0 +1,7 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { RspackExecutorSchema } from '../executors/rspack/schema';
+
+export interface SharedConfigContext {
+  options: RspackExecutorSchema;
+  context: ExecutorContext;
+}
diff --git a/src/utils/normalize-assets.ts b/src/utils/normalize-assets.ts
new file mode 100644
index 0000000000000..3bb3c2d62379e
--- /dev/null
+++ b/src/utils/normalize-assets.ts
@@ -0,0 +1,50 @@
+import { normalizePath } from '@nrwl/devkit';
+import { statSync } from 'fs';
+import { basename, dirname, relative, resolve } from 'path';
+
+export function normalizeAssets(
+  assets: any[],
+  root: string,
+  sourceRoot: string
+): any[] {
+  return assets.map((asset) => {
+    if (typeof asset === 'string') {
+      const assetPath = normalizePath(asset);
+      const resolvedAssetPath = resolve(root, assetPath);
+      const resolvedSourceRoot = resolve(root, sourceRoot);
+
+      if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
+        throw new Error(
+          `The ${resolvedAssetPath} asset path must start with the project source root: ${sourceRoot}`
+        );
+      }
+
+      const isDirectory = statSync(resolvedAssetPath).isDirectory();
+      const input = isDirectory
+        ? resolvedAssetPath
+        : dirname(resolvedAssetPath);
+      const output = relative(resolvedSourceRoot, resolve(root, input));
+      const glob = isDirectory ? '**/*' : basename(resolvedAssetPath);
+      return {
+        input,
+        output,
+        glob,
+      };
+    } else {
+      if (asset.output.startsWith('..')) {
+        throw new Error(
+          'An asset cannot be written to a location outside of the output path.'
+        );
+      }
+
+      const assetPath = normalizePath(asset.input);
+      const resolvedAssetPath = resolve(root, assetPath);
+      return {
+        ...asset,
+        input: resolvedAssetPath,
+        // Now we remove starting slash to make Webpack place it from the output root.
+        output: asset.output.replace(/^\//, ''),
+      };
+    }
+  });
+}
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
new file mode 100644
index 0000000000000..da07b4cc96b27
--- /dev/null
+++ b/src/utils/versions.ts
@@ -0,0 +1,10 @@
+export const rspackCoreVersion = '^0.0.22';
+export const rspackDevServerVersion = '^0.0.22';
+
+export const rspackPluginMinifyVersion = '^0.0.22';
+export const rspackLessLoaderVersion = '^0.0.22';
+
+export const reactVersion = '~18.2.0';
+export const reactDomVersion = '~18.2.0';
+export const typesReactVersion = '~18.0.28';
+export const typesReactDomVersion = '~18.0.10';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
new file mode 100644
index 0000000000000..2b7f6ba8ba667
--- /dev/null
+++ b/src/utils/with-nx.ts
@@ -0,0 +1,122 @@
+import { Configuration } from '@rspack/core';
+import * as path from 'path';
+import { createCopyPlugin } from './create-copy-plugin';
+import { SharedConfigContext } from './model';
+import { normalizeAssets } from './normalize-assets';
+
+export function withNx(_opts = {}) {
+  return function makeConfig(
+    config: Configuration,
+    { options, context }: SharedConfigContext
+  ): Configuration {
+    const isProd = process.env.NODE_ENV === 'production';
+    const isDev = process.env.NODE_ENV === 'development';
+    const projectRoot = path.join(
+      context.root,
+      context.projectGraph.nodes[context.projectName].data.root
+    );
+    const sourceRoot = path.join(
+      context.root,
+      context.projectGraph.nodes[context.projectName].data.sourceRoot
+    );
+
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const tsconfigPaths = require('tsconfig-paths');
+    const { paths } = tsconfigPaths.loadConfig(options.tsConfig);
+    const alias = Object.keys(paths).reduce((acc, k) => {
+      acc[k] = path.join(context.root, paths[k][0]);
+      return acc;
+    }, {});
+
+    const updated = {
+      ...config,
+      target: options.target,
+      mode: 'development' as const,
+      context: context.root,
+      devtool:
+        options.sourceMap === 'hidden'
+          ? ('hidden-source-map' as const)
+          : options.sourceMap
+          ? ('source-map' as const)
+          : (false as const),
+      entry: {
+        main: {
+          import: [path.join(context.root, options.main)],
+        },
+      },
+      output: {
+        path: path.join(context.root, options.outputPath),
+        publicPath: '/',
+        filename: isProd ? '[name].[contenthash:8][ext]' : '[name][ext]',
+      },
+      devServer: {
+        port: 4200,
+        hot: true,
+      } as any,
+      module: {
+        rules: [
+          {
+            test: /\.css$/,
+            type: 'css/module' as any,
+          },
+        ],
+      },
+      plugins: config.plugins ?? [],
+      resolve: {
+        alias,
+        // This is not working it seems.
+        //plugins: [new TsconfigPathsPlugin({
+        //  configFile: path.resolve(__dirname, 'tsconfig.app.json')
+        //})]
+      },
+      infrastructureLogging: {
+        debug: false,
+      },
+      builtins: {
+        html: [
+          {
+            template: options.indexHtml
+              ? path.join(context.root, options.indexHtml)
+              : path.join(projectRoot, 'src/index.html'),
+          },
+        ],
+        define: {
+          'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
+        },
+        progress: {},
+        // TODO(jack): This should go to withReact.
+        react: {
+          runtime: 'automatic',
+          development: isDev,
+          refresh: isDev,
+        },
+      },
+    };
+
+    if (Array.isArray(options.assets) && options.assets.length > 0) {
+      // TODO(jack): uncomment this once copy-webpack-plugin is working
+      //updated.plugins.push(
+      //  createCopyPlugin(
+      //    normalizeAssets(options.assets, context.root, sourceRoot)
+      //  )
+      //);
+    }
+
+    if (options.optimization) {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const minifyPlugin = require('@rspack/plugin-minify');
+      updated.optimization = {
+        ...config.optimization,
+        minimize: true,
+        minimizer: [
+          ...(config.optimization?.minimizer || []),
+          new minifyPlugin({
+            minifier: 'terser',
+          }),
+        ],
+      };
+    }
+
+    return updated;
+  };
+}
diff --git a/src/utils/with-react.ts b/src/utils/with-react.ts
new file mode 100644
index 0000000000000..e99f2b43d9b76
--- /dev/null
+++ b/src/utils/with-react.ts
@@ -0,0 +1,26 @@
+import { Configuration } from '@rspack/core';
+import { SharedConfigContext } from './model';
+import { withWeb } from './with-web';
+
+export function withReact(opts = {}) {
+  return function makeConfig(
+    config: Configuration,
+    { options, context }: SharedConfigContext
+  ): Configuration {
+    const isDev = process.env.NODE_ENV === 'development';
+
+    config = withWeb(opts)(config, { options, context });
+
+    return {
+      ...config,
+      builtins: {
+        ...config.builtins,
+        react: {
+          runtime: 'automatic',
+          development: isDev,
+          refresh: isDev,
+        },
+      },
+    };
+  };
+}
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
new file mode 100644
index 0000000000000..e04df5898879c
--- /dev/null
+++ b/src/utils/with-web.ts
@@ -0,0 +1,62 @@
+import { Configuration } from '@rspack/core';
+import { ModuleRule } from '@rspack/core/dist/config/module';
+import * as path from 'path';
+import { SharedConfigContext } from './model';
+
+export interface WithWebOptions {
+  style?: 'css' | 'scss' | 'less';
+}
+
+export function withWeb(opts: WithWebOptions = {}) {
+  return function makeConfig(
+    config: Configuration,
+    { options, context }: SharedConfigContext
+  ): Configuration {
+    const isProd = process.env.NODE_ENV === 'production';
+
+    const projectRoot = path.join(
+      context.root,
+      context.projectGraph.nodes[context.projectName].data.root
+    );
+
+    return {
+      ...config,
+      module: {
+        ...config.module,
+        rules: [
+          ...(config.module.rules || []),
+          {
+            test: /\.css$/,
+            type: 'css/module' as any,
+          },
+          // TODO(jack): uncomment once supported.
+          // {
+          //   test: /\.s[ac]ss$/,
+          //   use: [{ builtinLoader: 'builtin:sass-loader' }],
+          //   type: 'css',
+          // },
+          opts.style === 'less' && {
+            test: /.less$/,
+            use: [{ loader: require('@rspack/less-loader') }],
+            type: 'css',
+          },
+        ].filter((a): a is ModuleRule => !!a),
+      },
+      builtins: {
+        ...config.builtins,
+        html: [
+          ...(config.builtins.html || []),
+          {
+            template: options.indexHtml
+              ? path.join(context.root, options.indexHtml)
+              : path.join(projectRoot, 'src/index.html'),
+          },
+        ],
+        define: {
+          ...config.builtins.define,
+          'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
+        },
+      },
+    };
+  };
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000000..19b9eece4df14
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs"
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/tsconfig.lib.json b/tsconfig.lib.json
new file mode 100644
index 0000000000000..edecad0e0fc40
--- /dev/null
+++ b/tsconfig.lib.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
+}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
new file mode 100644
index 0000000000000..546f12877f7f0
--- /dev/null
+++ b/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+}

From c8df947e325d17387c2840a44d06a906fde1c5d9 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Wed, 15 Feb 2023 15:30:52 -0500
Subject: [PATCH 02/92] feat: add rspack plugin (#143)

---
 jest.config.ts       | 15 +++++++++++++++
 project.json         | 17 +++++++++++++++++
 tests/rspack.spec.ts | 35 +++++++++++++++++++++++++++++++++++
 tsconfig.json        | 10 ++++++++++
 tsconfig.spec.json   |  9 +++++++++
 5 files changed, 86 insertions(+)
 create mode 100644 jest.config.ts
 create mode 100644 project.json
 create mode 100644 tests/rspack.spec.ts
 create mode 100644 tsconfig.json
 create mode 100644 tsconfig.spec.json

diff --git a/jest.config.ts b/jest.config.ts
new file mode 100644
index 0000000000000..893fb612ef641
--- /dev/null
+++ b/jest.config.ts
@@ -0,0 +1,15 @@
+/* eslint-disable */
+export default {
+  displayName: 'rspack-e2e',
+  preset: '../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  transform: {
+    '^.+\\.[tj]s$': 'ts-jest',
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/e2e/rspack-e2e',
+};
diff --git a/project.json b/project.json
new file mode 100644
index 0000000000000..d013186ec1ac3
--- /dev/null
+++ b/project.json
@@ -0,0 +1,17 @@
+{
+  "name": "rspack-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "sourceRoot": "e2e/rspack-e2e/src",
+  "targets": {
+    "e2e": {
+      "executor": "@nrwl/nx-plugin:e2e",
+      "options": {
+        "target": "rspack:build",
+        "jestConfig": "e2e/rspack-e2e/jest.config.ts"
+      }
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["rspack"]
+}
diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
new file mode 100644
index 0000000000000..801a7046d2c6c
--- /dev/null
+++ b/tests/rspack.spec.ts
@@ -0,0 +1,35 @@
+import {
+  ensureNxProject,
+  runNxCommandAsync,
+  uniq,
+} from '@nrwl/nx-plugin/testing';
+
+describe('rspack e2e', () => {
+  // Setting up individual workspaces per
+  // test can cause e2e runs to take a long time.
+  // For this reason, we recommend each suite only
+  // consumes 1 workspace. The tests should each operate
+  // on a unique project in the workspace, such that they
+  // are not dependant on one another.
+  beforeAll(() => {
+    ensureNxProject('@nrwl/rspack', 'dist/packages/rspack');
+  });
+
+  afterAll(() => {
+    // `nx reset` kills the daemon, and performs
+    // some work which can help clean up e2e leftovers
+    runNxCommandAsync('reset');
+  });
+
+  it('should create rspack project', async () => {
+    const project = uniq('myapp');
+    await runNxCommandAsync(
+      `generate @nrwl/rspack:preset ${project} --style=css --unitTestRunner=jest --e2eTestRunner=cypress`
+    );
+    let result = await runNxCommandAsync(`build ${project}`);
+    expect(result.stdout).toContain('Successfully ran target build');
+
+    result = await runNxCommandAsync(`e2e e2e`);
+    expect(result.stdout).toContain('Successfully ran target e2e');
+  }, 120_000);
+});
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000000..b9c9d95376eb4
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
new file mode 100644
index 0000000000000..546f12877f7f0
--- /dev/null
+++ b/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+}

From 0850023f710624af095147de8b4362741ad44570 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Tue, 28 Feb 2023 09:41:22 -0500
Subject: [PATCH 03/92] feat(rspack): update to latest rspack version (#159)

---
 package.json                      | 1 +
 src/generators/preset/schema.json | 2 +-
 src/utils/versions.ts             | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 74a68be690dbe..692e5e27ac2ae 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
+    "@nrwl/devkit": "^15.7.2",
     "copy-webpack-plugin": "^10.2.4"
   }
 }
diff --git a/src/generators/preset/schema.json b/src/generators/preset/schema.json
index fe47740445161..217ad44f5f8da 100644
--- a/src/generators/preset/schema.json
+++ b/src/generators/preset/schema.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "Preset",
-  "title": "Standalone preset",
+  "title": "Standalone React and rspack preset",
   "type": "object",
   "properties": {
     "name": {
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index da07b4cc96b27..ea0a5d07eaa33 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '^0.0.22';
-export const rspackDevServerVersion = '^0.0.22';
+export const rspackCoreVersion = '^0.0.23';
+export const rspackDevServerVersion = '^0.0.23';
 
-export const rspackPluginMinifyVersion = '^0.0.22';
-export const rspackLessLoaderVersion = '^0.0.22';
+export const rspackPluginMinifyVersion = '^0.0.23';
+export const rspackLessLoaderVersion = '^0.0.23';
 
 export const reactVersion = '~18.2.0';
 export const reactDomVersion = '~18.2.0';

From 133bd2c2730a19bccd5c9a29c791aeebd7aa6fd2 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 2 Mar 2023 08:11:46 -0500
Subject: [PATCH 04/92] feat(rspack): add missing features (less/sass/stylus,
 assets, etc.) (#160)

---
 README.md                                     |  82 +-
 generators.json                               |  13 +-
 package.json                                  |  10 +-
 src/generators/application/application.ts     | 110 +++
 .../files/src/app/app.module.__style__        |   0
 .../files/src/app/app.spec.tsx__template__    |   4 +-
 .../files/src/app/app.tsx__template__         |  10 +
 .../files/src/app/nx-welcome.tsx__template__  | 820 ++++++++++++++++++
 .../files/src/assets/.gitkeep                 |   0
 .../files/src/favicon.ico                     | Bin
 .../files/src/index.html__template__          |   0
 .../files/src/main.tsx__template__            |   0
 .../files/src/styles.__style__                |   0
 .../files/tsconfig.app.json__template__       |   0
 .../lib/add-cypress.ts                        |   4 +-
 .../{preset => application}/lib/add-jest.ts   |   8 +-
 src/generators/application/lib/add-linting.ts |  69 ++
 .../application/lib/create-ts-config.ts       |  47 +
 .../lib/normalize-options.ts                  |   8 +-
 src/generators/application/schema.d.ts        |  15 +
 src/generators/application/schema.json        |  92 ++
 src/generators/init/init.ts                   |   9 +-
 .../preset/files/src/app/app.tsx__template__  |  10 -
 .../preset/files/tsconfig.json__template__    |  17 -
 src/generators/preset/preset.ts               | 102 +--
 src/generators/preset/schema.d.ts             |   4 +-
 src/generators/preset/schema.json             |  16 +-
 .../rspack-project/rspack-project.ts          |   4 +-
 src/utils/create-copy-plugin.ts               |  23 -
 src/utils/get-copy-patterns.ts                |  19 +
 src/utils/versions.ts                         |   9 +
 src/utils/with-nx.ts                          |  16 +-
 src/utils/with-web.ts                         |  77 +-
 33 files changed, 1417 insertions(+), 181 deletions(-)
 create mode 100644 src/generators/application/application.ts
 rename src/generators/{preset => application}/files/src/app/app.module.__style__ (100%)
 rename src/generators/{preset => application}/files/src/app/app.spec.tsx__template__ (63%)
 create mode 100644 src/generators/application/files/src/app/app.tsx__template__
 create mode 100644 src/generators/application/files/src/app/nx-welcome.tsx__template__
 rename src/generators/{preset => application}/files/src/assets/.gitkeep (100%)
 rename src/generators/{preset => application}/files/src/favicon.ico (100%)
 rename src/generators/{preset => application}/files/src/index.html__template__ (100%)
 rename src/generators/{preset => application}/files/src/main.tsx__template__ (100%)
 rename src/generators/{preset => application}/files/src/styles.__style__ (100%)
 rename src/generators/{preset => application}/files/tsconfig.app.json__template__ (100%)
 rename src/generators/{preset => application}/lib/add-cypress.ts (80%)
 rename src/generators/{preset => application}/lib/add-jest.ts (87%)
 create mode 100644 src/generators/application/lib/add-linting.ts
 create mode 100644 src/generators/application/lib/create-ts-config.ts
 rename src/generators/{preset => application}/lib/normalize-options.ts (84%)
 create mode 100644 src/generators/application/schema.d.ts
 create mode 100644 src/generators/application/schema.json
 delete mode 100644 src/generators/preset/files/src/app/app.tsx__template__
 delete mode 100644 src/generators/preset/files/tsconfig.json__template__
 delete mode 100644 src/utils/create-copy-plugin.ts
 create mode 100644 src/utils/get-copy-patterns.ts

diff --git a/README.md b/README.md
index 1fda4cfdbbf06..0e43fea55a70d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,81 @@
-# rspack
+<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
-This library was generated with [Nx](https://nx.dev).
+<hr>
 
-## Building
+# Nx: Smart, Fast and Extensible Build System
 
-Run `nx build rspack` to build the library.
+Nx is a next generation build system with first class monorepo support and powerful integrations.
 
-## Running unit tests
+This package is a Rspack plugin for Nx.
 
-Run `nx test rspack` to execute the unit tests via [Jest](https://jestjs.io).
+## Getting Started
+
+Use `--preset=@nrwl/rspack` when creating new workspace.
+
+e.g.
+
+```bash
+npx create-nx-workspace@latest rspack-demo --preset=@nrwl/rspack
+```
+
+Now, you can go into the `rspack-demo` folder and start development.
+
+```bash
+cd rspack-demo
+npm start
+```
+
+You can also run lint, test, and e2e scripts for the project.
+
+```bash
+npm run lint
+npm run test
+npm run e2e
+```
+
+## Existing workspaces
+
+You can add Rspack to any existing Nx workspace.
+
+First, install the plugin:
+
+```bash
+npm install --save-dev @nrwl/rspack
+```
+
+Then, run the `rspack-project` generator:
+
+```bash
+npx nx g @nrwl/rspack:rspack-project --skipValidation
+```
+
+**Note:** The `--skipValidation` option allows you to overwrite existing build targets.
+
+## Workspace libraries
+
+The `@nrwl/rspack` executor support importing workspace libs into the app.
+
+```bash
+npx nx g @nrwl/react:lib mylib
+```
+
+Import the new library in your app.
+
+```typescript jsx
+// src/app/app.tsx
+import { Mylib } from '@rspack-demo/mylib';
+
+// ...
+
+export default function App() {
+  return <MyLib />;
+}
+```
+
+Now, run the dev server again to see the new library in action.
+
+```bash
+npm start
+```
+
+**Note:** You must restart the server if you make any changes to your library.
diff --git a/generators.json b/generators.json
index b263978a590b4..94d24a47ff309 100644
--- a/generators.json
+++ b/generators.json
@@ -6,19 +6,26 @@
     "rspack-project": {
       "factory": "./src/generators/rspack-project/rspack-project",
       "schema": "./src/generators/rspack-project/schema.json",
-      "description": "rspack generator"
+      "description": "Rspack project generator."
     },
     "init": {
       "factory": "./src/generators/init/init",
       "schema": "./src/generators/init/schema.json",
-      "description": "init generator",
+      "description": "Rspack init generator.",
       "hidden": true
     },
     "preset": {
       "factory": "./src/generators/preset/preset",
       "schema": "./src/generators/preset/schema.json",
-      "description": "preset generator",
+      "description": "React preset generator.",
       "hidden": true
+    },
+    "application": {
+      "factory": "./src/generators/application/application",
+      "schema": "./src/generators/application/schema.json",
+      "aliases": ["app"],
+      "x-type": "application",
+      "description": "React application generator."
     }
   }
 }
diff --git a/package.json b/package.json
index 692e5e27ac2ae..de4bf5c09bb07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/rspack",
-  "version": "15.7.0-beta.1",
+  "version": "0.0.1",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -19,7 +19,11 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nrwl/devkit": "^15.7.2",
-    "copy-webpack-plugin": "^10.2.4"
+    "@nrwl/linter": "^15.8.1",
+    "@nrwl/devkit": "^15.8.1",
+    "ajv": "^8.12.0",
+    "sass-loader": "^12.2.0",
+    "stylus-loader": "^7.1.0",
+    "less-loader": "11.1.0"
   }
 }
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
new file mode 100644
index 0000000000000..00c86601eb0a6
--- /dev/null
+++ b/src/generators/application/application.ts
@@ -0,0 +1,110 @@
+import {
+  addDependenciesToPackageJson,
+  addProjectConfiguration,
+  ensurePackage,
+  formatFiles,
+  generateFiles,
+  joinPathFragments,
+  names,
+  offsetFromRoot as _offsetFromRoot,
+  Tree,
+} from '@nrwl/devkit';
+import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+import { version as nxVersion } from 'nx/package.json';
+import * as path from 'path';
+import {
+  lessVersion,
+  reactDomVersion,
+  reactVersion,
+  sassVersion,
+  stylusVersion,
+  typesReactDomVersion,
+  typesReactVersion,
+} from '../../utils/versions';
+import projectGenerator from '../rspack-project/rspack-project';
+import { addCypress } from './lib/add-cypress';
+import { addJest } from './lib/add-jest';
+import { addLinting } from './lib/add-linting';
+import { createTsConfig } from './lib/create-ts-config';
+import { normalizeOptions } from './lib/normalize-options';
+import { ApplicationGeneratorSchema, NormalizedSchema } from './schema';
+
+export default async function (
+  tree: Tree,
+  _options: ApplicationGeneratorSchema
+) {
+  await ensurePackage(tree, '@nrwl/react', nxVersion);
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { reactInitGenerator } = require('@nrwl/react');
+
+  const tasks = [];
+  const options = normalizeOptions(tree, _options);
+
+  options.style ??= 'css';
+
+  addProjectConfiguration(tree, options.name, {
+    root: options.appProjectRoot,
+    projectType: 'application',
+    sourceRoot: `${options.appProjectRoot}/src`,
+    targets: {},
+  });
+
+  const offsetFromRoot = _offsetFromRoot(options.appProjectRoot);
+  generateFiles(tree, path.join(__dirname, 'files'), options.appProjectRoot, {
+    ...options,
+    ...names(options.name),
+    offsetFromRoot,
+    template: '',
+  });
+
+  createTsConfig(
+    tree,
+    options,
+    joinPathFragments(offsetFromRoot, 'tsconfig.base.json')
+  );
+
+  const projectTask = await projectGenerator(tree, {
+    project: options.name,
+    devServer: true,
+    tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
+    uiFramework: 'react',
+    target: 'web',
+    main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
+  });
+  tasks.push(projectTask);
+
+  const jestTask = await addJest(tree, options);
+  tasks.push(jestTask);
+
+  const cypressTask = await addCypress(tree, options);
+  tasks.push(cypressTask);
+
+  const lintTask = await addLinting(tree, options);
+  tasks.push(lintTask);
+
+  const installTask = addDependenciesToPackageJson(
+    tree,
+    { react: reactVersion, 'react-dom': reactDomVersion },
+    {
+      ...getStyleDependency(options),
+      '@nrwl/react': nxVersion,
+      '@types/react': typesReactVersion,
+      '@types/react-dom': typesReactDomVersion,
+    }
+  );
+  tasks.push(installTask);
+
+  const reactInitTask = await reactInitGenerator(tree, options);
+  tasks.push(reactInitTask);
+
+  await formatFiles(tree);
+
+  return runTasksInSerial(...tasks);
+}
+
+function getStyleDependency(options: NormalizedSchema): Record<string, string> {
+  if (options.style === 'scss') return { sass: sassVersion };
+  if (options.style === 'less') return { less: lessVersion };
+  if (options.style === 'styl') return { stylus: stylusVersion };
+  return {};
+}
diff --git a/src/generators/preset/files/src/app/app.module.__style__ b/src/generators/application/files/src/app/app.module.__style__
similarity index 100%
rename from src/generators/preset/files/src/app/app.module.__style__
rename to src/generators/application/files/src/app/app.module.__style__
diff --git a/src/generators/preset/files/src/app/app.spec.tsx__template__ b/src/generators/application/files/src/app/app.spec.tsx__template__
similarity index 63%
rename from src/generators/preset/files/src/app/app.spec.tsx__template__
rename to src/generators/application/files/src/app/app.spec.tsx__template__
index d229ddcff5f79..b67b70fea41f8 100644
--- a/src/generators/preset/files/src/app/app.spec.tsx__template__
+++ b/src/generators/application/files/src/app/app.spec.tsx__template__
@@ -2,10 +2,10 @@ import { render } from '@testing-library/react';
 import { App } from './app';
 
 describe('App component', () => {
-  it('should render a header', () => {
+  it('should render a welcome message', () => {
     const { getByTestId } = render(<App />);
 
-    expect(getByTestId('header')).toBeTruthy();
+    expect(getByTestId('welcome')).toBeTruthy();
   });
 
 });
diff --git a/src/generators/application/files/src/app/app.tsx__template__ b/src/generators/application/files/src/app/app.tsx__template__
new file mode 100644
index 0000000000000..54cc8cf2e4fbd
--- /dev/null
+++ b/src/generators/application/files/src/app/app.tsx__template__
@@ -0,0 +1,10 @@
+import styles from './app.module.<%= style %>';
+import { NxWelcome } from './nx-welcome';
+
+export function App() {
+  return (
+    <div className={styles['container']} data-testid="welcome">
+      <NxWelcome title="<%= name %>" />
+    </div>
+  );
+}
diff --git a/src/generators/application/files/src/app/nx-welcome.tsx__template__ b/src/generators/application/files/src/app/nx-welcome.tsx__template__
new file mode 100644
index 0000000000000..761a47a0e2978
--- /dev/null
+++ b/src/generators/application/files/src/app/nx-welcome.tsx__template__
@@ -0,0 +1,820 @@
+/*
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ This is a starter component and can be deleted.
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ Delete this file and get started with your project!
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+export function NxWelcome({ title }: { title: string }) {
+  return (
+    <>
+      <style
+        dangerouslySetInnerHTML={{
+          __html: `
+    html {
+      -webkit-text-size-adjust: 100%;
+      font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+      'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif,
+      'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+      'Noto Color Emoji';
+      line-height: 1.5;
+      tab-size: 4;
+      scroll-behavior: smooth;
+    }
+    body {
+      font-family: inherit;
+      line-height: inherit;
+      margin: 0;
+    }
+    h1,
+    h2,
+    p,
+    pre {
+      margin: 0;
+    }
+    *,
+    ::before,
+    ::after {
+      box-sizing: border-box;
+      border-width: 0;
+      border-style: solid;
+      border-color: currentColor;
+    }
+    h1,
+    h2 {
+      font-size: inherit;
+      font-weight: inherit;
+    }
+    a {
+      color: inherit;
+      text-decoration: inherit;
+    }
+    pre {
+      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
+      'Liberation Mono', 'Courier New', monospace;
+    }
+    svg {
+      display: block;
+      vertical-align: middle;
+      shape-rendering: auto;
+      text-rendering: optimizeLegibility;
+    }
+    pre {
+      background-color: rgba(55, 65, 81, 1);
+      border-radius: 0.25rem;
+      color: rgba(229, 231, 235, 1);
+      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
+      'Liberation Mono', 'Courier New', monospace;
+      overflow: scroll;
+      padding: 0.5rem 0.75rem;
+    }
+
+    .shadow {
+      box-shadow: 0 0 #0000, 0 0 #0000, 0 10px 15px -3px rgba(0, 0, 0, 0.1),
+      0 4px 6px -2px rgba(0, 0, 0, 0.05);
+    }
+    .rounded {
+      border-radius: 1.5rem;
+    }
+    .wrapper {
+      width: 100%;
+    }
+    .container {
+      margin-left: auto;
+      margin-right: auto;
+      max-width: 768px;
+      padding-bottom: 3rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+      color: rgba(55, 65, 81, 1);
+      width: 100%;
+    }
+    #welcome {
+      margin-top: 2.5rem;
+    }
+    #welcome h1 {
+      font-size: 3rem;
+      font-weight: 500;
+      letter-spacing: -0.025em;
+      line-height: 1;
+    }
+    #welcome span {
+      display: block;
+      font-size: 1.875rem;
+      font-weight: 300;
+      line-height: 2.25rem;
+      margin-bottom: 0.5rem;
+    }
+    #hero {
+      align-items: center;
+      background-color: hsla(214, 62%, 21%, 1);
+      border: none;
+      box-sizing: border-box;
+      color: rgba(55, 65, 81, 1);
+      display: grid;
+      grid-template-columns: 1fr;
+      margin-top: 3.5rem;
+    }
+    #hero .text-container {
+      color: rgba(255, 255, 255, 1);
+      padding: 3rem 2rem;
+    }
+    #hero .text-container h2 {
+      font-size: 1.5rem;
+      line-height: 2rem;
+      position: relative;
+    }
+    #hero .text-container h2 svg {
+      color: hsla(162, 47%, 50%, 1);
+      height: 2rem;
+      left: -0.25rem;
+      position: absolute;
+      top: 0;
+      width: 2rem;
+    }
+    #hero .text-container h2 span {
+      margin-left: 2.5rem;
+    }
+    #hero .text-container a {
+      background-color: rgba(255, 255, 255, 1);
+      border-radius: 0.75rem;
+      color: rgba(55, 65, 81, 1);
+      display: inline-block;
+      margin-top: 1.5rem;
+      padding: 1rem 2rem;
+      text-decoration: inherit;
+    }
+    #hero .logo-container {
+      display: none;
+      justify-content: center;
+      padding-left: 2rem;
+      padding-right: 2rem;
+    }
+    #hero .logo-container svg {
+      color: rgba(255, 255, 255, 1);
+      width: 66.666667%;
+    }
+    #middle-content {
+      align-items: flex-start;
+      display: grid;
+      gap: 4rem;
+      grid-template-columns: 1fr;
+      margin-top: 3.5rem;
+    }
+    #learning-materials {
+      padding: 2.5rem 2rem;
+    }
+    #learning-materials h2 {
+      font-weight: 500;
+      font-size: 1.25rem;
+      letter-spacing: -0.025em;
+      line-height: 1.75rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+    }
+    .list-item-link {
+      align-items: center;
+      border-radius: 0.75rem;
+      display: flex;
+      margin-top: 1rem;
+      padding: 1rem;
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+      width: 100%;
+    }
+    .list-item-link svg:first-child {
+      margin-right: 1rem;
+      height: 1.5rem;
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+      width: 1.5rem;
+    }
+    .list-item-link > span {
+      flex-grow: 1;
+      font-weight: 400;
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+    }
+    .list-item-link > span > span {
+      color: rgba(107, 114, 128, 1);
+      display: block;
+      flex-grow: 1;
+      font-size: 0.75rem;
+      font-weight: 300;
+      line-height: 1rem;
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+    }
+    .list-item-link svg:last-child {
+      height: 1rem;
+      transition-property: all;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+      width: 1rem;
+    }
+    .list-item-link:hover {
+      color: rgba(255, 255, 255, 1);
+      background-color: hsla(162, 47%, 50%, 1);
+    }
+    .list-item-link:hover > span {}
+    .list-item-link:hover > span > span {
+      color: rgba(243, 244, 246, 1);
+    }
+    .list-item-link:hover svg:last-child {
+      transform: translateX(0.25rem);
+    }
+    #other-links {}
+    .button-pill {
+      padding: 1.5rem 2rem;
+      transition-duration: 300ms;
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      align-items: center;
+      display: flex;
+    }
+    .button-pill svg {
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+      flex-shrink: 0;
+      width: 3rem;
+    }
+    .button-pill > span {
+      letter-spacing: -0.025em;
+      font-weight: 400;
+      font-size: 1.125rem;
+      line-height: 1.75rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+    }
+    .button-pill span span {
+      display: block;
+      font-size: 0.875rem;
+      font-weight: 300;
+      line-height: 1.25rem;
+    }
+    .button-pill:hover svg,
+    .button-pill:hover {
+      color: rgba(255, 255, 255, 1) !important;
+    }
+    #nx-console:hover {
+      background-color: rgba(0, 122, 204, 1);
+    }
+    #nx-console svg {
+      color: rgba(0, 122, 204, 1);
+    }
+    #nx-repo:hover {
+      background-color: rgba(24, 23, 23, 1);
+    }
+    #nx-repo svg {
+      color: rgba(24, 23, 23, 1);
+    }
+    #nx-cloud {
+      margin-bottom: 2rem;
+      margin-top: 2rem;
+      padding: 2.5rem 2rem;
+    }
+    #nx-cloud > div {
+      align-items: center;
+      display: flex;
+    }
+    #nx-cloud > div svg {
+      border-radius: 0.375rem;
+      flex-shrink: 0;
+      width: 3rem;
+    }
+    #nx-cloud > div h2 {
+      font-size: 1.125rem;
+      font-weight: 400;
+      letter-spacing: -0.025em;
+      line-height: 1.75rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+    }
+    #nx-cloud > div h2 span {
+      display: block;
+      font-size: 0.875rem;
+      font-weight: 300;
+      line-height: 1.25rem;
+    }
+    #nx-cloud p {
+      font-size: 1rem;
+      line-height: 1.5rem;
+      margin-top: 1rem;
+    }
+    #nx-cloud pre {
+      margin-top: 1rem;
+    }
+    #nx-cloud a {
+      color: rgba(107, 114, 128, 1);
+      display: block;
+      font-size: 0.875rem;
+      line-height: 1.25rem;
+      margin-top: 1.5rem;
+      text-align: right;
+    }
+    #nx-cloud a:hover {
+      text-decoration: underline;
+    }
+    #commands {
+      padding: 2.5rem 2rem;
+      margin-top: 3.5rem;
+    }
+    #commands h2 {
+      font-size: 1.25rem;
+      font-weight: 400;
+      letter-spacing: -0.025em;
+      line-height: 1.75rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+    }
+    #commands p {
+      font-size: 1rem;
+      font-weight: 300;
+      line-height: 1.5rem;
+      margin-top: 1rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+    }
+    details {
+      align-items: center;
+      display: flex;
+      margin-top: 1rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+      width: 100%;
+    }
+    details pre > span {
+      color: rgba(181, 181, 181, 1);
+      display: block;
+    }
+    summary {
+      border-radius: 0.5rem;
+      display: flex;
+      font-weight: 400;
+      padding: 0.5rem;
+      cursor: pointer;
+      transition-property: background-color, border-color, color, fill, stroke,
+      opacity, box-shadow, transform, filter, backdrop-filter,
+      -webkit-backdrop-filter;
+      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+      transition-duration: 150ms;
+    }
+    summary:hover {
+      background-color: rgba(243, 244, 246, 1);
+    }
+    summary svg {
+      height: 1.5rem;
+      margin-right: 1rem;
+      width: 1.5rem;
+    }
+    #love {
+      color: rgba(107, 114, 128, 1);
+      font-size: 0.875rem;
+      line-height: 1.25rem;
+      margin-top: 3.5rem;
+      opacity: 0.6;
+      text-align: center;
+    }
+    #love svg {
+      color: rgba(252, 165, 165, 1);
+      width: 1.25rem;
+      height: 1.25rem;
+      display: inline;
+      margin-top: -0.25rem;
+    }
+    @media screen and (min-width: 768px) {
+      #hero {
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+      }
+      #hero .logo-container {
+        display: flex;
+      }
+      #middle-content {
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+      }
+    }
+          `,
+        }}
+      />
+      <div className="wrapper">
+        <div className="container">
+          <div id="welcome">
+            <h1>
+              <span> Hello there, </span>
+              Welcome {title} 👋
+            </h1>
+          </div>
+
+          <div id="hero" className="rounded">
+            <div className="text-container">
+              <h2>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
+                  />
+                </svg>
+                <span>You&apos;re up and running</span>
+              </h2>
+              <a href="#commands"> What&apos;s next? </a>
+            </div>
+            <div className="logo-container">
+              <svg
+                fill="currentColor"
+                role="img"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path d="M11.987 14.138l-3.132 4.923-5.193-8.427-.012 8.822H0V4.544h3.691l5.247 8.833.005-3.998 3.044 4.759zm.601-5.761c.024-.048 0-3.784.008-3.833h-3.65c.002.059-.005 3.776-.003 3.833h3.645zm5.634 4.134a2.061 2.061 0 0 0-1.969 1.336 1.963 1.963 0 0 1 2.343-.739c.396.161.917.422 1.33.283a2.1 2.1 0 0 0-1.704-.88zm3.39 1.061c-.375-.13-.8-.277-1.109-.681-.06-.08-.116-.17-.176-.265a2.143 2.143 0 0 0-.533-.642c-.294-.216-.68-.322-1.18-.322a2.482 2.482 0 0 0-2.294 1.536 2.325 2.325 0 0 1 4.002.388.75.75 0 0 0 .836.334c.493-.105.46.36 1.203.518v-.133c-.003-.446-.246-.55-.75-.733zm2.024 1.266a.723.723 0 0 0 .347-.638c-.01-2.957-2.41-5.487-5.37-5.487a5.364 5.364 0 0 0-4.487 2.418c-.01-.026-1.522-2.39-1.538-2.418H8.943l3.463 5.423-3.379 5.32h3.54l1.54-2.366 1.568 2.366h3.541l-3.21-5.052a.7.7 0 0 1-.084-.32 2.69 2.69 0 0 1 2.69-2.691h.001c1.488 0 1.736.89 2.057 1.308.634.826 1.9.464 1.9 1.541a.707.707 0 0 0 1.066.596zm.35.133c-.173.372-.56.338-.755.639-.176.271.114.412.114.412s.337.156.538-.311c.104-.231.14-.488.103-.74z" />
+              </svg>
+            </div>
+          </div>
+
+          <div id="middle-content">
+            <div id="learning-materials" className="rounded shadow">
+              <h2>Learning materials</h2>
+              <a
+                href="https://nx.dev/getting-started/intro?utm_source=nx-project"
+                target="_blank"
+                rel="noreferrer"
+                className="list-item-link"
+              >
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
+                  />
+                </svg>
+                <span>
+                  Documentation
+                  <span> Everything is in there </span>
+                </span>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M9 5l7 7-7 7"
+                  />
+                </svg>
+              </a>
+              <a
+                href="https://blog.nrwl.io/?utm_source=nx-project"
+                target="_blank"
+                rel="noreferrer"
+                className="list-item-link"
+              >
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"
+                  />
+                </svg>
+                <span>
+                  Blog
+                  <span> Changelog, features & events </span>
+                </span>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M9 5l7 7-7 7"
+                  />
+                </svg>
+              </a>
+              <a
+                href="https://www.youtube.com/@NxDevtools/videos?utm_source=nx-project&sub_confirmation=1"
+                target="_blank"
+                rel="noreferrer"
+                className="list-item-link"
+              >
+                <svg
+                  role="img"
+                  viewBox="0 0 24 24"
+                  fill="currentColor"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <title>YouTube</title>
+                  <path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z" />
+                </svg>
+                <span>
+                  YouTube channel
+                  <span> Nx Show, talks & tutorials </span>
+                </span>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M9 5l7 7-7 7"
+                  />
+                </svg>
+              </a>
+              <a
+                href="https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project"
+                target="_blank"
+                rel="noreferrer"
+                className="list-item-link"
+              >
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
+                  />
+                </svg>
+                <span>
+                  Interactive tutorials
+                  <span> Create an app, step-by-step </span>
+                </span>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M9 5l7 7-7 7"
+                  />
+                </svg>
+              </a>
+              <a
+                href="https://nxplaybook.com/?utm_source=nx-project"
+                target="_blank"
+                rel="noreferrer"
+                className="list-item-link"
+              >
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path d="M12 14l9-5-9-5-9 5 9 5z" />
+                  <path d="M12 14l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14z" />
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M12 14l9-5-9-5-9 5 9 5zm0 0l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14zm-4 6v-7.5l4-2.222"
+                  />
+                </svg>
+                <span>
+                  Video courses
+                  <span> Nx custom courses </span>
+                </span>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M9 5l7 7-7 7"
+                  />
+                </svg>
+              </a>
+            </div>
+            <div id="other-links">
+              <a
+                id="nx-console"
+                className="button-pill rounded shadow"
+                href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <svg
+                  fill="currentColor"
+                  role="img"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <title>Visual Studio Code</title>
+                  <path d="M23.15 2.587L18.21.21a1.494 1.494 0 0 0-1.705.29l-9.46 8.63-4.12-3.128a.999.999 0 0 0-1.276.057L.327 7.261A1 1 0 0 0 .326 8.74L3.899 12 .326 15.26a1 1 0 0 0 .001 1.479L1.65 17.94a.999.999 0 0 0 1.276.057l4.12-3.128 9.46 8.63a1.492 1.492 0 0 0 1.704.29l4.942-2.377A1.5 1.5 0 0 0 24 20.06V3.939a1.5 1.5 0 0 0-.85-1.352zm-5.146 14.861L10.826 12l7.178-5.448v10.896z" />
+                </svg>
+                <span>
+                  Install Nx Console
+                  <span>Plugin for VSCode</span>
+                </span>
+              </a>
+              <div id="nx-cloud" className="rounded shadow">
+                <div>
+                  <svg
+                    viewBox="0 0 120 120"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M120 15V30C103.44 30 90 43.44 90 60C90 76.56 76.56 90 60 90C43.44 90 30 103.44 30 120H15C6.72 120 0 113.28 0 105V15C0 6.72 6.72 0 15 0H105C113.28 0 120 6.72 120 15Z"
+                      fill="#0E2039"
+                    />
+                    <path
+                      d="M120 30V105C120 113.28 113.28 120 105 120H30C30 103.44 43.44 90 60 90C76.56 90 90 76.56 90 60C90 43.44 103.44 30 120 30Z"
+                      fill="white"
+                    />
+                  </svg>
+                  <h2>
+                    NxCloud
+                    <span>Enable faster CI & better DX</span>
+                  </h2>
+                </div>
+                <p>
+                  You can activate distributed tasks executions and caching by
+                  running:
+                </p>
+                <pre>nx connect-to-nx-cloud</pre>
+                <a
+                  href="https://nx.app/?utm_source=nx-project"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  {' '}
+                  What is Nx Cloud?{' '}
+                </a>
+              </div>
+              <a
+                id="nx-repo"
+                className="button-pill rounded shadow"
+                href="https://github.com/nrwl/nx?utm_source=nx-project"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <svg
+                  fill="currentColor"
+                  role="img"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
+                </svg>
+                <span>
+                  Nx is open source
+                  <span> Love Nx? Give us a star! </span>
+                </span>
+              </a>
+            </div>
+          </div>
+
+          <div id="commands" className="rounded shadow">
+            <h2>Next steps</h2>
+            <p>Here are some things you can do with Nx:</p>
+            <details>
+              <summary>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                  />
+                </svg>
+                Add UI library
+              </summary>
+              <pre>
+                <span># Generate UI lib</span>
+                nx g @nrwl/react:lib ui
+                <span># Add a component</span>
+                nx g @nrwl/react:component button --project ui
+              </pre>
+            </details>
+            <details>
+              <summary>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                  />
+                </svg>
+                View interactive project graph
+              </summary>
+              <pre>nx graph</pre>
+            </details>
+            <details>
+              <summary>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                  />
+                </svg>
+                Run affected commands
+              </summary>
+              <pre>
+                <span># see what&apos;s been affected by changes</span>
+                nx affected:graph
+                <span># run tests for current changes</span>
+                nx affected:test
+                <span># run e2e tests for current changes</span>
+                nx affected:e2e
+              </pre>
+            </details>
+          </div>
+
+          <p id="love">
+            Carefully crafted with
+            <svg
+              fill="currentColor"
+              stroke="none"
+              viewBox="0 0 24 24"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth="2"
+                d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"
+              />
+            </svg>
+          </p>
+        </div>
+      </div>
+    </>
+  );
+}
+
+export default NxWelcome;
diff --git a/src/generators/preset/files/src/assets/.gitkeep b/src/generators/application/files/src/assets/.gitkeep
similarity index 100%
rename from src/generators/preset/files/src/assets/.gitkeep
rename to src/generators/application/files/src/assets/.gitkeep
diff --git a/src/generators/preset/files/src/favicon.ico b/src/generators/application/files/src/favicon.ico
similarity index 100%
rename from src/generators/preset/files/src/favicon.ico
rename to src/generators/application/files/src/favicon.ico
diff --git a/src/generators/preset/files/src/index.html__template__ b/src/generators/application/files/src/index.html__template__
similarity index 100%
rename from src/generators/preset/files/src/index.html__template__
rename to src/generators/application/files/src/index.html__template__
diff --git a/src/generators/preset/files/src/main.tsx__template__ b/src/generators/application/files/src/main.tsx__template__
similarity index 100%
rename from src/generators/preset/files/src/main.tsx__template__
rename to src/generators/application/files/src/main.tsx__template__
diff --git a/src/generators/preset/files/src/styles.__style__ b/src/generators/application/files/src/styles.__style__
similarity index 100%
rename from src/generators/preset/files/src/styles.__style__
rename to src/generators/application/files/src/styles.__style__
diff --git a/src/generators/preset/files/tsconfig.app.json__template__ b/src/generators/application/files/tsconfig.app.json__template__
similarity index 100%
rename from src/generators/preset/files/tsconfig.app.json__template__
rename to src/generators/application/files/tsconfig.app.json__template__
diff --git a/src/generators/preset/lib/add-cypress.ts b/src/generators/application/lib/add-cypress.ts
similarity index 80%
rename from src/generators/preset/lib/add-cypress.ts
rename to src/generators/application/lib/add-cypress.ts
index f11126aae7132..b73e98efa0885 100644
--- a/src/generators/preset/lib/add-cypress.ts
+++ b/src/generators/application/lib/add-cypress.ts
@@ -1,8 +1,8 @@
 import { ensurePackage, Tree } from '@nrwl/devkit';
 import { version as nxVersion } from 'nx/package.json';
-import { PresetGeneratorSchema } from '../schema';
+import { NormalizedSchema } from '../schema';
 
-export async function addCypress(host: Tree, options: PresetGeneratorSchema) {
+export async function addCypress(host: Tree, options: NormalizedSchema) {
   if (options.e2eTestRunner !== 'cypress') {
     return () => {
       //nothing
diff --git a/src/generators/preset/lib/add-jest.ts b/src/generators/application/lib/add-jest.ts
similarity index 87%
rename from src/generators/preset/lib/add-jest.ts
rename to src/generators/application/lib/add-jest.ts
index 2bc6c0200d9e3..e55e566128b1c 100644
--- a/src/generators/preset/lib/add-jest.ts
+++ b/src/generators/application/lib/add-jest.ts
@@ -7,15 +7,15 @@ import {
 } from '@nrwl/devkit';
 import { version as nxVersion } from 'nx/package.json';
 import { updateJestConfigContent } from '../../../utils/jest-utils';
-import { PresetGeneratorSchema } from '../schema';
+import { NormalizedSchema } from '../schema';
 
-export async function addJest(host: Tree, options: PresetGeneratorSchema) {
+export async function addJest(host: Tree, options: NormalizedSchema) {
   if (options.unitTestRunner !== 'jest') {
     return () => {
       // nothing
     };
   }
-  
+
   await ensurePackage(host, '@nrwl/jest', nxVersion);
   const { jestProjectGenerator } = await import('@nrwl/jest');
 
@@ -34,7 +34,7 @@ export async function addJest(host: Tree, options: PresetGeneratorSchema) {
   return task;
 }
 
-function updateSpecConfig(host: Tree, options: PresetGeneratorSchema) {
+function updateSpecConfig(host: Tree, options: NormalizedSchema) {
   if (options.unitTestRunner !== 'jest') {
     return;
   }
diff --git a/src/generators/application/lib/add-linting.ts b/src/generators/application/lib/add-linting.ts
new file mode 100644
index 0000000000000..f912d001ab287
--- /dev/null
+++ b/src/generators/application/lib/add-linting.ts
@@ -0,0 +1,69 @@
+import {
+  addDependenciesToPackageJson,
+  GeneratorCallback,
+  joinPathFragments,
+  Tree,
+  updateJson,
+} from '@nrwl/devkit';
+import { Linter, lintProjectGenerator } from '@nrwl/linter';
+import { mapLintPattern } from '@nrwl/linter/src/generators/lint-project/lint-project';
+import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+import type * as eslint from 'eslint';
+
+import {
+  eslintPluginImportVersion,
+  eslintPluginJsxA11yVersion,
+  eslintPluginReactHooksVersion,
+  eslintPluginReactVersion,
+} from '../../../utils/versions';
+import { NormalizedSchema } from '../schema';
+
+export async function addLinting(host: Tree, options: NormalizedSchema) {
+  const tasks: GeneratorCallback[] = [];
+  const lintTask = await lintProjectGenerator(host, {
+    linter: Linter.EsLint,
+    project: options.name,
+    tsConfigPaths: [
+      joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
+    ],
+    unitTestRunner: options.unitTestRunner,
+    eslintFilePatterns: [
+      mapLintPattern(
+        options.appProjectRoot,
+        '{ts,tsx,js,jsx}',
+        options.rootProject
+      ),
+    ],
+    skipFormat: true,
+    rootProject: options.rootProject,
+  });
+  tasks.push(lintTask);
+
+  updateJson(
+    host,
+    joinPathFragments(options.appProjectRoot, '.eslintrc.json'),
+    extendReactEslintJson
+  );
+
+  const installTask = await addDependenciesToPackageJson(
+    host,
+    {},
+    {
+      'eslint-plugin-import': eslintPluginImportVersion,
+      'eslint-plugin-jsx-a11y': eslintPluginJsxA11yVersion,
+      'eslint-plugin-react': eslintPluginReactVersion,
+      'eslint-plugin-react-hooks': eslintPluginReactHooksVersion,
+    }
+  );
+  tasks.push(installTask);
+
+  return runTasksInSerial(...tasks);
+}
+
+function extendReactEslintJson(json: eslint.Linter.Config) {
+  const { extends: pluginExtends, ...config } = json;
+  return {
+    extends: ['plugin:@nrwl/nx/react', ...(pluginExtends || [])],
+    ...config,
+  };
+}
diff --git a/src/generators/application/lib/create-ts-config.ts b/src/generators/application/lib/create-ts-config.ts
new file mode 100644
index 0000000000000..74493c28d88b2
--- /dev/null
+++ b/src/generators/application/lib/create-ts-config.ts
@@ -0,0 +1,47 @@
+import { Tree, writeJson } from '@nrwl/devkit';
+import { NormalizedSchema } from '../schema';
+
+export function createTsConfig(
+  tree: Tree,
+  options: NormalizedSchema,
+  relativePathToRootTsConfig: string
+) {
+  // Nx 15.8 moved util to @nrwl/js, but it is in @nrwl/workspace in 15.7
+  let shared: any;
+  try {
+    shared = require('@nrwl/js/src/utils/typescript/create-ts-config');
+  } catch {
+    shared = require('@nrwl/workspace/src/utils/create-ts-config');
+  }
+
+  const json = {
+    compilerOptions: {
+      jsx: 'react-jsx',
+      allowJs: false,
+      esModuleInterop: false,
+      allowSyntheticDefaultImports: true,
+      strict: true,
+    },
+    files: [],
+    include: [],
+    references: [
+      {
+        path: './tsconfig.app.json',
+      },
+    ],
+  } as any;
+
+  // inline tsconfig.base.json into the project
+  if (options.rootProject) {
+    json.compileOnSave = false;
+    json.compilerOptions = {
+      ...shared.tsConfigBaseOptions,
+      ...json.compilerOptions,
+    };
+    json.exclude = ['node_modules', 'tmp'];
+  } else {
+    json.extends = relativePathToRootTsConfig;
+  }
+
+  writeJson(tree, `${options.appProjectRoot}/tsconfig.json`, json);
+}
diff --git a/src/generators/preset/lib/normalize-options.ts b/src/generators/application/lib/normalize-options.ts
similarity index 84%
rename from src/generators/preset/lib/normalize-options.ts
rename to src/generators/application/lib/normalize-options.ts
index e3e121acb93c9..6b568eb4481c8 100644
--- a/src/generators/preset/lib/normalize-options.ts
+++ b/src/generators/application/lib/normalize-options.ts
@@ -5,22 +5,22 @@ import {
   normalizePath,
   Tree,
 } from '@nrwl/devkit';
-import { NormalizedSchema, PresetGeneratorSchema } from '../schema';
+import { ApplicationGeneratorSchema, NormalizedSchema } from '../schema';
 
-export function normalizeDirectory(options: PresetGeneratorSchema) {
+export function normalizeDirectory(options: ApplicationGeneratorSchema) {
   const { projectDirectory } = extractLayoutDirectory(options.directory);
   return projectDirectory
     ? `${names(projectDirectory).fileName}/${names(options.name).fileName}`
     : names(options.name).fileName;
 }
 
-export function normalizeProjectName(options: PresetGeneratorSchema) {
+export function normalizeProjectName(options: ApplicationGeneratorSchema) {
   return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
 }
 
 export function normalizeOptions(
   host: Tree,
-  options: PresetGeneratorSchema
+  options: ApplicationGeneratorSchema
 ): NormalizedSchema {
   // --monorepo takes precedence over --rootProject
   // This won't be needed once we add --bundler=rspack to the @nrwl/react:app preset
diff --git a/src/generators/application/schema.d.ts b/src/generators/application/schema.d.ts
new file mode 100644
index 0000000000000..7a4adf104cb42
--- /dev/null
+++ b/src/generators/application/schema.d.ts
@@ -0,0 +1,15 @@
+export interface ApplicationGeneratorSchema {
+  name: string;
+  style: 'css' | 'scss' | 'less' | 'styl';
+  unitTestRunner?: 'none' | 'jest';
+  e2eTestRunner?: 'none' | 'cypress';
+  directory?: string;
+  tags?: string[];
+  rootProject?: boolean;
+  monorepo?: boolean;
+}
+
+export interface NormalizedSchema extends ApplicationGeneratorSchema {
+  appProjectRoot: string;
+  e2eProjectName: string;
+}
diff --git a/src/generators/application/schema.json b/src/generators/application/schema.json
new file mode 100644
index 0000000000000..d353b0fc63432
--- /dev/null
+++ b/src/generators/application/schema.json
@@ -0,0 +1,92 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "Application",
+  "title": "Application generator for React + rspack",
+  "type": "object",
+  "examples": [
+    {
+      "command": "nx g app myapp --directory=myorg",
+      "description": "Generate `apps/myorg/myapp` and `apps/myorg/myapp-e2e`"
+    }
+  ],
+  "properties": {
+    "name": {
+      "description": "The name of the application.",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the application?",
+      "pattern": "^[a-zA-Z].*$",
+      "x-priority": "important"
+    },
+    "style": {
+      "description": "The file extension to be used for style files.",
+      "type": "string",
+      "default": "css",
+      "alias": "s",
+      "x-prompt": {
+        "message": "Which stylesheet format would you like to use?",
+        "type": "list",
+        "items": [
+          {
+            "value": "css",
+            "label": "CSS"
+          },
+          {
+            "value": "scss",
+            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
+          },
+          {
+            "value": "styl",
+            "label": "Stylus(.styl)     [ http://stylus-lang.com                   ]"
+          },
+          {
+            "value": "less",
+            "label": "LESS              [ http://lesscss.org                       ]"
+          },
+          {
+            "value": "none",
+            "label": "None"
+          }
+        ]
+      }
+    },
+    "unitTestRunner": {
+      "type": "string",
+      "description": "The unit test runner to use.",
+      "enum": ["none", "jest"],
+      "default": "jest"
+    },
+    "e2eTestRunner": {
+      "type": "string",
+      "description": "The e2e test runner to use.",
+      "enum": ["none", "cypress"],
+      "default": "cypress"
+    },
+    "directory": {
+      "type": "string",
+      "description": "The directory to nest the app under."
+    },
+    "tags": {
+      "type": "array",
+      "description": "The tags to assign to the project.",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "monorepo": {
+      "type": "boolean",
+      "description": "Creates an integrated monorepo.",
+      "aliases": ["integrated"]
+    },
+    "rootProject": {
+      "type": "boolean",
+      "x-priority": "internal"
+    }
+  },
+  "required": ["name"]
+}
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index a21bfa6bc1547..fedac20e73ec6 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -16,12 +16,17 @@ export async function rspackInitGenerator(
   schema: InitGeneratorSchema
 ) {
   const devDependencies = {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    '@nrwl/rspack': require('../../../package.json').version,
     '@rspack/core': rspackCoreVersion,
     '@rspack/plugin-minify': rspackPluginMinifyVersion,
   };
 
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const version = require('../../../package.json').version;
+  if (version !== '0.0.1') {
+    // Ignored for local dev / e2e tests.
+    devDependencies['@nrwl/rspack'] = version;
+  }
+
   if (schema.style === 'less') {
     devDependencies['@rspack/less-loader'] = rspackLessLoaderVersion;
   }
diff --git a/src/generators/preset/files/src/app/app.tsx__template__ b/src/generators/preset/files/src/app/app.tsx__template__
deleted file mode 100644
index 42bd6a4df4933..0000000000000
--- a/src/generators/preset/files/src/app/app.tsx__template__
+++ /dev/null
@@ -1,10 +0,0 @@
-import styles from './app.module.<%= style %>';
-
-export function App() {
-  return (
-    <div className={styles['container']}>
-      <h1 data-testid="header">Welcome <%= name %></h1>
-      <p>NODE_ENV: {process.env['NODE_ENV']}</p>
-    </div>
-  );
-}
diff --git a/src/generators/preset/files/tsconfig.json__template__ b/src/generators/preset/files/tsconfig.json__template__
deleted file mode 100644
index 0f7e44b9f262c..0000000000000
--- a/src/generators/preset/files/tsconfig.json__template__
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "allowJs": false,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "strict": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    }
-  ],
-  "extends": "<%= offsetFromRoot %>tsconfig.base.json"
-}
diff --git a/src/generators/preset/preset.ts b/src/generators/preset/preset.ts
index f6644ea24317c..a12b16c7da7db 100644
--- a/src/generators/preset/preset.ts
+++ b/src/generators/preset/preset.ts
@@ -1,86 +1,36 @@
-import {
-  addDependenciesToPackageJson,
-  addProjectConfiguration,
-  ensurePackage,
-  formatFiles,
-  generateFiles,
-  joinPathFragments,
-  names,
-  offsetFromRoot,
-  Tree,
-} from '@nrwl/devkit';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
-import { version as nxVersion } from 'nx/package.json';
-import * as path from 'path';
+import { Tree, updateJson } from '@nrwl/devkit';
 
-import {
-  reactDomVersion,
-  reactVersion,
-  typesReactDomVersion,
-  typesReactVersion,
-} from '../../utils/versions';
-import projectGenerator from '../rspack-project/rspack-project';
-import { addCypress } from './lib/add-cypress';
-import { addJest } from './lib/add-jest';
-import { normalizeOptions } from './lib/normalize-options';
+import applicationGenerator from '../application/application';
 import { PresetGeneratorSchema } from './schema';
 
-export default async function (tree: Tree, _options: PresetGeneratorSchema) {
-  await ensurePackage(tree, '@nrwl/react', nxVersion);
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { reactInitGenerator } = require('@nrwl/react');
-
-  const tasks = [];
-  const options = normalizeOptions(tree, _options);
-
-  options.style ??= 'css';
-
-  addProjectConfiguration(tree, options.name, {
-    root: options.appProjectRoot,
-    projectType: 'application',
-    sourceRoot: `${options.appProjectRoot}/src`,
-    targets: {},
-  });
-
-  generateFiles(tree, path.join(__dirname, 'files'), options.appProjectRoot, {
+export default async function (tree: Tree, options: PresetGeneratorSchema) {
+  const appTask = applicationGenerator(tree, {
     ...options,
-    ...names(options.name),
-    offsetFromRoot: offsetFromRoot(options.appProjectRoot),
-    template: '',
+    // Since `--style` is not passed down to custom preset, we're using individual flags for now.
+    style: options.sass
+      ? 'scss'
+      : options.less
+      ? 'less'
+      : options.stylus
+      ? 'styl'
+      : 'css',
   });
 
-  const projectTask = await projectGenerator(tree, {
-    project: options.name,
-    style: options.style,
-    devServer: true,
-    tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
-    uiFramework: 'react',
-    target: 'web',
-    main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
+  updateJson(tree, 'package.json', (json) => {
+    json.scripts ??= {};
+    json.scripts.build ??= 'npx nx build';
+    json.scripts.start ??= 'npx nx serve';
+    json.scripts.lint ??= 'npx nx lint';
+    json.scripts.test ??= 'npx nx test';
+    json.scripts.e2e ??= 'npx nx e2e e2e';
+    return json;
   });
-  tasks.push(projectTask);
-
-  const jestTask = await addJest(tree, options);
-  tasks.push(jestTask);
-
-  const cypressTask = await addCypress(tree, options);
-  tasks.push(cypressTask);
-
-  const installTask = addDependenciesToPackageJson(
-    tree,
-    { react: reactVersion, 'react-dom': reactDomVersion },
-    {
-      '@nrwl/react': nxVersion,
-      '@types/react': typesReactVersion,
-      '@types/react-dom': typesReactDomVersion,
-    }
-  );
-  tasks.push(installTask);
-
-  const reactInitTask = await reactInitGenerator(tree, options);
-  tasks.push(reactInitTask);
 
-  await formatFiles(tree);
+  if (options.rootProject) {
+    // Remove these folders so projects will be generated at the root.
+    tree.delete('apps');
+    tree.delete('libs');
+  }
 
-  return runTasksInSerial(...tasks);
+  return appTask;
 }
diff --git a/src/generators/preset/schema.d.ts b/src/generators/preset/schema.d.ts
index 06a197b0bc29c..e1f7c2ae9fef6 100644
--- a/src/generators/preset/schema.d.ts
+++ b/src/generators/preset/schema.d.ts
@@ -1,6 +1,8 @@
 export interface PresetGeneratorSchema {
   name: string;
-  style: 'css' | 'scss' | 'less';
+  less?: boolean;
+  sass?: boolean;
+  stylus?: boolean;
   unitTestRunner?: 'none' | 'jest';
   e2eTestRunner?: 'none' | 'cypress';
   directory?: string;
diff --git a/src/generators/preset/schema.json b/src/generators/preset/schema.json
index 217ad44f5f8da..6250dd062b3ca 100644
--- a/src/generators/preset/schema.json
+++ b/src/generators/preset/schema.json
@@ -14,11 +14,17 @@
       },
       "x-priority": "important"
     },
-    "style": {
-      "type": "string",
-      "description": "The style solution to use.",
-      "enum": ["none", "css", "sass", "less"],
-      "default": "css"
+    "less": {
+      "type": "boolean",
+      "description": "Use less for styling."
+    },
+    "sass": {
+      "type": "boolean",
+      "description": "Use sass for styling."
+    },
+    "stylus": {
+      "type": "boolean",
+      "description": "Use stylus for styling."
     },
     "unitTestRunner": {
       "type": "string",
diff --git a/src/generators/rspack-project/rspack-project.ts b/src/generators/rspack-project/rspack-project.ts
index f1b07635cbc82..fbf2e40062d15 100644
--- a/src/generators/rspack-project/rspack-project.ts
+++ b/src/generators/rspack-project/rspack-project.ts
@@ -142,7 +142,7 @@ function createConfig(options: RspackProjectGeneratorSchema) {
     return `
       const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
 
-      module.exports = composePlugins(withNx(), withReact({ style: '${options.style}' }), (config) => {
+      module.exports = composePlugins(withNx(), withReact(), (config) => {
         return config;
       });
     `;
@@ -150,7 +150,7 @@ function createConfig(options: RspackProjectGeneratorSchema) {
     return `
       const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
 
-      module.exports = composePlugins(withNx(), withWeb({ style: '${options.style}' }), (config) => {
+      module.exports = composePlugins(withNx(), withWeb(), (config) => {
         return config;
       });
     `;
diff --git a/src/utils/create-copy-plugin.ts b/src/utils/create-copy-plugin.ts
deleted file mode 100644
index ba481cb2c024b..0000000000000
--- a/src/utils/create-copy-plugin.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as CopyWebpackPlugin from 'copy-webpack-plugin';
-
-export function createCopyPlugin(assets: any[]) {
-  return new CopyWebpackPlugin({
-    patterns: assets.map((asset) => {
-      return {
-        context: asset.input,
-        // Now we remove starting slash to make Webpack place it from the output root.
-        to: asset.output,
-        from: asset.glob,
-        globOptions: {
-          ignore: [
-            '.gitkeep',
-            '**/.DS_Store',
-            '**/Thumbs.db',
-            ...(asset.ignore ?? []),
-          ],
-          dot: true,
-        },
-      };
-    }),
-  });
-}
diff --git a/src/utils/get-copy-patterns.ts b/src/utils/get-copy-patterns.ts
new file mode 100644
index 0000000000000..6b6134df99632
--- /dev/null
+++ b/src/utils/get-copy-patterns.ts
@@ -0,0 +1,19 @@
+export function getCopyPatterns(assets: any[]) {
+  return assets.map((asset) => {
+    return {
+      context: asset.input,
+      // Now we remove starting slash to make Webpack place it from the output root.
+      to: asset.output,
+      from: asset.glob,
+      globOptions: {
+        ignore: [
+          '.gitkeep',
+          '**/.DS_Store',
+          '**/Thumbs.db',
+          ...(asset.ignore ?? []),
+        ],
+        dot: true,
+      },
+    };
+  });
+}
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index ea0a5d07eaa33..7f5ec7fc56f31 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -8,3 +8,12 @@ export const reactVersion = '~18.2.0';
 export const reactDomVersion = '~18.2.0';
 export const typesReactVersion = '~18.0.28';
 export const typesReactDomVersion = '~18.0.10';
+
+export const lessVersion = '4.1.3';
+export const sassVersion = '^1.42.1';
+export const stylusVersion = '^0.55.0';
+
+export const eslintPluginImportVersion = '2.27.5';
+export const eslintPluginJsxA11yVersion = '6.7.1';
+export const eslintPluginReactVersion = '7.32.2';
+export const eslintPluginReactHooksVersion = '4.6.0';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 2b7f6ba8ba667..c690e5e59f1d1 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -1,6 +1,6 @@
 import { Configuration } from '@rspack/core';
 import * as path from 'path';
-import { createCopyPlugin } from './create-copy-plugin';
+import { getCopyPatterns } from './get-copy-patterns';
 import { SharedConfigContext } from './model';
 import { normalizeAssets } from './normalize-assets';
 
@@ -73,6 +73,11 @@ export function withNx(_opts = {}) {
         debug: false,
       },
       builtins: {
+        copy: {
+          patterns: getCopyPatterns(
+            normalizeAssets(options.assets, context.root, sourceRoot)
+          ),
+        },
         html: [
           {
             template: options.indexHtml
@@ -93,15 +98,6 @@ export function withNx(_opts = {}) {
       },
     };
 
-    if (Array.isArray(options.assets) && options.assets.length > 0) {
-      // TODO(jack): uncomment this once copy-webpack-plugin is working
-      //updated.plugins.push(
-      //  createCopyPlugin(
-      //    normalizeAssets(options.assets, context.root, sourceRoot)
-      //  )
-      //);
-    }
-
     if (options.optimization) {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       const minifyPlugin = require('@rspack/plugin-minify');
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index e04df5898879c..796a58aceb08c 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -4,7 +4,9 @@ import * as path from 'path';
 import { SharedConfigContext } from './model';
 
 export interface WithWebOptions {
-  style?: 'css' | 'scss' | 'less';
+  stylePreprocessorOptions?: {
+    includePaths?: string[];
+  };
 }
 
 export function withWeb(opts: WithWebOptions = {}) {
@@ -19,6 +21,22 @@ export function withWeb(opts: WithWebOptions = {}) {
       context.projectGraph.nodes[context.projectName].data.root
     );
 
+    const includePaths: string[] = [];
+    if (opts?.stylePreprocessorOptions?.includePaths?.length > 0) {
+      opts.stylePreprocessorOptions.includePaths.forEach(
+        (includePath: string) =>
+          includePaths.push(path.resolve(context.root, includePath))
+      );
+    }
+
+    let lessPathOptions: { paths?: string[] } = {};
+
+    if (includePaths.length > 0) {
+      lessPathOptions = {
+        paths: includePaths,
+      };
+    }
+
     return {
       ...config,
       module: {
@@ -27,18 +45,55 @@ export function withWeb(opts: WithWebOptions = {}) {
           ...(config.module.rules || []),
           {
             test: /\.css$/,
-            type: 'css/module' as any,
+            type: 'css/module',
           },
-          // TODO(jack): uncomment once supported.
-          // {
-          //   test: /\.s[ac]ss$/,
-          //   use: [{ builtinLoader: 'builtin:sass-loader' }],
-          //   type: 'css',
-          // },
-          opts.style === 'less' && {
+          {
+            test: /\.scss$|\.sass$/,
+            type: 'css/module',
+            use: [
+              {
+                loader: require.resolve('sass-loader'),
+                options: {
+                  sourceMap: !!options.sourceMap,
+                  sassOptions: {
+                    fiber: false,
+                    // bootstrap-sass requires a minimum precision of 8
+                    precision: 8,
+                    includePaths,
+                  },
+                },
+              },
+            ],
+          },
+          {
             test: /.less$/,
-            use: [{ loader: require('@rspack/less-loader') }],
-            type: 'css',
+            type: 'css/module',
+            use: [
+              {
+                loader: require.resolve('less-loader'),
+                options: {
+                  sourceMap: !!options.sourceMap,
+                  lessOptions: {
+                    javascriptEnabled: true,
+                    ...lessPathOptions,
+                  },
+                },
+              },
+            ],
+          },
+          {
+            test: /\.styl$/,
+            use: [
+              {
+                loader: require.resolve('stylus-loader'),
+                options: {
+                  sourceMap: !!options.sourceMap,
+                  stylusOptions: {
+                    include: includePaths,
+                  },
+                },
+              },
+            ],
           },
         ].filter((a): a is ModuleRule => !!a),
       },

From 3975404c88f1fd7f9dd8f9949f414b9223870cf2 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 2 Mar 2023 08:11:46 -0500
Subject: [PATCH 05/92] feat(rspack): add missing features (less/sass/stylus,
 assets, etc.) (#160)

---
 tests/rspack.spec.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 801a7046d2c6c..8c7a663b12624 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -24,11 +24,17 @@ describe('rspack e2e', () => {
   it('should create rspack project', async () => {
     const project = uniq('myapp');
     await runNxCommandAsync(
-      `generate @nrwl/rspack:preset ${project} --style=css --unitTestRunner=jest --e2eTestRunner=cypress`
+      `generate @nrwl/rspack:preset ${project} --unitTestRunner=jest --e2eTestRunner=cypress`
     );
     let result = await runNxCommandAsync(`build ${project}`);
     expect(result.stdout).toContain('Successfully ran target build');
 
+    result = await runNxCommandAsync(`lint ${project}`);
+    expect(result.stdout).toContain('Successfully ran target lint');
+
+    result = await runNxCommandAsync(`test ${project}`);
+    expect(result.stdout).toContain('Successfully ran target test');
+
     result = await runNxCommandAsync(`e2e e2e`);
     expect(result.stdout).toContain('Successfully ran target e2e');
   }, 120_000);

From c20f38179deb269e81295731971bc1e0bcfd00fc Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 2 Mar 2023 16:41:26 -0500
Subject: [PATCH 06/92] feat(rspack): clean-up project setup (#161)

---
 generators.json                               |  8 +--
 package.json                                  |  4 +-
 src/executors/rspack/rspack.impl.ts           |  8 +++
 src/generators/application/application.ts     |  4 +-
 .../configuration.ts}                         | 61 ++++++++-----------
 .../schema.d.ts                               |  2 +-
 .../schema.json                               |  6 --
 src/index.ts                                  |  2 +-
 8 files changed, 42 insertions(+), 53 deletions(-)
 rename src/generators/{rspack-project/rspack-project.ts => configuration/configuration.ts} (71%)
 rename src/generators/{rspack-project => configuration}/schema.d.ts (68%)
 rename src/generators/{rspack-project => configuration}/schema.json (89%)

diff --git a/generators.json b/generators.json
index 94d24a47ff309..1d2e2968c4a84 100644
--- a/generators.json
+++ b/generators.json
@@ -3,10 +3,10 @@
   "name": "rspack",
   "version": "0.0.1",
   "generators": {
-    "rspack-project": {
-      "factory": "./src/generators/rspack-project/rspack-project",
-      "schema": "./src/generators/rspack-project/schema.json",
-      "description": "Rspack project generator."
+    "configuration": {
+      "factory": "./src/generators/configuration/configuration",
+      "schema": "./src/generators/configuration/schema.json",
+      "description": "Rspack configuration generator."
     },
     "init": {
       "factory": "./src/generators/init/init",
diff --git a/package.json b/package.json
index de4bf5c09bb07..7da3a6aee8b6b 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "@nrwl/linter": "^15.8.1",
     "@nrwl/devkit": "^15.8.1",
     "ajv": "^8.12.0",
+    "less-loader": "11.1.0",
     "sass-loader": "^12.2.0",
-    "stylus-loader": "^7.1.0",
-    "less-loader": "11.1.0"
+    "stylus-loader": "^7.1.0"
   }
 }
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index 503abed25402f..a4665aee81700 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -1,4 +1,6 @@
 import { ExecutorContext } from '@nrwl/devkit';
+import { rmSync } from 'fs';
+import * as path from 'path';
 import { createCompiler } from '../../utils/create-compiler';
 import { RspackExecutorSchema } from './schema';
 
@@ -8,6 +10,12 @@ export default async function runExecutor(
 ) {
   process.env.NODE_ENV ??= 'production';
 
+  // Mimic --clean from webpack.
+  rmSync(path.join(context.root, options.outputPath), {
+    force: true,
+    recursive: true,
+  });
+
   const compiler = await createCompiler(options, context);
 
   return new Promise<{ success: boolean }>((res) => {
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index 00c86601eb0a6..b961d7c00f5e9 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -21,7 +21,7 @@ import {
   typesReactDomVersion,
   typesReactVersion,
 } from '../../utils/versions';
-import projectGenerator from '../rspack-project/rspack-project';
+import { configurationGenerator } from '../configuration/configuration';
 import { addCypress } from './lib/add-cypress';
 import { addJest } from './lib/add-jest';
 import { addLinting } from './lib/add-linting';
@@ -63,7 +63,7 @@ export default async function (
     joinPathFragments(offsetFromRoot, 'tsconfig.base.json')
   );
 
-  const projectTask = await projectGenerator(tree, {
+  const projectTask = await configurationGenerator(tree, {
     project: options.name,
     devServer: true,
     tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
diff --git a/src/generators/rspack-project/rspack-project.ts b/src/generators/configuration/configuration.ts
similarity index 71%
rename from src/generators/rspack-project/rspack-project.ts
rename to src/generators/configuration/configuration.ts
index fbf2e40062d15..492bfc0e89aa2 100644
--- a/src/generators/rspack-project/rspack-project.ts
+++ b/src/generators/configuration/configuration.ts
@@ -7,14 +7,13 @@ import {
 } from '@nrwl/devkit';
 import { RspackExecutorSchema } from '../../executors/rspack/schema';
 import rspackInitGenerator from '../init/init';
-import { RspackProjectGeneratorSchema } from './schema';
+import { ConfigurationSchema } from './schema';
 
-export async function rspackProjectGenerator(
+export async function configurationGenerator(
   tree: Tree,
-  options: RspackProjectGeneratorSchema
+  options: ConfigurationSchema
 ) {
   const task = await rspackInitGenerator(tree, options);
-  checkForTargetConflicts(tree, options);
   addBuildTarget(tree, options);
   if (options.uiFramework !== 'none' || options.devServer) {
     addServeTarget(tree, options);
@@ -24,28 +23,7 @@ export async function rspackProjectGenerator(
   return task;
 }
 
-function checkForTargetConflicts(
-  tree: Tree,
-  options: RspackProjectGeneratorSchema
-) {
-  if (options.skipValidation) return;
-
-  const project = readProjectConfiguration(tree, options.project);
-
-  if (project.targets?.build) {
-    throw new Error(
-      `Project "${project.name}" already has a build target. Pass --skipValidation to ignore this error.`
-    );
-  }
-
-  if (options.devServer && project.targets?.serve) {
-    throw new Error(
-      `Project "${project.name}" already has a serve target. Pass --skipValidation to ignore this error.`
-    );
-  }
-}
-
-function determineMain(tree: Tree, options: RspackProjectGeneratorSchema) {
+function determineMain(tree: Tree, options: ConfigurationSchema) {
   if (options.main) return options.main;
 
   const project = readProjectConfiguration(tree, options.project);
@@ -56,7 +34,7 @@ function determineMain(tree: Tree, options: RspackProjectGeneratorSchema) {
   return joinPathFragments(project.root, 'src/main.ts');
 }
 
-function determineTsConfig(tree: Tree, options: RspackProjectGeneratorSchema) {
+function determineTsConfig(tree: Tree, options: ConfigurationSchema) {
   if (options.tsConfig) return options.tsConfig;
 
   const project = readProjectConfiguration(tree, options.project);
@@ -70,11 +48,15 @@ function determineTsConfig(tree: Tree, options: RspackProjectGeneratorSchema) {
   return joinPathFragments(project.root, 'tsconfig.json');
 }
 
-function addBuildTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
+function addBuildTarget(tree: Tree, options: ConfigurationSchema) {
   const project = readProjectConfiguration(tree, options.project);
   const buildOptions: RspackExecutorSchema = {
     target: options.target ?? 'web',
-    outputPath: joinPathFragments('dist', project.root),
+    outputPath: joinPathFragments(
+      'dist',
+      // If standalone project then use the project's name in dist.
+      project.root === '.' ? project.name : project.root
+    ),
     main: determineMain(tree, options),
     tsConfig: determineTsConfig(tree, options),
     rspackConfig: joinPathFragments(project.root, 'rspack.config.js'),
@@ -94,6 +76,7 @@ function addBuildTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
         defaultConfiguration: 'production',
         options: buildOptions,
         configurations: {
+          development: {},
           production: {
             optimization: true,
             sourceMap: false,
@@ -104,7 +87,7 @@ function addBuildTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
   });
 }
 
-function addServeTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
+function addServeTarget(tree: Tree, options: ConfigurationSchema) {
   const project = readProjectConfiguration(tree, options.project);
   updateProjectConfiguration(tree, options.project, {
     ...project,
@@ -113,9 +96,10 @@ function addServeTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
       serve: {
         executor: '@nrwl/rspack:dev-server',
         options: {
-          buildTarget: `${options.project}:build`,
+          buildTarget: `${options.project}:build:development`,
         },
         configurations: {
+          development: {},
           production: {
             buildTarget: `${options.project}:build:production`,
           },
@@ -125,19 +109,22 @@ function addServeTarget(tree: Tree, options: RspackProjectGeneratorSchema) {
   });
 }
 
-function writeRspackConfigFile(
-  tree: Tree,
-  options: RspackProjectGeneratorSchema
-) {
+function writeRspackConfigFile(tree: Tree, options: ConfigurationSchema) {
   const project = readProjectConfiguration(tree, options.project);
 
   tree.write(
     joinPathFragments(project.root, 'rspack.config.js'),
     createConfig(options)
   );
+
+  // Remove previous webpack config if they exist
+  if (tree.exists(joinPathFragments(project.root, 'webpack.config.js')))
+    tree.delete(joinPathFragments(project.root, 'webpack.config.js'));
+  if (tree.exists(joinPathFragments(project.root, 'webpack.config.ts')))
+    tree.delete(joinPathFragments(project.root, 'webpack.config.ts'));
 }
 
-function createConfig(options: RspackProjectGeneratorSchema) {
+function createConfig(options: ConfigurationSchema) {
   if (options.uiFramework === 'react') {
     return `
       const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
@@ -165,4 +152,4 @@ function createConfig(options: RspackProjectGeneratorSchema) {
   }
 }
 
-export default rspackProjectGenerator;
+export default configurationGenerator;
diff --git a/src/generators/rspack-project/schema.d.ts b/src/generators/configuration/schema.d.ts
similarity index 68%
rename from src/generators/rspack-project/schema.d.ts
rename to src/generators/configuration/schema.d.ts
index 90b381dbbae76..2d1081ba5e69f 100644
--- a/src/generators/rspack-project/schema.d.ts
+++ b/src/generators/configuration/schema.d.ts
@@ -1,6 +1,6 @@
 import { InitGeneratorSchema } from '../init/schema';
 
-export interface RspackProjectGeneratorSchema extends InitGeneratorSchema {
+export interface ConfigurationSchema extends InitGeneratorSchema {
   project: string;
   main?: string;
   tsConfig?: string;
diff --git a/src/generators/rspack-project/schema.json b/src/generators/configuration/schema.json
similarity index 89%
rename from src/generators/rspack-project/schema.json
rename to src/generators/configuration/schema.json
index 15d64d7c4da00..5544dd84460bf 100644
--- a/src/generators/rspack-project/schema.json
+++ b/src/generators/configuration/schema.json
@@ -46,12 +46,6 @@
       "type": "string",
       "description": "The style solution to use.",
       "enum": ["none", "css", "scss", "less"]
-    },
-    "skipValidation": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not perform any validation on existing project.",
-      "x-priority": "internal"
     }
   },
   "required": ["project"]
diff --git a/src/index.ts b/src/index.ts
index e7e3031a6e588..10a9306018e7d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,5 @@
+export * from './generators/configuration/configuration';
 export * from './generators/init/init';
-export * from './generators/rspack-project/rspack-project';
 export * from './utils/config';
 export * from './utils/with-nx';
 export * from './utils/with-react';

From 885e763c442139f6a06e91c01176d6b5f72cce97 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 2 Mar 2023 16:41:26 -0500
Subject: [PATCH 07/92] feat(rspack): clean-up project setup (#161)

---
 tests/rspack.spec.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 8c7a663b12624..9480525ffc549 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -1,7 +1,9 @@
 import {
   ensureNxProject,
+  listFiles,
   runNxCommandAsync,
   uniq,
+  updateFile,
 } from '@nrwl/nx-plugin/testing';
 
 describe('rspack e2e', () => {
@@ -26,8 +28,12 @@ describe('rspack e2e', () => {
     await runNxCommandAsync(
       `generate @nrwl/rspack:preset ${project} --unitTestRunner=jest --e2eTestRunner=cypress`
     );
-    let result = await runNxCommandAsync(`build ${project}`);
+    let result = await runNxCommandAsync(`build ${project}`, {
+      env: { NODE_ENV: 'production' },
+    });
     expect(result.stdout).toContain('Successfully ran target build');
+    // Make sure expected files are present.
+    expect(listFiles(`dist/${project}`)).toHaveLength(5);
 
     result = await runNxCommandAsync(`lint ${project}`);
     expect(result.stdout).toContain('Successfully ran target lint');
@@ -37,5 +43,16 @@ describe('rspack e2e', () => {
 
     result = await runNxCommandAsync(`e2e e2e`);
     expect(result.stdout).toContain('Successfully ran target e2e');
+
+    // Update app and make sure previous dist files are not present.
+    updateFile(`src/app/app.tsx`, (content) => {
+      return `${content}\nconsole.log('hello');
+    `;
+    });
+    result = await runNxCommandAsync(`build ${project}`, {
+      env: { NODE_ENV: 'production' },
+    });
+    expect(result.stdout).toContain('Successfully ran target build');
+    expect(listFiles(`dist/${project}`)).toHaveLength(5); // same length as before
   }, 120_000);
 });

From 173d5e0e48329d8c418f101bab3fe1e6e88e3f5d Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Fri, 3 Mar 2023 09:55:49 -0500
Subject: [PATCH 08/92] fix(rspack): use correct app dir when generating
 non-root projects (#162)

---
 .../application/lib/normalize-options.spec.ts | 51 +++++++++++++++++++
 .../application/lib/normalize-options.ts      |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/generators/application/lib/normalize-options.spec.ts

diff --git a/src/generators/application/lib/normalize-options.spec.ts b/src/generators/application/lib/normalize-options.spec.ts
new file mode 100644
index 0000000000000..208f091cf5b18
--- /dev/null
+++ b/src/generators/application/lib/normalize-options.spec.ts
@@ -0,0 +1,51 @@
+import { Tree } from '@nrwl/devkit';
+import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { normalizeOptions } from './normalize-options';
+
+describe('normalizeOptions', () => {
+  let tree: Tree;
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace();
+  });
+
+  it('should set { rootProject: true } when --rootProject=true is passed', () => {
+    expect(
+      normalizeOptions(tree, {
+        name: 'demo',
+        style: 'css',
+        rootProject: true,
+      }).rootProject
+    ).toBeTruthy();
+  });
+
+  it('should set { rootProject: false } when --rootProject=undefined is passed', () => {
+    expect(
+      normalizeOptions(tree, {
+        name: 'demo',
+        style: 'css',
+      }).rootProject
+    ).toBeFalsy();
+  });
+
+  it('should set { rootProject: false } when --rootProject=false is passed', () => {
+    expect(
+      normalizeOptions(tree, {
+        name: 'demo',
+        style: 'css',
+        rootProject: false,
+      }).rootProject
+    ).toBeFalsy();
+  });
+
+  it('should set { rootProject: false } when --monorepo=true and --rootProject=true is passed', () => {
+    expect(
+      normalizeOptions(tree, {
+        name: 'demo',
+        style: 'css',
+        monorepo: true,
+        rootProject: true,
+      }).rootProject
+    ).toBeFalsy();
+  });
+});
diff --git a/src/generators/application/lib/normalize-options.ts b/src/generators/application/lib/normalize-options.ts
index 6b568eb4481c8..a21f25900f5d8 100644
--- a/src/generators/application/lib/normalize-options.ts
+++ b/src/generators/application/lib/normalize-options.ts
@@ -24,7 +24,7 @@ export function normalizeOptions(
 ): NormalizedSchema {
   // --monorepo takes precedence over --rootProject
   // This won't be needed once we add --bundler=rspack to the @nrwl/react:app preset
-  const rootProject = !options.monorepo && (options.rootProject ?? true);
+  const rootProject = !options.monorepo && options.rootProject;
   const appDirectory = normalizeDirectory(options);
   const appProjectName = normalizeProjectName(options);
   const e2eProjectName = options.rootProject

From 8e7aa32f854ade80e8dcca80b39c04a6bcbfb125 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Fri, 3 Mar 2023 09:55:49 -0500
Subject: [PATCH 09/92] fix(rspack): use correct app dir when generating
 non-root projects (#162)

---
 tests/rspack.spec.ts | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 9480525ffc549..66ca918736f09 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -1,4 +1,5 @@
 import {
+  checkFilesExist,
   ensureNxProject,
   listFiles,
   runNxCommandAsync,
@@ -23,7 +24,7 @@ describe('rspack e2e', () => {
     runNxCommandAsync('reset');
   });
 
-  it('should create rspack project', async () => {
+  it('should create rspack root project and additional apps', async () => {
     const project = uniq('myapp');
     await runNxCommandAsync(
       `generate @nrwl/rspack:preset ${project} --unitTestRunner=jest --e2eTestRunner=cypress`
@@ -54,5 +55,27 @@ describe('rspack e2e', () => {
     });
     expect(result.stdout).toContain('Successfully ran target build');
     expect(listFiles(`dist/${project}`)).toHaveLength(5); // same length as before
+
+    // Generate a new app and check that the files are correct
+    const app2 = uniq('app2');
+    await runNxCommandAsync(
+      `generate @nrwl/rspack:app ${app2} --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
+    );
+    checkFilesExist(`${app2}/project.json`, `${app2}-e2e/project.json`);
+    result = await runNxCommandAsync(`build ${app2}`, {
+      env: { NODE_ENV: 'production' },
+    });
+    expect(result.stdout).toContain('Successfully ran target build');
+    // Make sure expected files are present.
+    expect(listFiles(`dist/${app2}`)).toHaveLength(5);
+
+    result = await runNxCommandAsync(`lint ${app2}`);
+    expect(result.stdout).toContain('Successfully ran target lint');
+
+    result = await runNxCommandAsync(`test ${app2}`);
+    expect(result.stdout).toContain('Successfully ran target test');
+
+    result = await runNxCommandAsync(`e2e ${app2}-e2e`);
+    expect(result.stdout).toContain('Successfully ran target e2e');
   }, 120_000);
 });

From bd4b3244bcaedb507490cc8a7f5b2c392c69ac5d Mon Sep 17 00:00:00 2001
From: Philip Fulcher <philip@nrwl.io>
Date: Wed, 8 Mar 2023 06:26:57 -0700
Subject: [PATCH 10/92] chore(repo): migrate to Nx 15.8.5 (#169)

* chore(repo): migrate workspace to Nx 15.8.5

* chore(gatsby): fix init generator after migration

* chore(repo): remove Jest snapshot format

---------

Co-authored-by: Philip Fulcher <philipfulcher@Philips-MacBook-Pro-2.local>
---
 jest.config.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jest.config.ts b/jest.config.ts
index f3a6740a8888d..1223e1f4addd5 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -2,13 +2,14 @@
 export default {
   displayName: 'rspack',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  globals: {},
   transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/packages/rspack',

From 18e3443532e0d0a9ae9d0851c776b3053d04794a Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 9 Mar 2023 08:30:08 -0500
Subject: [PATCH 11/92] feat(rspack): update and pin rspack to 0.1.0 (#173)

---
 src/utils/versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 7f5ec7fc56f31..2a87c4d9d2ecb 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '^0.0.23';
-export const rspackDevServerVersion = '^0.0.23';
+export const rspackCoreVersion = '0.1.0';
+export const rspackDevServerVersion = '0.1.0';
 
-export const rspackPluginMinifyVersion = '^0.0.23';
-export const rspackLessLoaderVersion = '^0.0.23';
+export const rspackPluginMinifyVersion = '0.1.0';
+export const rspackLessLoaderVersion = '0.1.0';
 
 export const reactVersion = '~18.2.0';
 export const reactDomVersion = '~18.2.0';

From cab70e5487c2719575b8e0b1e3c1bebf11182aa3 Mon Sep 17 00:00:00 2001
From: FrozenPandaz <jasonjean1993@gmail.com>
Date: Fri, 10 Mar 2023 15:21:26 -0500
Subject: [PATCH 12/92] fix(rspack): fix rspack build

---
 project.json                        | 10 ++++++++++
 src/executors/rspack/rspack.impl.ts | 26 +++++++++++++++++++++++---
 src/utils/with-nx.ts                |  6 +++++-
 src/utils/with-web.ts               |  4 ++--
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/project.json b/project.json
index 54367c77ef2f9..8cd47ed61ad22 100644
--- a/project.json
+++ b/project.json
@@ -55,6 +55,16 @@
         "jestConfig": "packages/rspack/jest.config.ts",
         "passWithNoTests": true
       }
+    },
+    "publish": {
+      "executor": "nx:run-commands",
+      "options": {
+        "parallel": false,
+        "commands": [
+          "nx build rspack",
+          "node tools/scripts/publish.mjs rspack {args.ver} {args.tag}"
+        ]
+      }
     }
   },
   "tags": []
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index a4665aee81700..321035a9cd9fc 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -19,9 +19,29 @@ export default async function runExecutor(
   const compiler = await createCompiler(options, context);
 
   return new Promise<{ success: boolean }>((res) => {
-    compiler.run(() => {
-      compiler.close((err: any) => {
-        res({ success: !err });
+    compiler.run((error, stats) => {
+      // OURS
+      compiler.close(() => {
+        if (error) {
+          console.error(error);
+          res({ success: false });
+          return;
+        }
+        if (!compiler || !stats) {
+          res({ success: false });
+          return;
+        }
+
+        // TODO: Handle MultipleCompiler
+        const statsOptions = compiler.options
+            ? compiler.options.stats
+            : undefined;
+        const printedStats = stats.toString(statsOptions);
+        // Avoid extra empty line when `stats: 'none'`
+        if (printedStats) {
+          console.error(printedStats);
+        }
+        res({ success: !stats.hasErrors() });
       });
     });
   });
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index c690e5e59f1d1..f29f7b524b9c2 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -28,7 +28,7 @@ export function withNx(_opts = {}) {
       return acc;
     }, {});
 
-    const updated = {
+    const updated: Configuration = {
       ...config,
       target: options.target,
       mode: 'development' as const,
@@ -96,6 +96,10 @@ export function withNx(_opts = {}) {
           refresh: isDev,
         },
       },
+      stats: {
+        colors: true,
+        preset: 'normal'
+      }
     };
 
     if (options.optimization) {
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index 796a58aceb08c..7da29ac8ec516 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -1,5 +1,5 @@
 import { Configuration } from '@rspack/core';
-import { ModuleRule } from '@rspack/core/dist/config/module';
+import { RuleSetRule } from '@rspack/core';
 import * as path from 'path';
 import { SharedConfigContext } from './model';
 
@@ -95,7 +95,7 @@ export function withWeb(opts: WithWebOptions = {}) {
               },
             ],
           },
-        ].filter((a): a is ModuleRule => !!a),
+        ].filter((a): a is RuleSetRule => !!a),
       },
       builtins: {
         ...config.builtins,

From 463ece0f3f57d44525bff5769dab895b9a478a68 Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Wed, 15 Mar 2023 13:55:30 -0400
Subject: [PATCH 13/92] chore(rspack): remove comment (#175)

---
 src/executors/rspack/rspack.impl.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index 321035a9cd9fc..a308bb50e00e4 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -20,7 +20,6 @@ export default async function runExecutor(
 
   return new Promise<{ success: boolean }>((res) => {
     compiler.run((error, stats) => {
-      // OURS
       compiler.close(() => {
         if (error) {
           console.error(error);

From b172d2219b2494564f7f9e48986638c5482eface Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Thu, 16 Mar 2023 15:16:54 +0200
Subject: [PATCH 14/92] feat(rspack): set mode in configuration and expose
 option (#177)

---
 src/executors/dev-server/dev-server.impl.ts   | 10 ++++++++--
 src/executors/dev-server/schema.d.ts          |  3 +++
 src/executors/dev-server/schema.json          |  5 +++++
 src/executors/rspack/rspack.impl.ts           | 10 +++++++---
 src/executors/rspack/schema.d.ts              |  2 ++
 src/executors/rspack/schema.json              |  5 +++++
 src/generators/configuration/configuration.ts |  5 ++++-
 src/utils/mode-utils.ts                       |  5 +++++
 src/utils/with-nx.ts                          | 12 +++++++-----
 src/utils/with-react.ts                       |  3 ++-
 src/utils/with-web.ts                         |  6 +++---
 11 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 src/utils/mode-utils.ts

diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index f2f724c5aec9a..c01267b60bc6b 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -6,13 +6,19 @@ import {
 import { createAsyncIterable } from '@nrwl/devkit/src/utils/async-iterable';
 import { RspackDevServer } from '@rspack/dev-server';
 import { createCompiler } from '../../utils/create-compiler';
+import { isMode } from '../../utils/mode-utils';
 import { DevServerExecutorSchema } from './schema';
 
 export default async function* runExecutor(
   options: DevServerExecutorSchema,
   context: ExecutorContext
 ) {
-  process.env.NODE_ENV ??= 'development';
+  process.env.NODE_ENV ??= options.mode ?? 'development';
+
+  if (isMode(process.env.NODE_ENV)) {
+    options.mode = process.env.NODE_ENV;
+  }
+
   const buildTarget = parseTargetString(
     options.buildTarget,
     context.projectGraph
@@ -23,7 +29,7 @@ export default async function* runExecutor(
   };
   const buildOptions = readTargetOptions<any>(buildTarget, context);
   const compiler = await createCompiler(
-    { ...buildOptions, devServer: devServerConfig },
+    { ...buildOptions, devServer: devServerConfig, mode: options.mode },
     context
   );
 
diff --git a/src/executors/dev-server/schema.d.ts b/src/executors/dev-server/schema.d.ts
index 66b5708123e0a..07265b6e84ea4 100644
--- a/src/executors/dev-server/schema.d.ts
+++ b/src/executors/dev-server/schema.d.ts
@@ -1,5 +1,8 @@
+import type { Mode } from '@rspack/core';
+
 export interface DevServerExecutorSchema {
   buildTarget: string;
+  mode?: Mode;
 
   port?: number;
 }
diff --git a/src/executors/dev-server/schema.json b/src/executors/dev-server/schema.json
index 0702e2be344c1..7c0b6fc91f8e5 100644
--- a/src/executors/dev-server/schema.json
+++ b/src/executors/dev-server/schema.json
@@ -13,6 +13,11 @@
     "port": {
       "type": "number",
       "description": "The port to for the dev-server to listen on."
+    },
+    "mode": {
+      "type": "string",
+      "description": "Mode to run the server in.",
+      "enum": ["development", "production", "none"]
     }
   },
   "required": ["buildTarget"]
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index a308bb50e00e4..c1bb789ef1d14 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -2,14 +2,18 @@ import { ExecutorContext } from '@nrwl/devkit';
 import { rmSync } from 'fs';
 import * as path from 'path';
 import { createCompiler } from '../../utils/create-compiler';
+import { isMode } from '../../utils/mode-utils';
 import { RspackExecutorSchema } from './schema';
 
 export default async function runExecutor(
   options: RspackExecutorSchema,
   context: ExecutorContext
 ) {
-  process.env.NODE_ENV ??= 'production';
+  process.env.NODE_ENV ??= options.mode ?? 'production';
 
+  if (isMode(process.env.NODE_ENV)) {
+    options.mode = process.env.NODE_ENV;
+  }
   // Mimic --clean from webpack.
   rmSync(path.join(context.root, options.outputPath), {
     force: true,
@@ -33,8 +37,8 @@ export default async function runExecutor(
 
         // TODO: Handle MultipleCompiler
         const statsOptions = compiler.options
-            ? compiler.options.stats
-            : undefined;
+          ? compiler.options.stats
+          : undefined;
         const printedStats = stats.toString(statsOptions);
         // Avoid extra empty line when `stats: 'none'`
         if (printedStats) {
diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index f0a7bb91a288a..7f14806e68a3b 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -1,9 +1,11 @@
+import type { Mode } from '@rspack/core';
 export interface RspackExecutorSchema {
   target: 'web' | 'node';
   main: string;
   tsConfig: string;
   outputPath: string;
   indexHtml?: string;
+  mode?: Mode;
 
   rspackConfig: string;
   optimization?: boolean;
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index 4ae0ace118527..e195a7d0b6222 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -54,6 +54,11 @@
       "items": {
         "$ref": "#/definitions/assetPattern"
       }
+    },
+    "mode": {
+      "type": "string",
+      "description": "Mode to run the build in.",
+      "enum": ["development", "production", "none"]
     }
   },
   "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 492bfc0e89aa2..74fc670290b66 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -76,8 +76,11 @@ function addBuildTarget(tree: Tree, options: ConfigurationSchema) {
         defaultConfiguration: 'production',
         options: buildOptions,
         configurations: {
-          development: {},
+          development: {
+            mode: 'development',
+          },
           production: {
+            mode: 'production',
             optimization: true,
             sourceMap: false,
           },
diff --git a/src/utils/mode-utils.ts b/src/utils/mode-utils.ts
new file mode 100644
index 0000000000000..4ec3d704b21b2
--- /dev/null
+++ b/src/utils/mode-utils.ts
@@ -0,0 +1,5 @@
+import { Mode } from '@rspack/core';
+
+export function isMode(mode: string): mode is Mode {
+  return mode === 'development' || mode === 'production' || mode === 'none';
+}
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index f29f7b524b9c2..7ccaf777b5c24 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -9,8 +9,10 @@ export function withNx(_opts = {}) {
     config: Configuration,
     { options, context }: SharedConfigContext
   ): Configuration {
-    const isProd = process.env.NODE_ENV === 'production';
-    const isDev = process.env.NODE_ENV === 'development';
+    const isProd =
+      process.env.NODE_ENV === 'production' || options.mode === 'production';
+    const isDev =
+      process.env.NODE_ENV === 'development' || options.mode === 'development';
     const projectRoot = path.join(
       context.root,
       context.projectGraph.nodes[context.projectName].data.root
@@ -31,7 +33,7 @@ export function withNx(_opts = {}) {
     const updated: Configuration = {
       ...config,
       target: options.target,
-      mode: 'development' as const,
+      mode: options.mode,
       context: context.root,
       devtool:
         options.sourceMap === 'hidden'
@@ -98,8 +100,8 @@ export function withNx(_opts = {}) {
       },
       stats: {
         colors: true,
-        preset: 'normal'
-      }
+        preset: 'normal',
+      },
     };
 
     if (options.optimization) {
diff --git a/src/utils/with-react.ts b/src/utils/with-react.ts
index e99f2b43d9b76..822ea3d9e38d7 100644
--- a/src/utils/with-react.ts
+++ b/src/utils/with-react.ts
@@ -7,7 +7,8 @@ export function withReact(opts = {}) {
     config: Configuration,
     { options, context }: SharedConfigContext
   ): Configuration {
-    const isDev = process.env.NODE_ENV === 'development';
+    const isDev =
+      process.env.NODE_ENV === 'development' || options.mode === 'development';
 
     config = withWeb(opts)(config, { options, context });
 
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index 7da29ac8ec516..3af2f3e65520c 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -1,5 +1,4 @@
-import { Configuration } from '@rspack/core';
-import { RuleSetRule } from '@rspack/core';
+import { Configuration, RuleSetRule } from '@rspack/core';
 import * as path from 'path';
 import { SharedConfigContext } from './model';
 
@@ -14,7 +13,8 @@ export function withWeb(opts: WithWebOptions = {}) {
     config: Configuration,
     { options, context }: SharedConfigContext
   ): Configuration {
-    const isProd = process.env.NODE_ENV === 'production';
+    const isProd =
+      process.env.NODE_ENV === 'production' || options.mode === 'production';
 
     const projectRoot = path.join(
       context.root,

From e16ce1b0cece1f5c88d1fa2b80a1b190d214f379 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 21 Mar 2023 15:31:31 +0200
Subject: [PATCH 15/92] fix(rspack): handle existing stylePreprocessorOptions
 (#182)

---
 src/generators/configuration/configuration.ts | 55 ++++++++++++++++---
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 74fc670290b66..74bff21604b35 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -14,11 +14,16 @@ export async function configurationGenerator(
   options: ConfigurationSchema
 ) {
   const task = await rspackInitGenerator(tree, options);
+
+  const { targets } = readProjectConfiguration(tree, options.project);
+  const foundStylePreprocessorOptions: { includePaths?: string[] } | undefined =
+    targets?.build?.options?.stylePreprocessorOptions;
+
   addBuildTarget(tree, options);
   if (options.uiFramework !== 'none' || options.devServer) {
     addServeTarget(tree, options);
   }
-  writeRspackConfigFile(tree, options);
+  writeRspackConfigFile(tree, options, foundStylePreprocessorOptions);
   await formatFiles(tree);
   return task;
 }
@@ -112,12 +117,16 @@ function addServeTarget(tree: Tree, options: ConfigurationSchema) {
   });
 }
 
-function writeRspackConfigFile(tree: Tree, options: ConfigurationSchema) {
+function writeRspackConfigFile(
+  tree: Tree,
+  options: ConfigurationSchema,
+  stylePreprocessorOptions?: { includePaths?: string[] }
+) {
   const project = readProjectConfiguration(tree, options.project);
 
   tree.write(
     joinPathFragments(project.root, 'rspack.config.js'),
-    createConfig(options)
+    createConfig(options, stylePreprocessorOptions)
   );
 
   // Remove previous webpack config if they exist
@@ -127,12 +136,23 @@ function writeRspackConfigFile(tree: Tree, options: ConfigurationSchema) {
     tree.delete(joinPathFragments(project.root, 'webpack.config.ts'));
 }
 
-function createConfig(options: ConfigurationSchema) {
+function createConfig(
+  options: ConfigurationSchema,
+  stylePreprocessorOptions?: { includePaths?: string[] }
+) {
   if (options.uiFramework === 'react') {
     return `
       const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
 
-      module.exports = composePlugins(withNx(), withReact(), (config) => {
+      module.exports = composePlugins(withNx(), withReact(${
+        stylePreprocessorOptions
+          ? `
+        {
+          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
+        }
+        `
+          : ''
+      }), (config) => {
         return config;
       });
     `;
@@ -140,15 +160,32 @@ function createConfig(options: ConfigurationSchema) {
     return `
       const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
 
-      module.exports = composePlugins(withNx(), withWeb(), (config) => {
+      module.exports = composePlugins(withNx(), withWeb(${
+        stylePreprocessorOptions
+          ? `
+        {
+          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
+        }
+        `
+          : ''
+      }), (config) => {
         return config;
       });
     `;
   } else {
     return `
-      const { composePlugins, withNx } = require('@nrwl/rspack');
-
-      module.exports = composePlugins(withNx(), (config) => {
+      const { composePlugins, withNx${
+        stylePreprocessorOptions ? ', withWeb' : ''
+      } } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx()${
+        stylePreprocessorOptions
+          ? `,
+        withWeb({
+          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
+        })`
+          : ''
+      }, (config) => {
         return config;
       });
     `;

From 4297648730ec3e00ec60147462670241aa5ebfa0 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Mon, 27 Mar 2023 06:47:36 -0400
Subject: [PATCH 16/92] fix(rspack): add dependency to ajv-keywords that match
 the version used by rspack (#187)

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 7da3a6aee8b6b..0790b9b228686 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "@nrwl/linter": "^15.8.1",
     "@nrwl/devkit": "^15.8.1",
     "ajv": "^8.12.0",
+    "ajv-keywords": "5.1.0",
     "less-loader": "11.1.0",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0"

From f7fb57cec47974144d693647f09c25714cde137b Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 28 Mar 2023 17:41:26 +0300
Subject: [PATCH 17/92] fix(rspack): pass devServer options to devServer (#193)

---
 src/executors/dev-server/dev-server.impl.ts | 23 ++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index c01267b60bc6b..d7d6c59e7f1c1 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -4,6 +4,7 @@ import {
   readTargetOptions,
 } from '@nrwl/devkit';
 import { createAsyncIterable } from '@nrwl/devkit/src/utils/async-iterable';
+import { DevServer } from '@rspack/core/dist/config';
 import { RspackDevServer } from '@rspack/dev-server';
 import { createCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
@@ -23,18 +24,33 @@ export default async function* runExecutor(
     options.buildTarget,
     context.projectGraph
   );
-  const devServerConfig = {
+
+  // If I don't typecast, it throws an error
+  // that port does not exist on type DevServer
+  // however, it does exist, since DevServer extends
+  // WebpackDevServer.Configuration which has port
+  let devServerConfig: DevServer = {
     port: options.port ?? 4200,
     hot: true,
-  };
+  } as DevServer;
+
   const buildOptions = readTargetOptions<any>(buildTarget, context);
   const compiler = await createCompiler(
     { ...buildOptions, devServer: devServerConfig, mode: options.mode },
     context
   );
 
+  devServerConfig = {
+    ...devServerConfig,
+    ...compiler.options.devServer,
+  };
+
   yield* createAsyncIterable(({ next }) => {
     const server: any = new RspackDevServer(
+      // If I don't typecast, it throws an error
+      // that onListening does not exist on type DevServer
+      // however, it does exist, since DevServer extends
+      // WebpackDevServer.Configuration which has onListening
       {
         ...devServerConfig,
         onListening: (server: any) => {
@@ -43,7 +59,8 @@ export default async function* runExecutor(
             baseUrl: `http://localhost:${options.port ?? 4200}`,
           });
         },
-      } as any,
+      } as DevServer,
+
       compiler
     );
     server.start();

From cc6ac2504557b54e540e00b3075de57e4b832c6a Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 28 Mar 2023 19:02:34 +0300
Subject: [PATCH 18/92] fix(rspack): set externals for target node (#194)

---
 src/generators/configuration/configuration.ts |  2 +-
 src/utils/with-nx.ts                          | 45 +++++++++----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 74bff21604b35..08d775a151cc6 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -86,7 +86,7 @@ function addBuildTarget(tree: Tree, options: ConfigurationSchema) {
           },
           production: {
             mode: 'production',
-            optimization: true,
+            optimization: options.target === 'web' ? true : undefined,
             sourceMap: false,
           },
         },
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 7ccaf777b5c24..7644eb59cae47 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -1,4 +1,4 @@
-import { Configuration } from '@rspack/core';
+import { Configuration, ExternalItem } from '@rspack/core';
 import * as path from 'path';
 import { getCopyPatterns } from './get-copy-patterns';
 import { SharedConfigContext } from './model';
@@ -11,12 +11,7 @@ export function withNx(_opts = {}) {
   ): Configuration {
     const isProd =
       process.env.NODE_ENV === 'production' || options.mode === 'production';
-    const isDev =
-      process.env.NODE_ENV === 'development' || options.mode === 'development';
-    const projectRoot = path.join(
-      context.root,
-      context.projectGraph.nodes[context.projectName].data.root
-    );
+
     const sourceRoot = path.join(
       context.root,
       context.projectGraph.nodes[context.projectName].data.sourceRoot
@@ -30,6 +25,20 @@ export function withNx(_opts = {}) {
       return acc;
     }, {});
 
+    const externals: ExternalItem = {};
+    if (options.target === 'node') {
+      const projectDeps =
+        context.projectGraph.dependencies[context.projectName];
+      for (const dep of Object.values(projectDeps)) {
+        const externalNode = context.projectGraph.externalNodes[dep.target];
+        if (externalNode) {
+          externals[
+            externalNode.data.packageName
+          ] = `"${externalNode.data.packageName}"`;
+        }
+      }
+    }
+
     const updated: Configuration = {
       ...config,
       target: options.target,
@@ -49,7 +58,10 @@ export function withNx(_opts = {}) {
       output: {
         path: path.join(context.root, options.outputPath),
         publicPath: '/',
-        filename: isProd ? '[name].[contenthash:8][ext]' : '[name][ext]',
+        filename:
+          isProd && options.target !== 'node'
+            ? '[name].[contenthash:8][ext]'
+            : '[name][ext]',
       },
       devServer: {
         port: 4200,
@@ -80,24 +92,9 @@ export function withNx(_opts = {}) {
             normalizeAssets(options.assets, context.root, sourceRoot)
           ),
         },
-        html: [
-          {
-            template: options.indexHtml
-              ? path.join(context.root, options.indexHtml)
-              : path.join(projectRoot, 'src/index.html'),
-          },
-        ],
-        define: {
-          'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
-        },
         progress: {},
-        // TODO(jack): This should go to withReact.
-        react: {
-          runtime: 'automatic',
-          development: isDev,
-          refresh: isDev,
-        },
       },
+      externals,
       stats: {
         colors: true,
         preset: 'normal',

From fb002b0690ec11fab112acad9d96c954d47d8602 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Wed, 29 Mar 2023 17:56:24 +0300
Subject: [PATCH 19/92] feat(rspack): install latest patch when configuring
 (#195)

---
 src/utils/versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 2a87c4d9d2ecb..662258b37834a 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '0.1.0';
-export const rspackDevServerVersion = '0.1.0';
+export const rspackCoreVersion = '~0.1.0';
+export const rspackDevServerVersion = '~0.1.0';
 
-export const rspackPluginMinifyVersion = '0.1.0';
-export const rspackLessLoaderVersion = '0.1.0';
+export const rspackPluginMinifyVersion = '~0.1.0';
+export const rspackLessLoaderVersion = '~0.1.0';
 
 export const reactVersion = '~18.2.0';
 export const reactDomVersion = '~18.2.0';

From cba3374267728d1d9f740e9169d8a1f423ad63a4 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:11:39 +0300
Subject: [PATCH 20/92] fix(rspack): add withWeb if web app (#200)

---
 package.json                                  |  1 +
 src/generators/configuration/configuration.ts | 84 +++++++++++++++++--
 2 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 0790b9b228686..a49cde93db1f4 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
   "dependencies": {
     "@nrwl/linter": "^15.8.1",
     "@nrwl/devkit": "^15.8.1",
+    "@phenomnomnominal/tsquery": "4.1.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",
     "less-loader": "11.1.0",
diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 08d775a151cc6..779fdb899d881 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -2,9 +2,11 @@ import {
   formatFiles,
   joinPathFragments,
   readProjectConfiguration,
+  TargetConfiguration,
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
+import { tsquery } from '@phenomnomnominal/tsquery';
 import { RspackExecutorSchema } from '../../executors/rspack/schema';
 import rspackInitGenerator from '../init/init';
 import { ConfigurationSchema } from './schema';
@@ -14,11 +16,19 @@ export async function configurationGenerator(
   options: ConfigurationSchema
 ) {
   const task = await rspackInitGenerator(tree, options);
-
-  const { targets } = readProjectConfiguration(tree, options.project);
+  const { targets, root } = readProjectConfiguration(tree, options.project);
   const foundStylePreprocessorOptions: { includePaths?: string[] } | undefined =
     targets?.build?.options?.stylePreprocessorOptions;
 
+  const { target, uiFramework } = determineFrameworkAndTarget(
+    tree,
+    options,
+    root,
+    targets
+  );
+  options.uiFramework = uiFramework;
+  options.target = target;
+
   addBuildTarget(tree, options);
   if (options.uiFramework !== 'none' || options.devServer) {
     addServeTarget(tree, options);
@@ -28,6 +38,57 @@ export async function configurationGenerator(
   return task;
 }
 
+function determineFrameworkAndTarget(
+  tree: Tree,
+  options: ConfigurationSchema,
+  projectRoot: string,
+  targets: {
+    [targetName: string]: TargetConfiguration<any>;
+  }
+): { target: 'node' | 'web'; uiFramework?: 'none' | 'react' | 'web' } {
+  // First try to infer if the target is node
+  if (options.target !== 'node') {
+    // Try to infer from jest config if the env is node
+    let jestConfigPath: string;
+    if (
+      targets?.test?.executor !== '@nrwl/jest:jest' &&
+      targets?.test?.options?.jestConfig
+    ) {
+      jestConfigPath = targets?.test?.options?.jestConfig;
+    } else {
+      jestConfigPath = joinPathFragments(projectRoot, 'jest.config.ts');
+    }
+
+    if (!tree.exists(jestConfigPath)) {
+      return { target: options.target, uiFramework: options.uiFramework };
+    }
+    const appFileContent = tree.read(jestConfigPath, 'utf-8');
+    const file = tsquery.ast(appFileContent);
+    // find testEnvironment: 'node' in jest config
+    const testEnvironment = tsquery(
+      file,
+      `PropertyAssignment:has(Identifier[name="testEnvironment"]) > StringLiteral[value="node"]`
+    );
+    if (testEnvironment.length > 0) {
+      return { target: 'node', uiFramework: options.uiFramework };
+    }
+  }
+
+  if (options.uiFramework !== 'react' && options.target === 'web') {
+    // Look if React is used in the project
+    let tsConfigPath = joinPathFragments(projectRoot, 'tsconfig.json');
+    if (!tree.exists(tsConfigPath)) {
+      tsConfigPath = determineTsConfig(tree, options);
+    }
+    const tsConfig = JSON.parse(tree.read(tsConfigPath).toString());
+    if (tsConfig?.compilerOptions?.jsx?.includes('react')) {
+      return { target: 'web', uiFramework: 'react' };
+    } else {
+      return { target: options.target, uiFramework: options.uiFramework };
+    }
+  }
+}
+
 function determineMain(tree: Tree, options: ConfigurationSchema) {
   if (options.main) return options.main;
 
@@ -55,6 +116,18 @@ function determineTsConfig(tree: Tree, options: ConfigurationSchema) {
 
 function addBuildTarget(tree: Tree, options: ConfigurationSchema) {
   const project = readProjectConfiguration(tree, options.project);
+
+  const assets = [];
+  if (
+    options.target === 'web' &&
+    tree.exists(joinPathFragments(project.root, 'src/favicon.ico'))
+  ) {
+    assets.push(joinPathFragments(project.root, 'src/favicon.ico'));
+  }
+  if (tree.exists(joinPathFragments(project.root, 'src/assets'))) {
+    assets.push(joinPathFragments(project.root, 'src/assets'));
+  }
+
   const buildOptions: RspackExecutorSchema = {
     target: options.target ?? 'web',
     outputPath: joinPathFragments(
@@ -65,10 +138,7 @@ function addBuildTarget(tree: Tree, options: ConfigurationSchema) {
     main: determineMain(tree, options),
     tsConfig: determineTsConfig(tree, options),
     rspackConfig: joinPathFragments(project.root, 'rspack.config.js'),
-    assets: [
-      joinPathFragments(project.root, 'src/favicon.ico'),
-      joinPathFragments(project.root, 'src/assets'),
-    ],
+    assets,
   };
 
   updateProjectConfiguration(tree, options.project, {
@@ -156,7 +226,7 @@ function createConfig(
         return config;
       });
     `;
-  } else if (options.uiFramework === 'web') {
+  } else if (options.uiFramework === 'web' || options.target === 'web') {
     return `
       const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
 

From fb84eb452742541e938bd69547d811c3672dc288 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Fri, 31 Mar 2023 15:02:23 -0400
Subject: [PATCH 21/92] chore(repo): fix release script (#202)

---
 src/generators/application/lib/add-cypress.ts | 1 -
 src/generators/application/lib/add-jest.ts    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/generators/application/lib/add-cypress.ts b/src/generators/application/lib/add-cypress.ts
index b73e98efa0885..ea753660a6e53 100644
--- a/src/generators/application/lib/add-cypress.ts
+++ b/src/generators/application/lib/add-cypress.ts
@@ -15,6 +15,5 @@ export async function addCypress(host: Tree, options: NormalizedSchema) {
     ...options,
     name: options.rootProject ? `e2e` : `${options.name}-e2e`,
     project: options.name,
-    rootProject: options.rootProject,
   });
 }
diff --git a/src/generators/application/lib/add-jest.ts b/src/generators/application/lib/add-jest.ts
index e55e566128b1c..02d81279dae74 100644
--- a/src/generators/application/lib/add-jest.ts
+++ b/src/generators/application/lib/add-jest.ts
@@ -26,7 +26,6 @@ export async function addJest(host: Tree, options: NormalizedSchema) {
     skipSerializers: true,
     setupFile: 'none',
     compiler: 'babel', // have to use babel for React projects
-    rootProject: options.rootProject,
   });
 
   updateSpecConfig(host, options);

From 54bdea0fad962cd8db3e3a4a8f26df6a8b2a52ba Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Fri, 31 Mar 2023 15:02:23 -0400
Subject: [PATCH 22/92] chore(repo): fix release script (#202)

---
 jest.config.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jest.config.ts b/jest.config.ts
index 893fb612ef641..b76e60a2dfc6b 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -2,13 +2,14 @@
 export default {
   displayName: 'rspack-e2e',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  globals: {},
   transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/e2e/rspack-e2e',

From 8f9daa0c5125c651d4484e597baa9c2524a16cc8 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Thu, 6 Apr 2023 17:11:48 +0300
Subject: [PATCH 23/92] feat(rspack): configuration generator better ux (#201)

---
 src/generators/application/application.ts     |   3 +-
 src/generators/configuration/configuration.ts | 321 +++-------
 src/generators/configuration/schema.d.ts      |   6 +-
 src/generators/configuration/schema.json      |  27 +-
 src/generators/init/init.ts                   |   2 +-
 src/generators/init/schema.d.ts               |   4 +-
 src/generators/init/schema.json               |   5 +-
 src/utils/generator-utils.ts                  | 600 ++++++++++++++++++
 8 files changed, 731 insertions(+), 237 deletions(-)
 create mode 100644 src/utils/generator-utils.ts

diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index b961d7c00f5e9..6258262ae4761 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -67,9 +67,10 @@ export default async function (
     project: options.name,
     devServer: true,
     tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
-    uiFramework: 'react',
+    framework: 'react',
     target: 'web',
     main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
+    newProject: true,
   });
   tasks.push(projectTask);
 
diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 779fdb899d881..5dc9e8586c134 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -1,13 +1,16 @@
+import { formatFiles, readProjectConfiguration, Tree } from '@nrwl/devkit';
 import {
-  formatFiles,
-  joinPathFragments,
-  readProjectConfiguration,
-  TargetConfiguration,
-  Tree,
-  updateProjectConfiguration,
-} from '@nrwl/devkit';
-import { tsquery } from '@phenomnomnominal/tsquery';
-import { RspackExecutorSchema } from '../../executors/rspack/schema';
+  addOrChangeBuildTarget,
+  addOrChangeServeTarget,
+  deleteWebpackConfig,
+  determineFrameworkAndTarget,
+  findExistingTargetsInProject,
+  handleUnknownExecutors,
+  handleUnsupportedUserProvidedTargets,
+  TargetFlags,
+  UserProvidedTargetName,
+  writeRspackConfigFile,
+} from '../../utils/generator-utils';
 import rspackInitGenerator from '../init/init';
 import { ConfigurationSchema } from './schema';
 
@@ -16,250 +19,116 @@ export async function configurationGenerator(
   options: ConfigurationSchema
 ) {
   const task = await rspackInitGenerator(tree, options);
-  const { targets, root } = readProjectConfiguration(tree, options.project);
-  const foundStylePreprocessorOptions: { includePaths?: string[] } | undefined =
-    targets?.build?.options?.stylePreprocessorOptions;
+  const { targets, root, projectType } = readProjectConfiguration(
+    tree,
+    options.project
+  );
 
-  const { target, uiFramework } = determineFrameworkAndTarget(
+  const { target, framework } = determineFrameworkAndTarget(
     tree,
     options,
     root,
     targets
   );
-  options.uiFramework = uiFramework;
+  options.framework = framework;
   options.target = target;
 
-  addBuildTarget(tree, options);
-  if (options.uiFramework !== 'none' || options.devServer) {
-    addServeTarget(tree, options);
-  }
-  writeRspackConfigFile(tree, options, foundStylePreprocessorOptions);
-  await formatFiles(tree);
-  return task;
-}
+  let foundStylePreprocessorOptions: { includePaths?: string[] } | undefined;
+
+  let buildTargetName = 'build';
+  let serveTargetName = 'serve';
+
+  /**
+   * This is for when we are converting an existing project
+   * to use the vite executors.
+   */
+  let projectAlreadyHasRspackTargets: TargetFlags = {};
+
+  if (!options.newProject) {
+    const userProvidedTargetName: UserProvidedTargetName = {
+      build: options.buildTarget,
+      serve: options.serveTarget,
+    };
+
+    const {
+      validFoundTargetName,
+      projectContainsUnsupportedExecutor,
+      userProvidedTargetIsUnsupported,
+      alreadyHasNxRspackTargets,
+    } = findExistingTargetsInProject(targets, userProvidedTargetName);
+    projectAlreadyHasRspackTargets = alreadyHasNxRspackTargets;
 
-function determineFrameworkAndTarget(
-  tree: Tree,
-  options: ConfigurationSchema,
-  projectRoot: string,
-  targets: {
-    [targetName: string]: TargetConfiguration<any>;
-  }
-): { target: 'node' | 'web'; uiFramework?: 'none' | 'react' | 'web' } {
-  // First try to infer if the target is node
-  if (options.target !== 'node') {
-    // Try to infer from jest config if the env is node
-    let jestConfigPath: string;
     if (
-      targets?.test?.executor !== '@nrwl/jest:jest' &&
-      targets?.test?.options?.jestConfig
+      alreadyHasNxRspackTargets.build &&
+      (alreadyHasNxRspackTargets.serve ||
+        projectType === 'library' ||
+        options.framework === 'nest')
     ) {
-      jestConfigPath = targets?.test?.options?.jestConfig;
-    } else {
-      jestConfigPath = joinPathFragments(projectRoot, 'jest.config.ts');
+      throw new Error(
+        `The project ${options.project} is already configured to use the @nrwl/rspack executors.
+        Please try a different project, or remove the existing targets 
+        and re-run this generator to reset the existing Rspack Configuration.
+        `
+      );
     }
 
-    if (!tree.exists(jestConfigPath)) {
-      return { target: options.target, uiFramework: options.uiFramework };
+    if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {
+      throw new Error(
+        `The project ${options.project} cannot be converted to use the @nrwl/rspack executors.`
+      );
     }
-    const appFileContent = tree.read(jestConfigPath, 'utf-8');
-    const file = tsquery.ast(appFileContent);
-    // find testEnvironment: 'node' in jest config
-    const testEnvironment = tsquery(
-      file,
-      `PropertyAssignment:has(Identifier[name="testEnvironment"]) > StringLiteral[value="node"]`
-    );
-    if (testEnvironment.length > 0) {
-      return { target: 'node', uiFramework: options.uiFramework };
-    }
-  }
 
-  if (options.uiFramework !== 'react' && options.target === 'web') {
-    // Look if React is used in the project
-    let tsConfigPath = joinPathFragments(projectRoot, 'tsconfig.json');
-    if (!tree.exists(tsConfigPath)) {
-      tsConfigPath = determineTsConfig(tree, options);
-    }
-    const tsConfig = JSON.parse(tree.read(tsConfigPath).toString());
-    if (tsConfig?.compilerOptions?.jsx?.includes('react')) {
-      return { target: 'web', uiFramework: 'react' };
-    } else {
-      return { target: options.target, uiFramework: options.uiFramework };
+    if (
+      !projectContainsUnsupportedExecutor &&
+      !validFoundTargetName.build &&
+      !validFoundTargetName.serve
+    ) {
+      await handleUnknownExecutors(options.project);
     }
-  }
-}
-
-function determineMain(tree: Tree, options: ConfigurationSchema) {
-  if (options.main) return options.main;
-
-  const project = readProjectConfiguration(tree, options.project);
-
-  const mainTsx = joinPathFragments(project.root, 'src/main.tsx');
-  if (tree.exists(mainTsx)) return mainTsx;
 
-  return joinPathFragments(project.root, 'src/main.ts');
-}
+    await handleUnsupportedUserProvidedTargets(
+      userProvidedTargetIsUnsupported,
+      userProvidedTargetName,
+      validFoundTargetName,
+      options.framework
+    );
 
-function determineTsConfig(tree: Tree, options: ConfigurationSchema) {
-  if (options.tsConfig) return options.tsConfig;
+    /**
+     * Once the user is at this stage, then they can go ahead and convert.
+     */
 
-  const project = readProjectConfiguration(tree, options.project);
+    buildTargetName = validFoundTargetName.build ?? buildTargetName;
+    serveTargetName = validFoundTargetName.serve ?? serveTargetName;
 
-  const appJson = joinPathFragments(project.root, 'tsconfig.app.json');
-  if (tree.exists(appJson)) return appJson;
+    // Not needed atm
+    // if (projectType === 'application' && options.target !== 'node') {
+    //   moveAndEditIndexHtml(tree, options, buildTargetName);
+    // }
 
-  const libJson = joinPathFragments(project.root, 'tsconfig.lib.json');
-  if (tree.exists(libJson)) return libJson;
+    foundStylePreprocessorOptions =
+      targets?.[buildTargetName]?.options?.stylePreprocessorOptions;
 
-  return joinPathFragments(project.root, 'tsconfig.json');
-}
+    deleteWebpackConfig(
+      tree,
+      root,
+      targets?.[buildTargetName]?.options?.webpackConfig
+    );
+  }
 
-function addBuildTarget(tree: Tree, options: ConfigurationSchema) {
-  const project = readProjectConfiguration(tree, options.project);
+  if (!projectAlreadyHasRspackTargets.build) {
+    addOrChangeBuildTarget(tree, options, buildTargetName);
+  }
 
-  const assets = [];
   if (
-    options.target === 'web' &&
-    tree.exists(joinPathFragments(project.root, 'src/favicon.ico'))
+    (options.framework !== 'none' || options.devServer) &&
+    options.framework !== 'nest' &&
+    !projectAlreadyHasRspackTargets.serve
   ) {
-    assets.push(joinPathFragments(project.root, 'src/favicon.ico'));
-  }
-  if (tree.exists(joinPathFragments(project.root, 'src/assets'))) {
-    assets.push(joinPathFragments(project.root, 'src/assets'));
-  }
-
-  const buildOptions: RspackExecutorSchema = {
-    target: options.target ?? 'web',
-    outputPath: joinPathFragments(
-      'dist',
-      // If standalone project then use the project's name in dist.
-      project.root === '.' ? project.name : project.root
-    ),
-    main: determineMain(tree, options),
-    tsConfig: determineTsConfig(tree, options),
-    rspackConfig: joinPathFragments(project.root, 'rspack.config.js'),
-    assets,
-  };
-
-  updateProjectConfiguration(tree, options.project, {
-    ...project,
-    targets: {
-      ...project.targets,
-      build: {
-        executor: '@nrwl/rspack:rspack',
-        outputs: ['{options.outputPath}'],
-        defaultConfiguration: 'production',
-        options: buildOptions,
-        configurations: {
-          development: {
-            mode: 'development',
-          },
-          production: {
-            mode: 'production',
-            optimization: options.target === 'web' ? true : undefined,
-            sourceMap: false,
-          },
-        },
-      },
-    },
-  });
-}
-
-function addServeTarget(tree: Tree, options: ConfigurationSchema) {
-  const project = readProjectConfiguration(tree, options.project);
-  updateProjectConfiguration(tree, options.project, {
-    ...project,
-    targets: {
-      ...project.targets,
-      serve: {
-        executor: '@nrwl/rspack:dev-server',
-        options: {
-          buildTarget: `${options.project}:build:development`,
-        },
-        configurations: {
-          development: {},
-          production: {
-            buildTarget: `${options.project}:build:production`,
-          },
-        },
-      },
-    },
-  });
-}
-
-function writeRspackConfigFile(
-  tree: Tree,
-  options: ConfigurationSchema,
-  stylePreprocessorOptions?: { includePaths?: string[] }
-) {
-  const project = readProjectConfiguration(tree, options.project);
-
-  tree.write(
-    joinPathFragments(project.root, 'rspack.config.js'),
-    createConfig(options, stylePreprocessorOptions)
-  );
-
-  // Remove previous webpack config if they exist
-  if (tree.exists(joinPathFragments(project.root, 'webpack.config.js')))
-    tree.delete(joinPathFragments(project.root, 'webpack.config.js'));
-  if (tree.exists(joinPathFragments(project.root, 'webpack.config.ts')))
-    tree.delete(joinPathFragments(project.root, 'webpack.config.ts'));
-}
-
-function createConfig(
-  options: ConfigurationSchema,
-  stylePreprocessorOptions?: { includePaths?: string[] }
-) {
-  if (options.uiFramework === 'react') {
-    return `
-      const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
-
-      module.exports = composePlugins(withNx(), withReact(${
-        stylePreprocessorOptions
-          ? `
-        {
-          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
-        }
-        `
-          : ''
-      }), (config) => {
-        return config;
-      });
-    `;
-  } else if (options.uiFramework === 'web' || options.target === 'web') {
-    return `
-      const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
-
-      module.exports = composePlugins(withNx(), withWeb(${
-        stylePreprocessorOptions
-          ? `
-        {
-          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
-        }
-        `
-          : ''
-      }), (config) => {
-        return config;
-      });
-    `;
-  } else {
-    return `
-      const { composePlugins, withNx${
-        stylePreprocessorOptions ? ', withWeb' : ''
-      } } = require('@nrwl/rspack');
-
-      module.exports = composePlugins(withNx()${
-        stylePreprocessorOptions
-          ? `,
-        withWeb({
-          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
-        })`
-          : ''
-      }, (config) => {
-        return config;
-      });
-    `;
+    addOrChangeServeTarget(tree, options, serveTargetName);
   }
+  writeRspackConfigFile(tree, options, foundStylePreprocessorOptions);
+  await formatFiles(tree);
+  return task;
 }
 
 export default configurationGenerator;
diff --git a/src/generators/configuration/schema.d.ts b/src/generators/configuration/schema.d.ts
index 2d1081ba5e69f..62fea52e10e7b 100644
--- a/src/generators/configuration/schema.d.ts
+++ b/src/generators/configuration/schema.d.ts
@@ -1,4 +1,4 @@
-import { InitGeneratorSchema } from '../init/schema';
+import { Framework, InitGeneratorSchema } from '../init/schema';
 
 export interface ConfigurationSchema extends InitGeneratorSchema {
   project: string;
@@ -6,4 +6,8 @@ export interface ConfigurationSchema extends InitGeneratorSchema {
   tsConfig?: string;
   target?: 'node' | 'web';
   skipValidation?: boolean;
+  newProject?: boolean;
+  buildTarget?: string;
+  serveTarget?: string;
+  framework?: Framework;
 }
diff --git a/src/generators/configuration/schema.json b/src/generators/configuration/schema.json
index 5544dd84460bf..f621f7f09305b 100644
--- a/src/generators/configuration/schema.json
+++ b/src/generators/configuration/schema.json
@@ -16,6 +16,14 @@
       "x-prompt": "What is the name of the project to set up a rspack for?",
       "x-priority": "important"
     },
+    "framework": {
+      "type": "string",
+      "description": "The framework used by the project.",
+      "x-prompt": "What framework is the project you want to convert using?",
+      "enum": ["none", "react", "web", "nest"],
+      "alias": ["uiFramework"],
+      "x-priority": "important"
+    },
     "main": {
       "type": "string",
       "description": "Path relative to the workspace root for the main entry file. Defaults to '<projectRoot>/src/main.ts'.",
@@ -37,15 +45,24 @@
       "description": "Add a serve target to run a local rspack dev-server",
       "default": false
     },
-    "uiFramework": {
-      "type": "string",
-      "description": "The UI framework used by the project.",
-      "enum": ["none", "react"]
-    },
     "style": {
       "type": "string",
       "description": "The style solution to use.",
       "enum": ["none", "css", "scss", "less"]
+    },
+    "newProject": {
+      "type": "boolean",
+      "description": "Is this a new project?",
+      "default": false,
+      "hidden": true
+    },
+    "buildTarget": {
+      "type": "string",
+      "description": "The build target of the project to be transformed to use the @nrwl/vite:build executor."
+    },
+    "serveTarget": {
+      "type": "string",
+      "description": "The serve target of the project to be transformed to use the @nrwl/vite:dev-server and @nrwl/vite:preview-server executors."
     }
   },
   "required": ["project"]
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index fedac20e73ec6..e0943619ce9f0 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -31,7 +31,7 @@ export async function rspackInitGenerator(
     devDependencies['@rspack/less-loader'] = rspackLessLoaderVersion;
   }
 
-  if (schema.uiFramework !== 'none' || schema.devServer) {
+  if (schema.framework !== 'none' || schema.devServer) {
     devDependencies['@rspack/dev-server'] = rspackDevServerVersion;
   }
 
diff --git a/src/generators/init/schema.d.ts b/src/generators/init/schema.d.ts
index 6025907385ef8..b1184cfa56281 100644
--- a/src/generators/init/schema.d.ts
+++ b/src/generators/init/schema.d.ts
@@ -1,5 +1,7 @@
+export type Framework = 'none' | 'react' | 'web' | 'nest';
+
 export interface InitGeneratorSchema {
-  uiFramework?: 'none' | 'react' | 'web';
+  framework?: Framework;
   style?: 'none' | 'css' | 'scss' | 'less';
   devServer?: boolean;
 }
diff --git a/src/generators/init/schema.json b/src/generators/init/schema.json
index 38e289c320fd9..11b8c4c269b85 100644
--- a/src/generators/init/schema.json
+++ b/src/generators/init/schema.json
@@ -5,10 +5,11 @@
   "title": "",
   "type": "object",
   "properties": {
-    "uiFramework": {
+    "framework": {
       "type": "string",
       "description": "The UI framework used by the project.",
-      "enum": ["none", "react", "web"]
+      "enum": ["none", "react", "web", "nest"],
+      "alias": ["uiFramework"]
     },
     "style": {
       "type": "string",
diff --git a/src/utils/generator-utils.ts b/src/utils/generator-utils.ts
new file mode 100644
index 0000000000000..5ae91f1516af2
--- /dev/null
+++ b/src/utils/generator-utils.ts
@@ -0,0 +1,600 @@
+import {
+  joinPathFragments,
+  logger,
+  readProjectConfiguration,
+  TargetConfiguration,
+  Tree,
+  updateProjectConfiguration,
+} from '@nrwl/devkit';
+import { tsquery } from '@phenomnomnominal/tsquery';
+import { RspackExecutorSchema } from '../executors/rspack/schema';
+import { ConfigurationSchema } from '../generators/configuration/schema';
+import { Framework } from '../generators/init/schema';
+
+export type Target = 'build' | 'serve';
+export type TargetFlags = Partial<Record<Target, boolean>>;
+export type UserProvidedTargetName = Partial<Record<Target, string>>;
+export type ValidFoundTargetName = Partial<Record<Target, string>>;
+
+export function findExistingTargetsInProject(
+  targets: {
+    [targetName: string]: TargetConfiguration;
+  },
+  userProvidedTargets?: UserProvidedTargetName
+): {
+  validFoundTargetName: ValidFoundTargetName;
+  projectContainsUnsupportedExecutor: boolean;
+  userProvidedTargetIsUnsupported: TargetFlags;
+  alreadyHasNxRspackTargets: TargetFlags;
+} {
+  const output: ReturnType<typeof findExistingTargetsInProject> = {
+    validFoundTargetName: {},
+    projectContainsUnsupportedExecutor: false,
+    userProvidedTargetIsUnsupported: {},
+    alreadyHasNxRspackTargets: {},
+  };
+
+  const supportedExecutors = {
+    build: [
+      '@nxext/vite:build',
+      '@nrwl/webpack:webpack',
+      '@nrwl/rollup:rollup',
+      '@nrwl/web:rollup',
+      '@nrwl/vite:build',
+    ],
+    serve: [
+      '@nxext/vite:dev',
+      '@nrwl/webpack:dev-server',
+      '@nrwl/vite:dev-server',
+    ],
+  };
+
+  const unsupportedExecutors = [
+    '@nrwl/js:babel',
+    '@nrwl/js:node',
+    '@nrwl/js:swc',
+    '@nrwl/js:tsc',
+    '@nrwl/angular:ng-packagr-lite',
+    '@nrwl/angular:package',
+    '@nrwl/angular:webpack-browser',
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:dev-server',
+    '@nrwl/react-native:run-ios',
+    '@nrwl/react-native:start',
+    '@nrwl/react-native:run-android',
+    '@nrwl/react-native:bundle',
+    '@nrwl/react-native:build-android',
+    '@nrwl/react-native:bundle',
+    '@nrwl/next:build',
+    '@nrwl/next:server',
+    '@nrwl/esbuild:esbuild',
+  ];
+
+  // First, we check if the user has provided a target
+  // If they have, we check if the executor the target is using is supported
+  // If it's not supported, then we set the unsupported flag to true for that target
+
+  function checkUserProvidedTarget(target: Target) {
+    if (userProvidedTargets?.[target]) {
+      if (
+        supportedExecutors[target].includes(
+          targets[userProvidedTargets[target]]?.executor
+        )
+      ) {
+        output.validFoundTargetName[target] = userProvidedTargets[target];
+      } else {
+        output.userProvidedTargetIsUnsupported[target] = true;
+      }
+    }
+  }
+
+  checkUserProvidedTarget('build');
+  checkUserProvidedTarget('serve');
+
+  // Returns early when we have a build, serve, and test targets.
+  if (output.validFoundTargetName.build && output.validFoundTargetName.serve) {
+    return output;
+  }
+
+  // We try to find the targets that are using the supported executors
+  // for build, serve and test, since these are the ones we will be converting
+  for (const target in targets) {
+    const executorName = targets[target].executor;
+
+    const hasRspackTargets = output.alreadyHasNxRspackTargets;
+    hasRspackTargets.build ||= executorName === '@nrwl/rspack:rspack';
+    hasRspackTargets.serve ||= executorName === '@nrwl/rspack:dev-server';
+
+    const foundTargets = output.validFoundTargetName;
+    if (
+      !foundTargets.build &&
+      supportedExecutors.build.includes(executorName)
+    ) {
+      foundTargets.build = target;
+    }
+    if (
+      !foundTargets.serve &&
+      supportedExecutors.serve.includes(executorName)
+    ) {
+      foundTargets.serve = target;
+    }
+
+    output.projectContainsUnsupportedExecutor ||=
+      unsupportedExecutors.includes(executorName);
+  }
+
+  return output;
+}
+
+export function addOrChangeBuildTarget(
+  tree: Tree,
+  options: ConfigurationSchema,
+  target: string
+) {
+  const project = readProjectConfiguration(tree, options.project);
+  const assets = [];
+  if (
+    options.target === 'web' &&
+    tree.exists(joinPathFragments(project.root, 'src/favicon.ico'))
+  ) {
+    assets.push(joinPathFragments(project.root, 'src/favicon.ico'));
+  }
+  if (tree.exists(joinPathFragments(project.root, 'src/assets'))) {
+    assets.push(joinPathFragments(project.root, 'src/assets'));
+  }
+
+  const buildOptions: RspackExecutorSchema = {
+    target: options.target ?? 'web',
+    outputPath: joinPathFragments(
+      'dist',
+      // If standalone project then use the project's name in dist.
+      project.root === '.' ? project.name : project.root
+    ),
+    main: determineMain(tree, options),
+    tsConfig: determineTsConfig(tree, options),
+    rspackConfig: joinPathFragments(project.root, 'rspack.config.js'),
+    assets,
+  };
+
+  project.targets ??= {};
+
+  project.targets[target] = {
+    executor: '@nrwl/rspack:rspack',
+    outputs: ['{options.outputPath}'],
+    defaultConfiguration: 'production',
+    options: buildOptions,
+    configurations: {
+      development: {
+        mode: 'development',
+      },
+      production: {
+        mode: 'production',
+        optimization: options.target === 'web' ? true : undefined,
+        sourceMap: false,
+      },
+    },
+  };
+
+  updateProjectConfiguration(tree, options.project, project);
+}
+
+export function addOrChangeServeTarget(
+  tree: Tree,
+  options: ConfigurationSchema,
+  target: string
+) {
+  const project = readProjectConfiguration(tree, options.project);
+
+  project.targets ??= {};
+
+  project.targets[target] = {
+    executor: '@nrwl/rspack:dev-server',
+    options: {
+      buildTarget: `${options.project}:build:development`,
+    },
+    configurations: {
+      development: {},
+      production: {
+        buildTarget: `${options.project}:build:production`,
+      },
+    },
+  };
+
+  updateProjectConfiguration(tree, options.project, project);
+}
+
+export function writeRspackConfigFile(
+  tree: Tree,
+  options: ConfigurationSchema,
+  stylePreprocessorOptions?: { includePaths?: string[] }
+) {
+  const project = readProjectConfiguration(tree, options.project);
+
+  tree.write(
+    joinPathFragments(project.root, 'rspack.config.js'),
+    createConfig(options, stylePreprocessorOptions)
+  );
+}
+
+function createConfig(
+  options: ConfigurationSchema,
+  stylePreprocessorOptions?: { includePaths?: string[] }
+) {
+  if (options.framework === 'react') {
+    return `
+      const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx(), withReact(${
+        stylePreprocessorOptions
+          ? `
+        {
+          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
+        }
+        `
+          : ''
+      }), (config) => {
+        return config;
+      });
+    `;
+  } else if (options.framework === 'web' || options.target === 'web') {
+    return `
+      const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx(), withWeb(${
+        stylePreprocessorOptions
+          ? `
+        {
+          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
+        }
+        `
+          : ''
+      }), (config) => {
+        return config;
+      });
+    `;
+  } else if (options.framework === 'nest') {
+    return `
+    const { composePlugins, withNx } = require('@nrwl/rspack');
+
+    module.exports = composePlugins(withNx(), (config) => {
+      ${
+        options.main
+          ? `config.entry = {
+          main: './${options.main}',
+          };`
+          : ``
+      }
+      return config;
+    });
+    `;
+  } else {
+    return `
+      const { composePlugins, withNx${
+        stylePreprocessorOptions ? ', withWeb' : ''
+      } } = require('@nrwl/rspack');
+
+      module.exports = composePlugins(withNx()${
+        stylePreprocessorOptions
+          ? `,
+        withWeb({
+          stylePreprocessorOptions: ${JSON.stringify(stylePreprocessorOptions)},
+        })`
+          : ''
+      }, (config) => {
+        return config;
+      });
+    `;
+  }
+}
+
+export function deleteWebpackConfig(
+  tree: Tree,
+  projectRoot: string,
+  webpackConfigFilePath?: string
+) {
+  const webpackConfigPath =
+    webpackConfigFilePath && tree.exists(webpackConfigFilePath)
+      ? webpackConfigFilePath
+      : tree.exists(`${projectRoot}/webpack.config.js`)
+      ? `${projectRoot}/webpack.config.js`
+      : tree.exists(`${projectRoot}/webpack.config.ts`)
+      ? `${projectRoot}/webpack.config.ts`
+      : null;
+  if (webpackConfigPath) {
+    tree.delete(webpackConfigPath);
+  }
+}
+
+// Maybe add delete vite config?
+
+export function moveAndEditIndexHtml(
+  tree: Tree,
+  options: ConfigurationSchema,
+  buildTarget: string
+) {
+  const projectConfig = readProjectConfiguration(tree, options.project);
+
+  let indexHtmlPath =
+    projectConfig.targets?.[buildTarget]?.options?.index ??
+    `${projectConfig.root}/src/index.html`;
+  let mainPath =
+    projectConfig.targets?.[buildTarget]?.options?.main ??
+    `${projectConfig.root}/src/main.ts${
+      options.framework === 'react' ? 'x' : ''
+    }`;
+
+  if (projectConfig.root !== '.') {
+    mainPath = mainPath.replace(projectConfig.root, '');
+  }
+
+  if (
+    !tree.exists(indexHtmlPath) &&
+    tree.exists(`${projectConfig.root}/index.html`)
+  ) {
+    indexHtmlPath = `${projectConfig.root}/index.html`;
+  }
+
+  if (tree.exists(indexHtmlPath)) {
+    const indexHtmlContent = tree.read(indexHtmlPath, 'utf8');
+    if (
+      !indexHtmlContent.includes(
+        `<script type="module" src="${mainPath}"></script>`
+      )
+    ) {
+      tree.write(
+        `${projectConfig.root}/index.html`,
+        indexHtmlContent.replace(
+          '</body>',
+          `<script type="module" src="${mainPath}"></script>
+          </body>`
+        )
+      );
+
+      if (tree.exists(`${projectConfig.root}/src/index.html`)) {
+        tree.delete(`${projectConfig.root}/src/index.html`);
+      }
+    }
+  } else {
+    tree.write(
+      `${projectConfig.root}/index.html`,
+      `<!DOCTYPE html>
+      <html lang="en">
+        <head>
+          <meta charset="UTF-8" />
+          <link rel="icon" href="/favicon.ico" />
+          <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+          <title>Vite</title>
+        </head>
+        <body>
+          <div id="root"></div>
+          <script type="module" src="${mainPath}"></script>
+        </body>
+      </html>`
+    );
+  }
+}
+
+export function normalizeViteConfigFilePathWithTree(
+  tree: Tree,
+  projectRoot: string,
+  configFile?: string
+): string {
+  return configFile && tree.exists(configFile)
+    ? configFile
+    : tree.exists(joinPathFragments(`${projectRoot}/rspack.config.ts`))
+    ? joinPathFragments(`${projectRoot}/rspack.config.ts`)
+    : tree.exists(joinPathFragments(`${projectRoot}/rspack.config.js`))
+    ? joinPathFragments(`${projectRoot}/rspack.config.js`)
+    : undefined;
+}
+
+export function getViteConfigPathForProject(
+  tree: Tree,
+  projectName: string,
+  target?: string
+) {
+  let viteConfigPath: string | undefined;
+  const { targets, root } = readProjectConfiguration(tree, projectName);
+  if (target) {
+    viteConfigPath = targets?.[target]?.options?.configFile;
+  } else {
+    const config = Object.values(targets).find(
+      (config) => config.executor === '@nrwl/rspack:build'
+    );
+    viteConfigPath = config?.options?.configFile;
+  }
+
+  return normalizeViteConfigFilePathWithTree(tree, root, viteConfigPath);
+}
+
+export async function handleUnsupportedUserProvidedTargets(
+  userProvidedTargetIsUnsupported: TargetFlags,
+  userProvidedTargetName: UserProvidedTargetName,
+  validFoundTargetName: ValidFoundTargetName,
+  framework: Framework
+) {
+  if (userProvidedTargetIsUnsupported.build && validFoundTargetName.build) {
+    await handleUnsupportedUserProvidedTargetsErrors(
+      userProvidedTargetName.build,
+      validFoundTargetName.build,
+      'build',
+      'rspack'
+    );
+  }
+
+  if (
+    framework !== 'nest' &&
+    userProvidedTargetIsUnsupported.serve &&
+    validFoundTargetName.serve
+  ) {
+    await handleUnsupportedUserProvidedTargetsErrors(
+      userProvidedTargetName.serve,
+      validFoundTargetName.serve,
+      'serve',
+      'dev-server'
+    );
+  }
+}
+
+async function handleUnsupportedUserProvidedTargetsErrors(
+  userProvidedTargetName: string,
+  validFoundTargetName: string,
+  target: Target,
+  executor: 'rspack' | 'dev-server'
+) {
+  logger.warn(
+    `The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nrwl/rspack:${executor} executor.
+     However, we found the following ${target} target in your project that can be converted: ${validFoundTargetName}
+
+     Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
+     your changes before converting a project to use Vite.js, and test the converted project thoroughly before deploying it.
+    `
+  );
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { Confirm } = require('enquirer');
+  const prompt = new Confirm({
+    name: 'question',
+    message: `Should we convert the ${validFoundTargetName} target to use the @nrwl/rspack:${executor} executor?`,
+    initial: true,
+  });
+  const shouldConvert = await prompt.run();
+  if (!shouldConvert) {
+    throw new Error(
+      `The ${target} target ${userProvidedTargetName} cannot be converted to use the @nrwl/rspack:${executor} executor.
+      Please try again, either by providing a different ${target} target or by not providing a target at all (Nx will
+        convert the first one it finds, most probably this one: ${validFoundTargetName})
+
+      Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
+      your changes before converting a project to use Vite.js, and test the converted project thoroughly before deploying it.
+      `
+    );
+  }
+}
+
+export async function handleUnknownExecutors(projectName: string) {
+  logger.warn(
+    `
+      We could not find any targets in project ${projectName} that use executors which 
+      can be converted to the @nrwl/rspack executors.
+
+      This either means that your project may not have a target 
+      for building, serving, or testing at all, or that your targets are 
+      using executors that are not known to Nx.
+      
+      If you still want to convert your project to use the @nrwl/rspack executors,
+      please make sure to commit your changes before running this generator.
+      `
+  );
+
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { Confirm } = require('enquirer');
+  const prompt = new Confirm({
+    name: 'question',
+    message: `Should Nx convert your project to use the @nrwl/rspack executors?`,
+    initial: true,
+  });
+  const shouldConvert = await prompt.run();
+  if (!shouldConvert) {
+    throw new Error(`
+      Nx could not verify that the executors you are using can be converted to the @nrwl/rspack executors.
+      Please try again with a different project.
+    `);
+  }
+}
+
+export function determineFrameworkAndTarget(
+  tree: Tree,
+  options: ConfigurationSchema,
+  projectRoot: string,
+  targets: {
+    [targetName: string]: TargetConfiguration<any>;
+  }
+): { target: 'node' | 'web'; framework?: Framework } {
+  // First try to infer if the target is node
+  if (options.target !== 'node') {
+    // Try to infer from jest config if the env is node
+    let jestConfigPath: string;
+    if (
+      targets?.test?.executor !== '@nrwl/jest:jest' &&
+      targets?.test?.options?.jestConfig
+    ) {
+      jestConfigPath = targets?.test?.options?.jestConfig;
+    } else {
+      jestConfigPath = joinPathFragments(projectRoot, 'jest.config.ts');
+    }
+
+    if (!tree.exists(jestConfigPath)) {
+      return { target: options.target, framework: options.framework };
+    }
+    const appFileContent = tree.read(jestConfigPath, 'utf-8');
+    const file = tsquery.ast(appFileContent);
+    // find testEnvironment: 'node' in jest config
+    const testEnvironment = tsquery(
+      file,
+      `PropertyAssignment:has(Identifier[name="testEnvironment"]) > StringLiteral[value="node"]`
+    );
+    if (testEnvironment.length > 0) {
+      return { target: 'node', framework: options.framework };
+    }
+
+    if (tree.exists(joinPathFragments(projectRoot, 'src/main.ts'))) {
+      const appFileContent = tree.read(
+        joinPathFragments(projectRoot, 'src/main.ts'),
+        'utf-8'
+      );
+      const file = tsquery.ast(appFileContent);
+      const hasNestJsDependency = tsquery(
+        file,
+        `ImportDeclaration:has(StringLiteral[value="@nestjs/common"])`
+      );
+      if (hasNestJsDependency?.length > 0) {
+        return { target: 'node', framework: 'nest' };
+      }
+    }
+  }
+
+  if (options.framework === 'nest') {
+    return { target: 'node', framework: 'nest' };
+  }
+
+  if (options.framework !== 'react' && options.target === 'web') {
+    // Look if React is used in the project
+    let tsConfigPath = joinPathFragments(projectRoot, 'tsconfig.json');
+    if (!tree.exists(tsConfigPath)) {
+      tsConfigPath = determineTsConfig(tree, options);
+    }
+    const tsConfig = JSON.parse(tree.read(tsConfigPath).toString());
+    if (tsConfig?.compilerOptions?.jsx?.includes('react')) {
+      return { target: 'web', framework: 'react' };
+    } else {
+      return { target: options.target, framework: options.framework };
+    }
+  }
+
+  return { target: options.target, framework: options.framework };
+}
+
+export function determineMain(tree: Tree, options: ConfigurationSchema) {
+  if (options.main) return options.main;
+
+  const project = readProjectConfiguration(tree, options.project);
+
+  const mainTsx = joinPathFragments(project.root, 'src/main.tsx');
+  if (tree.exists(mainTsx)) return mainTsx;
+
+  return joinPathFragments(project.root, 'src/main.ts');
+}
+
+export function determineTsConfig(tree: Tree, options: ConfigurationSchema) {
+  if (options.tsConfig) return options.tsConfig;
+
+  const project = readProjectConfiguration(tree, options.project);
+
+  const appJson = joinPathFragments(project.root, 'tsconfig.app.json');
+  if (tree.exists(appJson)) return appJson;
+
+  const libJson = joinPathFragments(project.root, 'tsconfig.lib.json');
+  if (tree.exists(libJson)) return libJson;
+
+  return joinPathFragments(project.root, 'tsconfig.json');
+}

From 0869fed7720900e6f018ef09e8dcb5f9a3d67ece Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Thu, 6 Apr 2023 17:16:23 +0300
Subject: [PATCH 24/92] feat(rspack): builder returns outfile (#207)

---
 src/executors/rspack/rspack.impl.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index c1bb789ef1d14..a6568398987d2 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -22,7 +22,7 @@ export default async function runExecutor(
 
   const compiler = await createCompiler(options, context);
 
-  return new Promise<{ success: boolean }>((res) => {
+  return new Promise<{ success: boolean; outfile?: string }>((res) => {
     compiler.run((error, stats) => {
       compiler.close(() => {
         if (error) {
@@ -44,7 +44,10 @@ export default async function runExecutor(
         if (printedStats) {
           console.error(printedStats);
         }
-        res({ success: !stats.hasErrors() });
+        res({
+          success: !stats.hasErrors(),
+          outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+        });
       });
     });
   });

From 394d661534904a4deb854c417690e44125c1b1b5 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 11 Apr 2023 17:57:48 +0300
Subject: [PATCH 25/92] fix(rspack): use ensureTypescript before tsquery (#215)

---
 package.json                 | 1 +
 src/utils/generator-utils.ts | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a49cde93db1f4..abf66154f6c51 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
+    "@nrwl/js": "^15.8.1",
     "@nrwl/linter": "^15.8.1",
     "@nrwl/devkit": "^15.8.1",
     "@phenomnomnominal/tsquery": "4.1.1",
diff --git a/src/utils/generator-utils.ts b/src/utils/generator-utils.ts
index 5ae91f1516af2..359e6d6fb98e9 100644
--- a/src/utils/generator-utils.ts
+++ b/src/utils/generator-utils.ts
@@ -6,7 +6,7 @@ import {
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { tsquery } from '@phenomnomnominal/tsquery';
+import { ensureTypescript } from '@nrwl/js/src/utils/typescript/ensure-typescript';
 import { RspackExecutorSchema } from '../executors/rspack/schema';
 import { ConfigurationSchema } from '../generators/configuration/schema';
 import { Framework } from '../generators/init/schema';
@@ -510,6 +510,10 @@ export function determineFrameworkAndTarget(
     [targetName: string]: TargetConfiguration<any>;
   }
 ): { target: 'node' | 'web'; framework?: Framework } {
+  ensureTypescript();
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { tsquery } = require('@phenomnomnominal/tsquery');
+
   // First try to infer if the target is node
   if (options.target !== 'node') {
     // Try to infer from jest config if the env is node

From 8d50f89f4f8062ba323d86073a25e2819d79c2f0 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 11 Apr 2023 18:36:06 +0300
Subject: [PATCH 26/92] feat(rspack): simplify app generator (#212)

Co-Author: Douglas Machado <douglas.machado@valor-software.com>
---
 package.json                                  |   2 +-
 src/generators/application/application.ts     | 164 ++--
 .../files/src/app/app.module.__style__        |   2 -
 .../files/src/app/app.spec.tsx__template__    |  11 -
 .../files/src/app/app.tsx__template__         |  10 -
 .../files/src/app/nx-welcome.tsx__template__  | 820 ------------------
 .../application/files/src/assets/.gitkeep     |   0
 .../application/files/src/favicon.ico         | Bin 15086 -> 0 bytes
 .../files/src/index.html__template__          |  14 -
 .../files/src/main.tsx__template__            |  15 -
 .../application/files/src/styles.__style__    |   1 -
 .../files/tsconfig.app.json__template__       |  13 -
 src/generators/application/lib/add-cypress.ts |  19 -
 src/generators/application/lib/add-jest.ts    |  55 --
 src/generators/application/lib/add-linting.ts |  69 --
 .../application/lib/create-ts-config.ts       |  68 +-
 src/generators/application/schema.d.ts        |   3 +-
 src/generators/application/schema.json        |  18 +-
 src/generators/configuration/configuration.ts |  16 +-
 src/generators/configuration/schema.d.ts      |   3 +-
 src/generators/configuration/schema.json      |   4 +
 src/generators/init/init.ts                   |  22 +-
 src/generators/init/schema.d.ts               |   3 +-
 src/generators/init/schema.json               |   6 +-
 src/generators/preset/schema.d.ts             |   3 +-
 src/generators/preset/schema.json             |  17 +-
 src/utils/generator-utils.ts                  |   7 -
 src/utils/versions.ts                         |   5 +
 src/utils/with-nx.ts                          |   8 +-
 29 files changed, 201 insertions(+), 1177 deletions(-)
 delete mode 100644 src/generators/application/files/src/app/app.module.__style__
 delete mode 100644 src/generators/application/files/src/app/app.spec.tsx__template__
 delete mode 100644 src/generators/application/files/src/app/app.tsx__template__
 delete mode 100644 src/generators/application/files/src/app/nx-welcome.tsx__template__
 delete mode 100644 src/generators/application/files/src/assets/.gitkeep
 delete mode 100644 src/generators/application/files/src/favicon.ico
 delete mode 100644 src/generators/application/files/src/index.html__template__
 delete mode 100644 src/generators/application/files/src/main.tsx__template__
 delete mode 100644 src/generators/application/files/src/styles.__style__
 delete mode 100644 src/generators/application/files/tsconfig.app.json__template__
 delete mode 100644 src/generators/application/lib/add-cypress.ts
 delete mode 100644 src/generators/application/lib/add-jest.ts
 delete mode 100644 src/generators/application/lib/add-linting.ts

diff --git a/package.json b/package.json
index abf66154f6c51..eb6755f792395 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "@nrwl/js": "^15.8.1",
     "@nrwl/linter": "^15.8.1",
     "@nrwl/devkit": "^15.8.1",
-    "@phenomnomnominal/tsquery": "4.1.1",
+    "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",
     "less-loader": "11.1.0",
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index 6258262ae4761..05a6c44ddd2ed 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -1,111 +1,101 @@
 import {
-  addDependenciesToPackageJson,
-  addProjectConfiguration,
   ensurePackage,
   formatFiles,
-  generateFiles,
-  joinPathFragments,
-  names,
-  offsetFromRoot as _offsetFromRoot,
+  runTasksInSerial,
   Tree,
 } from '@nrwl/devkit';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
 import { version as nxVersion } from 'nx/package.json';
-import * as path from 'path';
-import {
-  lessVersion,
-  reactDomVersion,
-  reactVersion,
-  sassVersion,
-  stylusVersion,
-  typesReactDomVersion,
-  typesReactVersion,
-} from '../../utils/versions';
-import { configurationGenerator } from '../configuration/configuration';
-import { addCypress } from './lib/add-cypress';
-import { addJest } from './lib/add-jest';
-import { addLinting } from './lib/add-linting';
-import { createTsConfig } from './lib/create-ts-config';
+import configurationGenerator from '../configuration/configuration';
+import rspackInitGenerator from '../init/init';
 import { normalizeOptions } from './lib/normalize-options';
-import { ApplicationGeneratorSchema, NormalizedSchema } from './schema';
+import { ApplicationGeneratorSchema } from './schema';
 
 export default async function (
   tree: Tree,
   _options: ApplicationGeneratorSchema
 ) {
-  await ensurePackage(tree, '@nrwl/react', nxVersion);
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { reactInitGenerator } = require('@nrwl/react');
-
   const tasks = [];
+  const initTask = await rspackInitGenerator(tree, _options);
+  tasks.push(initTask);
+
   const options = normalizeOptions(tree, _options);
 
   options.style ??= 'css';
 
-  addProjectConfiguration(tree, options.name, {
-    root: options.appProjectRoot,
-    projectType: 'application',
-    sourceRoot: `${options.appProjectRoot}/src`,
-    targets: {},
-  });
-
-  const offsetFromRoot = _offsetFromRoot(options.appProjectRoot);
-  generateFiles(tree, path.join(__dirname, 'files'), options.appProjectRoot, {
-    ...options,
-    ...names(options.name),
-    offsetFromRoot,
-    template: '',
-  });
-
-  createTsConfig(
-    tree,
-    options,
-    joinPathFragments(offsetFromRoot, 'tsconfig.base.json')
-  );
-
-  const projectTask = await configurationGenerator(tree, {
-    project: options.name,
-    devServer: true,
-    tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
-    framework: 'react',
-    target: 'web',
-    main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
-    newProject: true,
-  });
-  tasks.push(projectTask);
+  if (options.framework === 'nest') {
+    const { applicationGenerator: nestAppGenerator } = ensurePackage(
+      '@nrwl/nest',
+      nxVersion
+    );
+    const createAppTask = await nestAppGenerator(tree, {
+      ...options,
+      skipFormat: true,
+      tags: options.tags ?? '',
+    });
 
-  const jestTask = await addJest(tree, options);
-  tasks.push(jestTask);
+    const convertAppTask = await configurationGenerator(tree, {
+      project: options.name,
+      target: 'node',
+      newProject: false,
+      buildTarget: 'build',
+      framework: 'nest',
+    });
 
-  const cypressTask = await addCypress(tree, options);
-  tasks.push(cypressTask);
-
-  const lintTask = await addLinting(tree, options);
-  tasks.push(lintTask);
-
-  const installTask = addDependenciesToPackageJson(
-    tree,
-    { react: reactVersion, 'react-dom': reactDomVersion },
-    {
-      ...getStyleDependency(options),
-      '@nrwl/react': nxVersion,
-      '@types/react': typesReactVersion,
-      '@types/react-dom': typesReactDomVersion,
-    }
-  );
-  tasks.push(installTask);
-
-  const reactInitTask = await reactInitGenerator(tree, options);
-  tasks.push(reactInitTask);
+    tasks.push(createAppTask, convertAppTask);
+  } else if (options.framework === 'web') {
+    const { applicationGenerator: webAppGenerator } = ensurePackage(
+      '@nrwl/web',
+      nxVersion
+    );
+    const createAppTask = await webAppGenerator(tree, {
+      bundler: 'webpack',
+      name: options.name,
+      style: options.style,
+      directorsy: options.directory,
+      tags: options.tags ?? '',
+      unitTestRunner: options.unitTestRunner,
+      e2eTestRunner: options.e2eTestRunner,
+      rootProject: options.rootProject,
+      skipFormat: true,
+    });
+    const convertAppTask = await configurationGenerator(tree, {
+      project: options.name,
+      target: 'web',
+      newProject: false,
+      buildTarget: 'build',
+      serveTarget: 'serve',
+      framework: 'web',
+    });
+    tasks.push(createAppTask, convertAppTask);
+  } else {
+    // default to react
+    const { applicationGenerator: reactAppGenerator } = ensurePackage(
+      '@nrwl/react',
+      nxVersion
+    );
+    const createAppTask = await reactAppGenerator(tree, {
+      bundler: 'webpack',
+      name: options.name,
+      style: options.style,
+      directorsy: options.directory,
+      tags: options.tags ?? '',
+      unitTestRunner: options.unitTestRunner,
+      e2eTestRunner: options.e2eTestRunner,
+      rootProject: options.rootProject,
+      skipFormat: true,
+    });
+    const convertAppTask = await configurationGenerator(tree, {
+      project: options.name,
+      target: 'web',
+      newProject: false,
+      buildTarget: 'build',
+      serveTarget: 'serve',
+      framework: 'react',
+    });
+    tasks.push(createAppTask, convertAppTask);
+  }
 
   await formatFiles(tree);
 
   return runTasksInSerial(...tasks);
 }
-
-function getStyleDependency(options: NormalizedSchema): Record<string, string> {
-  if (options.style === 'scss') return { sass: sassVersion };
-  if (options.style === 'less') return { less: lessVersion };
-  if (options.style === 'styl') return { stylus: stylusVersion };
-  return {};
-}
diff --git a/src/generators/application/files/src/app/app.module.__style__ b/src/generators/application/files/src/app/app.module.__style__
deleted file mode 100644
index 485140808b943..0000000000000
--- a/src/generators/application/files/src/app/app.module.__style__
+++ /dev/null
@@ -1,2 +0,0 @@
-.container {
-}
diff --git a/src/generators/application/files/src/app/app.spec.tsx__template__ b/src/generators/application/files/src/app/app.spec.tsx__template__
deleted file mode 100644
index b67b70fea41f8..0000000000000
--- a/src/generators/application/files/src/app/app.spec.tsx__template__
+++ /dev/null
@@ -1,11 +0,0 @@
-import { render } from '@testing-library/react';
-import { App } from './app';
-
-describe('App component', () => {
-  it('should render a welcome message', () => {
-    const { getByTestId } = render(<App />);
-
-    expect(getByTestId('welcome')).toBeTruthy();
-  });
-
-});
diff --git a/src/generators/application/files/src/app/app.tsx__template__ b/src/generators/application/files/src/app/app.tsx__template__
deleted file mode 100644
index 54cc8cf2e4fbd..0000000000000
--- a/src/generators/application/files/src/app/app.tsx__template__
+++ /dev/null
@@ -1,10 +0,0 @@
-import styles from './app.module.<%= style %>';
-import { NxWelcome } from './nx-welcome';
-
-export function App() {
-  return (
-    <div className={styles['container']} data-testid="welcome">
-      <NxWelcome title="<%= name %>" />
-    </div>
-  );
-}
diff --git a/src/generators/application/files/src/app/nx-welcome.tsx__template__ b/src/generators/application/files/src/app/nx-welcome.tsx__template__
deleted file mode 100644
index 761a47a0e2978..0000000000000
--- a/src/generators/application/files/src/app/nx-welcome.tsx__template__
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
- * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- This is a starter component and can be deleted.
- * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- Delete this file and get started with your project!
- * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- */
-export function NxWelcome({ title }: { title: string }) {
-  return (
-    <>
-      <style
-        dangerouslySetInnerHTML={{
-          __html: `
-    html {
-      -webkit-text-size-adjust: 100%;
-      font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
-      'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif,
-      'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
-      'Noto Color Emoji';
-      line-height: 1.5;
-      tab-size: 4;
-      scroll-behavior: smooth;
-    }
-    body {
-      font-family: inherit;
-      line-height: inherit;
-      margin: 0;
-    }
-    h1,
-    h2,
-    p,
-    pre {
-      margin: 0;
-    }
-    *,
-    ::before,
-    ::after {
-      box-sizing: border-box;
-      border-width: 0;
-      border-style: solid;
-      border-color: currentColor;
-    }
-    h1,
-    h2 {
-      font-size: inherit;
-      font-weight: inherit;
-    }
-    a {
-      color: inherit;
-      text-decoration: inherit;
-    }
-    pre {
-      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
-      'Liberation Mono', 'Courier New', monospace;
-    }
-    svg {
-      display: block;
-      vertical-align: middle;
-      shape-rendering: auto;
-      text-rendering: optimizeLegibility;
-    }
-    pre {
-      background-color: rgba(55, 65, 81, 1);
-      border-radius: 0.25rem;
-      color: rgba(229, 231, 235, 1);
-      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
-      'Liberation Mono', 'Courier New', monospace;
-      overflow: scroll;
-      padding: 0.5rem 0.75rem;
-    }
-
-    .shadow {
-      box-shadow: 0 0 #0000, 0 0 #0000, 0 10px 15px -3px rgba(0, 0, 0, 0.1),
-      0 4px 6px -2px rgba(0, 0, 0, 0.05);
-    }
-    .rounded {
-      border-radius: 1.5rem;
-    }
-    .wrapper {
-      width: 100%;
-    }
-    .container {
-      margin-left: auto;
-      margin-right: auto;
-      max-width: 768px;
-      padding-bottom: 3rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-      color: rgba(55, 65, 81, 1);
-      width: 100%;
-    }
-    #welcome {
-      margin-top: 2.5rem;
-    }
-    #welcome h1 {
-      font-size: 3rem;
-      font-weight: 500;
-      letter-spacing: -0.025em;
-      line-height: 1;
-    }
-    #welcome span {
-      display: block;
-      font-size: 1.875rem;
-      font-weight: 300;
-      line-height: 2.25rem;
-      margin-bottom: 0.5rem;
-    }
-    #hero {
-      align-items: center;
-      background-color: hsla(214, 62%, 21%, 1);
-      border: none;
-      box-sizing: border-box;
-      color: rgba(55, 65, 81, 1);
-      display: grid;
-      grid-template-columns: 1fr;
-      margin-top: 3.5rem;
-    }
-    #hero .text-container {
-      color: rgba(255, 255, 255, 1);
-      padding: 3rem 2rem;
-    }
-    #hero .text-container h2 {
-      font-size: 1.5rem;
-      line-height: 2rem;
-      position: relative;
-    }
-    #hero .text-container h2 svg {
-      color: hsla(162, 47%, 50%, 1);
-      height: 2rem;
-      left: -0.25rem;
-      position: absolute;
-      top: 0;
-      width: 2rem;
-    }
-    #hero .text-container h2 span {
-      margin-left: 2.5rem;
-    }
-    #hero .text-container a {
-      background-color: rgba(255, 255, 255, 1);
-      border-radius: 0.75rem;
-      color: rgba(55, 65, 81, 1);
-      display: inline-block;
-      margin-top: 1.5rem;
-      padding: 1rem 2rem;
-      text-decoration: inherit;
-    }
-    #hero .logo-container {
-      display: none;
-      justify-content: center;
-      padding-left: 2rem;
-      padding-right: 2rem;
-    }
-    #hero .logo-container svg {
-      color: rgba(255, 255, 255, 1);
-      width: 66.666667%;
-    }
-    #middle-content {
-      align-items: flex-start;
-      display: grid;
-      gap: 4rem;
-      grid-template-columns: 1fr;
-      margin-top: 3.5rem;
-    }
-    #learning-materials {
-      padding: 2.5rem 2rem;
-    }
-    #learning-materials h2 {
-      font-weight: 500;
-      font-size: 1.25rem;
-      letter-spacing: -0.025em;
-      line-height: 1.75rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-    }
-    .list-item-link {
-      align-items: center;
-      border-radius: 0.75rem;
-      display: flex;
-      margin-top: 1rem;
-      padding: 1rem;
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-      width: 100%;
-    }
-    .list-item-link svg:first-child {
-      margin-right: 1rem;
-      height: 1.5rem;
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-      width: 1.5rem;
-    }
-    .list-item-link > span {
-      flex-grow: 1;
-      font-weight: 400;
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-    }
-    .list-item-link > span > span {
-      color: rgba(107, 114, 128, 1);
-      display: block;
-      flex-grow: 1;
-      font-size: 0.75rem;
-      font-weight: 300;
-      line-height: 1rem;
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-    }
-    .list-item-link svg:last-child {
-      height: 1rem;
-      transition-property: all;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-      width: 1rem;
-    }
-    .list-item-link:hover {
-      color: rgba(255, 255, 255, 1);
-      background-color: hsla(162, 47%, 50%, 1);
-    }
-    .list-item-link:hover > span {}
-    .list-item-link:hover > span > span {
-      color: rgba(243, 244, 246, 1);
-    }
-    .list-item-link:hover svg:last-child {
-      transform: translateX(0.25rem);
-    }
-    #other-links {}
-    .button-pill {
-      padding: 1.5rem 2rem;
-      transition-duration: 300ms;
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      align-items: center;
-      display: flex;
-    }
-    .button-pill svg {
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-      flex-shrink: 0;
-      width: 3rem;
-    }
-    .button-pill > span {
-      letter-spacing: -0.025em;
-      font-weight: 400;
-      font-size: 1.125rem;
-      line-height: 1.75rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-    }
-    .button-pill span span {
-      display: block;
-      font-size: 0.875rem;
-      font-weight: 300;
-      line-height: 1.25rem;
-    }
-    .button-pill:hover svg,
-    .button-pill:hover {
-      color: rgba(255, 255, 255, 1) !important;
-    }
-    #nx-console:hover {
-      background-color: rgba(0, 122, 204, 1);
-    }
-    #nx-console svg {
-      color: rgba(0, 122, 204, 1);
-    }
-    #nx-repo:hover {
-      background-color: rgba(24, 23, 23, 1);
-    }
-    #nx-repo svg {
-      color: rgba(24, 23, 23, 1);
-    }
-    #nx-cloud {
-      margin-bottom: 2rem;
-      margin-top: 2rem;
-      padding: 2.5rem 2rem;
-    }
-    #nx-cloud > div {
-      align-items: center;
-      display: flex;
-    }
-    #nx-cloud > div svg {
-      border-radius: 0.375rem;
-      flex-shrink: 0;
-      width: 3rem;
-    }
-    #nx-cloud > div h2 {
-      font-size: 1.125rem;
-      font-weight: 400;
-      letter-spacing: -0.025em;
-      line-height: 1.75rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-    }
-    #nx-cloud > div h2 span {
-      display: block;
-      font-size: 0.875rem;
-      font-weight: 300;
-      line-height: 1.25rem;
-    }
-    #nx-cloud p {
-      font-size: 1rem;
-      line-height: 1.5rem;
-      margin-top: 1rem;
-    }
-    #nx-cloud pre {
-      margin-top: 1rem;
-    }
-    #nx-cloud a {
-      color: rgba(107, 114, 128, 1);
-      display: block;
-      font-size: 0.875rem;
-      line-height: 1.25rem;
-      margin-top: 1.5rem;
-      text-align: right;
-    }
-    #nx-cloud a:hover {
-      text-decoration: underline;
-    }
-    #commands {
-      padding: 2.5rem 2rem;
-      margin-top: 3.5rem;
-    }
-    #commands h2 {
-      font-size: 1.25rem;
-      font-weight: 400;
-      letter-spacing: -0.025em;
-      line-height: 1.75rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-    }
-    #commands p {
-      font-size: 1rem;
-      font-weight: 300;
-      line-height: 1.5rem;
-      margin-top: 1rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-    }
-    details {
-      align-items: center;
-      display: flex;
-      margin-top: 1rem;
-      padding-left: 1rem;
-      padding-right: 1rem;
-      width: 100%;
-    }
-    details pre > span {
-      color: rgba(181, 181, 181, 1);
-      display: block;
-    }
-    summary {
-      border-radius: 0.5rem;
-      display: flex;
-      font-weight: 400;
-      padding: 0.5rem;
-      cursor: pointer;
-      transition-property: background-color, border-color, color, fill, stroke,
-      opacity, box-shadow, transform, filter, backdrop-filter,
-      -webkit-backdrop-filter;
-      transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-      transition-duration: 150ms;
-    }
-    summary:hover {
-      background-color: rgba(243, 244, 246, 1);
-    }
-    summary svg {
-      height: 1.5rem;
-      margin-right: 1rem;
-      width: 1.5rem;
-    }
-    #love {
-      color: rgba(107, 114, 128, 1);
-      font-size: 0.875rem;
-      line-height: 1.25rem;
-      margin-top: 3.5rem;
-      opacity: 0.6;
-      text-align: center;
-    }
-    #love svg {
-      color: rgba(252, 165, 165, 1);
-      width: 1.25rem;
-      height: 1.25rem;
-      display: inline;
-      margin-top: -0.25rem;
-    }
-    @media screen and (min-width: 768px) {
-      #hero {
-        grid-template-columns: repeat(2, minmax(0, 1fr));
-      }
-      #hero .logo-container {
-        display: flex;
-      }
-      #middle-content {
-        grid-template-columns: repeat(2, minmax(0, 1fr));
-      }
-    }
-          `,
-        }}
-      />
-      <div className="wrapper">
-        <div className="container">
-          <div id="welcome">
-            <h1>
-              <span> Hello there, </span>
-              Welcome {title} 👋
-            </h1>
-          </div>
-
-          <div id="hero" className="rounded">
-            <div className="text-container">
-              <h2>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
-                  />
-                </svg>
-                <span>You&apos;re up and running</span>
-              </h2>
-              <a href="#commands"> What&apos;s next? </a>
-            </div>
-            <div className="logo-container">
-              <svg
-                fill="currentColor"
-                role="img"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path d="M11.987 14.138l-3.132 4.923-5.193-8.427-.012 8.822H0V4.544h3.691l5.247 8.833.005-3.998 3.044 4.759zm.601-5.761c.024-.048 0-3.784.008-3.833h-3.65c.002.059-.005 3.776-.003 3.833h3.645zm5.634 4.134a2.061 2.061 0 0 0-1.969 1.336 1.963 1.963 0 0 1 2.343-.739c.396.161.917.422 1.33.283a2.1 2.1 0 0 0-1.704-.88zm3.39 1.061c-.375-.13-.8-.277-1.109-.681-.06-.08-.116-.17-.176-.265a2.143 2.143 0 0 0-.533-.642c-.294-.216-.68-.322-1.18-.322a2.482 2.482 0 0 0-2.294 1.536 2.325 2.325 0 0 1 4.002.388.75.75 0 0 0 .836.334c.493-.105.46.36 1.203.518v-.133c-.003-.446-.246-.55-.75-.733zm2.024 1.266a.723.723 0 0 0 .347-.638c-.01-2.957-2.41-5.487-5.37-5.487a5.364 5.364 0 0 0-4.487 2.418c-.01-.026-1.522-2.39-1.538-2.418H8.943l3.463 5.423-3.379 5.32h3.54l1.54-2.366 1.568 2.366h3.541l-3.21-5.052a.7.7 0 0 1-.084-.32 2.69 2.69 0 0 1 2.69-2.691h.001c1.488 0 1.736.89 2.057 1.308.634.826 1.9.464 1.9 1.541a.707.707 0 0 0 1.066.596zm.35.133c-.173.372-.56.338-.755.639-.176.271.114.412.114.412s.337.156.538-.311c.104-.231.14-.488.103-.74z" />
-              </svg>
-            </div>
-          </div>
-
-          <div id="middle-content">
-            <div id="learning-materials" className="rounded shadow">
-              <h2>Learning materials</h2>
-              <a
-                href="https://nx.dev/getting-started/intro?utm_source=nx-project"
-                target="_blank"
-                rel="noreferrer"
-                className="list-item-link"
-              >
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
-                  />
-                </svg>
-                <span>
-                  Documentation
-                  <span> Everything is in there </span>
-                </span>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M9 5l7 7-7 7"
-                  />
-                </svg>
-              </a>
-              <a
-                href="https://blog.nrwl.io/?utm_source=nx-project"
-                target="_blank"
-                rel="noreferrer"
-                className="list-item-link"
-              >
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"
-                  />
-                </svg>
-                <span>
-                  Blog
-                  <span> Changelog, features & events </span>
-                </span>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M9 5l7 7-7 7"
-                  />
-                </svg>
-              </a>
-              <a
-                href="https://www.youtube.com/@NxDevtools/videos?utm_source=nx-project&sub_confirmation=1"
-                target="_blank"
-                rel="noreferrer"
-                className="list-item-link"
-              >
-                <svg
-                  role="img"
-                  viewBox="0 0 24 24"
-                  fill="currentColor"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <title>YouTube</title>
-                  <path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z" />
-                </svg>
-                <span>
-                  YouTube channel
-                  <span> Nx Show, talks & tutorials </span>
-                </span>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M9 5l7 7-7 7"
-                  />
-                </svg>
-              </a>
-              <a
-                href="https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project"
-                target="_blank"
-                rel="noreferrer"
-                className="list-item-link"
-              >
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
-                  />
-                </svg>
-                <span>
-                  Interactive tutorials
-                  <span> Create an app, step-by-step </span>
-                </span>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M9 5l7 7-7 7"
-                  />
-                </svg>
-              </a>
-              <a
-                href="https://nxplaybook.com/?utm_source=nx-project"
-                target="_blank"
-                rel="noreferrer"
-                className="list-item-link"
-              >
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path d="M12 14l9-5-9-5-9 5 9 5z" />
-                  <path d="M12 14l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14z" />
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M12 14l9-5-9-5-9 5 9 5zm0 0l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14zm-4 6v-7.5l4-2.222"
-                  />
-                </svg>
-                <span>
-                  Video courses
-                  <span> Nx custom courses </span>
-                </span>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M9 5l7 7-7 7"
-                  />
-                </svg>
-              </a>
-            </div>
-            <div id="other-links">
-              <a
-                id="nx-console"
-                className="button-pill rounded shadow"
-                href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project"
-                target="_blank"
-                rel="noreferrer"
-              >
-                <svg
-                  fill="currentColor"
-                  role="img"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <title>Visual Studio Code</title>
-                  <path d="M23.15 2.587L18.21.21a1.494 1.494 0 0 0-1.705.29l-9.46 8.63-4.12-3.128a.999.999 0 0 0-1.276.057L.327 7.261A1 1 0 0 0 .326 8.74L3.899 12 .326 15.26a1 1 0 0 0 .001 1.479L1.65 17.94a.999.999 0 0 0 1.276.057l4.12-3.128 9.46 8.63a1.492 1.492 0 0 0 1.704.29l4.942-2.377A1.5 1.5 0 0 0 24 20.06V3.939a1.5 1.5 0 0 0-.85-1.352zm-5.146 14.861L10.826 12l7.178-5.448v10.896z" />
-                </svg>
-                <span>
-                  Install Nx Console
-                  <span>Plugin for VSCode</span>
-                </span>
-              </a>
-              <div id="nx-cloud" className="rounded shadow">
-                <div>
-                  <svg
-                    viewBox="0 0 120 120"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M120 15V30C103.44 30 90 43.44 90 60C90 76.56 76.56 90 60 90C43.44 90 30 103.44 30 120H15C6.72 120 0 113.28 0 105V15C0 6.72 6.72 0 15 0H105C113.28 0 120 6.72 120 15Z"
-                      fill="#0E2039"
-                    />
-                    <path
-                      d="M120 30V105C120 113.28 113.28 120 105 120H30C30 103.44 43.44 90 60 90C76.56 90 90 76.56 90 60C90 43.44 103.44 30 120 30Z"
-                      fill="white"
-                    />
-                  </svg>
-                  <h2>
-                    NxCloud
-                    <span>Enable faster CI & better DX</span>
-                  </h2>
-                </div>
-                <p>
-                  You can activate distributed tasks executions and caching by
-                  running:
-                </p>
-                <pre>nx connect-to-nx-cloud</pre>
-                <a
-                  href="https://nx.app/?utm_source=nx-project"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  {' '}
-                  What is Nx Cloud?{' '}
-                </a>
-              </div>
-              <a
-                id="nx-repo"
-                className="button-pill rounded shadow"
-                href="https://github.com/nrwl/nx?utm_source=nx-project"
-                target="_blank"
-                rel="noreferrer"
-              >
-                <svg
-                  fill="currentColor"
-                  role="img"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
-                </svg>
-                <span>
-                  Nx is open source
-                  <span> Love Nx? Give us a star! </span>
-                </span>
-              </a>
-            </div>
-          </div>
-
-          <div id="commands" className="rounded shadow">
-            <h2>Next steps</h2>
-            <p>Here are some things you can do with Nx:</p>
-            <details>
-              <summary>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-                  />
-                </svg>
-                Add UI library
-              </summary>
-              <pre>
-                <span># Generate UI lib</span>
-                nx g @nrwl/react:lib ui
-                <span># Add a component</span>
-                nx g @nrwl/react:component button --project ui
-              </pre>
-            </details>
-            <details>
-              <summary>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-                  />
-                </svg>
-                View interactive project graph
-              </summary>
-              <pre>nx graph</pre>
-            </details>
-            <details>
-              <summary>
-                <svg
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-                  />
-                </svg>
-                Run affected commands
-              </summary>
-              <pre>
-                <span># see what&apos;s been affected by changes</span>
-                nx affected:graph
-                <span># run tests for current changes</span>
-                nx affected:test
-                <span># run e2e tests for current changes</span>
-                nx affected:e2e
-              </pre>
-            </details>
-          </div>
-
-          <p id="love">
-            Carefully crafted with
-            <svg
-              fill="currentColor"
-              stroke="none"
-              viewBox="0 0 24 24"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                strokeLinecap="round"
-                strokeLinejoin="round"
-                strokeWidth="2"
-                d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"
-              />
-            </svg>
-          </p>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default NxWelcome;
diff --git a/src/generators/application/files/src/assets/.gitkeep b/src/generators/application/files/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/generators/application/files/src/favicon.ico b/src/generators/application/files/src/favicon.ico
deleted file mode 100644
index 317ebcb2336e0833a22dddf0ab287849f26fda57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15086
zcmeI332;<p632UzfWZqabw#Bx7P_!_0dhki0VLs6ku&5D2}uYcfO5%@G2s;D7LY@f
zc(GokAnWR)DHUDuUROCpjmsH4pjZ`wkZ*te^4>U^%p|z7g|#(P)qFEA@4f!_@qOK2
z_lJl}!lhL!VT_U|uN7%8B2iKH??xhDa;*`g{yjTFWHvXn;2s{4R7kH|pKGdy(7z!K
zgftM+Ku7~24TLlh(!g)gz|foI94G^t2^IO$uvX$3(OR0<_5L2sB)lMAMy|+`xodJ{
z_Uh_1m)~h?a;2W{dmhM;u!YGo=)OdmId_B<%^V^{o<UMHeV`Og=_iGE^^rgN-XH8c
zcrSonhm1cBZ!ITAw2}V7o^`H|ik40(UF5*b;bPY1iFs&D4f>vI@y`7^g1_V9G}*f#
zNzA<oVrCB$Q*?(I_ibXP4UktS^^r?_?+^Ap7=Cnb(EW*on`_5Eu9uvb8!Jzxb`g^j
zEoNy(P#NAphQ^8mTQpjkC7Y1JEKU`3KQhc4A!g=KG1%Z+_pQ=17+(MDwc$@_BPT}I
zjelf*FFBSID`t2HG2{A(S({r!|7w#;sOaIb;$obLPn|>tvou}I!W1#{M^@ROc(BZ!
z+F!!_aR&Px3_reO(EW+TwlW~tv*2zr?iP7(d~a~yA|@*a89IUke+c472NXM0wiX{-
zl`UrZC^1XYyf%1u)-Y)jj9;MZ!SLfd2Hl?o|80Su%Z?To_=^g_Jt0oa#CT*tjx>BI
z16wec&AOWNK<#i0Qd=1O$fymLRoUR*%;h@*@v7}wApDl^w*h}!sYq%kw+DKDY)@&A
z@9$ULEB3qkR#85`lb8#WZw=@})#kQig9oqy^I$dj&k4jU&^2(M3q{n1AKeGUKPFbr
z1^<)aH;VsG@J|B&l>UtU#Ejv3GIqERzYgL@UOAWtW<{p#zy`WyJgpCy8$c_e%wYJL
zyGHRRx38)HyjU3y{-4z6)pzb>&Q1pR)B&u01F-|&Gx4EZWK$nkUkOI|(D4UHOXg_-
zw{OBf!oWQUn)Pe(=f=nt=zkmdjpO^o8ZZ9o_|4tW1ni+Un9iCW47*-ut$KQOww!;u
z`0q)$s6IZO!~9$e_P9X!hqLxu`fpcL|2f^I5d4*a@Dq28;@2271v_N+5HqYZ>x;&O
z05*7JT)mUe&%S0@UD)@&8SmQrMtsDfZT;fkdA!r(S=}Oz>iP)w=W508=Rc#nNn7ym
z1;42c|8($ALY8#a({%1#IXbWn9-Y|0eDY$_L&j{63?{?AH{);Ezcqf<!MFQ9x99b^
z@1DK4rAh7R(%7o_Ukrp_*B^iXAJs(~WJSwk+1;6+e)#eKWB7lW`oH?lRCGTU-%svF
zZa{1eHiz~4`%lFm`)1d&`Q<xTH!a_>ydD$@-B`Y3<%IIj7S7rK_N}je^=dEk%JQ4c
z!tBdTPE3Tse;oYF>cnrapWq*o)m47X1`~6@(!Y29#>-#8zm&LXrXa(3=7Z)ElaQqj
z-#0JJy3Fi(C#Rx(`=VXtJ63E2_bZGCz+QRa{W0e2(m3<b<R<WQnM~H@G~%P;$A5kX
zdr~m`<Zaga!@akqca}>sI?LOcUBx)~^YCqZ{XEPX)C>G>U4tfqeH8L(3|pQR*zbL1
zT9e~4Tb5p9_G}$y4t`i*4t_Mr9QYvL9C&Ah*}t`q*}S+VYh0M6GxTTSXI)hMpMpIq
zD1ImYqJLzbj0}~EpE-aH#VCH_udYEW#`P2zYmi&xSPs_{n6tBj=MY|-XrA;SGA_>y
zGtU$?HXm$gYj*!N)_nQ59%lQdXtQZS3*#PC-{iB_sm+ytD*7j`D*k(P&IH2GHT}Eh
z5697eQECVIGQAUe#eU2I!yI<zz;0~NQr|N^PTU%|61cC99Bv=_KdCmbW0yDoS&$NL
zmX1EpEE#=)nKLrdOzGz`6PQPeUwJD36mmpxeE`0zYQ<kQhbyqvzLfS-seXqK8MUG9
zLlxLyyuL#}xjn?4!rv0%QA-Z}Ik<a5n=IY4E@=+ED3w^9C}z%Zdk>&%0CP#>%6MWV
z@zS!p@+Y1i1b^QuuEF*1<Us0cJY(4nAF}4q=qekOvJQFo807!%A>3CuB<Ol`0^E7Z
zm%Qg1;_@p_?ztejY7aAu{Qn-^!+@VXn3b3498=%1e7}?I2TQ^o*He<VKf(OR$A_%>
zu69dve5k7&Wgb+^s|UB08Dr3u`h@yM0NTj4h7MnHo-4@xmyr7(*4$rpPwsCDZ@2be
zRz9V^GnV;;?^Lk%ynzq&K(Aix`mWmW`^152Hoy<pVuSh)79DeX%8W&6LDw72`#byI
zuiwcz>$CTYVehpD-S1-W^#k#{0^L`V6CN+<CFS_e7W_3E{FnMaufOZUZ|?(su|Y>E
z!w+xte;2vu4AmVNEFUOBmrBL>6MK@!O2*N|2=d|Y;oN&A&qv=qKn73lD<dYxNnd>D
zI(+oJAdgv>Yr}8(&@ZuAZE%XUXmX(U!N+Z_sjL<1vjy1R+1IeHt`79fnYdOL{$ci7
z%3f0A*;Zt@ED&Gjm|OFTYBDe%bbo*xXAQsFz+Q`fVBH!N2)kaxN8P$c>sp~QXnv>b
zwq=W3&Mtmih7xkR$YA)1Yi?avHNR6C99!u6fh=cL|KQ&PwF!n@ud^n(HNI<nwsH(x
z4qKM9iN6x;Git-Ge<QzeYkbrg?<<GKYW(VK;@<}TE9%0}y5!azL-V9+a#Y#me~G_7
z_y$7-P`)3H<9Cg?6G#?vr1r=#4jJ;1As-p?v4v7WW|z~i2L^g~=vqhvAq|8y5YoVz
z*MPA;B4>ImHD!h87!i*t?G|p0o+eelJ?B@A64_9%SBhNaJ64EvKgD&%LjLCYnNfc;
znj?%*p@*?dq#NqcQFmmX($wms@CSAr9#>hUR^=I+=<d%GUe;81{*2u{g^cHvbvMet
zq2G9w{o5J4+rJB|kH1xKEr1^d#X#P3T8;P-`h+wP(!lRV1LVP1Lc^g%o06y@-V_L6
z|LdjRj60+cXBkqdN2S;_lHZp*_b*D3i|<dAq12rcshK6-Jy4RVdtC4Q-G78<Kj;TY
z`wo@Xp1QRZ`QN9%Igij|bgX>0B)vvGX%T&#h$kmX*s=^M2E!@N9#m?LhMvz}YB+kd
zG~mbP|D(;{s_#;hsKK9lbVK&Lo734x7SIFJ9<NU=?g-!eQa_AcHCny_gVFO3=-?Ff
zpQ!;E+ZX-$+jXg8|7WNdWKr`tkx%U-6%4aR)Tn2E2!?mH{;IuaYG~T~e~tQ?w-)OE
zPW|o6Uu!aUe`l8Oy~y1R{-0{yNNcxwV92JHv^=wh9W0$_ZxbDS$2peXzVGq<4qx4$
zomY*&*0iVxQCs)&XP+Am{{`BU)INarGA2_)&ZdSk^|op@@Y(}^)ZXuX$RD&e2j7;^
zG=Kioa;ovC-VsBs;~V9#{ao!u<I@&~EHDJ>V_}2$@q?zm^7?*XH94w5Qae{7zOMUF
z^?%F%)c1Y)Q?Iy?I>kn<wOIXdo4@ulwHK&57|S*7*E_zrF3)A2E52%lFF*bMb!l%G
zy}qa;9}evE=KA)}jOrS348HHx%0F5%s4*N@{+9gIUXlNZB|rTz?W4}2#$2t3ivPX3
z;^uwd?pi$L&=(snEZ?=}lJcEvdLR7wt}*oM{;}o3)<4b5xYVk<BCnoLswTf}|6=yn
zO{sT$qO~)vo7wi?jQuw`_Me0u)ZZQ1b=2P*rZqIXUrRoE=(D-o%D3PDQTacMe%kl<
zgvuv8S5vbJvwBt9>w*8gYW#ok|2gdS=YYZLiD=CW|Nj;n^x!<jBV+M}EHEt_<tMvs
z2W)RP+<me6;Lp)!_m%->=S#iJ#`~Ld79+xXpVmUK^B(xO_vO!btA9y7w3L3-0j-y4
z?M-V{%z;JI`bk7yFDcP}OcCd*{Q9S5$iGA7*E1@tfkyjAi!;wP^O71cZ^Ep)qrQ)N
z#wqw0_HS;T7x3y|`P==i3hEwK%|>fZ)c&@kgKO1~5<5xBSk?iZV?KI6&i72H6S9A*
z=U(*e)EqEs?Oc04)V-~K5AUmh|62H4*`UAtItO$O(q5?6jj+K<YInKHn~#h06D6E4
zGY{ug$#47Kv+%ag8gORiMr412_5ZN7{xetf3<>^oD!04r=6#dsxp?~}{`?&sXn#q2
zGuY~7>O2=!u@@Kfu7q=W*4egu@qPMRM>(eyYyaIE<|j%d=iWNdGsx%c!902v#ngNg
z@#U-O_4xN$s_9?(`{>{>7~-6FgWpBpqXb`Ydc3OFL#&I}Irse9F_8R@4zSS*Y*o*B
zXL?6*Aw!AfkNCgcr#*yj&p3ZDe2y>v$>FUdKIy_2N~}6AbHc7gA3`6$g@1o|dE>vz
z4pl(j9;kyMsjaw}lO?(?Xg%4k!5%^<zlDDcygq_<+VnZ&Gf<7VJ+h6sSQqBwlV5;i
zCw{q${^Q$V`LF*641DyQ>t#@5n=WVc&JRa+XT$~#@rldv<HlfUj4u8F@xOCIpO6NA
zy#}i448i{`KGLeNxU7{aE~DpK>N3S1rEpU$;XgxVny7mki3<w%v}zUZDd^bHQ&8C5
zbEMEH-2)Zd6o`w~DKrp8LEbvW|DiWCr<+4vh%GJ2v8))B+*#`1mn3b-AEVjNSn-{>
z-Hh|jUCHrUXuLr!)`w>wgO0N%KTB-1di>cj(x3Ba<?I9X?CUltmc0Kh`u0bO`)SUz
zI`Zt(kjD0x$i3<j4=*8~D%HKjoCGVDSMdD5bnn34<pnTY=seGJdM@*6jf=!2>v`7v
z3G7EIbU$z>`Nad7Rk_&OT-W{;qg)-GXV-aJT#(o<Y^cxkn^`Yg6Fa`(`BTK_6MC*|
zK4(2Nm)J1vqV0R$o7U>zdmnA~Rq3GQ_3mby(>q6Ocb-RgTUhTN)))x>m&eD;$J5Bg
zo&DhY36Yg=J=$Z>t}RJ>o|@hAcwWzN#r(WJ52^g$lh^!63@hh+dR$&_dEGu&^CR*<
z!oFqSqO@>xZ*nC2oiOd0eS*F^IL~W-rsrO`J`ej{=ou_q^_(<$&-3f^<pOjU!=7&~
zXC+=DZ(jt~8+`R|WB7!1Jc_^TdE2d4ZXGA{9G&SoadMXW<Ql&A*O;WS@i_a$QF<>J
z&L^MSYWIe{&pYq&9eGaArA~*kA<MSpHuZ@k$zXI7$6|f&|Gj<JTB<KKxmBbwQL-^L
X*GBfq^a!*Sks)$E_17kl@BRM)`^nwN

diff --git a/src/generators/application/files/src/index.html__template__ b/src/generators/application/files/src/index.html__template__
deleted file mode 100644
index 6cfb12408cd4d..0000000000000
--- a/src/generators/application/files/src/index.html__template__
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title><%= name %></title>
-    <base href="/" />
-
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
diff --git a/src/generators/application/files/src/main.tsx__template__ b/src/generators/application/files/src/main.tsx__template__
deleted file mode 100644
index 8506fa7ab04d2..0000000000000
--- a/src/generators/application/files/src/main.tsx__template__
+++ /dev/null
@@ -1,15 +0,0 @@
-import { StrictMode } from 'react';
-import * as ReactDOM from 'react-dom/client';
-
-import './styles.<%= style %>';
-import { App } from './app/app';
-
-const root = ReactDOM.createRoot(
-  document.getElementById('root') as HTMLElement
-);
-
-root.render(
-  <StrictMode>
-    <App />
-  </StrictMode>
-);
diff --git a/src/generators/application/files/src/styles.__style__ b/src/generators/application/files/src/styles.__style__
deleted file mode 100644
index 90d4ee0072ce3..0000000000000
--- a/src/generators/application/files/src/styles.__style__
+++ /dev/null
@@ -1 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
diff --git a/src/generators/application/files/tsconfig.app.json__template__ b/src/generators/application/files/tsconfig.app.json__template__
deleted file mode 100644
index 52fbcc8213f9b..0000000000000
--- a/src/generators/application/files/tsconfig.app.json__template__
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
-    "types": ["node"]
-  },
-  "files": [
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
-  ],
-  "exclude": ["jest.config.ts","src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
-  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
-}
diff --git a/src/generators/application/lib/add-cypress.ts b/src/generators/application/lib/add-cypress.ts
deleted file mode 100644
index ea753660a6e53..0000000000000
--- a/src/generators/application/lib/add-cypress.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ensurePackage, Tree } from '@nrwl/devkit';
-import { version as nxVersion } from 'nx/package.json';
-import { NormalizedSchema } from '../schema';
-
-export async function addCypress(host: Tree, options: NormalizedSchema) {
-  if (options.e2eTestRunner !== 'cypress') {
-    return () => {
-      //nothing
-    };
-  }
-  await ensurePackage(host, '@nrwl/cypress', nxVersion);
-  const { cypressProjectGenerator } = await import('@nrwl/cypress');
-
-  return await cypressProjectGenerator(host, {
-    ...options,
-    name: options.rootProject ? `e2e` : `${options.name}-e2e`,
-    project: options.name,
-  });
-}
diff --git a/src/generators/application/lib/add-jest.ts b/src/generators/application/lib/add-jest.ts
deleted file mode 100644
index 02d81279dae74..0000000000000
--- a/src/generators/application/lib/add-jest.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {
-  ensurePackage,
-  offsetFromRoot,
-  readProjectConfiguration,
-  Tree,
-  updateJson,
-} from '@nrwl/devkit';
-import { version as nxVersion } from 'nx/package.json';
-import { updateJestConfigContent } from '../../../utils/jest-utils';
-import { NormalizedSchema } from '../schema';
-
-export async function addJest(host: Tree, options: NormalizedSchema) {
-  if (options.unitTestRunner !== 'jest') {
-    return () => {
-      // nothing
-    };
-  }
-
-  await ensurePackage(host, '@nrwl/jest', nxVersion);
-  const { jestProjectGenerator } = await import('@nrwl/jest');
-
-  const task = await jestProjectGenerator(host, {
-    ...options,
-    project: options.name,
-    supportTsx: true,
-    skipSerializers: true,
-    setupFile: 'none',
-    compiler: 'babel', // have to use babel for React projects
-  });
-
-  updateSpecConfig(host, options);
-
-  return task;
-}
-
-function updateSpecConfig(host: Tree, options: NormalizedSchema) {
-  if (options.unitTestRunner !== 'jest') {
-    return;
-  }
-  const project = readProjectConfiguration(host, options.name);
-
-  updateJson(host, `${project.root}/tsconfig.spec.json`, (json) => {
-    const offset = offsetFromRoot(project.root);
-    json.files = [
-      `${offset}node_modules/@nrwl/react/typings/cssmodule.d.ts`,
-      `${offset}node_modules/@nrwl/react/typings/image.d.ts`,
-    ];
-    return json;
-  });
-
-  const configPath = `${project.root}/jest.config.ts`;
-  const originalContent = host.read(configPath, 'utf-8');
-  const content = updateJestConfigContent(originalContent);
-  host.write(configPath, content);
-}
diff --git a/src/generators/application/lib/add-linting.ts b/src/generators/application/lib/add-linting.ts
deleted file mode 100644
index f912d001ab287..0000000000000
--- a/src/generators/application/lib/add-linting.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import {
-  addDependenciesToPackageJson,
-  GeneratorCallback,
-  joinPathFragments,
-  Tree,
-  updateJson,
-} from '@nrwl/devkit';
-import { Linter, lintProjectGenerator } from '@nrwl/linter';
-import { mapLintPattern } from '@nrwl/linter/src/generators/lint-project/lint-project';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
-import type * as eslint from 'eslint';
-
-import {
-  eslintPluginImportVersion,
-  eslintPluginJsxA11yVersion,
-  eslintPluginReactHooksVersion,
-  eslintPluginReactVersion,
-} from '../../../utils/versions';
-import { NormalizedSchema } from '../schema';
-
-export async function addLinting(host: Tree, options: NormalizedSchema) {
-  const tasks: GeneratorCallback[] = [];
-  const lintTask = await lintProjectGenerator(host, {
-    linter: Linter.EsLint,
-    project: options.name,
-    tsConfigPaths: [
-      joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
-    ],
-    unitTestRunner: options.unitTestRunner,
-    eslintFilePatterns: [
-      mapLintPattern(
-        options.appProjectRoot,
-        '{ts,tsx,js,jsx}',
-        options.rootProject
-      ),
-    ],
-    skipFormat: true,
-    rootProject: options.rootProject,
-  });
-  tasks.push(lintTask);
-
-  updateJson(
-    host,
-    joinPathFragments(options.appProjectRoot, '.eslintrc.json'),
-    extendReactEslintJson
-  );
-
-  const installTask = await addDependenciesToPackageJson(
-    host,
-    {},
-    {
-      'eslint-plugin-import': eslintPluginImportVersion,
-      'eslint-plugin-jsx-a11y': eslintPluginJsxA11yVersion,
-      'eslint-plugin-react': eslintPluginReactVersion,
-      'eslint-plugin-react-hooks': eslintPluginReactHooksVersion,
-    }
-  );
-  tasks.push(installTask);
-
-  return runTasksInSerial(...tasks);
-}
-
-function extendReactEslintJson(json: eslint.Linter.Config) {
-  const { extends: pluginExtends, ...config } = json;
-  return {
-    extends: ['plugin:@nrwl/nx/react', ...(pluginExtends || [])],
-    ...config,
-  };
-}
diff --git a/src/generators/application/lib/create-ts-config.ts b/src/generators/application/lib/create-ts-config.ts
index 74493c28d88b2..bb1e49877a0a6 100644
--- a/src/generators/application/lib/create-ts-config.ts
+++ b/src/generators/application/lib/create-ts-config.ts
@@ -1,9 +1,11 @@
-import { Tree, writeJson } from '@nrwl/devkit';
-import { NormalizedSchema } from '../schema';
+import { Tree, workspaceRoot, writeJson } from '@nrwl/devkit';
+import { relative } from 'path';
+import { Framework } from '../../init/schema';
 
-export function createTsConfig(
+export function editTsConfig(
   tree: Tree,
-  options: NormalizedSchema,
+  projectRoot: string,
+  framework: Framework,
   relativePathToRootTsConfig: string
 ) {
   // Nx 15.8 moved util to @nrwl/js, but it is in @nrwl/workspace in 15.7
@@ -14,34 +16,40 @@ export function createTsConfig(
     shared = require('@nrwl/workspace/src/utils/create-ts-config');
   }
 
-  const json = {
-    compilerOptions: {
-      jsx: 'react-jsx',
-      allowJs: false,
-      esModuleInterop: false,
-      allowSyntheticDefaultImports: true,
-      strict: true,
-    },
-    files: [],
-    include: [],
-    references: [
-      {
-        path: './tsconfig.app.json',
+  if (framework === 'react') {
+    const json = {
+      compilerOptions: {
+        jsx: 'react-jsx',
+        allowJs: false,
+        esModuleInterop: false,
+        allowSyntheticDefaultImports: true,
+        strict: true,
       },
-    ],
-  } as any;
+      files: [],
+      include: [],
+      references: [
+        {
+          path: './tsconfig.app.json',
+        },
+      ],
+    } as any;
 
-  // inline tsconfig.base.json into the project
-  if (options.rootProject) {
-    json.compileOnSave = false;
-    json.compilerOptions = {
-      ...shared.tsConfigBaseOptions,
-      ...json.compilerOptions,
-    };
-    json.exclude = ['node_modules', 'tmp'];
-  } else {
-    json.extends = relativePathToRootTsConfig;
+    // inline tsconfig.base.json into the project
+    if (projectIsRootProjectInStandaloneWorkspace(projectRoot)) {
+      json.compileOnSave = false;
+      json.compilerOptions = {
+        ...shared.tsConfigBaseOptions,
+        ...json.compilerOptions,
+      };
+      json.exclude = ['node_modules', 'tmp'];
+    } else {
+      json.extends = relativePathToRootTsConfig;
+    }
+
+    writeJson(tree, `${projectRoot}/tsconfig.json`, json);
   }
+}
 
-  writeJson(tree, `${options.appProjectRoot}/tsconfig.json`, json);
+function projectIsRootProjectInStandaloneWorkspace(projectRoot: string) {
+  return relative(workspaceRoot, projectRoot).length === 0;
 }
diff --git a/src/generators/application/schema.d.ts b/src/generators/application/schema.d.ts
index 7a4adf104cb42..c14d74bf346f7 100644
--- a/src/generators/application/schema.d.ts
+++ b/src/generators/application/schema.d.ts
@@ -1,10 +1,11 @@
 export interface ApplicationGeneratorSchema {
   name: string;
+  framework?: Framework;
   style: 'css' | 'scss' | 'less' | 'styl';
   unitTestRunner?: 'none' | 'jest';
   e2eTestRunner?: 'none' | 'cypress';
   directory?: string;
-  tags?: string[];
+  tags?: string;
   rootProject?: boolean;
   monorepo?: boolean;
 }
diff --git a/src/generators/application/schema.json b/src/generators/application/schema.json
index d353b0fc63432..60451adaf00eb 100644
--- a/src/generators/application/schema.json
+++ b/src/generators/application/schema.json
@@ -22,6 +22,15 @@
       "pattern": "^[a-zA-Z].*$",
       "x-priority": "important"
     },
+    "framework": {
+      "type": "string",
+      "description": "The framework to use for the application.",
+      "x-prompt": "What framework do you want to use when generating this application?",
+      "enum": ["none", "react", "web", "nest"],
+      "alias": ["uiFramework"],
+      "x-priority": "important",
+      "default": "react"
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -71,12 +80,9 @@
       "description": "The directory to nest the app under."
     },
     "tags": {
-      "type": "array",
-      "description": "The tags to assign to the project.",
-      "items": {
-        "type": "string"
-      },
-      "default": []
+      "type": "string",
+      "description": "Add tags to the application (used for linting).",
+      "alias": "t"
     },
     "monorepo": {
       "type": "boolean",
diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 5dc9e8586c134..4f2970bc568a2 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -1,4 +1,10 @@
-import { formatFiles, readProjectConfiguration, Tree } from '@nrwl/devkit';
+import {
+  formatFiles,
+  joinPathFragments,
+  offsetFromRoot,
+  readProjectConfiguration,
+  Tree,
+} from '@nrwl/devkit';
 import {
   addOrChangeBuildTarget,
   addOrChangeServeTarget,
@@ -11,6 +17,7 @@ import {
   UserProvidedTargetName,
   writeRspackConfigFile,
 } from '../../utils/generator-utils';
+import { editTsConfig } from '../application/lib/create-ts-config';
 import rspackInitGenerator from '../init/init';
 import { ConfigurationSchema } from './schema';
 
@@ -113,6 +120,13 @@ export async function configurationGenerator(
       root,
       targets?.[buildTargetName]?.options?.webpackConfig
     );
+
+    editTsConfig(
+      tree,
+      root,
+      options.framework,
+      joinPathFragments(offsetFromRoot(root), 'tsconfig.base.json')
+    );
   }
 
   if (!projectAlreadyHasRspackTargets.build) {
diff --git a/src/generators/configuration/schema.d.ts b/src/generators/configuration/schema.d.ts
index 62fea52e10e7b..0d4ee469bfea9 100644
--- a/src/generators/configuration/schema.d.ts
+++ b/src/generators/configuration/schema.d.ts
@@ -1,4 +1,4 @@
-import { Framework, InitGeneratorSchema } from '../init/schema';
+import { InitGeneratorSchema } from '../init/schema';
 
 export interface ConfigurationSchema extends InitGeneratorSchema {
   project: string;
@@ -9,5 +9,4 @@ export interface ConfigurationSchema extends InitGeneratorSchema {
   newProject?: boolean;
   buildTarget?: string;
   serveTarget?: string;
-  framework?: Framework;
 }
diff --git a/src/generators/configuration/schema.json b/src/generators/configuration/schema.json
index f621f7f09305b..7b1899ccb7a29 100644
--- a/src/generators/configuration/schema.json
+++ b/src/generators/configuration/schema.json
@@ -63,6 +63,10 @@
     "serveTarget": {
       "type": "string",
       "description": "The serve target of the project to be transformed to use the @nrwl/vite:dev-server and @nrwl/vite:preview-server executors."
+    },
+    "rootProject": {
+      "type": "boolean",
+      "x-priority": "internal"
     }
   },
   "required": ["project"]
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index e0943619ce9f0..11484900bdd21 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -1,8 +1,12 @@
 import {
   addDependenciesToPackageJson,
   convertNxGenerator,
+  ensurePackage,
+  GeneratorCallback,
+  runTasksInSerial,
   Tree,
 } from '@nrwl/devkit';
+import { version as nxVersion } from 'nx/package.json';
 import {
   rspackCoreVersion,
   rspackDevServerVersion,
@@ -15,6 +19,19 @@ export async function rspackInitGenerator(
   tree: Tree,
   schema: InitGeneratorSchema
 ) {
+  const tasks: GeneratorCallback[] = [];
+  const { initGenerator } = ensurePackage<typeof import('@nrwl/js')>(
+    '@nrwl/js',
+    nxVersion
+  );
+  const jsInitTask = await initGenerator(tree, {
+    ...schema,
+    tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+    skipFormat: true,
+  });
+
+  tasks.push(jsInitTask);
+
   const devDependencies = {
     '@rspack/core': rspackCoreVersion,
     '@rspack/plugin-minify': rspackPluginMinifyVersion,
@@ -35,7 +52,10 @@ export async function rspackInitGenerator(
     devDependencies['@rspack/dev-server'] = rspackDevServerVersion;
   }
 
-  return addDependenciesToPackageJson(tree, {}, devDependencies);
+  const installTask = addDependenciesToPackageJson(tree, {}, devDependencies);
+  tasks.push(installTask);
+
+  return runTasksInSerial(...tasks);
 }
 
 export default rspackInitGenerator;
diff --git a/src/generators/init/schema.d.ts b/src/generators/init/schema.d.ts
index b1184cfa56281..11f60be151dbf 100644
--- a/src/generators/init/schema.d.ts
+++ b/src/generators/init/schema.d.ts
@@ -2,6 +2,7 @@ export type Framework = 'none' | 'react' | 'web' | 'nest';
 
 export interface InitGeneratorSchema {
   framework?: Framework;
-  style?: 'none' | 'css' | 'scss' | 'less';
+  style?: 'none' | 'css' | 'scss' | 'less' | 'styl';
   devServer?: boolean;
+  rootProject?: boolean;
 }
diff --git a/src/generators/init/schema.json b/src/generators/init/schema.json
index 11b8c4c269b85..81c9bfa02efe3 100644
--- a/src/generators/init/schema.json
+++ b/src/generators/init/schema.json
@@ -14,7 +14,11 @@
     "style": {
       "type": "string",
       "description": "The style solution to use.",
-      "enum": ["none", "css", "scss", "less"]
+      "enum": ["none", "css", "scss", "less", "styl"]
+    },
+    "rootProject": {
+      "type": "boolean",
+      "x-priority": "internal"
     }
   },
   "required": []
diff --git a/src/generators/preset/schema.d.ts b/src/generators/preset/schema.d.ts
index e1f7c2ae9fef6..f06b33bced746 100644
--- a/src/generators/preset/schema.d.ts
+++ b/src/generators/preset/schema.d.ts
@@ -1,12 +1,13 @@
 export interface PresetGeneratorSchema {
   name: string;
+  framework?: Framework;
   less?: boolean;
   sass?: boolean;
   stylus?: boolean;
   unitTestRunner?: 'none' | 'jest';
   e2eTestRunner?: 'none' | 'cypress';
   directory?: string;
-  tags?: string[];
+  tags?: string;
   rootProject?: boolean;
   monorepo?: boolean;
 }
diff --git a/src/generators/preset/schema.json b/src/generators/preset/schema.json
index 6250dd062b3ca..f7118466c1bc6 100644
--- a/src/generators/preset/schema.json
+++ b/src/generators/preset/schema.json
@@ -14,6 +14,14 @@
       },
       "x-priority": "important"
     },
+    "framework": {
+      "type": "string",
+      "description": "The framework to use for the application.",
+      "enum": ["none", "react", "web", "nest"],
+      "alias": ["uiFramework"],
+      "x-priority": "important",
+      "default": "react"
+    },
     "less": {
       "type": "boolean",
       "description": "Use less for styling."
@@ -43,12 +51,9 @@
       "description": "The directory to nest the app under."
     },
     "tags": {
-      "type": "array",
-      "description": "The tags to assign to the project.",
-      "items": {
-        "type": "string"
-      },
-      "default": []
+      "type": "string",
+      "description": "Add tags to the project (used for linting).",
+      "alias": "t"
     },
     "monorepo": {
       "type": "boolean",
diff --git a/src/utils/generator-utils.ts b/src/utils/generator-utils.ts
index 359e6d6fb98e9..2a8a089226043 100644
--- a/src/utils/generator-utils.ts
+++ b/src/utils/generator-utils.ts
@@ -257,13 +257,6 @@ function createConfig(
     const { composePlugins, withNx } = require('@nrwl/rspack');
 
     module.exports = composePlugins(withNx(), (config) => {
-      ${
-        options.main
-          ? `config.entry = {
-          main: './${options.main}',
-          };`
-          : ``
-      }
       return config;
     });
     `;
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 662258b37834a..d34500f38600d 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -9,6 +9,11 @@ export const reactDomVersion = '~18.2.0';
 export const typesReactVersion = '~18.0.28';
 export const typesReactDomVersion = '~18.0.10';
 
+export const nestjsCommonVersion = '~9.0.0';
+export const nestjsCoreVersion = '~9.0.0';
+export const nestjsPlatformExpressVersion = '~9.0.0';
+export const nestjsMicroservicesVersion = '~9.0.0';
+
 export const lessVersion = '4.1.3';
 export const sassVersion = '^1.42.1';
 export const stylusVersion = '^0.55.0';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 7644eb59cae47..b9581e24614ab 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -26,17 +26,18 @@ export function withNx(_opts = {}) {
     }, {});
 
     const externals: ExternalItem = {};
+    let externalsType: Configuration['externalsType'];
     if (options.target === 'node') {
       const projectDeps =
         context.projectGraph.dependencies[context.projectName];
       for (const dep of Object.values(projectDeps)) {
         const externalNode = context.projectGraph.externalNodes[dep.target];
         if (externalNode) {
-          externals[
-            externalNode.data.packageName
-          ] = `"${externalNode.data.packageName}"`;
+          externals[externalNode.data.packageName] =
+            externalNode.data.packageName;
         }
       }
+      externalsType = 'commonjs';
     }
 
     const updated: Configuration = {
@@ -95,6 +96,7 @@ export function withNx(_opts = {}) {
         progress: {},
       },
       externals,
+      externalsType,
       stats: {
         colors: true,
         preset: 'normal',

From 9c67a8a6593c2d277f402c5a8ffebf46f635b465 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 11 Apr 2023 18:36:06 +0300
Subject: [PATCH 27/92] feat(rspack): simplify app generator (#212)

Co-Author: Douglas Machado <douglas.machado@valor-software.com>
---
 tests/rspack.spec.ts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 66ca918736f09..1ade9fda4b4f8 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -27,17 +27,14 @@ describe('rspack e2e', () => {
   it('should create rspack root project and additional apps', async () => {
     const project = uniq('myapp');
     await runNxCommandAsync(
-      `generate @nrwl/rspack:preset ${project} --unitTestRunner=jest --e2eTestRunner=cypress`
+      `generate @nrwl/rspack:preset ${project} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress`
     );
     let result = await runNxCommandAsync(`build ${project}`, {
       env: { NODE_ENV: 'production' },
     });
     expect(result.stdout).toContain('Successfully ran target build');
     // Make sure expected files are present.
-    expect(listFiles(`dist/${project}`)).toHaveLength(5);
-
-    result = await runNxCommandAsync(`lint ${project}`);
-    expect(result.stdout).toContain('Successfully ran target lint');
+    expect(listFiles(`dist/${project}`)).toHaveLength(4);
 
     result = await runNxCommandAsync(`test ${project}`);
     expect(result.stdout).toContain('Successfully ran target test');
@@ -54,12 +51,12 @@ describe('rspack e2e', () => {
       env: { NODE_ENV: 'production' },
     });
     expect(result.stdout).toContain('Successfully ran target build');
-    expect(listFiles(`dist/${project}`)).toHaveLength(5); // same length as before
+    expect(listFiles(`dist/${project}`)).toHaveLength(4); // same length as before
 
     // Generate a new app and check that the files are correct
     const app2 = uniq('app2');
     await runNxCommandAsync(
-      `generate @nrwl/rspack:app ${app2} --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
+      `generate @nrwl/rspack:app ${app2} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
     );
     checkFilesExist(`${app2}/project.json`, `${app2}-e2e/project.json`);
     result = await runNxCommandAsync(`build ${app2}`, {
@@ -67,15 +64,12 @@ describe('rspack e2e', () => {
     });
     expect(result.stdout).toContain('Successfully ran target build');
     // Make sure expected files are present.
-    expect(listFiles(`dist/${app2}`)).toHaveLength(5);
-
-    result = await runNxCommandAsync(`lint ${app2}`);
-    expect(result.stdout).toContain('Successfully ran target lint');
+    expect(listFiles(`dist/${app2}`)).toHaveLength(4);
 
     result = await runNxCommandAsync(`test ${app2}`);
     expect(result.stdout).toContain('Successfully ran target test');
 
     result = await runNxCommandAsync(`e2e ${app2}-e2e`);
     expect(result.stdout).toContain('Successfully ran target e2e');
-  }, 120_000);
+  }, 200_000);
 });

From fbdb46dea38d080c837aad58b08dc18269ea4ff1 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Thu, 13 Apr 2023 16:25:02 +0300
Subject: [PATCH 28/92] fix(rspack): implement watch mode (#217)

---
 src/executors/rspack/rspack.impl.ts | 112 +++++++++++++++++++++-------
 src/executors/rspack/schema.d.ts    |   1 +
 src/executors/rspack/schema.json    |   5 ++
 3 files changed, 92 insertions(+), 26 deletions(-)

diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index a6568398987d2..8fa1f1ff3f721 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -1,11 +1,14 @@
-import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorContext, logger } from '@nrwl/devkit';
+import { createAsyncIterable } from '@nrwl/devkit/src/utils/async-iterable';
+import { Stats } from '@rspack/core';
+import Watching from '@rspack/core/dist/watching';
 import { rmSync } from 'fs';
 import * as path from 'path';
 import { createCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { RspackExecutorSchema } from './schema';
 
-export default async function runExecutor(
+export default async function* runExecutor(
   options: RspackExecutorSchema,
   context: ExecutorContext
 ) {
@@ -22,33 +25,90 @@ export default async function runExecutor(
 
   const compiler = await createCompiler(options, context);
 
-  return new Promise<{ success: boolean; outfile?: string }>((res) => {
-    compiler.run((error, stats) => {
-      compiler.close(() => {
-        if (error) {
-          console.error(error);
-          res({ success: false });
-          return;
-        }
-        if (!compiler || !stats) {
-          res({ success: false });
-          return;
-        }
+  const iterable = createAsyncIterable<{
+    success: boolean;
+    outfile?: string;
+  }>(async ({ next, done }) => {
+    if (options.watch) {
+      const watcher: Watching = compiler.watch(
+        {},
+        async (err, stats: Stats) => {
+          if (err) {
+            logger.error(err);
+            next({ success: false });
+            return;
+          }
+          if (!compiler || !stats) {
+            logger.error(new Error('Compiler or stats not available'));
+            next({ success: false });
+            return;
+          }
 
-        // TODO: Handle MultipleCompiler
-        const statsOptions = compiler.options
-          ? compiler.options.stats
-          : undefined;
-        const printedStats = stats.toString(statsOptions);
-        // Avoid extra empty line when `stats: 'none'`
-        if (printedStats) {
-          console.error(printedStats);
+          const statsOptions = compiler.options
+            ? compiler.options.stats
+            : undefined;
+          const printedStats = stats.toString(statsOptions);
+          // Avoid extra empty line when `stats: 'none'`
+          if (printedStats) {
+            console.error(printedStats);
+          }
+          next({
+            success: !stats.hasErrors(),
+            outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+          });
         }
-        res({
-          success: !stats.hasErrors(),
-          outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+      );
+
+      registerCleanupCallback(() => {
+        watcher.close(() => {
+          logger.info('Watcher closed');
+        });
+      });
+    } else {
+      compiler.run(async (err, stats: Stats) => {
+        compiler.close(() => {
+          if (err) {
+            logger.error(err);
+            next({ success: false });
+            return;
+          }
+          if (!compiler || !stats) {
+            logger.error(new Error('Compiler or stats not available'));
+            next({ success: false });
+            return;
+          }
+
+          const statsOptions = compiler.options
+            ? compiler.options.stats
+            : undefined;
+          const printedStats = stats.toString(statsOptions);
+          // Avoid extra empty line when `stats: 'none'`
+          if (printedStats) {
+            console.error(printedStats);
+          }
+          next({
+            success: !stats.hasErrors(),
+            outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+          });
+          done();
         });
       });
-    });
+    }
   });
+
+  yield* iterable;
+}
+
+// copied from packages/esbuild/src/executors/esbuild/esbuild.impl.ts
+function registerCleanupCallback(callback: () => void) {
+  const wrapped = () => {
+    callback();
+    process.off('SIGINT', wrapped);
+    process.off('SIGTERM', wrapped);
+    process.off('exit', wrapped);
+  };
+
+  process.on('SIGINT', wrapped);
+  process.on('SIGTERM', wrapped);
+  process.on('exit', wrapped);
 }
diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index 7f14806e68a3b..edc5c7f1bac66 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -6,6 +6,7 @@ export interface RspackExecutorSchema {
   outputPath: string;
   indexHtml?: string;
   mode?: Mode;
+  watch?: boolean;
 
   rspackConfig: string;
   optimization?: boolean;
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index e195a7d0b6222..aaa282ccf5eb6 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -86,6 +86,11 @@
             "output": {
               "type": "string",
               "description": "Absolute path within the output."
+            },
+            "watch": {
+              "type": "boolean",
+              "description": "Enable re-building when files change.",
+              "default": false
             }
           },
           "additionalProperties": false,

From e058b43c42396abd790f367d4b7af95694b26ff3 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Wed, 19 Apr 2023 16:16:00 +0300
Subject: [PATCH 29/92] fix(rspack): do not force cssmodules (#222)

---
 src/utils/with-nx.ts    | 9 +--------
 src/utils/with-react.ts | 5 ++++-
 src/utils/with-web.ts   | 7 ++++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index b9581e24614ab..0874d4c0bd62c 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -68,14 +68,7 @@ export function withNx(_opts = {}) {
         port: 4200,
         hot: true,
       } as any,
-      module: {
-        rules: [
-          {
-            test: /\.css$/,
-            type: 'css/module' as any,
-          },
-        ],
-      },
+      module: {},
       plugins: config.plugins ?? [],
       resolve: {
         alias,
diff --git a/src/utils/with-react.ts b/src/utils/with-react.ts
index 822ea3d9e38d7..d6b4ab7ede968 100644
--- a/src/utils/with-react.ts
+++ b/src/utils/with-react.ts
@@ -10,7 +10,10 @@ export function withReact(opts = {}) {
     const isDev =
       process.env.NODE_ENV === 'development' || options.mode === 'development';
 
-    config = withWeb(opts)(config, { options, context });
+    config = withWeb({ ...opts, cssModules: true })(config, {
+      options,
+      context,
+    });
 
     return {
       ...config,
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index 3af2f3e65520c..1e496a0767b5e 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -6,6 +6,7 @@ export interface WithWebOptions {
   stylePreprocessorOptions?: {
     includePaths?: string[];
   };
+  cssModules?: boolean;
 }
 
 export function withWeb(opts: WithWebOptions = {}) {
@@ -45,11 +46,11 @@ export function withWeb(opts: WithWebOptions = {}) {
           ...(config.module.rules || []),
           {
             test: /\.css$/,
-            type: 'css/module',
+            type: opts?.cssModules ? 'css/module' : undefined,
           },
           {
             test: /\.scss$|\.sass$/,
-            type: 'css/module',
+            type: opts?.cssModules ? 'css/module' : undefined,
             use: [
               {
                 loader: require.resolve('sass-loader'),
@@ -67,7 +68,7 @@ export function withWeb(opts: WithWebOptions = {}) {
           },
           {
             test: /.less$/,
-            type: 'css/module',
+            type: opts?.cssModules ? 'css/module' : undefined,
             use: [
               {
                 loader: require.resolve('less-loader'),

From f0f2a65ac456a4d755c2b09b56954f1055bd7bd7 Mon Sep 17 00:00:00 2001
From: Gengkun <ahabhgk@gmail.com>
Date: Fri, 21 Apr 2023 01:52:00 +0800
Subject: [PATCH 30/92] fix(rspack): use builtin minify instead (#172)

---
 src/utils/with-nx.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 0874d4c0bd62c..041d0bae816be 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -72,10 +72,7 @@ export function withNx(_opts = {}) {
       plugins: config.plugins ?? [],
       resolve: {
         alias,
-        // This is not working it seems.
-        //plugins: [new TsconfigPathsPlugin({
-        //  configFile: path.resolve(__dirname, 'tsconfig.app.json')
-        //})]
+        tsConfigPath: path.resolve(__dirname, 'tsconfig.app.json'),
       },
       infrastructureLogging: {
         debug: false,
@@ -97,17 +94,9 @@ export function withNx(_opts = {}) {
     };
 
     if (options.optimization) {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const minifyPlugin = require('@rspack/plugin-minify');
       updated.optimization = {
         ...config.optimization,
         minimize: true,
-        minimizer: [
-          ...(config.optimization?.minimizer || []),
-          new minifyPlugin({
-            minifier: 'terser',
-          }),
-        ],
       };
     }
 

From b6be2c1370926443693f2acdcd8468d700bd61a1 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 20 Apr 2023 14:42:41 -0400
Subject: [PATCH 31/92] fix(rspack): use built-in tsconfig paths support (#227)

---
 src/utils/with-nx.ts | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 041d0bae816be..fc2c704455b8f 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -12,18 +12,8 @@ export function withNx(_opts = {}) {
     const isProd =
       process.env.NODE_ENV === 'production' || options.mode === 'production';
 
-    const sourceRoot = path.join(
-      context.root,
-      context.projectGraph.nodes[context.projectName].data.sourceRoot
-    );
-
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const tsconfigPaths = require('tsconfig-paths');
-    const { paths } = tsconfigPaths.loadConfig(options.tsConfig);
-    const alias = Object.keys(paths).reduce((acc, k) => {
-      acc[k] = path.join(context.root, paths[k][0]);
-      return acc;
-    }, {});
+    const project = context.projectGraph.nodes[context.projectName];
+    const sourceRoot = path.join(context.root, project.data.sourceRoot);
 
     const externals: ExternalItem = {};
     let externalsType: Configuration['externalsType'];
@@ -71,8 +61,7 @@ export function withNx(_opts = {}) {
       module: {},
       plugins: config.plugins ?? [],
       resolve: {
-        alias,
-        tsConfigPath: path.resolve(__dirname, 'tsconfig.app.json'),
+        tsConfigPath: path.join(context.root, options.tsConfig),
       },
       infrastructureLogging: {
         debug: false,

From a5a7fa2f46987edb32846e2a7ff3a59e0c5c783a Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Mon, 24 Apr 2023 13:46:00 -0400
Subject: [PATCH 32/92] fix(rspack): add back `resolve.alias` configuration
 since `resolve.tsConfigPaths` seem to be incorrect in some scenarios (#229)

---
 src/utils/with-nx.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index fc2c704455b8f..a550ee7dacb07 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -15,6 +15,14 @@ export function withNx(_opts = {}) {
     const project = context.projectGraph.nodes[context.projectName];
     const sourceRoot = path.join(context.root, project.data.sourceRoot);
 
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const tsconfigPaths = require('tsconfig-paths');
+    const { paths } = tsconfigPaths.loadConfig(options.tsConfig);
+    const alias = Object.keys(paths).reduce((acc, k) => {
+      acc[k] = path.join(context.root, paths[k][0]);
+      return acc;
+    }, {});
+
     const externals: ExternalItem = {};
     let externalsType: Configuration['externalsType'];
     if (options.target === 'node') {
@@ -61,7 +69,11 @@ export function withNx(_opts = {}) {
       module: {},
       plugins: config.plugins ?? [],
       resolve: {
-        tsConfigPath: path.join(context.root, options.tsConfig),
+        // There are some issues resolving workspace libs in a monorepo.
+        // It looks to be an issue with rspack itself, but will check back after Nx 16 release
+        // once I can reproduce a small example repo with rspack only.
+        alias,
+        // tsConfigPath: path.join(context.root, options.tsConfig),
       },
       infrastructureLogging: {
         debug: false,

From ffb91bcabb7b142f10edf4fe072b3b3841b8d432 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Tue, 2 May 2023 10:45:48 -0400
Subject: [PATCH 33/92] feat(misc): update to Nx 16 and rescoped packages
 (#235)

---
 .eslintrc.json                                |  2 +-
 README.md                                     |  2 +-
 package.json                                  |  8 +-
 project.json                                  |  6 +-
 src/executors/dev-server/dev-server.impl.ts   |  4 +-
 src/executors/dev-server/schema.json          |  1 -
 src/executors/rspack/rspack.impl.ts           |  4 +-
 src/executors/rspack/schema.json              |  1 -
 src/generators/application/application.ts     | 11 +--
 .../application/lib/create-ts-config.ts       |  8 +-
 .../application/lib/normalize-options.spec.ts |  4 +-
 .../application/lib/normalize-options.ts      |  4 +-
 src/generators/application/schema.json        |  1 -
 src/generators/configuration/configuration.ts |  8 +-
 src/generators/configuration/schema.json      |  1 -
 src/generators/init/init.ts                   | 11 +--
 src/generators/init/schema.json               |  1 -
 src/generators/preset/preset.ts               |  2 +-
 src/generators/preset/schema.json             |  1 -
 src/utils/create-compiler.ts                  |  2 +-
 src/utils/generator-utils.ts                  | 80 ++++++++++++-------
 src/utils/jest-utils.ts                       |  4 +-
 src/utils/model.ts                            |  2 +-
 src/utils/normalize-assets.ts                 |  2 +-
 24 files changed, 88 insertions(+), 82 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 556554a7956a5..4cf7f347f6a85 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -18,7 +18,7 @@
       "files": ["./package.json", "./generators.json", "./executors.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
+        "@nx/nx-plugin-checks": "error"
       }
     }
   ]
diff --git a/README.md b/README.md
index 0e43fea55a70d..0246d31b259f3 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ npx nx g @nrwl/rspack:rspack-project --skipValidation
 The `@nrwl/rspack` executor support importing workspace libs into the app.
 
 ```bash
-npx nx g @nrwl/react:lib mylib
+npx nx g @nx/react:lib mylib
 ```
 
 Import the new library in your app.
diff --git a/package.json b/package.json
index eb6755f792395..e352b6fa0d287 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@nrwl/rspack",
+  "name": "@nx/rspack",
   "version": "0.0.1",
   "type": "commonjs",
   "repository": {
@@ -19,9 +19,9 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nrwl/js": "^15.8.1",
-    "@nrwl/linter": "^15.8.1",
-    "@nrwl/devkit": "^15.8.1",
+    "@nx/js": "^16.0.0",
+    "@nx/linter": "^16.0.0",
+    "@nx/devkit": "^16.0.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",
diff --git a/project.json b/project.json
index 8cd47ed61ad22..193c2dc521fc9 100644
--- a/project.json
+++ b/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/rspack",
@@ -37,7 +37,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -49,7 +49,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/rspack/jest.config.ts",
diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index d7d6c59e7f1c1..8c192be408f91 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -2,8 +2,8 @@ import {
   ExecutorContext,
   parseTargetString,
   readTargetOptions,
-} from '@nrwl/devkit';
-import { createAsyncIterable } from '@nrwl/devkit/src/utils/async-iterable';
+} from '@nx/devkit';
+import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
 import { DevServer } from '@rspack/core/dist/config';
 import { RspackDevServer } from '@rspack/dev-server';
 import { createCompiler } from '../../utils/create-compiler';
diff --git a/src/executors/dev-server/schema.json b/src/executors/dev-server/schema.json
index 7c0b6fc91f8e5..178eb12faf563 100644
--- a/src/executors/dev-server/schema.json
+++ b/src/executors/dev-server/schema.json
@@ -1,7 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
   "version": 2,
-  "cli": "nx",
   "title": "Rspack dev-server executor",
   "description": "",
   "type": "object",
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index 8fa1f1ff3f721..c550cd232d807 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -1,5 +1,5 @@
-import { ExecutorContext, logger } from '@nrwl/devkit';
-import { createAsyncIterable } from '@nrwl/devkit/src/utils/async-iterable';
+import { ExecutorContext, logger } from '@nx/devkit';
+import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
 import { Stats } from '@rspack/core';
 import Watching from '@rspack/core/dist/watching';
 import { rmSync } from 'fs';
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index aaa282ccf5eb6..0337f7a24e459 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -1,7 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
   "version": 2,
-  "cli": "nx",
   "title": "Rspack build executor",
   "description": "",
   "type": "object",
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index 05a6c44ddd2ed..bd41490e3df7f 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -1,9 +1,4 @@
-import {
-  ensurePackage,
-  formatFiles,
-  runTasksInSerial,
-  Tree,
-} from '@nrwl/devkit';
+import { ensurePackage, formatFiles, runTasksInSerial, Tree } from '@nx/devkit';
 import { version as nxVersion } from 'nx/package.json';
 import configurationGenerator from '../configuration/configuration';
 import rspackInitGenerator from '../init/init';
@@ -24,7 +19,7 @@ export default async function (
 
   if (options.framework === 'nest') {
     const { applicationGenerator: nestAppGenerator } = ensurePackage(
-      '@nrwl/nest',
+      '@nx/nest',
       nxVersion
     );
     const createAppTask = await nestAppGenerator(tree, {
@@ -70,7 +65,7 @@ export default async function (
   } else {
     // default to react
     const { applicationGenerator: reactAppGenerator } = ensurePackage(
-      '@nrwl/react',
+      '@nx/react',
       nxVersion
     );
     const createAppTask = await reactAppGenerator(tree, {
diff --git a/src/generators/application/lib/create-ts-config.ts b/src/generators/application/lib/create-ts-config.ts
index bb1e49877a0a6..4bbfa2b836565 100644
--- a/src/generators/application/lib/create-ts-config.ts
+++ b/src/generators/application/lib/create-ts-config.ts
@@ -1,4 +1,4 @@
-import { Tree, workspaceRoot, writeJson } from '@nrwl/devkit';
+import { Tree, workspaceRoot, writeJson } from '@nx/devkit';
 import { relative } from 'path';
 import { Framework } from '../../init/schema';
 
@@ -8,12 +8,12 @@ export function editTsConfig(
   framework: Framework,
   relativePathToRootTsConfig: string
 ) {
-  // Nx 15.8 moved util to @nrwl/js, but it is in @nrwl/workspace in 15.7
+  // Nx 15.8 moved util to @nx/js, but it is in @nx/workspace in 15.7
   let shared: any;
   try {
-    shared = require('@nrwl/js/src/utils/typescript/create-ts-config');
+    shared = require('@nx/js/src/utils/typescript/create-ts-config');
   } catch {
-    shared = require('@nrwl/workspace/src/utils/create-ts-config');
+    shared = require('@nx/workspace/src/utils/create-ts-config');
   }
 
   if (framework === 'react') {
diff --git a/src/generators/application/lib/normalize-options.spec.ts b/src/generators/application/lib/normalize-options.spec.ts
index 208f091cf5b18..3e560296fc41e 100644
--- a/src/generators/application/lib/normalize-options.spec.ts
+++ b/src/generators/application/lib/normalize-options.spec.ts
@@ -1,5 +1,5 @@
-import { Tree } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { Tree } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { normalizeOptions } from './normalize-options';
 
 describe('normalizeOptions', () => {
diff --git a/src/generators/application/lib/normalize-options.ts b/src/generators/application/lib/normalize-options.ts
index a21f25900f5d8..72c03ffec87c2 100644
--- a/src/generators/application/lib/normalize-options.ts
+++ b/src/generators/application/lib/normalize-options.ts
@@ -4,7 +4,7 @@ import {
   names,
   normalizePath,
   Tree,
-} from '@nrwl/devkit';
+} from '@nx/devkit';
 import { ApplicationGeneratorSchema, NormalizedSchema } from '../schema';
 
 export function normalizeDirectory(options: ApplicationGeneratorSchema) {
@@ -23,7 +23,7 @@ export function normalizeOptions(
   options: ApplicationGeneratorSchema
 ): NormalizedSchema {
   // --monorepo takes precedence over --rootProject
-  // This won't be needed once we add --bundler=rspack to the @nrwl/react:app preset
+  // This won't be needed once we add --bundler=rspack to the @nx/react:app preset
   const rootProject = !options.monorepo && options.rootProject;
   const appDirectory = normalizeDirectory(options);
   const appProjectName = normalizeProjectName(options);
diff --git a/src/generators/application/schema.json b/src/generators/application/schema.json
index 60451adaf00eb..b193d1b3305df 100644
--- a/src/generators/application/schema.json
+++ b/src/generators/application/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "$id": "Application",
   "title": "Application generator for React + rspack",
   "type": "object",
diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 4f2970bc568a2..4ea1ac7e6b6f8 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -4,7 +4,7 @@ import {
   offsetFromRoot,
   readProjectConfiguration,
   Tree,
-} from '@nrwl/devkit';
+} from '@nx/devkit';
 import {
   addOrChangeBuildTarget,
   addOrChangeServeTarget,
@@ -72,8 +72,8 @@ export async function configurationGenerator(
         options.framework === 'nest')
     ) {
       throw new Error(
-        `The project ${options.project} is already configured to use the @nrwl/rspack executors.
-        Please try a different project, or remove the existing targets 
+        `The project ${options.project} is already configured to use the @nx/rspack executors.
+        Please try a different project, or remove the existing targets
         and re-run this generator to reset the existing Rspack Configuration.
         `
       );
@@ -81,7 +81,7 @@ export async function configurationGenerator(
 
     if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {
       throw new Error(
-        `The project ${options.project} cannot be converted to use the @nrwl/rspack executors.`
+        `The project ${options.project} cannot be converted to use the @nx/rspack executors.`
       );
     }
 
diff --git a/src/generators/configuration/schema.json b/src/generators/configuration/schema.json
index 7b1899ccb7a29..d2593ae47e712 100644
--- a/src/generators/configuration/schema.json
+++ b/src/generators/configuration/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "$id": "Rspack",
   "title": "",
   "type": "object",
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index 11484900bdd21..96c8dfd6320e0 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -1,12 +1,11 @@
 import {
   addDependenciesToPackageJson,
   convertNxGenerator,
-  ensurePackage,
   GeneratorCallback,
   runTasksInSerial,
   Tree,
-} from '@nrwl/devkit';
-import { version as nxVersion } from 'nx/package.json';
+} from '@nx/devkit';
+import { initGenerator } from '@nx/js';
 import {
   rspackCoreVersion,
   rspackDevServerVersion,
@@ -20,10 +19,6 @@ export async function rspackInitGenerator(
   schema: InitGeneratorSchema
 ) {
   const tasks: GeneratorCallback[] = [];
-  const { initGenerator } = ensurePackage<typeof import('@nrwl/js')>(
-    '@nrwl/js',
-    nxVersion
-  );
   const jsInitTask = await initGenerator(tree, {
     ...schema,
     tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -41,7 +36,7 @@ export async function rspackInitGenerator(
   const version = require('../../../package.json').version;
   if (version !== '0.0.1') {
     // Ignored for local dev / e2e tests.
-    devDependencies['@nrwl/rspack'] = version;
+    devDependencies['@nx/rspack'] = version;
   }
 
   if (schema.style === 'less') {
diff --git a/src/generators/init/schema.json b/src/generators/init/schema.json
index 81c9bfa02efe3..b53f45eeeac1d 100644
--- a/src/generators/init/schema.json
+++ b/src/generators/init/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "$id": "Init",
   "title": "",
   "type": "object",
diff --git a/src/generators/preset/preset.ts b/src/generators/preset/preset.ts
index a12b16c7da7db..69bec32baa5c0 100644
--- a/src/generators/preset/preset.ts
+++ b/src/generators/preset/preset.ts
@@ -1,4 +1,4 @@
-import { Tree, updateJson } from '@nrwl/devkit';
+import { Tree, updateJson } from '@nx/devkit';
 
 import applicationGenerator from '../application/application';
 import { PresetGeneratorSchema } from './schema';
diff --git a/src/generators/preset/schema.json b/src/generators/preset/schema.json
index f7118466c1bc6..45b542f2d2944 100644
--- a/src/generators/preset/schema.json
+++ b/src/generators/preset/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "$id": "Preset",
   "title": "Standalone React and rspack preset",
   "type": "object",
diff --git a/src/utils/create-compiler.ts b/src/utils/create-compiler.ts
index 5ba7ca1442f82..fbb0b1c4d1e86 100644
--- a/src/utils/create-compiler.ts
+++ b/src/utils/create-compiler.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorContext } from '@nx/devkit';
 import { Compiler, createCompiler as _createCompiler } from '@rspack/core';
 import * as path from 'path';
 import { RspackExecutorSchema } from '../executors/rspack/schema';
diff --git a/src/utils/generator-utils.ts b/src/utils/generator-utils.ts
index 2a8a089226043..a89a4d5e9cfd8 100644
--- a/src/utils/generator-utils.ts
+++ b/src/utils/generator-utils.ts
@@ -5,8 +5,8 @@ import {
   TargetConfiguration,
   Tree,
   updateProjectConfiguration,
-} from '@nrwl/devkit';
-import { ensureTypescript } from '@nrwl/js/src/utils/typescript/ensure-typescript';
+} from '@nx/devkit';
+import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript';
 import { RspackExecutorSchema } from '../executors/rspack/schema';
 import { ConfigurationSchema } from '../generators/configuration/schema';
 import { Framework } from '../generators/init/schema';
@@ -41,24 +41,40 @@ export function findExistingTargetsInProject(
       '@nrwl/rollup:rollup',
       '@nrwl/web:rollup',
       '@nrwl/vite:build',
+      '@nx/webpack:webpack',
+      '@nx/rollup:rollup',
+      '@nx/web:rollup',
+      '@nx/vite:build',
     ],
     serve: [
       '@nxext/vite:dev',
       '@nrwl/webpack:dev-server',
       '@nrwl/vite:dev-server',
+      '@nx/webpack:dev-server',
+      '@nx/vite:dev-server',
     ],
   };
 
   const unsupportedExecutors = [
+    '@nx/js:babel',
+    '@nx/js:node',
+    '@nx/js:swc',
+    '@nx/react-native:run-ios',
+    '@nx/react-native:start',
+    '@nx/react-native:run-android',
+    '@nx/react-native:bundle',
+    '@nx/react-native:build-android',
+    '@nx/react-native:bundle',
+    '@nx/next:build',
+    '@nx/next:server',
+    '@nx/js:tsc',
+    '@nx/angular:ng-packagr-lite',
+    '@nx/angular:package',
+    '@nx/angular:webpack-browser',
+    '@nx/esbuild:esbuild',
     '@nrwl/js:babel',
     '@nrwl/js:node',
     '@nrwl/js:swc',
-    '@nrwl/js:tsc',
-    '@nrwl/angular:ng-packagr-lite',
-    '@nrwl/angular:package',
-    '@nrwl/angular:webpack-browser',
-    '@angular-devkit/build-angular:browser',
-    '@angular-devkit/build-angular:dev-server',
     '@nrwl/react-native:run-ios',
     '@nrwl/react-native:start',
     '@nrwl/react-native:run-android',
@@ -67,7 +83,13 @@ export function findExistingTargetsInProject(
     '@nrwl/react-native:bundle',
     '@nrwl/next:build',
     '@nrwl/next:server',
+    '@nrwl/js:tsc',
+    '@nrwl/angular:ng-packagr-lite',
+    '@nrwl/angular:package',
+    '@nrwl/angular:webpack-browser',
     '@nrwl/esbuild:esbuild',
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:dev-server',
   ];
 
   // First, we check if the user has provided a target
@@ -102,8 +124,8 @@ export function findExistingTargetsInProject(
     const executorName = targets[target].executor;
 
     const hasRspackTargets = output.alreadyHasNxRspackTargets;
-    hasRspackTargets.build ||= executorName === '@nrwl/rspack:rspack';
-    hasRspackTargets.serve ||= executorName === '@nrwl/rspack:dev-server';
+    hasRspackTargets.build ||= executorName === '@nx/rspack:rspack';
+    hasRspackTargets.serve ||= executorName === '@nx/rspack:dev-server';
 
     const foundTargets = output.validFoundTargetName;
     if (
@@ -159,7 +181,7 @@ export function addOrChangeBuildTarget(
   project.targets ??= {};
 
   project.targets[target] = {
-    executor: '@nrwl/rspack:rspack',
+    executor: '@nx/rspack:rspack',
     outputs: ['{options.outputPath}'],
     defaultConfiguration: 'production',
     options: buildOptions,
@@ -188,7 +210,7 @@ export function addOrChangeServeTarget(
   project.targets ??= {};
 
   project.targets[target] = {
-    executor: '@nrwl/rspack:dev-server',
+    executor: '@nx/rspack:dev-server',
     options: {
       buildTarget: `${options.project}:build:development`,
     },
@@ -222,7 +244,7 @@ function createConfig(
 ) {
   if (options.framework === 'react') {
     return `
-      const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
+      const { composePlugins, withNx, withReact } = require('@nx/rspack');
 
       module.exports = composePlugins(withNx(), withReact(${
         stylePreprocessorOptions
@@ -238,7 +260,7 @@ function createConfig(
     `;
   } else if (options.framework === 'web' || options.target === 'web') {
     return `
-      const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
+      const { composePlugins, withNx, withWeb } = require('@nx/rspack');
 
       module.exports = composePlugins(withNx(), withWeb(${
         stylePreprocessorOptions
@@ -254,7 +276,7 @@ function createConfig(
     `;
   } else if (options.framework === 'nest') {
     return `
-    const { composePlugins, withNx } = require('@nrwl/rspack');
+    const { composePlugins, withNx } = require('@nx/rspack');
 
     module.exports = composePlugins(withNx(), (config) => {
       return config;
@@ -264,7 +286,7 @@ function createConfig(
     return `
       const { composePlugins, withNx${
         stylePreprocessorOptions ? ', withWeb' : ''
-      } } = require('@nrwl/rspack');
+      } } = require('@nx/rspack');
 
       module.exports = composePlugins(withNx()${
         stylePreprocessorOptions
@@ -392,7 +414,7 @@ export function getViteConfigPathForProject(
     viteConfigPath = targets?.[target]?.options?.configFile;
   } else {
     const config = Object.values(targets).find(
-      (config) => config.executor === '@nrwl/rspack:build'
+      (config) => config.executor === '@nx/rspack:build'
     );
     viteConfigPath = config?.options?.configFile;
   }
@@ -436,7 +458,7 @@ async function handleUnsupportedUserProvidedTargetsErrors(
   executor: 'rspack' | 'dev-server'
 ) {
   logger.warn(
-    `The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nrwl/rspack:${executor} executor.
+    `The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nx/rspack:${executor} executor.
      However, we found the following ${target} target in your project that can be converted: ${validFoundTargetName}
 
      Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
@@ -447,13 +469,13 @@ async function handleUnsupportedUserProvidedTargetsErrors(
   const { Confirm } = require('enquirer');
   const prompt = new Confirm({
     name: 'question',
-    message: `Should we convert the ${validFoundTargetName} target to use the @nrwl/rspack:${executor} executor?`,
+    message: `Should we convert the ${validFoundTargetName} target to use the @nx/rspack:${executor} executor?`,
     initial: true,
   });
   const shouldConvert = await prompt.run();
   if (!shouldConvert) {
     throw new Error(
-      `The ${target} target ${userProvidedTargetName} cannot be converted to use the @nrwl/rspack:${executor} executor.
+      `The ${target} target ${userProvidedTargetName} cannot be converted to use the @nx/rspack:${executor} executor.
       Please try again, either by providing a different ${target} target or by not providing a target at all (Nx will
         convert the first one it finds, most probably this one: ${validFoundTargetName})
 
@@ -467,14 +489,14 @@ async function handleUnsupportedUserProvidedTargetsErrors(
 export async function handleUnknownExecutors(projectName: string) {
   logger.warn(
     `
-      We could not find any targets in project ${projectName} that use executors which 
-      can be converted to the @nrwl/rspack executors.
+      We could not find any targets in project ${projectName} that use executors which
+      can be converted to the @nx/rspack executors.
 
-      This either means that your project may not have a target 
-      for building, serving, or testing at all, or that your targets are 
+      This either means that your project may not have a target
+      for building, serving, or testing at all, or that your targets are
       using executors that are not known to Nx.
-      
-      If you still want to convert your project to use the @nrwl/rspack executors,
+
+      If you still want to convert your project to use the @nx/rspack executors,
       please make sure to commit your changes before running this generator.
       `
   );
@@ -483,13 +505,13 @@ export async function handleUnknownExecutors(projectName: string) {
   const { Confirm } = require('enquirer');
   const prompt = new Confirm({
     name: 'question',
-    message: `Should Nx convert your project to use the @nrwl/rspack executors?`,
+    message: `Should Nx convert your project to use the @nx/rspack executors?`,
     initial: true,
   });
   const shouldConvert = await prompt.run();
   if (!shouldConvert) {
     throw new Error(`
-      Nx could not verify that the executors you are using can be converted to the @nrwl/rspack executors.
+      Nx could not verify that the executors you are using can be converted to the @nx/rspack executors.
       Please try again with a different project.
     `);
   }
@@ -512,7 +534,7 @@ export function determineFrameworkAndTarget(
     // Try to infer from jest config if the env is node
     let jestConfigPath: string;
     if (
-      targets?.test?.executor !== '@nrwl/jest:jest' &&
+      targets?.test?.executor !== '@nx/jest:jest' &&
       targets?.test?.options?.jestConfig
     ) {
       jestConfigPath = targets?.test?.options?.jestConfig;
diff --git a/src/utils/jest-utils.ts b/src/utils/jest-utils.ts
index c44bc73429f70..2000cede4692b 100644
--- a/src/utils/jest-utils.ts
+++ b/src/utils/jest-utils.ts
@@ -2,10 +2,10 @@ export function updateJestConfigContent(content: string) {
   return content
     .replace(
       'transform: {',
-      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',"
+      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',"
     )
     .replace(
       `'babel-jest'`,
-      `['babel-jest', { presets: ['@nrwl/react/babel'] }]`
+      `['babel-jest', { presets: ['@nx/react/babel'] }]`
     );
 }
diff --git a/src/utils/model.ts b/src/utils/model.ts
index 999f4ef3d8421..3ca89adaaadfd 100644
--- a/src/utils/model.ts
+++ b/src/utils/model.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorContext } from '@nx/devkit';
 import { RspackExecutorSchema } from '../executors/rspack/schema';
 
 export interface SharedConfigContext {
diff --git a/src/utils/normalize-assets.ts b/src/utils/normalize-assets.ts
index 3bb3c2d62379e..2eae341f3efbd 100644
--- a/src/utils/normalize-assets.ts
+++ b/src/utils/normalize-assets.ts
@@ -1,4 +1,4 @@
-import { normalizePath } from '@nrwl/devkit';
+import { normalizePath } from '@nx/devkit';
 import { statSync } from 'fs';
 import { basename, dirname, relative, resolve } from 'path';
 

From fe6058a87d0224cf1fa2e8ce52e3bf9079e8bff3 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Tue, 2 May 2023 10:45:48 -0400
Subject: [PATCH 34/92] feat(misc): update to Nx 16 and rescoped packages
 (#235)

---
 project.json         | 2 +-
 tests/rspack.spec.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project.json b/project.json
index d013186ec1ac3..7b8b647cbfc99 100644
--- a/project.json
+++ b/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "e2e/rspack-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/nx-plugin:e2e",
+      "executor": "@nx/plugin:e2e",
       "options": {
         "target": "rspack:build",
         "jestConfig": "e2e/rspack-e2e/jest.config.ts"
diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 1ade9fda4b4f8..c33f3e67992e0 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -5,7 +5,7 @@ import {
   runNxCommandAsync,
   uniq,
   updateFile,
-} from '@nrwl/nx-plugin/testing';
+} from '@nx/plugin/testing';
 
 describe('rspack e2e', () => {
   // Setting up individual workspaces per
@@ -15,7 +15,7 @@ describe('rspack e2e', () => {
   // on a unique project in the workspace, such that they
   // are not dependant on one another.
   beforeAll(() => {
-    ensureNxProject('@nrwl/rspack', 'dist/packages/rspack');
+    ensureNxProject('@nx/rspack', 'dist/packages/rspack');
   });
 
   afterAll(() => {
@@ -27,7 +27,7 @@ describe('rspack e2e', () => {
   it('should create rspack root project and additional apps', async () => {
     const project = uniq('myapp');
     await runNxCommandAsync(
-      `generate @nrwl/rspack:preset ${project} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress`
+      `generate @nx/rspack:preset ${project} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress`
     );
     let result = await runNxCommandAsync(`build ${project}`, {
       env: { NODE_ENV: 'production' },
@@ -56,7 +56,7 @@ describe('rspack e2e', () => {
     // Generate a new app and check that the files are correct
     const app2 = uniq('app2');
     await runNxCommandAsync(
-      `generate @nrwl/rspack:app ${app2} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
+      `generate @nx/rspack:app ${app2} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
     );
     checkFilesExist(`${app2}/project.json`, `${app2}-e2e/project.json`);
     result = await runNxCommandAsync(`build ${app2}`, {

From 55b24e4e89e2e182ff54d26cd61e3c1103f0a533 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Tue, 2 May 2023 14:07:37 -0400
Subject: [PATCH 35/92] fix(misc): replace missed references to @nrwl scope
 (#239)

---
 README.md                                 | 10 +++++-----
 src/generators/application/application.ts |  2 +-
 src/generators/configuration/schema.json  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0246d31b259f3..0c85e576b3bff 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,12 @@ This package is a Rspack plugin for Nx.
 
 ## Getting Started
 
-Use `--preset=@nrwl/rspack` when creating new workspace.
+Use `--preset=@nx/rspack` when creating new workspace.
 
 e.g.
 
 ```bash
-npx create-nx-workspace@latest rspack-demo --preset=@nrwl/rspack
+npx create-nx-workspace@latest rspack-demo --preset=@nx/rspack
 ```
 
 Now, you can go into the `rspack-demo` folder and start development.
@@ -40,20 +40,20 @@ You can add Rspack to any existing Nx workspace.
 First, install the plugin:
 
 ```bash
-npm install --save-dev @nrwl/rspack
+npm install --save-dev @nx/rspack
 ```
 
 Then, run the `rspack-project` generator:
 
 ```bash
-npx nx g @nrwl/rspack:rspack-project --skipValidation
+npx nx g @nx/rspack:rspack-project --skipValidation
 ```
 
 **Note:** The `--skipValidation` option allows you to overwrite existing build targets.
 
 ## Workspace libraries
 
-The `@nrwl/rspack` executor support importing workspace libs into the app.
+The `@nx/rspack` executor support importing workspace libs into the app.
 
 ```bash
 npx nx g @nx/react:lib mylib
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index bd41490e3df7f..5fe252a8cfd1b 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -39,7 +39,7 @@ export default async function (
     tasks.push(createAppTask, convertAppTask);
   } else if (options.framework === 'web') {
     const { applicationGenerator: webAppGenerator } = ensurePackage(
-      '@nrwl/web',
+      '@nx/web',
       nxVersion
     );
     const createAppTask = await webAppGenerator(tree, {
diff --git a/src/generators/configuration/schema.json b/src/generators/configuration/schema.json
index d2593ae47e712..90c4189b21b77 100644
--- a/src/generators/configuration/schema.json
+++ b/src/generators/configuration/schema.json
@@ -57,11 +57,11 @@
     },
     "buildTarget": {
       "type": "string",
-      "description": "The build target of the project to be transformed to use the @nrwl/vite:build executor."
+      "description": "The build target of the project to be transformed to use the @nx/vite:build executor."
     },
     "serveTarget": {
       "type": "string",
-      "description": "The serve target of the project to be transformed to use the @nrwl/vite:dev-server and @nrwl/vite:preview-server executors."
+      "description": "The serve target of the project to be transformed to use the @nx/vite:dev-server and @nx/vite:preview-server executors."
     },
     "rootProject": {
       "type": "boolean",

From aa5578f181537f096113ab85adc5e8a4baab90d9 Mon Sep 17 00:00:00 2001
From: Caleb Ukle <caleb.ukle+github@pm.me>
Date: Tue, 2 May 2023 14:21:36 -0500
Subject: [PATCH 36/92] chore(repo): add legacy packages for nx rescope (#238)

---
 README.md       | 11 +++++++++++
 executors.json  | 15 +++++++++++++++
 generators.json |  4 ++++
 index.ts        |  1 +
 package.json    | 27 +++++++++++++++++++++++++++
 project.json    | 35 +++++++++++++++++++++++++++++++++++
 tsconfig.json   |  6 ++++++
 7 files changed, 99 insertions(+)
 create mode 100644 README.md
 create mode 100644 executors.json
 create mode 100644 generators.json
 create mode 100644 index.ts
 create mode 100644 package.json
 create mode 100644 project.json
 create mode 100644 tsconfig.json

diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000..12f09ec1da465
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+## @nrwl/rspack has been deprecated!
+
+@nrwl/rspack has been deprecated in favor of [@nx/rspack](https://www.npmjs.com/package/@nx/rspack). Please use that instead.
+
+@nrwl/rspack will no longer be published in Nx v17.
+
+<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+
+# Nx: Smart, Fast and Extensible Build System
+
+Nx is a next generation build system with first class monorepo support and powerful integrations.
diff --git a/executors.json b/executors.json
new file mode 100644
index 0000000000000..292b254c513d0
--- /dev/null
+++ b/executors.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "executors": {
+    "rspack": {
+      "implementation": "@nx/rspack/src/executors/rspack/rspack.impl",
+      "schema": "@nx/rspack/src/executors/rspack/schema.json",
+      "description": "rspack executor"
+    },
+    "dev-server": {
+      "implementation": "@nx/rspack/src/executors/dev-server/dev-server.impl",
+      "schema": "@nx/rspack/src/executors/dev-server/schema.json",
+      "description": "dev-server executor"
+    }
+  }
+}
diff --git a/generators.json b/generators.json
new file mode 100644
index 0000000000000..dc70c4a6afd02
--- /dev/null
+++ b/generators.json
@@ -0,0 +1,4 @@
+{
+  "extends": ["@nx/rspack"],
+  "schematics": {}
+}
diff --git a/index.ts b/index.ts
new file mode 100644
index 0000000000000..64c76247e0e10
--- /dev/null
+++ b/index.ts
@@ -0,0 +1 @@
+export * from '@nx/rspack';
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000000..f5e2066f960db
--- /dev/null
+++ b/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "@nrwl/rspack",
+  "version": "0.0.1",
+  "type": "commonjs",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nrwl/nx-labs.git",
+    "directory": "packages-legacy/rspack"
+  },
+  "keywords": [
+    "Monorepo",
+    "Next",
+    "Vercel"
+  ],
+  "author": "Jack Hsu",
+  "license": "MIT",
+  "homepage": "https://nx.dev",
+  "main": "src/index.js",
+  "generators": "./generators.json",
+  "executors": "./executors.json",
+  "dependencies": {
+    "@nx/rspack": "file:../../packages/rspack"
+  },
+  "nx-migrations": {
+    "migrations": "@nx/rspack/migrations.json"
+  }
+}
diff --git a/project.json b/project.json
new file mode 100644
index 0000000000000..b693391c8d9d8
--- /dev/null
+++ b/project.json
@@ -0,0 +1,35 @@
+{
+  "name": "rspack-legacy",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages-legacy/rspack",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nrwl/js:tsc",
+      "dependsOn": ["^build"],
+      "options": {
+        "main": "packages-legacy/rspack/index.ts",
+        "tsConfig": "packages-legacy/rspack/tsconfig.json",
+        "outputPath": "dist/packages/rspack-legacy",
+        "updateBuildableProjectDepsInPackageJson": false,
+        "assets": [
+          "packages-legacy/rspack/*.md",
+
+          {
+            "input": "packages-legacy/rspack",
+            "glob": "**/*.json",
+            "ignore": ["**/tsconfig*.json", "project.json"],
+            "output": "/"
+          },
+          {
+            "input": "packages-legacy/rspack",
+            "glob": "**/*.d.ts",
+            "output": "/"
+          },
+          "LICENSE"
+        ]
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000000..133314b126cff
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {},
+  "include": ["**/*.ts"],
+  "files": ["index.ts"]
+}

From 56631b89a98289b1502b8523d431398d199c9038 Mon Sep 17 00:00:00 2001
From: Caleb Ukle <caleb.ukle+github@pm.me>
Date: Tue, 2 May 2023 14:21:36 -0500
Subject: [PATCH 37/92] chore(repo): add legacy packages for nx rescope (#238)

---
 migrations.json                               | 12 ++++++
 package.json                                  |  3 ++
 project.json                                  |  8 +++-
 .../update-16-0-0-add-nx-packages.spec.ts     | 37 +++++++++++++++++++
 .../update-16-0-0-add-nx-packages.ts          |  8 ++++
 5 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 migrations.json
 create mode 100644 src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
 create mode 100644 src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts

diff --git a/migrations.json b/migrations.json
new file mode 100644
index 0000000000000..505ac1bb53ab2
--- /dev/null
+++ b/migrations.json
@@ -0,0 +1,12 @@
+{
+  "generators": {
+    "update-16-0-0-add-nx-packages": {
+      "cli": "nx",
+      "version": "16.0.0-beta.1",
+      "description": "Replace @nrwl/rspack with @nx/rspack",
+      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    }
+  },
+  "packageJsonUpdates": {},
+  "version": "0.1"
+}
diff --git a/package.json b/package.json
index e352b6fa0d287..bc779ca058a93 100644
--- a/package.json
+++ b/package.json
@@ -28,5 +28,8 @@
     "less-loader": "11.1.0",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0"
+  },
+  "nx-migrations": {
+    "migrations": "./migrations.json"
   }
 }
diff --git a/project.json b/project.json
index 193c2dc521fc9..e66341c62aa76 100644
--- a/project.json
+++ b/project.json
@@ -5,6 +5,10 @@
   "projectType": "library",
   "targets": {
     "build": {
+      "outputs": ["dist/packages/rspack"],
+      "command": "node ./scripts/add-dependency-to-build.js rspack @nrwl/rspack"
+    },
+    "build-base": {
       "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
@@ -32,7 +36,9 @@
             "input": "./packages/rspack",
             "glob": "executors.json",
             "output": "."
-          }
+          },
+
+          "LICENSE"
         ]
       }
     },
diff --git a/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts b/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
new file mode 100644
index 0000000000000..8fc2324fb4e19
--- /dev/null
+++ b/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
@@ -0,0 +1,37 @@
+import { readJson, Tree, updateJson } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import replacePackage from './update-16-0-0-add-nx-packages';
+
+describe('update-16-0-0-add-nx-packages', () => {
+  let tree: Tree;
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace();
+
+    updateJson(tree, 'package.json', (json) => {
+      json.devDependencies['@nrwl/rspack'] = '16.0.0';
+      return json;
+    });
+  });
+
+  it('should remove the dependency on @nrwl/rspack', async () => {
+    await replacePackage(tree);
+
+    expect(
+      readJson(tree, 'package.json').dependencies['@nrwl/rspack']
+    ).not.toBeDefined();
+    expect(
+      readJson(tree, 'package.json').devDependencies['@nrwl/rspack']
+    ).not.toBeDefined();
+  });
+
+  it('should add a dependency on @nx/rspack', async () => {
+    await replacePackage(tree);
+
+    const packageJson = readJson(tree, 'package.json');
+    const newDependencyVersion =
+      packageJson.devDependencies['@nx/rspack'] ??
+      packageJson.dependencies['@nx/rspack'];
+
+    expect(newDependencyVersion).toBeDefined();
+  });
+});
diff --git a/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts b/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
new file mode 100644
index 0000000000000..bf44165b3c4d4
--- /dev/null
+++ b/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
@@ -0,0 +1,8 @@
+import { formatFiles, Tree } from '@nx/devkit';
+import { replaceNrwlPackageWithNxPackage } from '@nx/devkit/src/utils/replace-package';
+
+export default async function replacePackage(tree: Tree): Promise<void> {
+  await replaceNrwlPackageWithNxPackage(tree, '@nrwl/rspack', '@nx/rspack');
+
+  await formatFiles(tree);
+}

From 78983a08f713106811daf0f9ff010336dc742e3f Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Tue, 2 May 2023 15:50:39 -0400
Subject: [PATCH 38/92] fix(repo): fix publishing for legacy packages (#240)

---
 project.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project.json b/project.json
index b693391c8d9d8..b96a4cbe1f87a 100644
--- a/project.json
+++ b/project.json
@@ -14,7 +14,6 @@
         "updateBuildableProjectDepsInPackageJson": false,
         "assets": [
           "packages-legacy/rspack/*.md",
-
           {
             "input": "packages-legacy/rspack",
             "glob": "**/*.json",
@@ -29,6 +28,9 @@
           "LICENSE"
         ]
       }
+    },
+    "publish": {
+      "command": "node tools/scripts/publish.mjs rspack-legacy {args.ver} {args.tag}"
     }
   },
   "tags": []

From b91b002c68995a54b973f5c9f5b6d0a1b093dcaf Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Tue, 2 May 2023 15:50:39 -0400
Subject: [PATCH 39/92] fix(repo): fix publishing for legacy packages (#240)

---
 project.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project.json b/project.json
index e66341c62aa76..b0c79bbf1accd 100644
--- a/project.json
+++ b/project.json
@@ -67,7 +67,6 @@
       "options": {
         "parallel": false,
         "commands": [
-          "nx build rspack",
           "node tools/scripts/publish.mjs rspack {args.ver} {args.tag}"
         ]
       }

From a862df29820352cf92289422d50b631e426bd5e7 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Tue, 2 May 2023 16:27:19 -0400
Subject: [PATCH 40/92] fix(misc): target commonjs for legacy packages (#241)

---
 tsconfig.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 133314b126cff..9cf8a29c54160 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {},
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true
+  },
   "include": ["**/*.ts"],
   "files": ["index.ts"]
 }

From 6fe2c7be006fa7d438121c8d14ee3e6e277f7af0 Mon Sep 17 00:00:00 2001
From: Caleb Ukle <caleb.ukle+github@pm.me>
Date: Tue, 2 May 2023 16:02:15 -0500
Subject: [PATCH 41/92] fix(repo): add json files to assets (#243)

---
 project.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/project.json b/project.json
index b0c79bbf1accd..16b0617e1aaee 100644
--- a/project.json
+++ b/project.json
@@ -29,13 +29,9 @@
           },
           {
             "input": "./packages/rspack",
-            "glob": "generators.json",
-            "output": "."
-          },
-          {
-            "input": "./packages/rspack",
-            "glob": "executors.json",
-            "output": "."
+            "glob": "**.json",
+            "output": ".",
+            "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"]
           },
 
           "LICENSE"

From 26610d378ab8d833eb709231a4d5c9b10072f00a Mon Sep 17 00:00:00 2001
From: Caleb Ukle <caleb.ukle+github@pm.me>
Date: Tue, 2 May 2023 18:13:39 -0500
Subject: [PATCH 42/92] chore(repo): update to 16.0.3 (#244)

* chore(repo): update to 16.0.3

* chore(repo): bump deps
---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index bc779ca058a93..346ff1bc94418 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^16.0.0",
-    "@nx/linter": "^16.0.0",
-    "@nx/devkit": "^16.0.0",
+    "@nx/js": "^16.0.3",
+    "@nx/linter": "^16.0.3",
+    "@nx/devkit": "^16.0.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",

From 03497ade7afd345b52c5643287dbc9f18df551ef Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Wed, 17 May 2023 11:39:51 -0400
Subject: [PATCH 43/92] chore(repo): update to nx 16.2.1 (#271)

---
 project.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/project.json b/project.json
index 7b8b647cbfc99..d55ed838fd0e5 100644
--- a/project.json
+++ b/project.json
@@ -5,11 +5,12 @@
   "sourceRoot": "e2e/rspack-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nx/plugin:e2e",
+      "executor": "@nx/jest:jest",
       "options": {
-        "target": "rspack:build",
-        "jestConfig": "e2e/rspack-e2e/jest.config.ts"
-      }
+        "jestConfig": "e2e/rspack-e2e/jest.config.ts",
+        "runInBand": true
+      },
+      "dependsOn": ["rspack:build"]
     }
   },
   "tags": [],

From e219d4b940d919641ad8e5c90d137064ee22976a Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 23 May 2023 18:22:14 +0300
Subject: [PATCH 44/92] fix(rspack): lock version to 0.1.11 (#279)

---
 src/utils/versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index d34500f38600d..97aaa4d3cea86 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '~0.1.0';
-export const rspackDevServerVersion = '~0.1.0';
+export const rspackCoreVersion = '0.1.11';
+export const rspackDevServerVersion = '0.1.11';
 
-export const rspackPluginMinifyVersion = '~0.1.0';
-export const rspackLessLoaderVersion = '~0.1.0';
+export const rspackPluginMinifyVersion = '0.1.11';
+export const rspackLessLoaderVersion = '^0.0.22';
 
 export const reactVersion = '~18.2.0';
 export const reactDomVersion = '~18.2.0';

From 930db7c18af584eb464737673bffbcc31fbcbcfc Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Wed, 24 May 2023 15:17:09 +0300
Subject: [PATCH 45/92] fix(rspack): refine output filename patterns (#280)

---
 src/utils/versions.ts |  6 +++---
 src/utils/with-nx.ts  | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 97aaa4d3cea86..2148b6781417c 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,7 +1,7 @@
-export const rspackCoreVersion = '0.1.11';
-export const rspackDevServerVersion = '0.1.11';
+export const rspackCoreVersion = '~0.1.12';
+export const rspackDevServerVersion = '~0.1.12';
 
-export const rspackPluginMinifyVersion = '0.1.11';
+export const rspackPluginMinifyVersion = '~0.1.12';
 export const rspackLessLoaderVersion = '^0.0.22';
 
 export const reactVersion = '~18.2.0';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index a550ee7dacb07..66e2195a735c2 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -58,6 +58,22 @@ export function withNx(_opts = {}) {
         path: path.join(context.root, options.outputPath),
         publicPath: '/',
         filename:
+          isProd && options.target !== 'node'
+            ? '[name].[contenthash:8].js'
+            : '[name].js',
+        chunkFilename:
+          isProd && options.target !== 'node'
+            ? '[name].[contenthash:8].js'
+            : '[name].js',
+        cssFilename:
+          isProd && options.target !== 'node'
+            ? '[name].[contenthash:8].css'
+            : '[name].css',
+        cssChunkFilename:
+          isProd && options.target !== 'node'
+            ? '[name].[contenthash:8].css'
+            : '[name].css',
+        assetModuleFilename:
           isProd && options.target !== 'node'
             ? '[name].[contenthash:8][ext]'
             : '[name][ext]',

From 4d62f10620d163bf0350c1564cebcaf56bd4ddbf Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Wed, 24 May 2023 19:09:30 +0300
Subject: [PATCH 46/92] chore(rspack): update to latest (#278)

---
 migrations.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/migrations.json b/migrations.json
index 505ac1bb53ab2..58e036e5ab229 100644
--- a/migrations.json
+++ b/migrations.json
@@ -7,6 +7,24 @@
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
     }
   },
-  "packageJsonUpdates": {},
+  "packageJsonUpdates": {
+    "16.1.3": {
+      "version": "16.1.3-beta.0",
+      "packages": {
+        "@rspack/core": {
+          "version": "~0.1.12",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/dev-server": {
+          "version": "~0.1.12",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/plugin-minify": {
+          "version": "~0.1.12",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    }
+  },
   "version": "0.1"
 }

From 519b3a1dfa632cc37f3cf25a15cb840dfb25fb80 Mon Sep 17 00:00:00 2001
From: Douglas Machado <douglassmachado@live.com>
Date: Wed, 24 May 2023 13:38:25 -0300
Subject: [PATCH 47/92] feat(rspack): Add extractLicenses option to rspack's
 project configuration (#230)

---
 src/executors/rspack/schema.d.ts |  1 +
 src/executors/rspack/schema.json |  5 +++++
 src/utils/with-nx.ts             | 18 ++++++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index edc5c7f1bac66..808689d5b935c 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -12,4 +12,5 @@ export interface RspackExecutorSchema {
   optimization?: boolean;
   sourceMap?: boolean | string;
   assets?: any[];
+  extractLicenses?: boolean;
 }
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index 0337f7a24e459..dbc061e1792e3 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -54,6 +54,11 @@
         "$ref": "#/definitions/assetPattern"
       }
     },
+    "extractLicenses": {
+      "type": "boolean",
+      "description": "Extract all licenses in a separate file.",
+      "default": true
+    },
     "mode": {
       "type": "string",
       "description": "Mode to run the build in.",
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 66e2195a735c2..7733ed43c0323 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -1,8 +1,9 @@
-import { Configuration, ExternalItem } from '@rspack/core';
+import { Configuration, ExternalItem, RspackPluginInstance } from '@rspack/core';
 import * as path from 'path';
 import { getCopyPatterns } from './get-copy-patterns';
 import { SharedConfigContext } from './model';
 import { normalizeAssets } from './normalize-assets';
+import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 
 export function withNx(_opts = {}) {
   return function makeConfig(
@@ -23,6 +24,19 @@ export function withNx(_opts = {}) {
       return acc;
     }, {});
 
+    const plugins = config.plugins ?? [];
+    if (options.extractLicenses) {
+      plugins.push(
+        new LicenseWebpackPlugin({
+          stats: {
+            warnings: false,
+            errors: false,
+          },
+          outputFilename: `3rdpartylicenses.txt`,
+        }) as unknown as RspackPluginInstance
+      );
+    }
+
     const externals: ExternalItem = {};
     let externalsType: Configuration['externalsType'];
     if (options.target === 'node') {
@@ -83,7 +97,7 @@ export function withNx(_opts = {}) {
         hot: true,
       } as any,
       module: {},
-      plugins: config.plugins ?? [],
+      plugins: plugins,
       resolve: {
         // There are some issues resolving workspace libs in a monorepo.
         // It looks to be an issue with rspack itself, but will check back after Nx 16 release

From 2da625b9cd1e3928a5482657e8576fa01f5f642e Mon Sep 17 00:00:00 2001
From: Douglas Machado <douglassmachado@live.com>
Date: Wed, 24 May 2023 13:38:25 -0300
Subject: [PATCH 48/92] feat(rspack): Add extractLicenses option to rspack's
 project configuration (#230)

---
 tests/rspack.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index c33f3e67992e0..215927e717121 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -34,7 +34,7 @@ describe('rspack e2e', () => {
     });
     expect(result.stdout).toContain('Successfully ran target build');
     // Make sure expected files are present.
-    expect(listFiles(`dist/${project}`)).toHaveLength(4);
+    expect(listFiles(`dist/${project}`)).toHaveLength(5);
 
     result = await runNxCommandAsync(`test ${project}`);
     expect(result.stdout).toContain('Successfully ran target test');
@@ -51,7 +51,7 @@ describe('rspack e2e', () => {
       env: { NODE_ENV: 'production' },
     });
     expect(result.stdout).toContain('Successfully ran target build');
-    expect(listFiles(`dist/${project}`)).toHaveLength(4); // same length as before
+    expect(listFiles(`dist/${project}`)).toHaveLength(5); // same length as before
 
     // Generate a new app and check that the files are correct
     const app2 = uniq('app2');
@@ -64,7 +64,7 @@ describe('rspack e2e', () => {
     });
     expect(result.stdout).toContain('Successfully ran target build');
     // Make sure expected files are present.
-    expect(listFiles(`dist/${app2}`)).toHaveLength(4);
+    expect(listFiles(`dist/${app2}`)).toHaveLength(5);
 
     result = await runNxCommandAsync(`test ${app2}`);
     expect(result.stdout).toContain('Successfully ran target test');

From 92c71c640c457bdd2b40123a0a31a40e13e93a46 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Thu, 15 Jun 2023 16:34:16 -0400
Subject: [PATCH 49/92] fix(rspack): add missing license-webpack-plugin
 dependency (#301)

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 346ff1bc94418..21664d69517e8 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",
     "less-loader": "11.1.0",
+    "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0"
   },

From 87c00125241cc349d02db8fc854ff347cb5c1298 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 2 Aug 2023 15:21:10 +0100
Subject: [PATCH 50/92] chore(repo): upgrade to nx 16.6.0 (#319)

---
 project.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project.json b/project.json
index 16b0617e1aaee..e53e95c968135 100644
--- a/project.json
+++ b/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "build": {
-      "outputs": ["dist/packages/rspack"],
+      "outputs": ["{workspaceRoot}/dist/packages/rspack"],
       "command": "node ./scripts/add-dependency-to-build.js rspack @nrwl/rspack"
     },
     "build-base": {
@@ -33,9 +33,9 @@
             "output": ".",
             "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"]
           },
-
           "LICENSE"
-        ]
+        ],
+        "updateBuildableProjectDepsInPackageJson": true
       }
     },
     "lint": {

From 332e5021e2a4a9fb7456ae012419602e8c63e981 Mon Sep 17 00:00:00 2001
From: Douglas Machado <douglas.machado@valor-software.com>
Date: Tue, 8 Aug 2023 11:15:36 -0300
Subject: [PATCH 51/92] fix(rspack): add fileReplacements support (#231)

---
 src/executors/rspack/schema.d.ts |  6 ++++++
 src/executors/rspack/schema.json | 22 ++++++++++++++++++++++
 src/utils/with-nx.ts             |  8 ++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index 808689d5b935c..027036e434aa3 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -13,4 +13,10 @@ export interface RspackExecutorSchema {
   sourceMap?: boolean | string;
   assets?: any[];
   extractLicenses?: boolean;
+  fileReplacements?: FileReplacement[];
 }
+
+export interface FileReplacement {
+  replace: string;
+  with: string;
+}
\ No newline at end of file
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index dbc061e1792e3..0a66e194031a6 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -59,6 +59,28 @@
       "description": "Extract all licenses in a separate file.",
       "default": true
     },
+    "fileReplacements": {
+      "description": "Replace files with other files in the build.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "replace": {
+            "type": "string",
+            "description": "The file to be replaced.",
+            "x-completion-type": "file"
+          },
+          "with": {
+            "type": "string",
+            "description": "The file to replace with.",
+            "x-completion-type": "file"
+          }
+        },
+        "additionalProperties": false,
+        "required": ["replace", "with"]
+      },
+      "default": []
+    },
     "mode": {
       "type": "string",
       "description": "Mode to run the build in.",
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 7733ed43c0323..3c1ec6c66db9d 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -1,4 +1,4 @@
-import { Configuration, ExternalItem, RspackPluginInstance } from '@rspack/core';
+import { Configuration, ExternalItem, RspackPluginInstance, ResolveAlias } from '@rspack/core';
 import * as path from 'path';
 import { getCopyPatterns } from './get-copy-patterns';
 import { SharedConfigContext } from './model';
@@ -19,7 +19,7 @@ export function withNx(_opts = {}) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const tsconfigPaths = require('tsconfig-paths');
     const { paths } = tsconfigPaths.loadConfig(options.tsConfig);
-    const alias = Object.keys(paths).reduce((acc, k) => {
+    const alias: ResolveAlias = Object.keys(paths).reduce((acc, k) => {
       acc[k] = path.join(context.root, paths[k][0]);
       return acc;
     }, {});
@@ -37,6 +37,10 @@ export function withNx(_opts = {}) {
       );
     }
 
+    options.fileReplacements.forEach(item => {
+      alias[item.replace] = item.with;
+    })
+     
     const externals: ExternalItem = {};
     let externalsType: Configuration['externalsType'];
     if (options.target === 'node') {

From d86ae220f74507a8a98e3d7ef4abc96bbe35d35b Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Fri, 18 Aug 2023 11:51:01 -0400
Subject: [PATCH 52/92] chore(reop): update nx to 16.7.1 (#325)

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 21664d69517e8..1d9b7110a4d5f 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^16.0.3",
-    "@nx/linter": "^16.0.3",
-    "@nx/devkit": "^16.0.3",
+    "@nx/js": "^16.7.0-rc.1",
+    "@nx/linter": "^16.7.0-rc.1",
+    "@nx/devkit": "^16.7.0-rc.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",

From 41c077a0ecb9e3df8de7eef173c82963ef22dbb9 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Tue, 22 Aug 2023 17:55:42 +0300
Subject: [PATCH 53/92] chore(rspack): add jest babel config to e2e (#321)

---
 tests/rspack.spec.ts | 52 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 215927e717121..3f18dc24fcf5d 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -1,11 +1,16 @@
+import { getPackageManagerCommand } from '@nx/devkit';
 import {
   checkFilesExist,
   ensureNxProject,
   listFiles,
   runNxCommandAsync,
+  tmpProjPath,
   uniq,
   updateFile,
 } from '@nx/plugin/testing';
+import { execSync } from 'child_process';
+import { writeFileSync } from 'fs';
+import { join } from 'path';
 
 describe('rspack e2e', () => {
   // Setting up individual workspaces per
@@ -29,6 +34,33 @@ describe('rspack e2e', () => {
     await runNxCommandAsync(
       `generate @nx/rspack:preset ${project} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress`
     );
+
+    // Added this so that the nx-ecosystem-ci tests don't throw jest error
+    writeFileSync(
+      join(tmpProjPath(), '.babelrc'),
+      `    
+        {
+          "presets": [
+            "@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript",
+            [
+              "@nx/react/babel",
+              {
+                "runtime": "automatic"
+              }
+            ]
+          ],
+          "plugins": ["@babel/plugin-transform-runtime"]
+        }
+      `
+    );
+
+    const pm = getPackageManagerCommand();
+    execSync(
+      pm.addDev +
+        ' @babel/preset-react @babel/preset-env @babel/preset-typescript',
+      { cwd: tmpProjPath() }
+    );
+
     let result = await runNxCommandAsync(`build ${project}`, {
       env: { NODE_ENV: 'production' },
     });
@@ -59,6 +91,26 @@ describe('rspack e2e', () => {
       `generate @nx/rspack:app ${app2} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
     );
     checkFilesExist(`${app2}/project.json`, `${app2}-e2e/project.json`);
+
+    // Added this so that the nx-ecosystem-ci tests don't throw jest error
+    writeFileSync(
+      join(tmpProjPath(), app2, '.babelrc'),
+      `    
+        {
+          "presets": [
+            "@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript",
+            [
+              "@nx/react/babel",
+              {
+                "runtime": "automatic"
+              }
+            ]
+          ],
+          "plugins": ["@babel/plugin-transform-runtime"]
+        }
+      `
+    );
+
     result = await runNxCommandAsync(`build ${app2}`, {
       env: { NODE_ENV: 'production' },
     });

From afc5a69cb25a7e72222c6228bb450b4cd80dd099 Mon Sep 17 00:00:00 2001
From: hardfist <yangjianzju@gmail.com>
Date: Wed, 23 Aug 2023 15:03:42 +0800
Subject: [PATCH 54/92] chore: don't use rspack internal module (#328)

---
 src/executors/dev-server/dev-server.impl.ts | 4 ++--
 src/executors/rspack/rspack.impl.ts         | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index 8c192be408f91..debbd5a9057b3 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -4,12 +4,12 @@ import {
   readTargetOptions,
 } from '@nx/devkit';
 import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
-import { DevServer } from '@rspack/core/dist/config';
+import { Configuration } from '@rspack/core';
 import { RspackDevServer } from '@rspack/dev-server';
 import { createCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { DevServerExecutorSchema } from './schema';
-
+type DevServer = Configuration['devServer'];
 export default async function* runExecutor(
   options: DevServerExecutorSchema,
   context: ExecutorContext
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index c550cd232d807..a008d465a360b 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -1,7 +1,6 @@
 import { ExecutorContext, logger } from '@nx/devkit';
 import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
 import { Stats } from '@rspack/core';
-import Watching from '@rspack/core/dist/watching';
 import { rmSync } from 'fs';
 import * as path from 'path';
 import { createCompiler } from '../../utils/create-compiler';
@@ -30,7 +29,7 @@ export default async function* runExecutor(
     outfile?: string;
   }>(async ({ next, done }) => {
     if (options.watch) {
-      const watcher: Watching = compiler.watch(
+      const watcher= compiler.watch(
         {},
         async (err, stats: Stats) => {
           if (err) {

From dd060a8d002b79a5be85546c7027c03d2fd38e00 Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Fri, 8 Sep 2023 16:48:24 -0400
Subject: [PATCH 55/92] chore(repo): update nx to 16.8.1 (#335)

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1d9b7110a4d5f..b6882f837d43e 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^16.7.0-rc.1",
-    "@nx/linter": "^16.7.0-rc.1",
-    "@nx/devkit": "^16.7.0-rc.1",
+    "@nx/js": "^16.8.0",
+    "@nx/linter": "^16.8.0",
+    "@nx/devkit": "^16.8.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",

From c4667924d8894c58ba77d4c5f372c86fe19d7698 Mon Sep 17 00:00:00 2001
From: Douglas Machado <douglas.machado@valor-software.com>
Date: Thu, 14 Sep 2023 15:33:31 -0300
Subject: [PATCH 56/92] feat(rspack): add typecheck (#338)

* feat(rspack): add typecheck

* Reusing the type-check existing on the @nx/js
---
 src/executors/rspack/rspack.impl.ts | 28 +++++++++++++++++++++++++++-
 src/executors/rspack/schema.d.ts    |  1 +
 src/executors/rspack/schema.json    |  4 ++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index a008d465a360b..a30c7e4017f1a 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -6,6 +6,7 @@ import * as path from 'path';
 import { createCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { RspackExecutorSchema } from './schema';
+import { printDiagnostics, runTypeCheck } from '@nx/js';
 
 export default async function* runExecutor(
   options: RspackExecutorSchema,
@@ -16,12 +17,17 @@ export default async function* runExecutor(
   if (isMode(process.env.NODE_ENV)) {
     options.mode = process.env.NODE_ENV;
   }
+
+  if (options.typeCheck) {
+    await executeTypeCheck(options, context);
+  }
+
   // Mimic --clean from webpack.
   rmSync(path.join(context.root, options.outputPath), {
     force: true,
     recursive: true,
   });
-
+  
   const compiler = await createCompiler(options, context);
 
   const iterable = createAsyncIterable<{
@@ -111,3 +117,23 @@ function registerCleanupCallback(callback: () => void) {
   process.on('SIGTERM', wrapped);
   process.on('exit', wrapped);
 }
+
+
+async function executeTypeCheck(
+  options: RspackExecutorSchema,
+  context: ExecutorContext
+) {
+  const projectConfiguration =
+  context.projectsConfigurations!.projects[context.projectName!];
+  const result = await runTypeCheck({
+    workspaceRoot: path.resolve(projectConfiguration.root),
+    tsConfigPath: options.tsConfig,
+    mode: 'noEmit',
+  });
+
+  await printDiagnostics(result.errors, result.warnings);
+
+  if (result.errors.length > 0) {
+    throw new Error('Found type errors. See above.');
+  }
+}
\ No newline at end of file
diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index 027036e434aa3..0c64557462237 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -3,6 +3,7 @@ export interface RspackExecutorSchema {
   target: 'web' | 'node';
   main: string;
   tsConfig: string;
+  typeCheck?: boolean;
   outputPath: string;
   indexHtml?: string;
   mode?: Mode;
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index 0a66e194031a6..85d4a5da3c46a 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -22,6 +22,10 @@
       "type": "string",
       "description": "The tsconfig file to build the project."
     },
+    "typeCheck": {
+      "type": "boolean",
+      "description": "Skip the type checking."
+    },
     "indexHtml": {
       "type": "string",
       "description": "The path to the index.html file."

From 68003f3b2f320a169d1d71da80a754f834542a7d Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Fri, 20 Oct 2023 16:02:58 -0400
Subject: [PATCH 57/92] chore(repo): update nx to 17.0.1 (#342)

---
 package.json | 8 ++++----
 project.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b6882f837d43e..66153b1555bde 100644
--- a/package.json
+++ b/package.json
@@ -19,16 +19,16 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^16.8.0",
-    "@nx/linter": "^16.8.0",
-    "@nx/devkit": "^16.8.0",
+    "@nx/js": "^17.0.1",
+    "@nx/devkit": "^17.0.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
-    "stylus-loader": "^7.1.0"
+    "stylus-loader": "^7.1.0",
+    "@nx/eslint": "^17.0.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/project.json b/project.json
index e53e95c968135..211b774dbc734 100644
--- a/project.json
+++ b/project.json
@@ -39,7 +39,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [

From 66169bd63e4b00f88caeb07f499889f7d6575068 Mon Sep 17 00:00:00 2001
From: Travis Tarr <trav.tarr@gmail.com>
Date: Mon, 30 Oct 2023 08:05:47 -0700
Subject: [PATCH 58/92] feat(rspack): add generatePackageJson plugin (#341)

Co-authored-by: Travis Tarr <travis.tarr@streamersonglist.com>
---
 src/executors/rspack/schema.d.ts            |  4 +-
 src/executors/rspack/schema.json            |  8 ++
 src/plugins/generate-package-json-plugin.ts | 87 +++++++++++++++++++++
 src/utils/with-nx.ts                        | 31 ++++++--
 4 files changed, 124 insertions(+), 6 deletions(-)
 create mode 100644 src/plugins/generate-package-json-plugin.ts

diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index 0c64557462237..caa5d27ab1687 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -5,6 +5,7 @@ export interface RspackExecutorSchema {
   tsConfig: string;
   typeCheck?: boolean;
   outputPath: string;
+  outputFileName?: string;
   indexHtml?: string;
   mode?: Mode;
   watch?: boolean;
@@ -15,9 +16,10 @@ export interface RspackExecutorSchema {
   assets?: any[];
   extractLicenses?: boolean;
   fileReplacements?: FileReplacement[];
+  generatePackageJson?: boolean;
 }
 
 export interface FileReplacement {
   replace: string;
   with: string;
-}
\ No newline at end of file
+}
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index 85d4a5da3c46a..31fc3499f2e45 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -18,6 +18,10 @@
       "type": "string",
       "description": "The output path for the bundle."
     },
+    "outputFileName": {
+      "type": "string",
+      "description": "The main output entry file"
+    },
     "tsConfig": {
       "type": "string",
       "description": "The tsconfig file to build the project."
@@ -89,6 +93,10 @@
       "type": "string",
       "description": "Mode to run the build in.",
       "enum": ["development", "production", "none"]
+    },
+    "generatePackageJson": {
+      "type": "boolean",
+      "description": "Generates a `package.json` and pruned lock file with the project's `node_module` dependencies populated for installing in a container. If a `package.json` exists in the project's directory, it will be reused with dependencies populated."
     }
   },
   "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
diff --git a/src/plugins/generate-package-json-plugin.ts b/src/plugins/generate-package-json-plugin.ts
new file mode 100644
index 0000000000000..51454264db292
--- /dev/null
+++ b/src/plugins/generate-package-json-plugin.ts
@@ -0,0 +1,87 @@
+import {
+  ExecutorContext,
+  detectPackageManager,
+  serializeJson,
+  type ProjectGraph,
+} from '@nx/devkit';
+import {
+  HelperDependency,
+  createLockFile,
+  createPackageJson,
+  getHelperDependenciesFromProjectGraph,
+  getLockFileName,
+  readTsConfig,
+} from '@nx/js';
+import { type Compiler, type RspackPluginInstance } from '@rspack/core';
+import { RawSource } from 'webpack-sources';
+
+const pluginName = 'GeneratePackageJsonPlugin';
+
+export class GeneratePackageJsonPlugin implements RspackPluginInstance {
+  private readonly projectGraph: ProjectGraph;
+
+  constructor(
+    private readonly options: { tsConfig: string; outputFileName: string },
+    private readonly context: ExecutorContext
+  ) {
+    this.projectGraph = context.projectGraph;
+  }
+
+  apply(compiler: Compiler): void {
+    compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
+      compilation.hooks.processAssets.tap(
+        {
+          name: pluginName,
+          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
+        },
+        () => {
+          const helperDependencies = getHelperDependenciesFromProjectGraph(
+            this.context.root,
+            this.context.projectName,
+            this.projectGraph
+          );
+
+          const importHelpers = !!readTsConfig(this.options.tsConfig).options
+            .importHelpers;
+          const shouldAddHelperDependency =
+            importHelpers &&
+            helperDependencies.every(
+              (dep) => dep.target !== HelperDependency.tsc
+            );
+
+          if (shouldAddHelperDependency) {
+            helperDependencies.push({
+              type: 'static',
+              source: this.context.projectName,
+              target: HelperDependency.tsc,
+            });
+          }
+
+          const packageJson = createPackageJson(
+            this.context.projectName,
+            this.projectGraph,
+            {
+              target: this.context.targetName,
+              root: this.context.root,
+              isProduction: true,
+              helperDependencies: helperDependencies.map((dep) => dep.target),
+            }
+          );
+          packageJson.main = packageJson.main ?? this.options.outputFileName;
+
+          compilation.emitAsset(
+            'package.json',
+            new RawSource(serializeJson(packageJson))
+          );
+          const packageManager = detectPackageManager(this.context.root);
+          compilation.emitAsset(
+            getLockFileName(packageManager),
+            new RawSource(
+              createLockFile(packageJson, this.projectGraph, packageManager)
+            )
+          );
+        }
+      );
+    });
+  }
+}
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 3c1ec6c66db9d..b0c7e7867fb56 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -1,9 +1,15 @@
-import { Configuration, ExternalItem, RspackPluginInstance, ResolveAlias } from '@rspack/core';
+import {
+  Configuration,
+  ExternalItem,
+  ResolveAlias,
+  RspackPluginInstance,
+} from '@rspack/core';
+import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import * as path from 'path';
+import { GeneratePackageJsonPlugin } from '../plugins/generate-package-json-plugin';
 import { getCopyPatterns } from './get-copy-patterns';
 import { SharedConfigContext } from './model';
 import { normalizeAssets } from './normalize-assets';
-import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 
 export function withNx(_opts = {}) {
   return function makeConfig(
@@ -37,10 +43,25 @@ export function withNx(_opts = {}) {
       );
     }
 
-    options.fileReplacements.forEach(item => {
+    if (options.generatePackageJson) {
+      const mainOutputFile =
+        options.main.split('/').pop().split('.')[0] + '.js';
+
+      plugins.push(
+        new GeneratePackageJsonPlugin(
+          {
+            tsConfig: options.tsConfig,
+            outputFileName: options.outputFileName ?? mainOutputFile,
+          },
+          context
+        )
+      );
+    }
+
+    options.fileReplacements.forEach((item) => {
       alias[item.replace] = item.with;
-    })
-     
+    });
+
     const externals: ExternalItem = {};
     let externalsType: Configuration['externalsType'];
     if (options.target === 'node') {

From 768bea744dffee75c216d643971d015a792d6c58 Mon Sep 17 00:00:00 2001
From: Travis Tarr <trav.tarr@gmail.com>
Date: Mon, 30 Oct 2023 08:05:47 -0700
Subject: [PATCH 59/92] feat(rspack): add generatePackageJson plugin (#341)

Co-authored-by: Travis Tarr <travis.tarr@streamersonglist.com>
---
 tests/rspack.spec.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 3f18dc24fcf5d..6870579ec3a4e 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -123,5 +123,24 @@ describe('rspack e2e', () => {
 
     result = await runNxCommandAsync(`e2e ${app2}-e2e`);
     expect(result.stdout).toContain('Successfully ran target e2e');
+
+    // Generate a Nest app and verify build output
+    const app3 = uniq('app3');
+    await runNxCommandAsync(
+      `generate @nx/rspack:app ${app3} --framework=nest --unitTestRunner=jest`
+    );
+    checkFilesExist(`${app3}/project.json`);
+
+    result = await runNxCommandAsync(`build ${app3}`);
+    expect(result.stdout).toContain('Successfully ran target build');
+    // Make sure expected files are present.
+    expect(listFiles(`dist/${app3}`)).toHaveLength(3);
+
+    result = await runNxCommandAsync(
+      `build ${app3} --generatePackageJson=true`
+    );
+    expect(result.stdout).toContain('Successfully ran target build');
+    // Make sure expected files are present.
+    expect(listFiles(`dist/${app3}`)).toHaveLength(5);
   }, 200_000);
 });

From 712688cadae16acc96ac89f57e7aade301d4bb41 Mon Sep 17 00:00:00 2001
From: Gengkun <ahabhgk@gmail.com>
Date: Thu, 21 Dec 2023 21:39:51 +0800
Subject: [PATCH 60/92] feat: upgrade rspack to 0.4.4 (#352)

* feat: upgrade rspack

* fix less

* disableTransformByDefault

* update

* enable disableTransformByDefault

* fix

* rebase

* fix

* fix

* clean

* fix
---
 src/executors/dev-server/dev-server.impl.ts | 19 +++----
 src/executors/rspack/rspack.impl.ts         | 28 ++++++----
 src/generators/init/init.ts                 |  6 +-
 src/utils/create-compiler.ts                | 10 +++-
 src/utils/versions.ts                       |  9 +--
 src/utils/with-nx.ts                        | 61 +++++++++++++++------
 src/utils/with-react.ts                     | 59 +++++++++++++++++---
 src/utils/with-web.ts                       | 26 ++++-----
 tsconfig.lib.json                           |  1 +
 9 files changed, 149 insertions(+), 70 deletions(-)

diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index debbd5a9057b3..ffd7171f00619 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -6,7 +6,7 @@ import {
 import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
 import { Configuration } from '@rspack/core';
 import { RspackDevServer } from '@rspack/dev-server';
-import { createCompiler } from '../../utils/create-compiler';
+import { createCompiler, isMultiCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { DevServerExecutorSchema } from './schema';
 type DevServer = Configuration['devServer'];
@@ -25,14 +25,10 @@ export default async function* runExecutor(
     context.projectGraph
   );
 
-  // If I don't typecast, it throws an error
-  // that port does not exist on type DevServer
-  // however, it does exist, since DevServer extends
-  // WebpackDevServer.Configuration which has port
   let devServerConfig: DevServer = {
     port: options.port ?? 4200,
     hot: true,
-  } as DevServer;
+  };
 
   const buildOptions = readTargetOptions<any>(buildTarget, context);
   const compiler = await createCompiler(
@@ -40,17 +36,16 @@ export default async function* runExecutor(
     context
   );
 
+  // Use the first one if it's MultiCompiler
+  // https://webpack.js.org/configuration/dev-server/#root:~:text=Be%20aware%20that%20when%20exporting%20multiple%20configurations%20only%20the%20devServer%20options%20for%20the%20first%20configuration%20will%20be%20taken%20into%20account%20and%20used%20for%20all%20the%20configurations%20in%20the%20array.
+  const firstCompiler = isMultiCompiler(compiler) ? compiler.compilers[0] : compiler;
   devServerConfig = {
     ...devServerConfig,
-    ...compiler.options.devServer,
+    ...firstCompiler.options.devServer,
   };
 
   yield* createAsyncIterable(({ next }) => {
     const server: any = new RspackDevServer(
-      // If I don't typecast, it throws an error
-      // that onListening does not exist on type DevServer
-      // however, it does exist, since DevServer extends
-      // WebpackDevServer.Configuration which has onListening
       {
         ...devServerConfig,
         onListening: (server: any) => {
@@ -59,7 +54,7 @@ export default async function* runExecutor(
             baseUrl: `http://localhost:${options.port ?? 4200}`,
           });
         },
-      } as DevServer,
+      },
 
       compiler
     );
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index a30c7e4017f1a..8179da525d4da 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -1,9 +1,9 @@
 import { ExecutorContext, logger } from '@nx/devkit';
 import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
-import { Stats } from '@rspack/core';
+import { Compiler, MultiCompiler, MultiStats, Stats } from '@rspack/core';
 import { rmSync } from 'fs';
 import * as path from 'path';
-import { createCompiler } from '../../utils/create-compiler';
+import { createCompiler, isMultiCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { RspackExecutorSchema } from './schema';
 import { printDiagnostics, runTypeCheck } from '@nx/js';
@@ -35,9 +35,9 @@ export default async function* runExecutor(
     outfile?: string;
   }>(async ({ next, done }) => {
     if (options.watch) {
-      const watcher= compiler.watch(
+      const watcher = compiler.watch(
         {},
-        async (err, stats: Stats) => {
+        async (err, stats: Stats | MultiStats) => {
           if (err) {
             logger.error(err);
             next({ success: false });
@@ -49,9 +49,7 @@ export default async function* runExecutor(
             return;
           }
 
-          const statsOptions = compiler.options
-            ? compiler.options.stats
-            : undefined;
+					const statsOptions = getStatsOptions(compiler);
           const printedStats = stats.toString(statsOptions);
           // Avoid extra empty line when `stats: 'none'`
           if (printedStats) {
@@ -70,7 +68,7 @@ export default async function* runExecutor(
         });
       });
     } else {
-      compiler.run(async (err, stats: Stats) => {
+      compiler.run(async (err, stats: Stats | MultiStats) => {
         compiler.close(() => {
           if (err) {
             logger.error(err);
@@ -83,9 +81,7 @@ export default async function* runExecutor(
             return;
           }
 
-          const statsOptions = compiler.options
-            ? compiler.options.stats
-            : undefined;
+          const statsOptions = getStatsOptions(compiler);
           const printedStats = stats.toString(statsOptions);
           // Avoid extra empty line when `stats: 'none'`
           if (printedStats) {
@@ -136,4 +132,14 @@ async function executeTypeCheck(
   if (result.errors.length > 0) {
     throw new Error('Found type errors. See above.');
   }
+}
+
+function getStatsOptions(compiler: Compiler | MultiCompiler) {
+  return isMultiCompiler(compiler)
+  ? {
+      children: compiler.compilers.map(compiler => compiler.options ? compiler.options.stats : undefined)
+    }
+  : compiler.options
+  ? compiler.options.stats
+  : undefined;
 }
\ No newline at end of file
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index 96c8dfd6320e0..ad53f2143e6e3 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -9,8 +9,9 @@ import { initGenerator } from '@nx/js';
 import {
   rspackCoreVersion,
   rspackDevServerVersion,
-  rspackLessLoaderVersion,
   rspackPluginMinifyVersion,
+  lessLoaderVersion,
+  rspackPluginReactRefreshVersion,
 } from '../../utils/versions';
 import { InitGeneratorSchema } from './schema';
 
@@ -30,6 +31,7 @@ export async function rspackInitGenerator(
   const devDependencies = {
     '@rspack/core': rspackCoreVersion,
     '@rspack/plugin-minify': rspackPluginMinifyVersion,
+    '@rspack/plugin-react-refresh': rspackPluginReactRefreshVersion,
   };
 
   // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -40,7 +42,7 @@ export async function rspackInitGenerator(
   }
 
   if (schema.style === 'less') {
-    devDependencies['@rspack/less-loader'] = rspackLessLoaderVersion;
+    devDependencies['less-loader'] = lessLoaderVersion;
   }
 
   if (schema.framework !== 'none' || schema.devServer) {
diff --git a/src/utils/create-compiler.ts b/src/utils/create-compiler.ts
index fbb0b1c4d1e86..26aa755fde940 100644
--- a/src/utils/create-compiler.ts
+++ b/src/utils/create-compiler.ts
@@ -1,12 +1,12 @@
 import { ExecutorContext } from '@nx/devkit';
-import { Compiler, createCompiler as _createCompiler } from '@rspack/core';
+import { Compiler, MultiCompiler, rspack } from '@rspack/core';
 import * as path from 'path';
 import { RspackExecutorSchema } from '../executors/rspack/schema';
 
 export async function createCompiler(
   options: RspackExecutorSchema,
   context: ExecutorContext
-): Promise<Compiler> {
+): Promise<Compiler | MultiCompiler> {
   let userDefinedConfig = await import(
     path.join(context.root, options.rspackConfig)
   ).then((x) => x.default || x);
@@ -17,5 +17,9 @@ export async function createCompiler(
 
   const config = await userDefinedConfig({}, { options, context });
 
-  return _createCompiler(config);
+  return rspack(config);
+}
+
+export function isMultiCompiler(compiler: Compiler | MultiCompiler): compiler is MultiCompiler {
+  return 'compilers' in compiler
 }
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 2148b6781417c..842fafa3d562a 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,9 @@
-export const rspackCoreVersion = '~0.1.12';
-export const rspackDevServerVersion = '~0.1.12';
+export const rspackCoreVersion = '~0.4.4';
+export const rspackDevServerVersion = '~0.4.4';
 
-export const rspackPluginMinifyVersion = '~0.1.12';
-export const rspackLessLoaderVersion = '^0.0.22';
+export const rspackPluginMinifyVersion = '~0.4.4';
+export const rspackPluginReactRefreshVersion = '~0.4.4';
+export const lessLoaderVersion = '~11.1.3';
 
 export const reactVersion = '~18.2.0';
 export const reactDomVersion = '~18.2.0';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index b0c7e7867fb56..60ce3394521a0 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -3,6 +3,7 @@ import {
   ExternalItem,
   ResolveAlias,
   RspackPluginInstance,
+  rspack,
 } from '@rspack/core';
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import * as path from 'path';
@@ -58,6 +59,13 @@ export function withNx(_opts = {}) {
       );
     }
 
+    plugins.push(new rspack.CopyRspackPlugin({
+      patterns: getCopyPatterns(
+        normalizeAssets(options.assets, context.root, sourceRoot)
+      ),
+    }));
+    plugins.push(new rspack.ProgressPlugin())
+
     options.fileReplacements.forEach((item) => {
       alias[item.replace] = item.with;
     });
@@ -121,7 +129,43 @@ export function withNx(_opts = {}) {
         port: 4200,
         hot: true,
       } as any,
-      module: {},
+      module: {
+        rules: [
+          {
+            test: /\.js$/,
+            loader: 'builtin:swc-loader',
+            exclude: /node_modules/,
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'ecmascript',
+                },
+                externalHelpers: true,
+              },
+            },
+            type: 'javascript/auto',
+          },
+          {
+            test: /\.ts$/,
+            loader: 'builtin:swc-loader',
+            exclude: /node_modules/,
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'typescript',
+                  decorators: true
+                },
+                transform: {
+                  legacyDecorator: true,
+                  decoratorMetadata: true
+                },
+                externalHelpers: true,
+              },
+            },
+            type: 'javascript/auto',
+          },
+        ]
+      },
       plugins: plugins,
       resolve: {
         // There are some issues resolving workspace libs in a monorepo.
@@ -133,14 +177,6 @@ export function withNx(_opts = {}) {
       infrastructureLogging: {
         debug: false,
       },
-      builtins: {
-        copy: {
-          patterns: getCopyPatterns(
-            normalizeAssets(options.assets, context.root, sourceRoot)
-          ),
-        },
-        progress: {},
-      },
       externals,
       externalsType,
       stats: {
@@ -149,13 +185,6 @@ export function withNx(_opts = {}) {
       },
     };
 
-    if (options.optimization) {
-      updated.optimization = {
-        ...config.optimization,
-        minimize: true,
-      };
-    }
-
     return updated;
   };
 }
diff --git a/src/utils/with-react.ts b/src/utils/with-react.ts
index d6b4ab7ede968..9a01cb82e4fa1 100644
--- a/src/utils/with-react.ts
+++ b/src/utils/with-react.ts
@@ -1,6 +1,7 @@
 import { Configuration } from '@rspack/core';
 import { SharedConfigContext } from './model';
 import { withWeb } from './with-web';
+import ReactRefreshPlugin from "@rspack/plugin-react-refresh";
 
 export function withReact(opts = {}) {
   return function makeConfig(
@@ -15,15 +16,59 @@ export function withReact(opts = {}) {
       context,
     });
 
+    const react = {
+      runtime: 'automatic',
+      development: isDev,
+      refresh: isDev,
+    };
+
     return {
       ...config,
-      builtins: {
-        ...config.builtins,
-        react: {
-          runtime: 'automatic',
-          development: isDev,
-          refresh: isDev,
-        },
+      plugins: [
+        ...(config.plugins || []),
+        isDev && new ReactRefreshPlugin(),
+      ].filter(Boolean),
+      module: {
+        ...config.module,
+        rules: [
+          ...(config.module.rules || []),
+          {
+            test: /\.jsx$/,
+            loader: 'builtin:swc-loader',
+            exclude: /node_modules/,
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'ecmascript',
+                  jsx: true,
+                },
+                transform: {
+                  react,
+                },
+                externalHelpers: true,
+              },
+            },
+            type: 'javascript/auto',
+          },
+          {
+            test: /\.tsx$/,
+            loader: 'builtin:swc-loader',
+            exclude: /node_modules/,
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'typescript',
+                  tsx: true,
+                },
+                transform: {
+                  react,
+                },
+                externalHelpers: true,
+              },
+            },
+            type: 'javascript/auto',
+          },
+        ],
       },
     };
   };
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index 1e496a0767b5e..13f5c0e54adfd 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -1,4 +1,4 @@
-import { Configuration, RuleSetRule } from '@rspack/core';
+import { Configuration, RuleSetRule, rspack } from '@rspack/core';
 import * as path from 'path';
 import { SharedConfigContext } from './model';
 
@@ -98,21 +98,17 @@ export function withWeb(opts: WithWebOptions = {}) {
           },
         ].filter((a): a is RuleSetRule => !!a),
       },
-      builtins: {
-        ...config.builtins,
-        html: [
-          ...(config.builtins.html || []),
-          {
-            template: options.indexHtml
-              ? path.join(context.root, options.indexHtml)
-              : path.join(projectRoot, 'src/index.html'),
-          },
-        ],
-        define: {
-          ...config.builtins.define,
+      plugins: [
+        ...config.plugins,
+        new rspack.HtmlRspackPlugin({
+          template: options.indexHtml
+            ? path.join(context.root, options.indexHtml)
+            : path.join(projectRoot, 'src/index.html'),
+        }),
+        new rspack.DefinePlugin({
           'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
-        },
-      },
+        })
+      ],
     };
   };
 }
diff --git a/tsconfig.lib.json b/tsconfig.lib.json
index edecad0e0fc40..53e9f950df36d 100644
--- a/tsconfig.lib.json
+++ b/tsconfig.lib.json
@@ -4,6 +4,7 @@
     "resolveJsonModule": true,
     "outDir": "../../dist/out-tsc",
     "declaration": true,
+    "esModuleInterop": true,
     "types": ["node"]
   },
   "include": ["**/*.ts"],

From 1e39bb3d00f034de4241a71c7bdf1b315612f6ce Mon Sep 17 00:00:00 2001
From: Nicholas Cunningham <ndcunningham@gmail.com>
Date: Tue, 23 Jan 2024 13:15:27 -0700
Subject: [PATCH 61/92] fix(rspack): Add missing peer dep (#372)

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 66153b1555bde..cdb72a964fc9c 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,9 @@
     "stylus-loader": "^7.1.0",
     "@nx/eslint": "^17.0.1"
   },
+  "peerDependencies": {
+    "@rspack/core": ">= 0.4.0"
+  },
   "nx-migrations": {
     "migrations": "./migrations.json"
   }

From 2cbdbb0e7c0c135aecfda11865fa06eca5115625 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 22 Feb 2024 13:41:07 +0000
Subject: [PATCH 62/92] chore(repo): migrate to latest nx (#376)

---
 project.json | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/project.json b/project.json
index 211b774dbc734..c37ff26e4ecdf 100644
--- a/project.json
+++ b/project.json
@@ -34,28 +34,18 @@
             "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"]
           },
           "LICENSE"
-        ],
-        "updateBuildableProjectDepsInPackageJson": true
+        ]
       }
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/rspack/**/*.ts",
-          "packages/rspack/generators.json",
-          "packages/rspack/executors.json",
-          "packages/rspack/package.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/rspack/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "packages/rspack/jest.config.ts"
       }
     },
     "publish": {

From d29336e1fa400e34ea7e8b1c8b4d653d96085fe8 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 22 Feb 2024 13:41:07 +0000
Subject: [PATCH 63/92] chore(repo): migrate to latest nx (#376)

---
 project.json         |  3 ++-
 tests/rspack.spec.ts | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/project.json b/project.json
index d55ed838fd0e5..a3f6d87970d28 100644
--- a/project.json
+++ b/project.json
@@ -8,7 +8,8 @@
       "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "e2e/rspack-e2e/jest.config.ts",
-        "runInBand": true
+        "runInBand": true,
+        "passWithNoTests": false
       },
       "dependsOn": ["rspack:build"]
     }
diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 6870579ec3a4e..e9a3d87f8502f 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -38,7 +38,7 @@ describe('rspack e2e', () => {
     // Added this so that the nx-ecosystem-ci tests don't throw jest error
     writeFileSync(
       join(tmpProjPath(), '.babelrc'),
-      `    
+      `
         {
           "presets": [
             "@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript",
@@ -71,8 +71,9 @@ describe('rspack e2e', () => {
     result = await runNxCommandAsync(`test ${project}`);
     expect(result.stdout).toContain('Successfully ran target test');
 
-    result = await runNxCommandAsync(`e2e e2e`);
-    expect(result.stdout).toContain('Successfully ran target e2e');
+    // TODO(Colum): re-enable when cypress issue is resolved
+    // result = await runNxCommandAsync(`e2e e2e`);
+    // expect(result.stdout).toContain('Successfully ran target e2e');
 
     // Update app and make sure previous dist files are not present.
     updateFile(`src/app/app.tsx`, (content) => {
@@ -95,7 +96,7 @@ describe('rspack e2e', () => {
     // Added this so that the nx-ecosystem-ci tests don't throw jest error
     writeFileSync(
       join(tmpProjPath(), app2, '.babelrc'),
-      `    
+      `
         {
           "presets": [
             "@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript",
@@ -121,8 +122,9 @@ describe('rspack e2e', () => {
     result = await runNxCommandAsync(`test ${app2}`);
     expect(result.stdout).toContain('Successfully ran target test');
 
-    result = await runNxCommandAsync(`e2e ${app2}-e2e`);
-    expect(result.stdout).toContain('Successfully ran target e2e');
+    // TODO(Colum): re-enable when cypress issue is resolved
+    // result = await runNxCommandAsync(`e2e ${app2}-e2e`);
+    // expect(result.stdout).toContain('Successfully ran target e2e');
 
     // Generate a Nest app and verify build output
     const app3 = uniq('app3');

From a2d91f0c8ed90331da776089daeabcd4fd59aad4 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 6 Mar 2024 11:59:15 +0000
Subject: [PATCH 64/92] feat(rspack): update rspack to install the latest
 version (#379)

---
 migrations.json       | 17 +++++++++++++++++
 package.json          |  6 +++---
 src/utils/versions.ts |  8 ++++----
 src/utils/with-nx.ts  |  2 ++
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/migrations.json b/migrations.json
index 58e036e5ab229..9ac65613acce4 100644
--- a/migrations.json
+++ b/migrations.json
@@ -24,6 +24,23 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.1.0": {
+      "version": "18.1.0-beta.0",
+      "packages": {
+        "@rspack/core": {
+          "version": "~0.5.6",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/dev-server": {
+          "version": "~0.5.6",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/plugin-minify": {
+          "version": "~0.5.6",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   },
   "version": "0.1"
diff --git a/package.json b/package.json
index cdb72a964fc9c..d62689d7c5024 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^17.0.1",
-    "@nx/devkit": "^17.0.1",
+    "@nx/js": "^18.0.7",
+    "@nx/devkit": "^18.0.7",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "ajv": "^8.12.0",
     "ajv-keywords": "5.1.0",
@@ -28,7 +28,7 @@
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
-    "@nx/eslint": "^17.0.1"
+    "@nx/eslint": "^18.0.7"
   },
   "peerDependencies": {
     "@rspack/core": ">= 0.4.0"
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 842fafa3d562a..fa0f90338b37e 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '~0.4.4';
-export const rspackDevServerVersion = '~0.4.4';
+export const rspackCoreVersion = '~0.5.6';
+export const rspackDevServerVersion = '~0.5.6';
 
-export const rspackPluginMinifyVersion = '~0.4.4';
-export const rspackPluginReactRefreshVersion = '~0.4.4';
+export const rspackPluginMinifyVersion = '~0.5.6';
+export const rspackPluginReactRefreshVersion = '~0.5.6';
 export const lessLoaderVersion = '~11.1.3';
 
 export const reactVersion = '~18.2.0';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 60ce3394521a0..63db6c60a2476 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -172,6 +172,8 @@ export function withNx(_opts = {}) {
         // It looks to be an issue with rspack itself, but will check back after Nx 16 release
         // once I can reproduce a small example repo with rspack only.
         alias,
+        // We need to define the extensions that rspack can resolve
+        extensions: ["...", ".ts", ".tsx", ".jsx"]
         // tsConfigPath: path.join(context.root, options.tsConfig),
       },
       infrastructureLogging: {

From 55d1d56ff7a16629a42f9967d6da7f612a801de7 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 6 Mar 2024 12:28:30 +0000
Subject: [PATCH 65/92] feat(rspack): add option to keep existing versions of
 packages for init generator (#378)

---
 package.json                    |  8 ++++----
 src/generators/init/init.ts     | 10 ++++++++--
 src/generators/init/schema.d.ts |  1 +
 src/generators/init/schema.json |  6 ++++++
 src/utils/with-react.ts         |  4 +++-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d62689d7c5024..1994825132ce2 100644
--- a/package.json
+++ b/package.json
@@ -28,10 +28,10 @@
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
-    "@nx/eslint": "^18.0.7"
-  },
-  "peerDependencies": {
-    "@rspack/core": ">= 0.4.0"
+    "@nx/eslint": "^18.0.7",
+    "@rspack/core": "^0.5.6",
+    "@rspack/plugin-react-refresh": "^0.5.6",
+    "@rspack/plugin-minify": "^0.5.6"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index ad53f2143e6e3..c36e2bcb11124 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -7,10 +7,10 @@ import {
 } from '@nx/devkit';
 import { initGenerator } from '@nx/js';
 import {
+  lessLoaderVersion,
   rspackCoreVersion,
   rspackDevServerVersion,
   rspackPluginMinifyVersion,
-  lessLoaderVersion,
   rspackPluginReactRefreshVersion,
 } from '../../utils/versions';
 import { InitGeneratorSchema } from './schema';
@@ -49,7 +49,13 @@ export async function rspackInitGenerator(
     devDependencies['@rspack/dev-server'] = rspackDevServerVersion;
   }
 
-  const installTask = addDependenciesToPackageJson(tree, {}, devDependencies);
+  const installTask = addDependenciesToPackageJson(
+    tree,
+    {},
+    devDependencies,
+    undefined,
+    schema.keepExistingVersions
+  );
   tasks.push(installTask);
 
   return runTasksInSerial(...tasks);
diff --git a/src/generators/init/schema.d.ts b/src/generators/init/schema.d.ts
index 11f60be151dbf..72497887bfa04 100644
--- a/src/generators/init/schema.d.ts
+++ b/src/generators/init/schema.d.ts
@@ -5,4 +5,5 @@ export interface InitGeneratorSchema {
   style?: 'none' | 'css' | 'scss' | 'less' | 'styl';
   devServer?: boolean;
   rootProject?: boolean;
+  keepExistingVersions?: boolean;
 }
diff --git a/src/generators/init/schema.json b/src/generators/init/schema.json
index b53f45eeeac1d..a91c05545cbae 100644
--- a/src/generators/init/schema.json
+++ b/src/generators/init/schema.json
@@ -18,6 +18,12 @@
     "rootProject": {
       "type": "boolean",
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []
diff --git a/src/utils/with-react.ts b/src/utils/with-react.ts
index 9a01cb82e4fa1..6afd0974c5a3c 100644
--- a/src/utils/with-react.ts
+++ b/src/utils/with-react.ts
@@ -1,7 +1,6 @@
 import { Configuration } from '@rspack/core';
 import { SharedConfigContext } from './model';
 import { withWeb } from './with-web';
-import ReactRefreshPlugin from "@rspack/plugin-react-refresh";
 
 export function withReact(opts = {}) {
   return function makeConfig(
@@ -16,6 +15,9 @@ export function withReact(opts = {}) {
       context,
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
+
     const react = {
       runtime: 'automatic',
       development: isDev,

From 461e017d93d540d6758ea9aba39c7c276e8cf539 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 8 Mar 2024 16:00:19 +0000
Subject: [PATCH 66/92] fix(rspack): do not depend directly on ajv to allow for
 correct hoisting (#384)

---
 package.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package.json b/package.json
index 1994825132ce2..d15833d952af2 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,6 @@
     "@nx/js": "^18.0.7",
     "@nx/devkit": "^18.0.7",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "ajv": "^8.12.0",
-    "ajv-keywords": "5.1.0",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",

From 0f2218f00378e16a18017b946ff96cadf3013198 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 8 Mar 2024 18:21:43 +0000
Subject: [PATCH 67/92] fix(rspack): ensure react-refresh is installed (#385)

---
 src/generators/init/init.ts | 5 +++--
 src/utils/versions.ts       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index c36e2bcb11124..64910a44331ef 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -7,11 +7,11 @@ import {
 } from '@nx/devkit';
 import { initGenerator } from '@nx/js';
 import {
-  lessLoaderVersion,
+  lessLoaderVersion, reactRefreshVersion,
   rspackCoreVersion,
   rspackDevServerVersion,
   rspackPluginMinifyVersion,
-  rspackPluginReactRefreshVersion,
+  rspackPluginReactRefreshVersion
 } from '../../utils/versions';
 import { InitGeneratorSchema } from './schema';
 
@@ -32,6 +32,7 @@ export async function rspackInitGenerator(
     '@rspack/core': rspackCoreVersion,
     '@rspack/plugin-minify': rspackPluginMinifyVersion,
     '@rspack/plugin-react-refresh': rspackPluginReactRefreshVersion,
+    'react-refresh': reactRefreshVersion
   };
 
   // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index fa0f90338b37e..04ff42ec9ef20 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -6,6 +6,7 @@ export const rspackPluginReactRefreshVersion = '~0.5.6';
 export const lessLoaderVersion = '~11.1.3';
 
 export const reactVersion = '~18.2.0';
+export const reactRefreshVersion = '~0.14.0';
 export const reactDomVersion = '~18.2.0';
 export const typesReactVersion = '~18.0.28';
 export const typesReactDomVersion = '~18.0.10';

From d3e7363b1cc03eb8e82b70833f36fbcac4b652d8 Mon Sep 17 00:00:00 2001
From: Nicholas Cunningham <ndcunningham@gmail.com>
Date: Tue, 9 Apr 2024 06:46:05 -0600
Subject: [PATCH 68/92] fix(rspack): User port should be respected. (#387)

closes: https://github.com/nrwl/nx/issues/22726
---
 src/executors/dev-server/dev-server.impl.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index ffd7171f00619..935b5a735a7cf 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -42,6 +42,7 @@ export default async function* runExecutor(
   devServerConfig = {
     ...devServerConfig,
     ...firstCompiler.options.devServer,
+    port: devServerConfig.port,
   };
 
   yield* createAsyncIterable(({ next }) => {

From dd38050713421a9f5fea1f9ceb7f514c5ba0b89f Mon Sep 17 00:00:00 2001
From: Zack Chapple <zackarychapple30@gmail.com>
Date: Tue, 16 Apr 2024 06:01:42 -0400
Subject: [PATCH 69/92] feat(rspack_: update rspack to install latest version
 (#389)

---
 migrations.json       | 17 +++++++++++++++++
 package.json          | 12 ++++++------
 src/utils/versions.ts |  8 ++++----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/migrations.json b/migrations.json
index 9ac65613acce4..af1c09cfdeb2f 100644
--- a/migrations.json
+++ b/migrations.json
@@ -41,6 +41,23 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.1.3": {
+      "version": "18.1.3",
+      "packages": {
+        "@rspack/core": {
+          "version": "^0.6.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/dev-server": {
+          "version": "^0.6.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/plugin-minify": {
+          "version": "^0.6.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   },
   "version": "0.1"
diff --git a/package.json b/package.json
index d15833d952af2..5d2a8f7880945 100644
--- a/package.json
+++ b/package.json
@@ -19,17 +19,17 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^18.0.7",
-    "@nx/devkit": "^18.0.7",
+    "@nx/js": "^18.1.3",
+    "@nx/devkit": "^18.1.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
-    "@nx/eslint": "^18.0.7",
-    "@rspack/core": "^0.5.6",
-    "@rspack/plugin-react-refresh": "^0.5.6",
-    "@rspack/plugin-minify": "^0.5.6"
+    "@nx/eslint": "^18.1.3",
+    "@rspack/core": "^0.6.1",
+    "@rspack/plugin-react-refresh": "^0.6.1",
+    "@rspack/plugin-minify": "^0.6.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 04ff42ec9ef20..97ffe07f0cf55 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '~0.5.6';
-export const rspackDevServerVersion = '~0.5.6';
+export const rspackCoreVersion = '^0.6.1';
+export const rspackDevServerVersion = '^0.6.1';
 
-export const rspackPluginMinifyVersion = '~0.5.6';
-export const rspackPluginReactRefreshVersion = '~0.5.6';
+export const rspackPluginMinifyVersion = '^0.6.1';
+export const rspackPluginReactRefreshVersion = '^0.6.1';
 export const lessLoaderVersion = '~11.1.3';
 
 export const reactVersion = '~18.2.0';

From efd0967c7ab2b1ac09c248b4881db549222aab60 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 23 May 2024 13:01:12 +0100
Subject: [PATCH 70/92] feat(rspack): support object configs (#402)

---
 src/utils/create-compiler.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/create-compiler.ts b/src/utils/create-compiler.ts
index 26aa755fde940..151e688c2b6c9 100644
--- a/src/utils/create-compiler.ts
+++ b/src/utils/create-compiler.ts
@@ -15,7 +15,12 @@ export async function createCompiler(
     userDefinedConfig = await userDefinedConfig;
   }
 
-  const config = await userDefinedConfig({}, { options, context });
+  let config = {};
+  if(typeof userDefinedConfig === 'function') {
+    config = await userDefinedConfig({}, { options, context });
+  } else {
+    config = userDefinedConfig;
+  }
 
   return rspack(config);
 }

From 65669e9ca90f947f51147a379662a02ca7099697 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Wed, 12 Jun 2024 11:48:57 -0400
Subject: [PATCH 71/92] feat(rspack): add crystal plugin for inferring projects
 (#407)

---
 package.json                                  |   6 +-
 plugin.ts                                     |   2 +
 src/generators/application/application.ts     |  11 +-
 src/generators/configuration/configuration.ts |   7 +-
 src/generators/init/init.ts                   |  52 +++-
 src/generators/init/schema.d.ts               |   8 +-
 src/plugins/plugin.ts                         | 228 ++++++++++++++++++
 src/utils/config.ts                           |  54 ++++-
 src/utils/read-rspack-options.ts              |  42 ++++
 .../resolve-user-defined-rspack-config.ts     |  44 ++++
 src/utils/versions.ts                         |   4 +-
 11 files changed, 435 insertions(+), 23 deletions(-)
 create mode 100644 plugin.ts
 create mode 100644 src/plugins/plugin.ts
 create mode 100644 src/utils/read-rspack-options.ts
 create mode 100644 src/utils/resolve-user-defined-rspack-config.ts

diff --git a/package.json b/package.json
index 5d2a8f7880945..ba7100fe5db74 100644
--- a/package.json
+++ b/package.json
@@ -19,14 +19,14 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^18.1.3",
-    "@nx/devkit": "^18.1.3",
+    "@nx/js": "^19.2.3",
+    "@nx/devkit": "^19.2.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
-    "@nx/eslint": "^18.1.3",
+    "@nx/eslint": "^19.2.3",
     "@rspack/core": "^0.6.1",
     "@rspack/plugin-react-refresh": "^0.6.1",
     "@rspack/plugin-minify": "^0.6.1"
diff --git a/plugin.ts b/plugin.ts
new file mode 100644
index 0000000000000..8d3c1a001313d
--- /dev/null
+++ b/plugin.ts
@@ -0,0 +1,2 @@
+export { createDependencies, createNodesV2 } from './src/plugins/plugin';
+export type { RspackPluginOptions } from './src/plugins/plugin';
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index 5fe252a8cfd1b..d4f27810978db 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -10,7 +10,12 @@ export default async function (
   _options: ApplicationGeneratorSchema
 ) {
   const tasks = [];
-  const initTask = await rspackInitGenerator(tree, _options);
+  const initTask = await rspackInitGenerator(tree, {
+    ..._options,
+    // TODO: Crystalize the default rspack.config.js file.
+    // The default setup isn't crystalized so don't add plugin.
+    addPlugin: false,
+  });
   tasks.push(initTask);
 
   const options = normalizeOptions(tree, _options);
@@ -26,6 +31,7 @@ export default async function (
       ...options,
       skipFormat: true,
       tags: options.tags ?? '',
+      addPlugin: false,
     });
 
     const convertAppTask = await configurationGenerator(tree, {
@@ -52,6 +58,7 @@ export default async function (
       e2eTestRunner: options.e2eTestRunner,
       rootProject: options.rootProject,
       skipFormat: true,
+      addPlugin: false,
     });
     const convertAppTask = await configurationGenerator(tree, {
       project: options.name,
@@ -60,6 +67,7 @@ export default async function (
       buildTarget: 'build',
       serveTarget: 'serve',
       framework: 'web',
+      addPlugin: false,
     });
     tasks.push(createAppTask, convertAppTask);
   } else {
@@ -78,6 +86,7 @@ export default async function (
       e2eTestRunner: options.e2eTestRunner,
       rootProject: options.rootProject,
       skipFormat: true,
+      addPlugin: false,
     });
     const convertAppTask = await configurationGenerator(tree, {
       project: options.name,
diff --git a/src/generators/configuration/configuration.ts b/src/generators/configuration/configuration.ts
index 4ea1ac7e6b6f8..4a977e450f320 100644
--- a/src/generators/configuration/configuration.ts
+++ b/src/generators/configuration/configuration.ts
@@ -25,7 +25,12 @@ export async function configurationGenerator(
   tree: Tree,
   options: ConfigurationSchema
 ) {
-  const task = await rspackInitGenerator(tree, options);
+  const task = await rspackInitGenerator(tree, {
+    ...options,
+    // TODO: Crystalize the default rspack.config.js file.
+    // The default setup isn't crystalized so don't add plugin.
+    addPlugin: false,
+  });
   const { targets, root, projectType } = readProjectConfiguration(
     tree,
     options.project
diff --git a/src/generators/init/init.ts b/src/generators/init/init.ts
index 64910a44331ef..f32af80d9c696 100644
--- a/src/generators/init/init.ts
+++ b/src/generators/init/init.ts
@@ -1,17 +1,22 @@
 import {
   addDependenciesToPackageJson,
   convertNxGenerator,
+  createProjectGraphAsync,
   GeneratorCallback,
+  readNxJson,
   runTasksInSerial,
   Tree,
 } from '@nx/devkit';
+import { addPlugin } from '@nx/devkit/src/utils/add-plugin';
 import { initGenerator } from '@nx/js';
+import { createNodesV2 } from '../../../plugin';
 import {
-  lessLoaderVersion, reactRefreshVersion,
+  lessLoaderVersion,
+  reactRefreshVersion,
   rspackCoreVersion,
   rspackDevServerVersion,
   rspackPluginMinifyVersion,
-  rspackPluginReactRefreshVersion
+  rspackPluginReactRefreshVersion,
 } from '../../utils/versions';
 import { InitGeneratorSchema } from './schema';
 
@@ -20,6 +25,46 @@ export async function rspackInitGenerator(
   schema: InitGeneratorSchema
 ) {
   const tasks: GeneratorCallback[] = [];
+
+  const nxJson = readNxJson(tree);
+  const addPluginDefault =
+    process.env.NX_ADD_PLUGINS !== 'false' &&
+    nxJson.useInferencePlugins !== false;
+  schema.addPlugin ??= addPluginDefault;
+
+  if (schema.addPlugin) {
+    await addPlugin(
+      tree,
+      await createProjectGraphAsync(),
+      '@nx/rspack/plugin',
+      createNodesV2,
+      {
+        buildTargetName: [
+          'build',
+          'rspack:build',
+          'build:rspack',
+          'rspack-build',
+          'build-rspack',
+        ],
+        serveTargetName: [
+          'serve',
+          'rspack:serve',
+          'serve:rspack',
+          'rspack-serve',
+          'serve-rspack',
+        ],
+        previewTargetName: [
+          'preview',
+          'rspack:preview',
+          'preview:rspack',
+          'rspack-preview',
+          'preview-rspack',
+        ],
+      },
+      schema.updatePackageScripts
+    );
+  }
+
   const jsInitTask = await initGenerator(tree, {
     ...schema,
     tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -30,9 +75,10 @@ export async function rspackInitGenerator(
 
   const devDependencies = {
     '@rspack/core': rspackCoreVersion,
+    '@rspack/cli': rspackCoreVersion,
     '@rspack/plugin-minify': rspackPluginMinifyVersion,
     '@rspack/plugin-react-refresh': rspackPluginReactRefreshVersion,
-    'react-refresh': reactRefreshVersion
+    'react-refresh': reactRefreshVersion,
   };
 
   // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/src/generators/init/schema.d.ts b/src/generators/init/schema.d.ts
index 72497887bfa04..cd48a7882b497 100644
--- a/src/generators/init/schema.d.ts
+++ b/src/generators/init/schema.d.ts
@@ -1,9 +1,11 @@
 export type Framework = 'none' | 'react' | 'web' | 'nest';
 
 export interface InitGeneratorSchema {
-  framework?: Framework;
-  style?: 'none' | 'css' | 'scss' | 'less' | 'styl';
+  addPlugin?: boolean;
   devServer?: boolean;
-  rootProject?: boolean;
+  framework?: Framework;
   keepExistingVersions?: boolean;
+  rootProject?: boolean;
+  style?: 'none' | 'css' | 'scss' | 'less' | 'styl';
+  updatePackageScripts?: boolean;
 }
diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts
new file mode 100644
index 0000000000000..8c9869de40212
--- /dev/null
+++ b/src/plugins/plugin.ts
@@ -0,0 +1,228 @@
+import {
+  CreateDependencies,
+  CreateNodesContext,
+  createNodesFromFiles,
+  CreateNodesV2,
+  detectPackageManager,
+  ProjectConfiguration,
+  readJsonFile,
+  workspaceRoot,
+  writeJsonFile,
+} from '@nx/devkit';
+import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes';
+import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs';
+import { getLockFileName, getRootTsConfigPath } from '@nx/js';
+import { existsSync, readdirSync } from 'fs';
+import { hashObject } from 'nx/src/hasher/file-hasher';
+import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
+import { dirname, isAbsolute, join, relative, resolve } from 'path';
+import { readRspackOptions } from '../utils/read-rspack-options';
+import { resolveUserDefinedRspackConfig } from '../utils/resolve-user-defined-rspack-config';
+
+export interface RspackPluginOptions {
+  buildTargetName?: string;
+  serveTargetName?: string;
+  serveStaticTargetName?: string;
+  previewTargetName?: string;
+}
+
+type RspackTargets = Pick<ProjectConfiguration, 'targets' | 'metadata'>;
+
+function readTargetsCache(cachePath: string): Record<string, RspackTargets> {
+  return existsSync(cachePath) ? readJsonFile(cachePath) : {};
+}
+
+function writeTargetsToCache(
+  cachePath,
+  results?: Record<string, RspackTargets>
+) {
+  writeJsonFile(cachePath, results);
+}
+
+export const createDependencies: CreateDependencies = () => {
+  return [];
+};
+
+const rspackConfigGlob = '**/rspack.config.{js,ts,mjs,mts,cjs,cts}';
+
+export const createNodesV2: CreateNodesV2<RspackPluginOptions> = [
+  rspackConfigGlob,
+  async (configFilePaths, options, context) => {
+    const optionsHash = hashObject(options);
+    const cachePath = join(workspaceDataDirectory, `vite-${optionsHash}.hash`);
+    const targetsCache = readTargetsCache(cachePath);
+    try {
+      return await createNodesFromFiles(
+        (configFile, options, context) =>
+          createNodesInternal(configFile, options, context, targetsCache),
+        configFilePaths,
+        options,
+        context
+      );
+    } finally {
+      writeTargetsToCache(cachePath, targetsCache);
+    }
+  },
+];
+
+async function createNodesInternal(
+  configFilePath: string,
+  options: RspackPluginOptions,
+  context: CreateNodesContext,
+  targetsCache: Record<string, RspackTargets>
+) {
+  const projectRoot = dirname(configFilePath);
+  // Do not create a project if package.json and project.json isn't there.
+  const siblingFiles = readdirSync(join(context.workspaceRoot, projectRoot));
+  if (
+    !siblingFiles.includes('package.json') &&
+    !siblingFiles.includes('project.json')
+  ) {
+    return {};
+  }
+
+  const normalizedOptions = normalizeOptions(options);
+
+  // We do not want to alter how the hash is calculated, so appending the config file path to the hash
+  // to prevent vite/vitest files overwriting the target cache created by the other
+  const hash =
+    (await calculateHashForCreateNodes(
+      projectRoot,
+      normalizedOptions,
+      context,
+      [getLockFileName(detectPackageManager(context.workspaceRoot))]
+    )) + configFilePath;
+
+  targetsCache[hash] ??= await createRspackTargets(
+    configFilePath,
+    projectRoot,
+    normalizedOptions,
+    context
+  );
+
+  const { targets, metadata } = targetsCache[hash];
+
+  return {
+    projects: {
+      [projectRoot]: {
+        root: projectRoot,
+        targets,
+        metadata,
+      },
+    },
+  };
+}
+
+async function createRspackTargets(
+  configFilePath: string,
+  projectRoot: string,
+  options: RspackPluginOptions,
+  context: CreateNodesContext
+): Promise<RspackTargets> {
+  const namedInputs = getNamedInputs(projectRoot, context);
+
+  const rspackConfig = resolveUserDefinedRspackConfig(
+    join(context.workspaceRoot, configFilePath),
+    getRootTsConfigPath(),
+    true
+  );
+
+  const rspackOptions = await readRspackOptions(rspackConfig);
+
+  const outputPath = normalizeOutputPath(
+    rspackOptions.output?.path,
+    projectRoot
+  );
+
+  const targets = {};
+
+  targets[options.buildTargetName] = {
+    command: `rspack build`,
+    options: { cwd: projectRoot, args: ['--node-env=production'] },
+    cache: true,
+    dependsOn: [`^${options.buildTargetName}`],
+    inputs:
+      'production' in namedInputs
+        ? [
+            'production',
+            '^production',
+            {
+              externalDependencies: ['@rspack/cli'],
+            },
+          ]
+        : [
+            'default',
+            '^default',
+            {
+              externalDependencies: ['@rspack/cli'],
+            },
+          ],
+    outputs: [outputPath],
+  };
+
+  targets[options.serveTargetName] = {
+    command: `rspack serve`,
+    options: {
+      cwd: projectRoot,
+      args: ['--node-env=development'],
+    },
+  };
+
+  targets[options.previewTargetName] = {
+    command: `rspack serve`,
+    options: {
+      cwd: projectRoot,
+      args: ['--node-env=production'],
+    },
+  };
+
+  targets[options.serveStaticTargetName] = {
+    executor: '@nx/web:file-server',
+    options: {
+      buildTarget: options.buildTargetName,
+      spa: true,
+    },
+  };
+
+  return { targets, metadata: {} };
+}
+
+function normalizeOptions(options: RspackPluginOptions): RspackPluginOptions {
+  options ??= {};
+  options.buildTargetName ??= 'build';
+  options.serveTargetName ??= 'serve';
+  options.previewTargetName ??= 'preview';
+  options.serveStaticTargetName ??= 'serve-static';
+  return options;
+}
+
+function normalizeOutputPath(
+  outputPath: string | undefined,
+  projectRoot: string
+): string | undefined {
+  if (!outputPath) {
+    // If outputPath is undefined, use rspack's default `dist` directory.
+    if (projectRoot === '.') {
+      return `{projectRoot}/dist`;
+    } else {
+      return `{workspaceRoot}/dist/{projectRoot}`;
+    }
+  } else {
+    if (isAbsolute(outputPath)) {
+      /**
+       * If outputPath is absolute, we need to resolve it relative to the workspaceRoot first.
+       * After that, we can use the relative path to the workspaceRoot token {workspaceRoot} to generate the output path.
+       */
+      return `{workspaceRoot}/${relative(
+        workspaceRoot,
+        resolve(workspaceRoot, outputPath)
+      )}`;
+    } else {
+      if (outputPath.startsWith('..')) {
+        return join('{workspaceRoot}', join(projectRoot, outputPath));
+      } else {
+        return join('{projectRoot}', outputPath);
+      }
+    }
+  }
+}
diff --git a/src/utils/config.ts b/src/utils/config.ts
index 26deecabb97c7..848d2b56a7300 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -1,15 +1,49 @@
-import { Configuration } from '@rspack/core';
+import type { ExecutorContext } from '@nx/devkit';
+import type { Configuration } from '@rspack/core';
+
 import { SharedConfigContext } from './model';
 
+export const nxRspackComposablePlugin = 'nxRspackComposablePlugin';
+
+export function isNxRspackComposablePlugin(
+  a: unknown
+): a is AsyncNxComposableRspackPlugin {
+  return a?.[nxRspackComposablePlugin] === true;
+}
+
+export interface NxRspackExecutionContext {
+  options: unknown;
+  context: ExecutorContext;
+  configuration?: string;
+}
+
+export interface NxComposableRspackPlugin {
+  (config: Configuration, ctx: NxRspackExecutionContext): Configuration;
+}
+
+export interface AsyncNxComposableRspackPlugin {
+  (config: Configuration, ctx: NxRspackExecutionContext):
+    | Configuration
+    | Promise<Configuration>;
+}
+
 export function composePlugins(...plugins: any[]) {
-  return async function combined(
-    config: Configuration,
-    ctx: SharedConfigContext
-  ): Promise<Configuration> {
-    for (const plugin of plugins) {
-      const fn = await plugin;
-      config = await fn(config, ctx);
+  return Object.defineProperty(
+    async function combined(
+      config: Configuration,
+      ctx: SharedConfigContext
+    ): Promise<Configuration> {
+      for (const plugin of plugins) {
+        const fn = await plugin;
+        config = await fn(config, ctx);
+      }
+      return config;
+    },
+    nxRspackComposablePlugin,
+    {
+      value: true,
+      enumerable: false,
+      writable: false,
     }
-    return config;
-  };
+  );
 }
diff --git a/src/utils/read-rspack-options.ts b/src/utils/read-rspack-options.ts
new file mode 100644
index 0000000000000..e526e1c1b6acc
--- /dev/null
+++ b/src/utils/read-rspack-options.ts
@@ -0,0 +1,42 @@
+import { workspaceRoot } from '@nx/devkit';
+import { Configuration } from '@rspack/core';
+import { isNxRspackComposablePlugin } from './config';
+
+/**
+ * Reads the Rspack options from a give Rspack configuration. The configuration can be:
+ * 1. A standard config object
+ * 2. A standard function that returns a config object
+ * 3. A Nx-specific composable function that takes Nx context, rspack config, and returns the config object.
+ *
+ * @param rspackConfig
+ */
+export async function readRspackOptions(
+  rspackConfig: unknown
+): Promise<Configuration> {
+  let config: Configuration;
+  if (isNxRspackComposablePlugin(rspackConfig)) {
+    config = await rspackConfig(
+      {},
+      {
+        // These values are only used during build-time, so passing stubs here just to read out
+        // the returned config object.
+        options: {
+          root: workspaceRoot,
+          projectRoot: '',
+          sourceRoot: '',
+        },
+        context: { root: workspaceRoot, cwd: undefined, isVerbose: false },
+      }
+    );
+  } else if (typeof rspackConfig === 'function') {
+    config = await rspackConfig(
+      {
+        production: true, // we want the production build options
+      },
+      {}
+    );
+  } else {
+    config = rspackConfig;
+  }
+  return config;
+}
diff --git a/src/utils/resolve-user-defined-rspack-config.ts b/src/utils/resolve-user-defined-rspack-config.ts
new file mode 100644
index 0000000000000..e4145d9280d89
--- /dev/null
+++ b/src/utils/resolve-user-defined-rspack-config.ts
@@ -0,0 +1,44 @@
+import { clearRequireCache } from '@nx/devkit/src/utils/config-utils';
+import { registerTsProject } from '@nx/js/src/internal';
+
+export function resolveUserDefinedRspackConfig(
+  path: string,
+  tsConfig: string,
+  /** Skip require cache and return latest content */
+  reload = false
+) {
+  if (reload) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+      // Clear all entries because config may import other modules
+      clearRequireCache();
+    }
+  }
+
+  // Don't transpile non-TS files. This prevents workspaces libs from being registered via tsconfig-paths.
+  // There's an issue here with Nx workspace where loading plugins from source (via tsconfig-paths) can lead to errors.
+  if (!/\.(ts|mts|cts)$/.test(path)) {
+    return require(path);
+  }
+
+  const cleanupTranspiler = registerTsProject(tsConfig);
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const maybeCustomRspackConfig = require(path);
+  cleanupTranspiler();
+
+  // If the user provides a configuration in TS file
+  // then there are 3 cases for exporing an object. The first one is:
+  // `module.exports = { ... }`. And the second one is:
+  // `export default { ... }`. The ESM format is compiled into:
+  // `{ default: { ... } }`
+  // There is also a case of
+  // `{ default: { default: { ... } }`
+  const customRspackConfig =
+    'default' in maybeCustomRspackConfig
+      ? 'default' in maybeCustomRspackConfig.default
+        ? maybeCustomRspackConfig.default.default
+        : maybeCustomRspackConfig.default
+      : maybeCustomRspackConfig;
+
+  return customRspackConfig;
+}
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 97ffe07f0cf55..17cd597d9f14b 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,5 +1,5 @@
-export const rspackCoreVersion = '^0.6.1';
-export const rspackDevServerVersion = '^0.6.1';
+export const rspackCoreVersion = '^0.7.2';
+export const rspackDevServerVersion = '^0.7.2';
 
 export const rspackPluginMinifyVersion = '^0.6.1';
 export const rspackPluginReactRefreshVersion = '^0.6.1';

From 078ac1700452524c05bb0740c7192664eb81dc91 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Wed, 12 Jun 2024 11:48:57 -0400
Subject: [PATCH 72/92] feat(rspack): add crystal plugin for inferring projects
 (#407)

---
 tests/rspack.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index e9a3d87f8502f..1d49a3cb69e7e 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -129,7 +129,7 @@ describe('rspack e2e', () => {
     // Generate a Nest app and verify build output
     const app3 = uniq('app3');
     await runNxCommandAsync(
-      `generate @nx/rspack:app ${app3} --framework=nest --unitTestRunner=jest`
+      `generate @nx/rspack:app ${app3} --framework=nest --unitTestRunner=jest --no-interactive`
     );
     checkFilesExist(`${app3}/project.json`);
 

From ca007a6065b5bcd46bb3235e3d452d74ef72839f Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 8 Aug 2024 14:02:27 +0100
Subject: [PATCH 73/92] feat(rspack): bump to latest rspack (#412)

---
 migrations.json       | 17 +++++++++++++++++
 package.json          | 12 ++++++------
 src/utils/versions.ts |  8 ++++----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/migrations.json b/migrations.json
index af1c09cfdeb2f..4f3c3a2b08ee4 100644
--- a/migrations.json
+++ b/migrations.json
@@ -58,6 +58,23 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.3.0": {
+      "version": "19.3.0-beta.0",
+      "packages": {
+        "@rspack/core": {
+          "version": "^0.7.5",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/dev-server": {
+          "version": "^0.7.5",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/plugin-minify": {
+          "version": "^0.7.5",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   },
   "version": "0.1"
diff --git a/package.json b/package.json
index ba7100fe5db74..836d5f039a8ee 100644
--- a/package.json
+++ b/package.json
@@ -19,17 +19,17 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^19.2.3",
-    "@nx/devkit": "^19.2.3",
+    "@nx/js": "^19.5.7",
+    "@nx/devkit": "^19.5.7",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
-    "@nx/eslint": "^19.2.3",
-    "@rspack/core": "^0.6.1",
-    "@rspack/plugin-react-refresh": "^0.6.1",
-    "@rspack/plugin-minify": "^0.6.1"
+    "@nx/eslint": "^19.5.7",
+    "@rspack/core": "^0.7.5",
+    "@rspack/plugin-react-refresh": "^0.7.5",
+    "@rspack/plugin-minify": "^0.7.5"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index 17cd597d9f14b..d40a4de18c2cb 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '^0.7.2';
-export const rspackDevServerVersion = '^0.7.2';
+export const rspackCoreVersion = '^0.7.5';
+export const rspackDevServerVersion = '^0.7.5';
 
-export const rspackPluginMinifyVersion = '^0.6.1';
-export const rspackPluginReactRefreshVersion = '^0.6.1';
+export const rspackPluginMinifyVersion = '^0.7.5';
+export const rspackPluginReactRefreshVersion = '^0.7.5';
 export const lessLoaderVersion = '~11.1.3';
 
 export const reactVersion = '~18.2.0';

From e61790d28668da62cb807177566671dbb5aec24c Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 23 Aug 2024 14:31:41 +0100
Subject: [PATCH 74/92] fix(rspack): add postcss-loader for css files (#415)

---
 package.json          | 1 +
 src/utils/with-web.ts | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/package.json b/package.json
index 836d5f039a8ee..35a49ced0b94d 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
+    "postcss-loader": "^8.1.1",
     "@nx/eslint": "^19.5.7",
     "@rspack/core": "^0.7.5",
     "@rspack/plugin-react-refresh": "^0.7.5",
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index 13f5c0e54adfd..244984ad4a75e 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -48,6 +48,13 @@ export function withWeb(opts: WithWebOptions = {}) {
             test: /\.css$/,
             type: opts?.cssModules ? 'css/module' : undefined,
           },
+          {
+            test: /\.css$/,
+            type: 'css',
+            use: [{
+              loader: require.resolve('postcss-loader'),
+            }]
+          },
           {
             test: /\.scss$|\.sass$/,
             type: opts?.cssModules ? 'css/module' : undefined,

From 2854ccaa43e37260a894197c1817a36734005909 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 4 Sep 2024 12:37:57 +0100
Subject: [PATCH 75/92] feat(rspack): add module federation support (#416)

* feat(rspack): add withModuleFederation util

* feat(rspack): add module federation required executors

* feat(rspack): add module federation support

* fix(rspack): dev server setup

* fix(rspack): cleanup package entry for module federation

* feat(rspack): migrate to rspack 1.0

* fix(rspack): ensure license plugin is not attempting to read root
---
 executors.json                                |  15 +
 migrations.json                               |  17 +
 module-federation.ts                          |   1 +
 package.json                                  |  11 +-
 src/executors/dev-server/dev-server.impl.ts   |  26 +-
 .../dev-server/lib/get-dev-server-config.ts   |  84 ++++
 src/executors/dev-server/lib/serve-path.ts    |  56 +++
 src/executors/dev-server/schema.d.ts          |   6 +-
 src/executors/dev-server/schema.json          |  32 +-
 .../module-federation-dev-server.impl.ts      | 424 ++++++++++++++++++
 .../module-federation-dev-server/schema.json  | 100 +++++
 .../module-federation-ssr-dev-server.impl.ts  | 406 +++++++++++++++++
 .../schema.json                               |  82 ++++
 src/executors/rspack/rspack.impl.ts           |  25 +-
 src/executors/rspack/schema.d.ts              |  11 +-
 src/executors/rspack/schema.json              |  68 ++-
 .../lib/wait-until-server-is-listening.ts     |  38 ++
 src/executors/ssr-dev-server/schema.d.ts      |  11 +
 src/executors/ssr-dev-server/schema.json      |  39 ++
 .../ssr-dev-server/ssr-dev-server.impl.ts     |  75 ++++
 src/generators/application/application.ts     |   4 +-
 src/utils/create-compiler.ts                  |  41 +-
 .../module-federation/dependencies.spec.ts    | 158 +++++++
 src/utils/module-federation/dependencies.ts   |  94 ++++
 .../module-federation/get-remotes-for-host.ts | 195 ++++++++
 src/utils/module-federation/index.ts          |   6 +
 src/utils/module-federation/models/index.ts   |  70 +++
 src/utils/module-federation/package-json.ts   |  16 +
 .../parse-static-remotes-config.ts            |  57 +++
 .../plugins/runtime-library-control.plugin.ts |  71 +++
 src/utils/module-federation/public-api.ts     |  51 +++
 src/utils/module-federation/remotes.ts        | 102 +++++
 .../secondary-entry-points.ts                 | 144 ++++++
 src/utils/module-federation/share.spec.ts     | 381 ++++++++++++++++
 src/utils/module-federation/share.ts          | 322 +++++++++++++
 .../module-federation/start-remote-proxies.ts |  62 +++
 .../start-ssr-remote-proxies.ts               |  77 ++++
 .../module-federation/typescript.spec.ts      |  45 ++
 src/utils/module-federation/typescript.ts     |  75 ++++
 .../with-module-federation/package-json.ts    |  16 +
 .../with-module-federation/utils.ts           | 131 ++++++
 .../with-module-federation-ssr.ts             |  77 ++++
 .../with-module-federation.ts                 | 101 +++++
 src/utils/versions.ts                         |   6 +-
 src/utils/with-nx.ts                          |  73 ++-
 45 files changed, 3833 insertions(+), 69 deletions(-)
 create mode 100644 module-federation.ts
 create mode 100644 src/executors/dev-server/lib/get-dev-server-config.ts
 create mode 100644 src/executors/dev-server/lib/serve-path.ts
 create mode 100644 src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
 create mode 100644 src/executors/module-federation-dev-server/schema.json
 create mode 100644 src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
 create mode 100644 src/executors/module-federation-ssr-dev-server/schema.json
 create mode 100644 src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
 create mode 100644 src/executors/ssr-dev-server/schema.d.ts
 create mode 100644 src/executors/ssr-dev-server/schema.json
 create mode 100644 src/executors/ssr-dev-server/ssr-dev-server.impl.ts
 create mode 100644 src/utils/module-federation/dependencies.spec.ts
 create mode 100644 src/utils/module-federation/dependencies.ts
 create mode 100644 src/utils/module-federation/get-remotes-for-host.ts
 create mode 100644 src/utils/module-federation/index.ts
 create mode 100644 src/utils/module-federation/models/index.ts
 create mode 100644 src/utils/module-federation/package-json.ts
 create mode 100644 src/utils/module-federation/parse-static-remotes-config.ts
 create mode 100644 src/utils/module-federation/plugins/runtime-library-control.plugin.ts
 create mode 100644 src/utils/module-federation/public-api.ts
 create mode 100644 src/utils/module-federation/remotes.ts
 create mode 100644 src/utils/module-federation/secondary-entry-points.ts
 create mode 100644 src/utils/module-federation/share.spec.ts
 create mode 100644 src/utils/module-federation/share.ts
 create mode 100644 src/utils/module-federation/start-remote-proxies.ts
 create mode 100644 src/utils/module-federation/start-ssr-remote-proxies.ts
 create mode 100644 src/utils/module-federation/typescript.spec.ts
 create mode 100644 src/utils/module-federation/typescript.ts
 create mode 100644 src/utils/module-federation/with-module-federation/package-json.ts
 create mode 100644 src/utils/module-federation/with-module-federation/utils.ts
 create mode 100644 src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
 create mode 100644 src/utils/module-federation/with-module-federation/with-module-federation.ts

diff --git a/executors.json b/executors.json
index 4ec8c30095772..8d1791db1b3be 100644
--- a/executors.json
+++ b/executors.json
@@ -10,6 +10,21 @@
       "implementation": "./src/executors/dev-server/dev-server.impl",
       "schema": "./src/executors/dev-server/schema.json",
       "description": "dev-server executor"
+    },
+    "ssr-dev-server": {
+      "implementation": "./src/executors/ssr-dev-server/ssr-dev-server.impl",
+      "schema": "./src/executors/ssr-dev-server/schema.json",
+      "description": "Serve a SSR application."
+    },
+    "module-federation-dev-server": {
+      "implementation": "./src/executors/module-federation-dev-server/module-federation-dev-server.impl",
+      "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/module-federation-ssr-dev-server.impl",
+      "schema": "./src/executors/module-federation-ssr-dev-server/schema.json",
+      "description": "Serve a host application along with it's known remotes."
     }
   }
 }
diff --git a/migrations.json b/migrations.json
index 4f3c3a2b08ee4..88f20a517d0b2 100644
--- a/migrations.json
+++ b/migrations.json
@@ -75,6 +75,23 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.7.0": {
+      "version": "19.7.0-beta.1",
+      "packages": {
+        "@rspack/core": {
+          "version": "^1.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/dev-server": {
+          "version": "^1.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@rspack/plugin-react-refresh": {
+          "version": "^1.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   },
   "version": "0.1"
diff --git a/module-federation.ts b/module-federation.ts
new file mode 100644
index 0000000000000..a4cf0dd1a4364
--- /dev/null
+++ b/module-federation.ts
@@ -0,0 +1 @@
+export * from './src/utils/module-federation/public-api';
diff --git a/package.json b/package.json
index 35a49ced0b94d..7eac341977a16 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,14 @@
     "stylus-loader": "^7.1.0",
     "postcss-loader": "^8.1.1",
     "@nx/eslint": "^19.5.7",
-    "@rspack/core": "^0.7.5",
-    "@rspack/plugin-react-refresh": "^0.7.5",
-    "@rspack/plugin-minify": "^0.7.5"
+    "@rspack/core": "^1.0.2",
+    "@rspack/plugin-react-refresh": "^1.0.0",
+    "@rspack/plugin-minify": "^0.7.5",
+    "chalk": "~4.1.0"
+  },
+  "peerDependencies": {
+    "@module-federation/enhanced": "~0.6.0",
+    "@module-federation/node": "~2.5.10"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index 935b5a735a7cf..49ee9047a9c09 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -8,12 +8,14 @@ import { Configuration } from '@rspack/core';
 import { RspackDevServer } from '@rspack/dev-server';
 import { createCompiler, isMultiCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
+import { getDevServerOptions } from './lib/get-dev-server-config';
 import { DevServerExecutorSchema } from './schema';
+
 type DevServer = Configuration['devServer'];
 export default async function* runExecutor(
   options: DevServerExecutorSchema,
   context: ExecutorContext
-) {
+): AsyncIterableIterator<{ success: boolean; baseUrl?: string }> {
   process.env.NODE_ENV ??= options.mode ?? 'development';
 
   if (isMode(process.env.NODE_ENV)) {
@@ -25,12 +27,14 @@ export default async function* runExecutor(
     context.projectGraph
   );
 
-  let devServerConfig: DevServer = {
-    port: options.port ?? 4200,
-    hot: true,
-  };
+  const buildOptions = readTargetOptions(buildTarget, context);
+
+  let devServerConfig: DevServer = getDevServerOptions(
+    context.root,
+    options,
+    buildOptions
+  );
 
-  const buildOptions = readTargetOptions<any>(buildTarget, context);
   const compiler = await createCompiler(
     { ...buildOptions, devServer: devServerConfig, mode: options.mode },
     context
@@ -38,18 +42,20 @@ export default async function* runExecutor(
 
   // Use the first one if it's MultiCompiler
   // https://webpack.js.org/configuration/dev-server/#root:~:text=Be%20aware%20that%20when%20exporting%20multiple%20configurations%20only%20the%20devServer%20options%20for%20the%20first%20configuration%20will%20be%20taken%20into%20account%20and%20used%20for%20all%20the%20configurations%20in%20the%20array.
-  const firstCompiler = isMultiCompiler(compiler) ? compiler.compilers[0] : compiler;
+  const firstCompiler = isMultiCompiler(compiler)
+    ? compiler.compilers[0]
+    : compiler;
   devServerConfig = {
     ...devServerConfig,
     ...firstCompiler.options.devServer,
     port: devServerConfig.port,
   };
 
-  yield* createAsyncIterable(({ next }) => {
-    const server: any = new RspackDevServer(
+  return yield* createAsyncIterable(({ next }) => {
+    const server = new RspackDevServer(
       {
         ...devServerConfig,
-        onListening: (server: any) => {
+        onListening: () => {
           next({
             success: true,
             baseUrl: `http://localhost:${options.port ?? 4200}`,
diff --git a/src/executors/dev-server/lib/get-dev-server-config.ts b/src/executors/dev-server/lib/get-dev-server-config.ts
new file mode 100644
index 0000000000000..c7ff6a0d8f242
--- /dev/null
+++ b/src/executors/dev-server/lib/get-dev-server-config.ts
@@ -0,0 +1,84 @@
+import { logger } from '@nx/devkit';
+import type { Configuration as RspackDevServerConfiguration } from '@rspack/dev-server';
+import { readFileSync } from 'fs';
+import * as path from 'path';
+import { RspackExecutorSchema } from '../../rspack/schema';
+import { DevServerExecutorSchema } from '../schema';
+import { buildServePath } from './serve-path';
+
+export function getDevServerOptions(
+  root: string,
+  serveOptions: DevServerExecutorSchema,
+  buildOptions: RspackExecutorSchema
+): RspackDevServerConfiguration {
+  const servePath = buildServePath(buildOptions);
+
+  let scriptsOptimization: boolean;
+  let stylesOptimization: boolean;
+  if (typeof buildOptions.optimization === 'boolean') {
+    scriptsOptimization = stylesOptimization = buildOptions.optimization;
+  } else if (buildOptions.optimization) {
+    scriptsOptimization = buildOptions.optimization.scripts;
+    stylesOptimization = buildOptions.optimization.styles;
+  } else {
+    scriptsOptimization = stylesOptimization = false;
+  }
+
+  const config: RspackDevServerConfiguration = {
+    host: serveOptions.host,
+    port: serveOptions.port,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+    historyApiFallback: {
+      index:
+        buildOptions.index &&
+        `${servePath}${path.basename(buildOptions.index)}`,
+      disableDotRule: true,
+      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+    },
+    onListening(server) {
+      const isHttps =
+        server.options.https ||
+        (server.options.server as { type: string })?.type === 'https';
+      logger.info(
+        `NX Web Development Server is listening at ${
+          isHttps ? 'https' : 'http'
+        }://${server.options.host}:${server.options.port}${buildServePath(
+          buildOptions
+        )}`
+      );
+    },
+    open: false,
+    static: false,
+    compress: scriptsOptimization || stylesOptimization,
+    devMiddleware: {
+      publicPath: servePath,
+      stats: false,
+    },
+    client: {
+      webSocketURL: serveOptions.publicHost,
+      overlay: {
+        errors: !(scriptsOptimization || stylesOptimization),
+        warnings: false,
+      },
+    },
+    hot: true,
+  };
+
+  if (serveOptions.ssl) {
+    config.server = {
+      type: 'https',
+    };
+    if (serveOptions.sslKey && serveOptions.sslCert) {
+      config.server.options = getSslConfig(root, serveOptions);
+    }
+  }
+
+  return config;
+}
+
+function getSslConfig(root: string, options: DevServerExecutorSchema) {
+  return {
+    key: readFileSync(path.resolve(root, options.sslKey), 'utf-8'),
+    cert: readFileSync(path.resolve(root, options.sslCert), 'utf-8'),
+  };
+}
diff --git a/src/executors/dev-server/lib/serve-path.ts b/src/executors/dev-server/lib/serve-path.ts
new file mode 100644
index 0000000000000..15b1c0ea3f617
--- /dev/null
+++ b/src/executors/dev-server/lib/serve-path.ts
@@ -0,0 +1,56 @@
+import type { RspackExecutorSchema } from '../../rspack/schema';
+
+export function buildServePath(browserOptions: RspackExecutorSchema) {
+  let servePath =
+    _findDefaultServePath(browserOptions.baseHref, browserOptions.deployUrl) ||
+    '/';
+  if (servePath.endsWith('/')) {
+    servePath = servePath.slice(0, -1);
+  }
+  if (!servePath.startsWith('/')) {
+    servePath = `/${servePath}`;
+  }
+
+  return servePath;
+}
+
+export function _findDefaultServePath(
+  baseHref?: string,
+  deployUrl?: string
+): string | null {
+  if (!baseHref && !deployUrl) {
+    return '';
+  }
+
+  if (
+    /^(\w+:)?\/\//.test(baseHref || '') ||
+    /^(\w+:)?\/\//.test(deployUrl || '')
+  ) {
+    // If baseHref or deployUrl is absolute, unsupported by nx serve
+    return null;
+  }
+
+  // normalize baseHref
+  // for nx serve the starting base is always `/` so a relative
+  // and root relative value are identical
+  const baseHrefParts = (baseHref || '')
+    .split('/')
+    .filter((part) => part !== '');
+  if (baseHref && !baseHref.endsWith('/')) {
+    baseHrefParts.pop();
+  }
+  const normalizedBaseHref =
+    baseHrefParts.length === 0 ? '/' : `/${baseHrefParts.join('/')}/`;
+
+  if (deployUrl && deployUrl[0] === '/') {
+    if (baseHref && baseHref[0] === '/' && normalizedBaseHref !== deployUrl) {
+      // If baseHref and deployUrl are root relative and not equivalent, unsupported by nx serve
+      return null;
+    }
+
+    return deployUrl;
+  }
+
+  // Join together baseHref and deployUrl
+  return `${normalizedBaseHref}${deployUrl || ''}`;
+}
diff --git a/src/executors/dev-server/schema.d.ts b/src/executors/dev-server/schema.d.ts
index 07265b6e84ea4..730b1b66b5aca 100644
--- a/src/executors/dev-server/schema.d.ts
+++ b/src/executors/dev-server/schema.d.ts
@@ -3,6 +3,10 @@ import type { Mode } from '@rspack/core';
 export interface DevServerExecutorSchema {
   buildTarget: string;
   mode?: Mode;
-
+  host?: string;
   port?: number;
+  ssl?: boolean;
+  sslKey?: string;
+  sslCert?: string;
+  publicHost?: string;
 }
diff --git a/src/executors/dev-server/schema.json b/src/executors/dev-server/schema.json
index 178eb12faf563..f8c605c749da2 100644
--- a/src/executors/dev-server/schema.json
+++ b/src/executors/dev-server/schema.json
@@ -16,8 +16,36 @@
     "mode": {
       "type": "string",
       "description": "Mode to run the server in.",
-      "enum": ["development", "production", "none"]
+      "enum": [
+        "development",
+        "production",
+        "none"
+      ]
+    },
+    "host": {
+      "type": "string",
+      "description": "Host to listen on.",
+      "default": "localhost"
+    },
+    "ssl": {
+      "type": "boolean",
+      "description": "Serve using `HTTPS`.",
+      "default": false
+    },
+    "sslKey": {
+      "type": "string",
+      "description": "SSL key to use for serving `HTTPS`."
+    },
+    "sslCert": {
+      "type": "string",
+      "description": "SSL certificate to use for serving `HTTPS`."
+    },
+    "publicHost": {
+      "type": "string",
+      "description": "Public URL where the application will be served."
     }
   },
-  "required": ["buildTarget"]
+  "required": [
+    "buildTarget"
+  ]
 }
diff --git a/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
new file mode 100644
index 0000000000000..d0ba24d81340d
--- /dev/null
+++ b/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
@@ -0,0 +1,424 @@
+import {
+  ExecutorContext,
+  logger,
+  parseTargetString,
+  readTargetOptions,
+  runExecutor,
+  workspaceRoot,
+} from '@nx/devkit';
+import {
+  combineAsyncIterables,
+  createAsyncIterable,
+} from '@nx/devkit/src/utils/async-iterable';
+import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl';
+import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
+import { cpSync, createWriteStream, existsSync } from 'fs';
+import { fork } from 'node:child_process';
+import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
+import { extname, join } from 'path';
+import {
+  getModuleFederationConfig,
+  getRemotes,
+} from '../../utils/module-federation';
+import {
+  parseStaticRemotesConfig,
+  type StaticRemotesConfig,
+} from '../../utils/module-federation/parse-static-remotes-config';
+import { startRemoteProxies } from '../../utils/module-federation/start-remote-proxies';
+import devServerExecutor from '../dev-server/dev-server.impl';
+import { DevServerExecutorSchema } from '../dev-server/schema';
+
+type ModuleFederationDevServerOptions = DevServerExecutorSchema & {
+  // Module Federation Specific Options
+  devRemotes?: (
+    | string
+    | {
+        remoteName: string;
+        configuration: string;
+      }
+  )[];
+  skipRemotes?: string[];
+  static?: boolean;
+  isInitialHost?: boolean;
+  parallel?: number;
+  staticRemotesPort?: number;
+  pathToManifestFile?: string;
+};
+
+function getBuildOptions(buildTarget: string, context: ExecutorContext) {
+  const target = parseTargetString(buildTarget, context);
+
+  const buildOptions = readTargetOptions(target, context);
+
+  return {
+    ...buildOptions,
+  };
+}
+
+function startStaticRemotesFileServer(
+  staticRemotesConfig: StaticRemotesConfig,
+  context: ExecutorContext,
+  options: ModuleFederationDevServerOptions
+) {
+  if (
+    !staticRemotesConfig.remotes ||
+    staticRemotesConfig.remotes.length === 0
+  ) {
+    return;
+  }
+  let shouldMoveToCommonLocation = false;
+  let commonOutputDirectory: string;
+  for (const app of staticRemotesConfig.remotes) {
+    const remoteBasePath = staticRemotesConfig.config[app].basePath;
+    if (!commonOutputDirectory) {
+      commonOutputDirectory = remoteBasePath;
+    } else if (commonOutputDirectory !== remoteBasePath) {
+      shouldMoveToCommonLocation = true;
+      break;
+    }
+  }
+
+  if (shouldMoveToCommonLocation) {
+    commonOutputDirectory = join(workspaceRoot, 'tmp/static-remotes');
+    for (const app of staticRemotesConfig.remotes) {
+      const remoteConfig = staticRemotesConfig.config[app];
+      cpSync(
+        remoteConfig.outputPath,
+        join(commonOutputDirectory, remoteConfig.urlSegment),
+        {
+          force: true,
+          recursive: true,
+        }
+      );
+    }
+  }
+
+  const staticRemotesIter = fileServerExecutor(
+    {
+      cors: true,
+      watch: false,
+      staticFilePath: commonOutputDirectory,
+      parallel: false,
+      spa: false,
+      withDeps: false,
+      host: options.host,
+      port: options.staticRemotesPort,
+      ssl: options.ssl,
+      sslCert: options.sslCert,
+      sslKey: options.sslKey,
+      cacheSeconds: -1,
+    },
+    context
+  );
+
+  return staticRemotesIter;
+}
+
+async function startRemotes(
+  remotes: string[],
+  context: ExecutorContext,
+  options: ModuleFederationDevServerOptions,
+  target: 'serve' | 'serve-static' = 'serve'
+) {
+  const remoteIters: AsyncIterable<{ success: boolean }>[] = [];
+
+  for (const app of remotes) {
+    const remoteProjectServeTarget =
+      context.projectGraph.nodes[app].data.targets[target];
+    const isUsingModuleFederationDevServerExecutor =
+      remoteProjectServeTarget.executor.includes(
+        'module-federation-dev-server'
+      );
+
+    const configurationOverride = options.devRemotes?.find(
+      (
+        r
+      ): r is {
+        remoteName: string;
+        configuration: string;
+      } => typeof r !== 'string' && r.remoteName === app
+    )?.configuration;
+
+    const defaultOverrides = {
+      ...(options.host ? { host: options.host } : {}),
+      ...(options.ssl ? { ssl: options.ssl } : {}),
+      ...(options.sslCert ? { sslCert: options.sslCert } : {}),
+      ...(options.sslKey ? { sslKey: options.sslKey } : {}),
+    };
+    const overrides =
+      target === 'serve'
+        ? {
+            watch: true,
+            ...(isUsingModuleFederationDevServerExecutor
+              ? { isInitialHost: false }
+              : {}),
+            ...defaultOverrides,
+          }
+        : { ...defaultOverrides };
+
+    remoteIters.push(
+      await runExecutor(
+        {
+          project: app,
+          target,
+          configuration: configurationOverride ?? context.configurationName,
+        },
+        overrides,
+        context
+      )
+    );
+  }
+  return remoteIters;
+}
+
+async function buildStaticRemotes(
+  staticRemotesConfig: StaticRemotesConfig,
+  nxBin,
+  context: ExecutorContext,
+  options: ModuleFederationDevServerOptions
+) {
+  if (!staticRemotesConfig.remotes.length) {
+    return;
+  }
+  logger.info(
+    `NX Building ${staticRemotesConfig.remotes.length} static remotes...`
+  );
+  const mappedLocationOfRemotes: Record<string, string> = {};
+
+  for (const app of staticRemotesConfig.remotes) {
+    mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${
+      options.host
+    }:${options.staticRemotesPort}/${
+      staticRemotesConfig.config[app].urlSegment
+    }`;
+  }
+
+  await new Promise<void>((res, rej) => {
+    const staticProcess = fork(
+      nxBin,
+      [
+        'run-many',
+        `--target=build`,
+        `--projects=${staticRemotesConfig.remotes.join(',')}`,
+        ...(context.configurationName
+          ? [`--configuration=${context.configurationName}`]
+          : []),
+        ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
+      ],
+      {
+        cwd: context.root,
+        stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+      }
+    );
+
+    // File to debug build failures e.g. 2024-01-01T00_00_0_0Z-build.log'
+    const remoteBuildLogFile = join(
+      workspaceDataDirectory,
+      // eslint-disable-next-line
+      `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`
+    );
+    const stdoutStream = createWriteStream(remoteBuildLogFile);
+
+    staticProcess.stdout.on('data', (data) => {
+      const ANSII_CODE_REGEX =
+        // eslint-disable-next-line no-control-regex
+        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+      const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
+      stdoutStream.write(stdoutString);
+
+      // in addition to writing into the stdout stream, also show error directly in console
+      // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
+      if (stdoutString.includes('ERROR in')) {
+        logger.log(stdoutString);
+      }
+
+      if (stdoutString.includes('Successfully ran target build')) {
+        staticProcess.stdout.removeAllListeners('data');
+        logger.info(
+          `NX Built ${staticRemotesConfig.remotes.length} static remotes`
+        );
+        res();
+      }
+    });
+    staticProcess.stderr.on('data', (data) => logger.info(data.toString()));
+    staticProcess.once('exit', (code) => {
+      stdoutStream.end();
+      staticProcess.stdout.removeAllListeners('data');
+      staticProcess.stderr.removeAllListeners('data');
+      if (code !== 0) {
+        rej(
+          `Remote failed to start. A complete log can be found in: ${remoteBuildLogFile}`
+        );
+      } else {
+        res();
+      }
+    });
+    process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
+    process.on('exit', () => staticProcess.kill('SIGTERM'));
+  });
+
+  return mappedLocationOfRemotes;
+}
+
+export default async function* moduleFederationDevServer(
+  options: ModuleFederationDevServerOptions,
+  context: ExecutorContext
+): AsyncIterableIterator<{ success: boolean; baseUrl?: string }> {
+  // Force Node to resolve to look for the nx binary that is inside node_modules
+  const nxBin = require.resolve('nx/bin/nx');
+  const currIter = options.static
+    ? fileServerExecutor(
+        {
+          ...options,
+          parallel: false,
+          withDeps: false,
+          spa: false,
+          cors: true,
+          cacheSeconds: -1,
+        },
+        context
+      )
+    : devServerExecutor(options, context);
+
+  const p = context.projectsConfigurations.projects[context.projectName];
+  const buildOptions = getBuildOptions(options.buildTarget, context);
+
+  let pathToManifestFile = join(
+    context.root,
+    p.sourceRoot,
+    'assets/module-federation.manifest.json'
+  );
+  if (options.pathToManifestFile) {
+    const userPathToManifestFile = join(
+      context.root,
+      options.pathToManifestFile
+    );
+    if (!existsSync(userPathToManifestFile)) {
+      throw new Error(
+        `The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`
+      );
+    } else if (extname(options.pathToManifestFile) !== '.json') {
+      throw new Error(
+        `The Module Federation manifest file must be a JSON. Please ensure the file at ${userPathToManifestFile} is a JSON.`
+      );
+    }
+
+    pathToManifestFile = userPathToManifestFile;
+  }
+
+  if (!options.isInitialHost) {
+    return yield* currIter;
+  }
+
+  const moduleFederationConfig = getModuleFederationConfig(
+    buildOptions.tsConfig,
+    context.root,
+    p.root,
+    'react'
+  );
+
+  const remoteNames = options.devRemotes?.map((r) =>
+    typeof r === 'string' ? r : r.remoteName
+  );
+
+  const remotes = getRemotes(
+    remoteNames,
+    options.skipRemotes,
+    moduleFederationConfig,
+    {
+      projectName: context.projectName,
+      projectGraph: context.projectGraph,
+      root: context.root,
+    },
+    pathToManifestFile
+  );
+  options.staticRemotesPort ??= remotes.staticRemotePort;
+
+  // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
+  process.env.NX_MF_DEV_REMOTES = JSON.stringify([
+    ...(remotes.devRemotes.map((r) =>
+      typeof r === 'string' ? r : r.remoteName
+    ) ?? []),
+    p.name,
+  ]);
+
+  const staticRemotesConfig = parseStaticRemotesConfig(
+    [...remotes.staticRemotes, ...remotes.dynamicRemotes],
+    context
+  );
+  const mappedLocationsOfStaticRemotes = await buildStaticRemotes(
+    staticRemotesConfig,
+    nxBin,
+    context,
+    options
+  );
+
+  const devRemoteIters = await startRemotes(
+    remotes.devRemotes,
+    context,
+    options,
+    'serve'
+  );
+
+  const staticRemotesIter = startStaticRemotesFileServer(
+    staticRemotesConfig,
+    context,
+    options
+  );
+
+  startRemoteProxies(
+    staticRemotesConfig,
+    mappedLocationsOfStaticRemotes,
+    options.ssl
+      ? {
+          pathToCert: join(workspaceRoot, options.sslCert),
+          pathToKey: join(workspaceRoot, options.sslKey),
+        }
+      : undefined
+  );
+
+  return yield* combineAsyncIterables(
+    currIter,
+    ...devRemoteIters,
+    ...(staticRemotesIter ? [staticRemotesIter] : []),
+    createAsyncIterable<{ success: true; baseUrl: string }>(
+      async ({ next, done }) => {
+        if (!options.isInitialHost) {
+          done();
+          return;
+        }
+        if (remotes.remotePorts.length === 0) {
+          done();
+          return;
+        }
+        try {
+          const host = options.host ?? 'localhost';
+          const baseUrl = `http${options.ssl ? 's' : ''}://${host}:${
+            options.port
+          }`;
+          const portsToWaitFor = staticRemotesIter
+            ? [options.staticRemotesPort, ...remotes.remotePorts]
+            : [...remotes.remotePorts];
+          await Promise.all(
+            portsToWaitFor.map((port) =>
+              waitForPortOpen(port, {
+                retries: 480,
+                retryDelay: 2500,
+                host: host,
+              })
+            )
+          );
+
+          logger.info(`NX All remotes started, server ready at ${baseUrl}`);
+          next({ success: true, baseUrl: baseUrl });
+        } catch (err) {
+          throw new Error(
+            `Failed to start remotes. Check above for any errors.`
+          );
+        } finally {
+          done();
+        }
+      }
+    )
+  );
+}
diff --git a/src/executors/module-federation-dev-server/schema.json b/src/executors/module-federation-dev-server/schema.json
new file mode 100644
index 0000000000000..b507657924e69
--- /dev/null
+++ b/src/executors/module-federation-dev-server/schema.json
@@ -0,0 +1,100 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "title": "Rspack Module Federation Dev Server",
+  "description": "Serve a module federation application.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "devRemotes": {
+      "type": "array",
+      "items": {
+        "oneOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "remoteName": {
+                "type": "string"
+              },
+              "configuration": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "remoteName"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "description": "List of remote applications to run in development mode (i.e. using serve target).",
+      "x-priority": "important"
+    },
+    "skipRemotes": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of remote applications to not automatically serve, either statically or in development mode. This will not remove the remotes from the `module-federation.config` file, and therefore the application may still try to fetch these remotes.\nThis option is useful if you have other means for serving the `remote` application(s).\n**NOTE:** Remotes that are not in the workspace will be skipped automatically.",
+      "x-priority": "important"
+    },
+    "buildTarget": {
+      "type": "string",
+      "description": "Target which builds the application.",
+      "x-priority": "important"
+    },
+    "port": {
+      "type": "number",
+      "description": "Port to listen on.",
+      "default": 4200,
+      "x-priority": "important"
+    },
+    "host": {
+      "type": "string",
+      "description": "Host to listen on.",
+      "default": "localhost"
+    },
+    "ssl": {
+      "type": "boolean",
+      "description": "Serve using `HTTPS`.",
+      "default": false
+    },
+    "sslKey": {
+      "type": "string",
+      "description": "SSL key to use for serving `HTTPS`."
+    },
+    "sslCert": {
+      "type": "string",
+      "description": "SSL certificate to use for serving `HTTPS`."
+    },
+    "publicHost": {
+      "type": "string",
+      "description": "Public URL where the application will be served."
+    },
+    "static": {
+      "type": "boolean",
+      "description": "Whether to use a static file server instead of the rspack-dev-server. This should be used for remote applications that are also host applications."
+    },
+    "isInitialHost": {
+      "type": "boolean",
+      "description": "Whether the host that is running this executor is the first in the project tree to do so.",
+      "default": true,
+      "x-priority": "internal"
+    },
+    "parallel": {
+      "type": "number",
+      "description": "Max number of parallel processes for building static remotes"
+    },
+    "staticRemotesPort": {
+      "type": "number",
+      "description": "The port at which to serve the file-server for the static remotes."
+    },
+    "pathToManifestFile": {
+      "type": "string",
+      "description": "Path to a Module Federation manifest file (e.g. `my/path/to/module-federation.manifest.json`) containing the dynamic remote applications relative to the workspace root."
+    }
+  }
+}
diff --git a/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts b/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
new file mode 100644
index 0000000000000..5301a26a4f8d7
--- /dev/null
+++ b/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
@@ -0,0 +1,406 @@
+import {
+  ExecutorContext,
+  logger,
+  parseTargetString,
+  readTargetOptions,
+  runExecutor,
+  workspaceRoot,
+} from '@nx/devkit';
+import { extname, join } from 'path';
+import {
+  getModuleFederationConfig,
+  getRemotes,
+} from '../../utils/module-federation';
+import { RspackSsrDevServerOptions } from '../ssr-dev-server/schema';
+import ssrDevServerExecutor from '../ssr-dev-server/ssr-dev-server.impl';
+
+import {
+  combineAsyncIterables,
+  createAsyncIterable,
+} from '@nx/devkit/src/utils/async-iterable';
+import { fork } from 'child_process';
+import { cpSync, createWriteStream, existsSync } from 'fs';
+
+import {
+  parseStaticSsrRemotesConfig,
+  type StaticRemotesConfig,
+} from '../../utils/module-federation/parse-static-remotes-config';
+
+import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl';
+import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
+import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
+import { startSsrRemoteProxies } from '../../utils/module-federation/start-ssr-remote-proxies';
+
+type ModuleFederationSsrDevServerOptions = RspackSsrDevServerOptions & {
+  devRemotes?: (
+    | string
+    | {
+        remoteName: string;
+        configuration: string;
+      }
+  )[];
+
+  skipRemotes?: string[];
+  host: string;
+  pathToManifestFile?: string;
+  staticRemotesPort?: number;
+  parallel?: number;
+  ssl?: boolean;
+  sslKey?: string;
+  sslCert?: string;
+  isInitialHost?: boolean;
+};
+
+function normalizeOptions(
+  options: ModuleFederationSsrDevServerOptions
+): ModuleFederationSsrDevServerOptions {
+  return {
+    ...options,
+    ssl: options.ssl ?? false,
+    sslCert: options.sslCert ? join(workspaceRoot, options.sslCert) : undefined,
+    sslKey: options.sslKey ? join(workspaceRoot, options.sslKey) : undefined,
+  };
+}
+
+function getBuildOptions(buildTarget: string, context: ExecutorContext) {
+  const target = parseTargetString(buildTarget, context);
+
+  const buildOptions = readTargetOptions(target, context);
+
+  return {
+    ...buildOptions,
+  };
+}
+
+function startSsrStaticRemotesFileServer(
+  ssrStaticRemotesConfig: StaticRemotesConfig,
+  context: ExecutorContext,
+  options: ModuleFederationSsrDevServerOptions
+) {
+  if (ssrStaticRemotesConfig.remotes.length === 0) {
+    return;
+  }
+
+  // The directories are usually generated with /browser and /server suffixes so we need to copy them to a common directory
+  const commonOutputDirectory = join(workspaceRoot, 'tmp/static-remotes');
+  for (const app of ssrStaticRemotesConfig.remotes) {
+    const remoteConfig = ssrStaticRemotesConfig.config[app];
+
+    cpSync(
+      remoteConfig.outputPath,
+      join(commonOutputDirectory, remoteConfig.urlSegment),
+      {
+        force: true,
+        recursive: true,
+      }
+    );
+  }
+
+  const staticRemotesIter = fileServerExecutor(
+    {
+      cors: true,
+      watch: false,
+      staticFilePath: commonOutputDirectory,
+      parallel: false,
+      spa: false,
+      withDeps: false,
+      host: options.host,
+      port: options.staticRemotesPort,
+      ssl: options.ssl,
+      sslCert: options.sslCert,
+      sslKey: options.sslKey,
+      cacheSeconds: -1,
+    },
+    context
+  );
+
+  return staticRemotesIter;
+}
+
+async function startRemotes(
+  remotes: string[],
+  context: ExecutorContext,
+  options: ModuleFederationSsrDevServerOptions
+) {
+  const remoteIters: AsyncIterable<{ success: boolean }>[] = [];
+  const target = 'serve';
+  for (const app of remotes) {
+    const remoteProjectServeTarget =
+      context.projectGraph.nodes[app].data.targets[target];
+    const isUsingModuleFederationSsrDevServerExecutor =
+      remoteProjectServeTarget.executor.includes(
+        'module-federation-ssr-dev-server'
+      );
+
+    const configurationOverride = options.devRemotes?.find(
+      (remote): remote is { remoteName: string; configuration: string } =>
+        typeof remote !== 'string' && remote.remoteName === app
+    )?.configuration;
+    {
+      const defaultOverrides = {
+        ...(options.host ? { host: options.host } : {}),
+        ...(options.ssl ? { ssl: options.ssl } : {}),
+        ...(options.sslCert ? { sslCert: options.sslCert } : {}),
+        ...(options.sslKey ? { sslKey: options.sslKey } : {}),
+      };
+
+      const overrides = {
+        watch: true,
+        ...defaultOverrides,
+        ...(isUsingModuleFederationSsrDevServerExecutor
+          ? { isInitialHost: false }
+          : {}),
+      };
+
+      remoteIters.push(
+        await runExecutor(
+          {
+            project: app,
+            target,
+            configuration: configurationOverride ?? context.configurationName,
+          },
+          overrides,
+          context
+        )
+      );
+    }
+  }
+  return remoteIters;
+}
+
+async function buildSsrStaticRemotes(
+  staticRemotesConfig: StaticRemotesConfig,
+  nxBin,
+  context: ExecutorContext,
+  options: ModuleFederationSsrDevServerOptions
+) {
+  if (!staticRemotesConfig.remotes.length) {
+    return;
+  }
+
+  logger.info(
+    `Nx is building ${staticRemotesConfig.remotes.length} static remotes...`
+  );
+  const mapLocationOfRemotes: Record<string, string> = {};
+
+  for (const remoteApp of staticRemotesConfig.remotes) {
+    mapLocationOfRemotes[remoteApp] = `http${options.ssl ? 's' : ''}://${
+      options.host
+    }:${options.staticRemotesPort}/${
+      staticRemotesConfig.config[remoteApp].urlSegment
+    }`;
+  }
+
+  await new Promise<void>((resolve) => {
+    const childProcess = fork(
+      nxBin,
+      [
+        'run-many',
+        '--target=server',
+        '--projects',
+        staticRemotesConfig.remotes.join(','),
+        ...(context.configurationName
+          ? [`--configuration=${context.configurationName}`]
+          : []),
+        ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
+      ],
+      {
+        cwd: context.root,
+        stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+      }
+    );
+
+    // Add a listener to the child process to capture the build log
+    const remoteBuildLogFile = join(
+      workspaceDataDirectory,
+      // eslint-disable-next-line
+      `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`
+    );
+
+    const remoteBuildLogStream = createWriteStream(remoteBuildLogFile);
+
+    childProcess.stdout.on('data', (data) => {
+      const ANSII_CODE_REGEX =
+        // eslint-disable-next-line no-control-regex
+        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+      const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
+      remoteBuildLogStream.write(stdoutString);
+
+      // in addition to writing into the stdout stream, also show error directly in console
+      // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
+      if (stdoutString.includes('ERROR in')) {
+        logger.log(stdoutString);
+      }
+
+      if (stdoutString.includes('Successfully ran target server')) {
+        childProcess.stdout.removeAllListeners('data');
+        logger.info(
+          `Nx Built ${staticRemotesConfig.remotes.length} static remotes.`
+        );
+        resolve();
+      }
+    });
+
+    process.on('SIGTERM', () => childProcess.kill('SIGTERM'));
+    process.on('exit', () => childProcess.kill('SIGTERM'));
+  });
+  return mapLocationOfRemotes;
+}
+
+export default async function* moduleFederationSsrDevServer(
+  ssrDevServerOptions: ModuleFederationSsrDevServerOptions,
+  context: ExecutorContext
+) {
+  const options = normalizeOptions(ssrDevServerOptions);
+  // Force Node to resolve to look for the nx binary that is inside node_modules
+  const nxBin = require.resolve('nx/bin/nx');
+  const iter = ssrDevServerExecutor(options, context);
+  const projectConfig =
+    context.projectsConfigurations.projects[context.projectName];
+  const buildOptions = getBuildOptions(options.browserTarget, context);
+
+  let pathToManifestFile = join(
+    context.root,
+    projectConfig.sourceRoot,
+    'assets/module-federation.manifest.json'
+  );
+
+  if (options.pathToManifestFile) {
+    const userPathToManifestFile = join(
+      context.root,
+      options.pathToManifestFile
+    );
+
+    if (!existsSync(userPathToManifestFile)) {
+      throw new Error(
+        `The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`
+      );
+    } else if (extname(userPathToManifestFile) !== '.json') {
+      throw new Error(
+        `The Module Federation manifest file must be a JSON. Please ensure the file at ${userPathToManifestFile} is a JSON.`
+      );
+    }
+    pathToManifestFile = userPathToManifestFile;
+  }
+
+  if (!options.isInitialHost) {
+    return yield* iter;
+  }
+
+  const moduleFederationConfig = getModuleFederationConfig(
+    buildOptions.tsConfig,
+    context.root,
+    projectConfig.root,
+    'react'
+  );
+
+  const remoteNames = options.devRemotes?.map((remote) =>
+    typeof remote === 'string' ? remote : remote.remoteName
+  );
+
+  const remotes = getRemotes(
+    remoteNames,
+    options.skipRemotes,
+    moduleFederationConfig,
+    {
+      projectName: context.projectName,
+      projectGraph: context.projectGraph,
+      root: context.root,
+    },
+    pathToManifestFile
+  );
+
+  options.staticRemotesPort ??= remotes.staticRemotePort;
+
+  process.env.NX_MF_DEV_REMOTES = JSON.stringify([
+    ...(remotes.devRemotes.map((r) =>
+      typeof r === 'string' ? r : r.remoteName
+    ) ?? []),
+    projectConfig.name,
+  ]);
+
+  const staticRemotesConfig = parseStaticSsrRemotesConfig(
+    [...remotes.staticRemotes, ...remotes.dynamicRemotes],
+    context
+  );
+
+  const mappedLocationsOfStaticRemotes = await buildSsrStaticRemotes(
+    staticRemotesConfig,
+    nxBin,
+    context,
+    options
+  );
+
+  const devRemoteIters = await startRemotes(
+    remotes.devRemotes,
+    context,
+    options
+  );
+
+  const staticRemotesIter = startSsrStaticRemotesFileServer(
+    staticRemotesConfig,
+    context,
+    options
+  );
+
+  startSsrRemoteProxies(
+    staticRemotesConfig,
+    mappedLocationsOfStaticRemotes,
+    options.ssl
+      ? {
+          pathToCert: options.sslCert,
+          pathToKey: options.sslKey,
+        }
+      : undefined
+  );
+
+  return yield* combineAsyncIterables(
+    iter,
+    ...devRemoteIters,
+    ...(staticRemotesIter ? [staticRemotesIter] : []),
+    createAsyncIterable<{ success: true; baseUrl: string }>(
+      async ({ next, done }) => {
+        if (!options.isInitialHost) {
+          done();
+          return;
+        }
+
+        if (remotes.remotePorts.length === 0) {
+          done();
+          return;
+        }
+
+        try {
+          const host = options.host ?? 'localhost';
+          const baseUrl = `http${options.ssl ? 's' : ''}://${host}:${
+            options.port
+          }`;
+          const portsToWaitFor = staticRemotesIter
+            ? [options.staticRemotesPort, ...remotes.remotePorts]
+            : [...remotes.remotePorts];
+
+          await Promise.all(
+            portsToWaitFor.map((port) =>
+              waitForPortOpen(port, {
+                retries: 480,
+                retryDelay: 2500,
+                host,
+              })
+            )
+          );
+
+          logger.info(
+            `Nx all ssr remotes have started, server ready at ${baseUrl}`
+          );
+          next({ success: true, baseUrl });
+        } catch (error) {
+          throw new Error(
+            `Nx failed to start ssr remotes. Check above for errors.`
+          );
+        } finally {
+          done();
+        }
+      }
+    )
+  );
+}
diff --git a/src/executors/module-federation-ssr-dev-server/schema.json b/src/executors/module-federation-ssr-dev-server/schema.json
new file mode 100644
index 0000000000000..db2c9ce882671
--- /dev/null
+++ b/src/executors/module-federation-ssr-dev-server/schema.json
@@ -0,0 +1,82 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "title": "Module Federation SSR Dev Server",
+  "description": "Serve a SSR host application along with its known remotes.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "browserTarget": {
+      "type": "string",
+      "description": "Target which builds the browser application.",
+      "x-priority": "important"
+    },
+    "serverTarget": {
+      "type": "string",
+      "description": "Target which builds the server application.",
+      "x-priority": "important"
+    },
+    "port": {
+      "type": "number",
+      "description": "The port to be set on `process.env.PORT` for use in the server.",
+      "default": 4200,
+      "x-priority": "important"
+    },
+    "devRemotes": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of remote applications to run in development mode (i.e. using serve target).",
+      "x-priority": "important"
+    },
+    "skipRemotes": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of remote applications to not automatically serve, either statically or in development mode.",
+      "x-priority": "important"
+    },
+    "host": {
+      "type": "string",
+      "description": "Host to listen on.",
+      "default": "localhost"
+    },
+    "staticRemotesPort": {
+      "type": "number",
+      "description": "The port at which to serve the file-server for the static remotes."
+    },
+    "pathToManifestFile": {
+      "type": "string",
+      "description": "Path to a Module Federation manifest file (e.g. `my/path/to/module-federation.manifest.json`) containing the dynamic remote applications relative to the workspace root."
+    },
+    "ssl": {
+      "type": "boolean",
+      "description": "Serve using HTTPS.",
+      "default": false
+    },
+    "sslKey": {
+      "type": "string",
+      "description": "SSL key to use for serving HTTPS."
+    },
+    "sslCert": {
+      "type": "string",
+      "description": "SSL certificate to use for serving HTTPS."
+    },
+    "publicHost": {
+      "type": "string",
+      "description": "Public URL where the application will be served."
+    },
+    "isInitialHost": {
+      "type": "boolean",
+      "description": "Whether the host that is running this executor is the first in the project tree to do so.",
+      "default": true,
+      "x-priority": "internal"
+    }
+  },
+  "required": [
+    "browserTarget",
+    "serverTarget"
+  ]
+}
diff --git a/src/executors/rspack/rspack.impl.ts b/src/executors/rspack/rspack.impl.ts
index 8179da525d4da..afcd885ddc7fd 100644
--- a/src/executors/rspack/rspack.impl.ts
+++ b/src/executors/rspack/rspack.impl.ts
@@ -1,12 +1,12 @@
 import { ExecutorContext, logger } from '@nx/devkit';
 import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
+import { printDiagnostics, runTypeCheck } from '@nx/js';
 import { Compiler, MultiCompiler, MultiStats, Stats } from '@rspack/core';
 import { rmSync } from 'fs';
 import * as path from 'path';
 import { createCompiler, isMultiCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { RspackExecutorSchema } from './schema';
-import { printDiagnostics, runTypeCheck } from '@nx/js';
 
 export default async function* runExecutor(
   options: RspackExecutorSchema,
@@ -27,7 +27,7 @@ export default async function* runExecutor(
     force: true,
     recursive: true,
   });
-  
+
   const compiler = await createCompiler(options, context);
 
   const iterable = createAsyncIterable<{
@@ -49,7 +49,7 @@ export default async function* runExecutor(
             return;
           }
 
-					const statsOptions = getStatsOptions(compiler);
+          const statsOptions = getStatsOptions(compiler);
           const printedStats = stats.toString(statsOptions);
           // Avoid extra empty line when `stats: 'none'`
           if (printedStats) {
@@ -114,13 +114,12 @@ function registerCleanupCallback(callback: () => void) {
   process.on('exit', wrapped);
 }
 
-
 async function executeTypeCheck(
   options: RspackExecutorSchema,
   context: ExecutorContext
 ) {
   const projectConfiguration =
-  context.projectsConfigurations!.projects[context.projectName!];
+    context.projectGraph.nodes[context.projectName].data;
   const result = await runTypeCheck({
     workspaceRoot: path.resolve(projectConfiguration.root),
     tsConfigPath: options.tsConfig,
@@ -136,10 +135,12 @@ async function executeTypeCheck(
 
 function getStatsOptions(compiler: Compiler | MultiCompiler) {
   return isMultiCompiler(compiler)
-  ? {
-      children: compiler.compilers.map(compiler => compiler.options ? compiler.options.stats : undefined)
-    }
-  : compiler.options
-  ? compiler.options.stats
-  : undefined;
-}
\ No newline at end of file
+    ? {
+        children: compiler.compilers.map((compiler) =>
+          compiler.options ? compiler.options.stats : undefined
+        ),
+      }
+    : compiler.options
+    ? compiler.options.stats
+    : undefined;
+}
diff --git a/src/executors/rspack/schema.d.ts b/src/executors/rspack/schema.d.ts
index caa5d27ab1687..fbc07402b5096 100644
--- a/src/executors/rspack/schema.d.ts
+++ b/src/executors/rspack/schema.d.ts
@@ -1,7 +1,9 @@
 import type { Mode } from '@rspack/core';
+
 export interface RspackExecutorSchema {
   target: 'web' | 'node';
   main: string;
+  index?: string;
   tsConfig: string;
   typeCheck?: boolean;
   outputPath: string;
@@ -9,9 +11,11 @@ export interface RspackExecutorSchema {
   indexHtml?: string;
   mode?: Mode;
   watch?: boolean;
+  baseHref?: string;
+  deployUrl?: string;
 
   rspackConfig: string;
-  optimization?: boolean;
+  optimization?: boolean | OptimizationOptions;
   sourceMap?: boolean | string;
   assets?: any[];
   extractLicenses?: boolean;
@@ -23,3 +27,8 @@ export interface FileReplacement {
   replace: string;
   with: string;
 }
+
+export interface OptimizationOptions {
+  scripts: boolean;
+  styles: boolean;
+}
diff --git a/src/executors/rspack/schema.json b/src/executors/rspack/schema.json
index 31fc3499f2e45..c51421bb07201 100644
--- a/src/executors/rspack/schema.json
+++ b/src/executors/rspack/schema.json
@@ -8,7 +8,10 @@
     "target": {
       "type": "string",
       "description": "The platform to target (e.g. web, node).",
-      "enum": ["web", "node"]
+      "enum": [
+        "web",
+        "node"
+      ]
     },
     "main": {
       "type": "string",
@@ -34,13 +37,47 @@
       "type": "string",
       "description": "The path to the index.html file."
     },
+    "index": {
+      "type": "string",
+      "description": "HTML File which will be contain the application.",
+      "x-completion-type": "file",
+      "x-completion-glob": "**/*@(.html|.htm)"
+    },
+    "baseHref": {
+      "type": "string",
+      "description": "Base url for the application being built."
+    },
+    "deployUrl": {
+      "type": "string",
+      "description": "URL where the application will be deployed."
+    },
     "rspackConfig": {
       "type": "string",
       "description": "The path to the rspack config file."
     },
     "optimization": {
-      "type": "boolean",
-      "description": "Enables optimization of the build output."
+      "description": "Enables optimization of the build output.",
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Enables optimization of the scripts output.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Enables optimization of the styles output.",
+              "default": true
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "sourceMap": {
       "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
@@ -85,21 +122,34 @@
           }
         },
         "additionalProperties": false,
-        "required": ["replace", "with"]
+        "required": [
+          "replace",
+          "with"
+        ]
       },
       "default": []
     },
     "mode": {
       "type": "string",
       "description": "Mode to run the build in.",
-      "enum": ["development", "production", "none"]
+      "enum": [
+        "development",
+        "production",
+        "none"
+      ]
     },
     "generatePackageJson": {
       "type": "boolean",
       "description": "Generates a `package.json` and pruned lock file with the project's `node_module` dependencies populated for installing in a container. If a `package.json` exists in the project's directory, it will be reused with dependencies populated."
     }
   },
-  "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
+  "required": [
+    "target",
+    "main",
+    "outputPath",
+    "tsConfig",
+    "rspackConfig"
+  ],
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -132,7 +182,11 @@
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": [
+            "glob",
+            "input",
+            "output"
+          ]
         },
         {
           "type": "string"
diff --git a/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts b/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
new file mode 100644
index 0000000000000..35de9978cddd0
--- /dev/null
+++ b/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
@@ -0,0 +1,38 @@
+import * as net from 'net';
+
+export function waitUntilServerIsListening(port: number): Promise<void> {
+  const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET'];
+  const maxAttempts = 25;
+  let attempts = 0;
+  const client = new net.Socket();
+  const cleanup = () => {
+    client.removeAllListeners('connect');
+    client.removeAllListeners('error');
+    client.end();
+    client.destroy();
+    client.unref();
+  };
+
+  return new Promise<void>((resolve, reject) => {
+    const listen = () => {
+      client.once('connect', () => {
+        cleanup();
+        resolve();
+      });
+      client.on('error', (err) => {
+        if (
+          attempts > maxAttempts ||
+          !allowedErrorCodes.includes(err['code'])
+        ) {
+          cleanup();
+          reject(err);
+        } else {
+          attempts++;
+          setTimeout(listen, 100 * attempts);
+        }
+      });
+      client.connect({ port, host: 'localhost' });
+    };
+    listen();
+  });
+}
diff --git a/src/executors/ssr-dev-server/schema.d.ts b/src/executors/ssr-dev-server/schema.d.ts
new file mode 100644
index 0000000000000..ee03668413a03
--- /dev/null
+++ b/src/executors/ssr-dev-server/schema.d.ts
@@ -0,0 +1,11 @@
+interface TargetOptions {
+  [key: string]: string | boolean | number | TargetOptions;
+}
+
+export interface RspackSsrDevServerOptions {
+  browserTarget: string;
+  serverTarget: string;
+  port: number;
+  browserTargetOptions: TargetOptions;
+  serverTargetOptions: TargetOptions;
+}
diff --git a/src/executors/ssr-dev-server/schema.json b/src/executors/ssr-dev-server/schema.json
new file mode 100644
index 0000000000000..dfa4f20810b4d
--- /dev/null
+++ b/src/executors/ssr-dev-server/schema.json
@@ -0,0 +1,39 @@
+{
+  "outputCapture": "direct-nodejs",
+  "title": "Rspack SSR Dev Server",
+  "description": "Serve a SSR application using rspack.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "browserTarget": {
+      "type": "string",
+      "description": "Target which builds the browser application.",
+      "x-priority": "important"
+    },
+    "serverTarget": {
+      "type": "string",
+      "description": "Target which builds the server application.",
+      "x-priority": "important"
+    },
+    "port": {
+      "type": "number",
+      "description": "The port to be set on `process.env.PORT` for use in the server.",
+      "default": 4200,
+      "x-priority": "important"
+    },
+    "browserTargetOptions": {
+      "type": "object",
+      "description": "Additional options to pass into the browser build target.",
+      "default": {}
+    },
+    "serverTargetOptions": {
+      "type": "object",
+      "description": "Additional options to pass into the server build target.",
+      "default": {}
+    }
+  },
+  "required": [
+    "browserTarget",
+    "serverTarget"
+  ]
+}
diff --git a/src/executors/ssr-dev-server/ssr-dev-server.impl.ts b/src/executors/ssr-dev-server/ssr-dev-server.impl.ts
new file mode 100644
index 0000000000000..92f614abb07a4
--- /dev/null
+++ b/src/executors/ssr-dev-server/ssr-dev-server.impl.ts
@@ -0,0 +1,75 @@
+import {
+  ExecutorContext,
+  parseTargetString,
+  readTargetOptions,
+  runExecutor,
+} from '@nx/devkit';
+import { combineAsyncIterables } from '@nx/devkit/src/utils/async-iterable';
+import * as chalk from 'chalk';
+
+import { RspackExecutorSchema } from '../rspack/schema';
+import { waitUntilServerIsListening } from './lib/wait-until-server-is-listening';
+import { RspackSsrDevServerOptions, TargetOptions } from './schema';
+
+export async function* ssrDevServerExecutor(
+  options: RspackSsrDevServerOptions,
+  context: ExecutorContext
+) {
+  const browserTarget = parseTargetString(
+    options.browserTarget,
+    context.projectGraph
+  );
+  const serverTarget = parseTargetString(options.serverTarget, context);
+  const browserOptions = readTargetOptions<RspackExecutorSchema>(
+    browserTarget,
+    context
+  );
+  const serverOptions = readTargetOptions<RspackExecutorSchema>(
+    serverTarget,
+    context
+  );
+
+  const runBrowser = await runExecutor<{
+    success: boolean;
+    baseUrl?: string;
+    options: TargetOptions;
+  }>(
+    browserTarget,
+    { ...browserOptions, ...options.browserTargetOptions },
+    context
+  );
+  const runServer = await runExecutor<{
+    success: boolean;
+    baseUrl?: string;
+    options: TargetOptions;
+  }>(
+    serverTarget,
+    { ...serverOptions, ...options.serverTargetOptions },
+    context
+  );
+  let browserBuilt = false;
+  let nodeStarted = false;
+  const combined = combineAsyncIterables(runBrowser, runServer);
+
+  for await (const output of combined) {
+    if (!output.success) throw new Error('Could not build application');
+    if (output.options?.target === 'node') {
+      nodeStarted = true;
+    } else if (output.options?.target === 'web') {
+      browserBuilt = true;
+    }
+
+    if (nodeStarted && browserBuilt) {
+      await waitUntilServerIsListening(options.port);
+      console.log(
+        `[ ${chalk.green('ready')} ] on http://localhost:${options.port}`
+      );
+      yield {
+        ...output,
+        baseUrl: `http://localhost:${options.port}`,
+      };
+    }
+  }
+}
+
+export default ssrDevServerExecutor;
diff --git a/src/generators/application/application.ts b/src/generators/application/application.ts
index d4f27810978db..10e65626395a3 100644
--- a/src/generators/application/application.ts
+++ b/src/generators/application/application.ts
@@ -52,7 +52,7 @@ export default async function (
       bundler: 'webpack',
       name: options.name,
       style: options.style,
-      directorsy: options.directory,
+      directory: options.directory,
       tags: options.tags ?? '',
       unitTestRunner: options.unitTestRunner,
       e2eTestRunner: options.e2eTestRunner,
@@ -80,7 +80,7 @@ export default async function (
       bundler: 'webpack',
       name: options.name,
       style: options.style,
-      directorsy: options.directory,
+      directory: options.directory,
       tags: options.tags ?? '',
       unitTestRunner: options.unitTestRunner,
       e2eTestRunner: options.e2eTestRunner,
diff --git a/src/utils/create-compiler.ts b/src/utils/create-compiler.ts
index 151e688c2b6c9..cbe05992d0315 100644
--- a/src/utils/create-compiler.ts
+++ b/src/utils/create-compiler.ts
@@ -1,30 +1,51 @@
 import { ExecutorContext } from '@nx/devkit';
-import { Compiler, MultiCompiler, rspack } from '@rspack/core';
+import {
+  Compiler,
+  type Configuration,
+  MultiCompiler,
+  rspack,
+} from '@rspack/core';
 import * as path from 'path';
 import { RspackExecutorSchema } from '../executors/rspack/schema';
+import { resolveUserDefinedRspackConfig } from './resolve-user-defined-rspack-config';
 
 export async function createCompiler(
-  options: RspackExecutorSchema,
+  options: RspackExecutorSchema & {
+    devServer?: any;
+  },
   context: ExecutorContext
 ): Promise<Compiler | MultiCompiler> {
-  let userDefinedConfig = await import(
-    path.join(context.root, options.rspackConfig)
-  ).then((x) => x.default || x);
+  const pathToConfig = path.join(context.root, options.rspackConfig);
+  let userDefinedConfig: any = {};
+  if (options.tsConfig) {
+    userDefinedConfig = resolveUserDefinedRspackConfig(
+      pathToConfig,
+      options.tsConfig
+    );
+  } else {
+    userDefinedConfig = await import(pathToConfig).then((x) => x.default || x);
+  }
 
   if (typeof userDefinedConfig.then === 'function') {
     userDefinedConfig = await userDefinedConfig;
   }
 
-  let config = {};
-  if(typeof userDefinedConfig === 'function') {
-    config = await userDefinedConfig({}, { options, context });
+  let config: Configuration = {};
+  if (typeof userDefinedConfig === 'function') {
+    config = await userDefinedConfig(
+      { devServer: options.devServer },
+      { options, context }
+    );
   } else {
     config = userDefinedConfig;
+    config.devServer ??= options.devServer;
   }
 
   return rspack(config);
 }
 
-export function isMultiCompiler(compiler: Compiler | MultiCompiler): compiler is MultiCompiler {
-  return 'compilers' in compiler
+export function isMultiCompiler(
+  compiler: Compiler | MultiCompiler
+): compiler is MultiCompiler {
+  return 'compilers' in compiler;
 }
diff --git a/src/utils/module-federation/dependencies.spec.ts b/src/utils/module-federation/dependencies.spec.ts
new file mode 100644
index 0000000000000..3a120b7c6dfb6
--- /dev/null
+++ b/src/utils/module-federation/dependencies.spec.ts
@@ -0,0 +1,158 @@
+import * as tsUtils from './typescript';
+import { getDependentPackagesForProject } from './dependencies';
+
+describe('getDependentPackagesForProject', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should collect npm packages and workspaces libraries without duplicates', () => {
+    jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+      '@myorg/lib1': ['libs/lib1/src/index.ts'],
+      '@myorg/lib2': ['libs/lib2/src/index.ts'],
+    });
+
+    const dependencies = getDependentPackagesForProject(
+      {
+        dependencies: {
+          shell: [
+            { source: 'shell', target: 'lib1', type: 'static' },
+            { source: 'shell', target: 'lib2', type: 'static' },
+            { source: 'shell', target: 'npm:lodash', type: 'static' },
+          ],
+          lib1: [{ source: 'lib1', target: 'lib2', type: 'static' }],
+          lib2: [{ source: 'lib2', target: 'npm:lodash', type: 'static' }],
+        },
+        nodes: {
+          shell: {
+            name: 'shell',
+            data: { root: 'apps/shell', sourceRoot: 'apps/shell/src' },
+            type: 'app',
+          },
+          lib1: {
+            name: 'lib1',
+            data: { root: 'libs/lib1', sourceRoot: 'libs/lib1/src' },
+            type: 'lib',
+          },
+          lib2: {
+            name: 'lib2',
+            data: { root: 'libs/lib2', sourceRoot: 'libs/lib2/src' },
+            type: 'lib',
+          },
+        } as any,
+      },
+      'shell'
+    );
+
+    expect(dependencies).toEqual({
+      workspaceLibraries: [
+        { name: 'lib1', root: 'libs/lib1', importKey: '@myorg/lib1' },
+        { name: 'lib2', root: 'libs/lib2', importKey: '@myorg/lib2' },
+      ],
+      npmPackages: ['lodash'],
+    });
+  });
+
+  it('should collect workspaces libraries recursively', () => {
+    jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+      '@myorg/lib1': ['libs/lib1/src/index.ts'],
+      '@myorg/lib2': ['libs/lib2/src/index.ts'],
+      '@myorg/lib3': ['libs/lib3/src/index.ts'],
+    });
+
+    const dependencies = getDependentPackagesForProject(
+      {
+        dependencies: {
+          shell: [{ source: 'shell', target: 'lib1', type: 'static' }],
+          lib1: [{ source: 'lib1', target: 'lib2', type: 'static' }],
+          lib2: [{ source: 'lib2', target: 'lib3', type: 'static' }],
+        },
+        nodes: {
+          shell: {
+            name: 'shell',
+            data: { root: 'apps/shell', sourceRoot: 'apps/shell/src' },
+            type: 'app',
+          },
+          lib1: {
+            name: 'lib1',
+            data: { root: 'libs/lib1', sourceRoot: 'libs/lib1/src' },
+            type: 'lib',
+          },
+          lib2: {
+            name: 'lib2',
+            data: { root: 'libs/lib2', sourceRoot: 'libs/lib2/src' },
+            type: 'lib',
+          },
+          lib3: {
+            name: 'lib3',
+            data: { root: 'libs/lib3', sourceRoot: 'libs/lib3/src' },
+            type: 'lib',
+          },
+        } as any,
+      },
+      'shell'
+    );
+
+    expect(dependencies).toEqual({
+      workspaceLibraries: [
+        { name: 'lib1', root: 'libs/lib1', importKey: '@myorg/lib1' },
+        { name: 'lib2', root: 'libs/lib2', importKey: '@myorg/lib2' },
+        { name: 'lib3', root: 'libs/lib3', importKey: '@myorg/lib3' },
+      ],
+      npmPackages: [],
+    });
+  });
+
+  it('should ignore TS path mappings with wildcards', () => {
+    jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+      '@myorg/lib1': ['libs/lib1/src/index.ts'],
+      '@myorg/lib1/*': ['libs/lib1/src/lib/*'],
+      '@myorg/lib2': ['libs/lib2/src/index.ts'],
+      '@myorg/lib2/*': ['libs/lib2/src/lib/*'],
+      '@myorg/lib3': ['libs/lib3/src/index.ts'],
+      '@myorg/lib3/*': ['libs/lib3/src/lib/*'],
+    });
+
+    const dependencies = getDependentPackagesForProject(
+      {
+        dependencies: {
+          shell: [{ source: 'shell', target: 'lib1', type: 'static' }],
+          lib1: [{ source: 'lib1', target: 'lib2', type: 'static' }],
+          lib2: [{ source: 'lib2', target: 'lib3', type: 'static' }],
+        },
+        nodes: {
+          shell: {
+            name: 'shell',
+            data: { root: 'apps/shell', sourceRoot: 'apps/shell/src' },
+            type: 'app',
+          },
+          lib1: {
+            name: 'lib1',
+            data: { root: 'libs/lib1', sourceRoot: 'libs/lib1/src' },
+            type: 'lib',
+          },
+          lib2: {
+            name: 'lib2',
+            data: { root: 'libs/lib2', sourceRoot: 'libs/lib2/src' },
+            type: 'lib',
+          },
+          lib3: {
+            name: 'lib3',
+            data: { root: 'libs/lib3', sourceRoot: 'libs/lib3/src' },
+            type: 'lib',
+          },
+        } as any,
+      },
+      'shell'
+    );
+
+    expect(dependencies).toEqual({
+      workspaceLibraries: [
+        { name: 'lib1', root: 'libs/lib1', importKey: '@myorg/lib1' },
+        { name: 'lib2', root: 'libs/lib2', importKey: '@myorg/lib2' },
+        { name: 'lib3', root: 'libs/lib3', importKey: '@myorg/lib3' },
+      ],
+      npmPackages: [],
+    });
+  });
+});
diff --git a/src/utils/module-federation/dependencies.ts b/src/utils/module-federation/dependencies.ts
new file mode 100644
index 0000000000000..18263ecf0f29a
--- /dev/null
+++ b/src/utils/module-federation/dependencies.ts
@@ -0,0 +1,94 @@
+import type { ProjectGraph } from '@nx/devkit';
+import type { WorkspaceLibrary } from './models';
+import { readTsPathMappings } from './typescript';
+import {
+  getOutputsForTargetAndConfiguration,
+  parseTargetString,
+} from '@nx/devkit';
+
+export function getDependentPackagesForProject(
+  projectGraph: ProjectGraph,
+  name: string
+): {
+  workspaceLibraries: WorkspaceLibrary[];
+  npmPackages: string[];
+} {
+  const { npmPackages, workspaceLibraries } = collectDependencies(
+    projectGraph,
+    name
+  );
+
+  return {
+    workspaceLibraries: [...workspaceLibraries.values()],
+    npmPackages: [...npmPackages],
+  };
+}
+
+function collectDependencies(
+  projectGraph: ProjectGraph,
+  name: string,
+  dependencies = {
+    workspaceLibraries: new Map<string, WorkspaceLibrary>(),
+    npmPackages: new Set<string>(),
+  },
+  seen: Set<string> = new Set()
+): {
+  workspaceLibraries: Map<string, WorkspaceLibrary>;
+  npmPackages: Set<string>;
+} {
+  if (seen.has(name)) {
+    return dependencies;
+  }
+  seen.add(name);
+
+  (projectGraph.dependencies[name] ?? []).forEach((dependency) => {
+    if (dependency.target.startsWith('npm:')) {
+      dependencies.npmPackages.add(dependency.target.replace('npm:', ''));
+    } else {
+      dependencies.workspaceLibraries.set(dependency.target, {
+        name: dependency.target,
+        root: projectGraph.nodes[dependency.target].data.root,
+        importKey: getLibraryImportPath(dependency.target, projectGraph),
+      });
+      collectDependencies(projectGraph, dependency.target, dependencies, seen);
+    }
+  });
+
+  return dependencies;
+}
+
+function getLibraryImportPath(
+  library: string,
+  projectGraph: ProjectGraph
+): string | undefined {
+  let buildLibsFromSource = true;
+  if (process.env.NX_BUILD_LIBS_FROM_SOURCE) {
+    buildLibsFromSource = process.env.NX_BUILD_LIBS_FROM_SOURCE === 'true';
+  }
+  const libraryNode = projectGraph.nodes[library];
+  let sourceRoots = [libraryNode.data.sourceRoot];
+
+  if (!buildLibsFromSource && process.env.NX_BUILD_TARGET) {
+    const buildTarget = parseTargetString(
+      process.env.NX_BUILD_TARGET,
+      projectGraph
+    );
+    sourceRoots = getOutputsForTargetAndConfiguration(
+      buildTarget,
+      {},
+      libraryNode
+    );
+  }
+
+  const tsConfigPathMappings = readTsPathMappings();
+
+  for (const [key, value] of Object.entries(tsConfigPathMappings)) {
+    for (const src of sourceRoots) {
+      if (value.find((path) => path.startsWith(src))) {
+        return key;
+      }
+    }
+  }
+
+  return undefined;
+}
diff --git a/src/utils/module-federation/get-remotes-for-host.ts b/src/utils/module-federation/get-remotes-for-host.ts
new file mode 100644
index 0000000000000..a1f3abf617741
--- /dev/null
+++ b/src/utils/module-federation/get-remotes-for-host.ts
@@ -0,0 +1,195 @@
+import { logger, type ProjectGraph } from '@nx/devkit';
+import { registerTsProject } from '@nx/js/src/internal';
+import chalk from 'chalk';
+import { existsSync, readFileSync } from 'fs';
+import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
+import { join } from 'path';
+import { ModuleFederationConfig } from './models';
+
+interface ModuleFederationExecutorContext {
+  projectName: string;
+  projectGraph: ProjectGraph;
+  root: string;
+}
+
+function extractRemoteProjectsFromConfig(
+  config: ModuleFederationConfig,
+  pathToManifestFile?: string
+) {
+  const remotes = [];
+  const dynamicRemotes = [];
+  if (pathToManifestFile && existsSync(pathToManifestFile)) {
+    const moduleFederationManifestJson = readFileSync(
+      pathToManifestFile,
+      'utf-8'
+    );
+
+    if (moduleFederationManifestJson) {
+      // This should have shape of
+      // {
+      //   "remoteName": "remoteLocation",
+      // }
+      const parsedManifest = JSON.parse(moduleFederationManifestJson);
+      if (
+        Object.keys(parsedManifest).every(
+          (key) =>
+            typeof key === 'string' && typeof parsedManifest[key] === 'string'
+        )
+      ) {
+        dynamicRemotes.push(...Object.keys(parsedManifest));
+      }
+    }
+  }
+  const staticRemotes =
+    config.remotes?.map((r) => (Array.isArray(r) ? r[0] : r)) ?? [];
+  remotes.push(...staticRemotes);
+  return { remotes, dynamicRemotes };
+}
+
+function collectRemoteProjects(
+  remote: string,
+  collected: Set<string>,
+  context: ModuleFederationExecutorContext
+) {
+  const remoteProject = context.projectGraph.nodes[remote]?.data;
+  if (!context.projectGraph.nodes[remote] || collected.has(remote)) {
+    return;
+  }
+
+  collected.add(remote);
+
+  const remoteProjectRoot = remoteProject.root;
+  const remoteProjectTsConfig = remoteProject.targets['build'].options.tsConfig;
+  const remoteProjectConfig = getModuleFederationConfig(
+    remoteProjectTsConfig,
+    context.root,
+    remoteProjectRoot
+  );
+  const { remotes: remoteProjectRemotes } =
+    extractRemoteProjectsFromConfig(remoteProjectConfig);
+
+  remoteProjectRemotes.forEach((r) =>
+    collectRemoteProjects(r, collected, context)
+  );
+}
+
+export function getRemotes(
+  devRemotes: string[],
+  skipRemotes: string[],
+  config: ModuleFederationConfig,
+  context: ModuleFederationExecutorContext,
+  pathToManifestFile?: string
+) {
+  const collectedRemotes = new Set<string>();
+  const { remotes, dynamicRemotes } = extractRemoteProjectsFromConfig(
+    config,
+    pathToManifestFile
+  );
+  remotes.forEach((r) => collectRemoteProjects(r, collectedRemotes, context));
+  const remotesToSkip = new Set(
+    findMatchingProjects(skipRemotes, context.projectGraph.nodes) ?? []
+  );
+
+  if (remotesToSkip.size > 0) {
+    logger.info(
+      `Remotes not served automatically: ${[...remotesToSkip.values()].join(
+        ', '
+      )}`
+    );
+  }
+
+  const knownRemotes = Array.from(collectedRemotes).filter(
+    (r) => !remotesToSkip.has(r)
+  );
+
+  const knownDynamicRemotes = dynamicRemotes.filter(
+    (r) => !remotesToSkip.has(r) && context.projectGraph.nodes[r]
+  );
+
+  logger.info(
+    `NX Starting module federation dev-server for ${chalk.bold(
+      context.projectName
+    )} with ${[...knownRemotes, ...knownDynamicRemotes].length} remotes`
+  );
+
+  const devServeApps = new Set(
+    !devRemotes
+      ? []
+      : Array.isArray(devRemotes)
+      ? findMatchingProjects(devRemotes, context.projectGraph.nodes)
+      : findMatchingProjects([devRemotes], context.projectGraph.nodes)
+  );
+
+  const staticRemotes = knownRemotes.filter((r) => !devServeApps.has(r));
+  const devServeRemotes = [...knownRemotes, ...knownDynamicRemotes].filter(
+    (r) => devServeApps.has(r)
+  );
+  const staticDynamicRemotes = knownDynamicRemotes.filter(
+    (r) => !devServeApps.has(r)
+  );
+  const remotePorts = [...devServeRemotes, ...staticDynamicRemotes].map(
+    (r) => context.projectGraph.nodes[r].data.targets['serve'].options.port
+  );
+  const staticRemotePort =
+    Math.max(
+      ...([
+        ...remotePorts,
+        ...staticRemotes.map(
+          (r) =>
+            context.projectGraph.nodes[r].data.targets['serve'].options.port
+        ),
+      ] as number[])
+    ) +
+    (remotesToSkip.size + 1);
+
+  return {
+    staticRemotes,
+    devRemotes: devServeRemotes,
+    dynamicRemotes: staticDynamicRemotes,
+    remotePorts,
+    staticRemotePort,
+  };
+}
+
+export function getModuleFederationConfig(
+  tsconfigPath: string,
+  workspaceRoot: string,
+  projectRoot: string,
+  pluginName: 'react' | 'angular' = 'react'
+) {
+  const moduleFederationConfigPathJS = join(
+    workspaceRoot,
+    projectRoot,
+    'module-federation.config.js'
+  );
+
+  const moduleFederationConfigPathTS = 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
+    : join(workspaceRoot, tsconfigPath);
+  let cleanupTranspiler = () => undefined;
+  if (existsSync(moduleFederationConfigPathTS)) {
+    cleanupTranspiler = registerTsProject(fullTSconfigPath);
+    moduleFederationConfigPath = moduleFederationConfigPathTS;
+  }
+
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const config = require(moduleFederationConfigPath);
+    cleanupTranspiler();
+
+    return config.default || config;
+  } catch {
+    throw new Error(
+      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/${pluginName}:host"?\nSee: https://nx.dev/concepts/more-concepts/faster-builds-with-module-federation`
+    );
+  }
+}
diff --git a/src/utils/module-federation/index.ts b/src/utils/module-federation/index.ts
new file mode 100644
index 0000000000000..d8ccb8fd03d76
--- /dev/null
+++ b/src/utils/module-federation/index.ts
@@ -0,0 +1,6 @@
+export * from './share';
+export * from './dependencies';
+export * from './package-json';
+export * from './remotes';
+export * from './models';
+export * from './get-remotes-for-host';
diff --git a/src/utils/module-federation/models/index.ts b/src/utils/module-federation/models/index.ts
new file mode 100644
index 0000000000000..4061ed811fb86
--- /dev/null
+++ b/src/utils/module-federation/models/index.ts
@@ -0,0 +1,70 @@
+import type { moduleFederationPlugin } from '@module-federation/sdk';
+import type { NormalModuleReplacementPlugin } from '@rspack/core';
+
+export type ModuleFederationLibrary = { type: string; name: string };
+
+export type WorkspaceLibrary = {
+  name: string;
+  root: string;
+  importKey: string | undefined;
+};
+
+export type SharedWorkspaceLibraryConfig = {
+  getAliases: () => Record<string, string>;
+  getLibraries: (
+    projectRoot: string,
+    eager?: boolean
+  ) => Record<string, SharedLibraryConfig>;
+  getReplacementPlugin: () => NormalModuleReplacementPlugin;
+};
+
+export type Remotes = Array<string | [remoteName: string, remoteUrl: string]>;
+
+export interface SharedLibraryConfig {
+  singleton?: boolean;
+  strictVersion?: boolean;
+  requiredVersion?: false | string;
+  eager?: boolean;
+}
+
+export type SharedFunction = (
+  libraryName: string,
+  sharedConfig: SharedLibraryConfig
+) => undefined | false | SharedLibraryConfig;
+
+export type AdditionalSharedConfig = Array<
+  | string
+  | [libraryName: string, sharedConfig: SharedLibraryConfig]
+  | { libraryName: string; sharedConfig: SharedLibraryConfig }
+>;
+
+export interface ModuleFederationConfig {
+  name: string;
+  remotes?: Remotes;
+  library?: ModuleFederationLibrary;
+  exposes?: Record<string, string>;
+  shared?: SharedFunction;
+  additionalShared?: AdditionalSharedConfig;
+  /**
+   * `nxRuntimeLibraryControlPlugin` is a runtime module federation plugin to ensure
+   * that shared libraries are resolved from a remote with live reload capabilities.
+   * If you run into any issues with loading shared libraries, try disabling this option.
+   */
+  disableNxRuntimeLibraryControlPlugin?: boolean;
+}
+
+export type NxModuleFederationConfigOverride = Omit<
+  moduleFederationPlugin.ModuleFederationPluginOptions,
+  | 'exposes'
+  | 'remotes'
+  | 'name'
+  | 'library'
+  | 'shared'
+  | 'filename'
+  | 'remoteType'
+>;
+
+export type WorkspaceLibrarySecondaryEntryPoint = {
+  name: string;
+  path: string;
+};
diff --git a/src/utils/module-federation/package-json.ts b/src/utils/module-federation/package-json.ts
new file mode 100644
index 0000000000000..52e64b7fb983c
--- /dev/null
+++ b/src/utils/module-federation/package-json.ts
@@ -0,0 +1,16 @@
+import { existsSync } from 'fs';
+import { workspaceRoot, readJsonFile, joinPathFragments } from '@nx/devkit';
+
+export function readRootPackageJson(): {
+  dependencies?: { [key: string]: string };
+  devDependencies?: { [key: string]: string };
+} {
+  const pkgJsonPath = joinPathFragments(workspaceRoot, 'package.json');
+  if (!existsSync(pkgJsonPath)) {
+    throw new Error(
+      'NX MF: Could not find root package.json to determine dependency versions.'
+    );
+  }
+
+  return readJsonFile(pkgJsonPath);
+}
diff --git a/src/utils/module-federation/parse-static-remotes-config.ts b/src/utils/module-federation/parse-static-remotes-config.ts
new file mode 100644
index 0000000000000..ef918839d18e0
--- /dev/null
+++ b/src/utils/module-federation/parse-static-remotes-config.ts
@@ -0,0 +1,57 @@
+import type { ExecutorContext } from '@nx/devkit';
+import { basename, dirname } from 'path';
+
+export type StaticRemoteConfig = {
+  basePath: string;
+  outputPath: string;
+  urlSegment: string;
+  port: number;
+};
+export type StaticRemotesConfig = {
+  remotes: string[];
+  config: Record<string, StaticRemoteConfig> | undefined;
+};
+
+export function parseStaticRemotesConfig(
+  staticRemotes: string[] | undefined,
+  context: ExecutorContext
+): StaticRemotesConfig {
+  if (!staticRemotes?.length) {
+    return { remotes: [], config: undefined };
+  }
+
+  const config: Record<string, StaticRemoteConfig> = {};
+  for (const app of staticRemotes) {
+    const outputPath =
+      context.projectGraph.nodes[app].data.targets['build'].options.outputPath;
+    const basePath = dirname(outputPath);
+    const urlSegment = basename(outputPath);
+    const port =
+      context.projectGraph.nodes[app].data.targets['serve'].options.port;
+    config[app] = { basePath, outputPath, urlSegment, port };
+  }
+
+  return { remotes: staticRemotes, config };
+}
+
+export function parseStaticSsrRemotesConfig(
+  staticRemotes: string[] | undefined,
+  context: ExecutorContext
+): StaticRemotesConfig {
+  if (!staticRemotes?.length) {
+    return { remotes: [], config: undefined };
+  }
+  const config: Record<string, StaticRemoteConfig> = {};
+  for (const app of staticRemotes) {
+    const outputPath = dirname(
+      context.projectGraph.nodes[app].data.targets['build'].options.outputPath // dist/checkout/browser -> checkout
+    ) as string;
+    const basePath = dirname(outputPath); // dist/checkout -> dist
+    const urlSegment = basename(outputPath); // dist/checkout -> checkout
+    const port =
+      context.projectGraph.nodes[app].data.targets['serve'].options.port;
+    config[app] = { basePath, outputPath, urlSegment, port };
+  }
+
+  return { remotes: staticRemotes, config };
+}
diff --git a/src/utils/module-federation/plugins/runtime-library-control.plugin.ts b/src/utils/module-federation/plugins/runtime-library-control.plugin.ts
new file mode 100644
index 0000000000000..4f5b57d2d0c5a
--- /dev/null
+++ b/src/utils/module-federation/plugins/runtime-library-control.plugin.ts
@@ -0,0 +1,71 @@
+import type { FederationRuntimePlugin } from '@module-federation/enhanced/runtime';
+
+const runtimeStore: {
+  name?: string;
+  devRemotes?: string[];
+  sharedPackagesFromDev: Record<string, string>;
+} = {
+  sharedPackagesFromDev: {},
+};
+
+if (process.env.NX_MF_DEV_REMOTES) {
+  // process.env.NX_MF_DEV_REMOTES is replaced by an array value via DefinePlugin, even though the original value is a stringified array.
+  runtimeStore.devRemotes = process.env
+    .NX_MF_DEV_REMOTES as unknown as string[];
+}
+
+const nxRuntimeLibraryControlPlugin: () => FederationRuntimePlugin =
+  function () {
+    return {
+      name: 'nx-runtime-library-control-plugin',
+      beforeInit(args) {
+        runtimeStore.name = args.options.name;
+        return args;
+      },
+      resolveShare: (args) => {
+        const { shareScopeMap, scope, pkgName, version, GlobalFederation } =
+          args;
+
+        const originalResolver = args.resolver;
+        args.resolver = function () {
+          if (!runtimeStore.sharedPackagesFromDev[pkgName]) {
+            if (!GlobalFederation.__INSTANCES__) {
+              return originalResolver();
+            } else if (!runtimeStore.devRemotes) {
+              return originalResolver();
+            }
+            const devRemoteInstanceToUse = GlobalFederation.__INSTANCES__.find(
+              (instance) =>
+                instance.options.shared[pkgName] &&
+                runtimeStore.devRemotes.find((dr) => instance.name === dr)
+            );
+            if (!devRemoteInstanceToUse) {
+              return originalResolver();
+            }
+            runtimeStore.sharedPackagesFromDev[pkgName] =
+              devRemoteInstanceToUse.name;
+          }
+
+          const remoteInstanceName =
+            runtimeStore.sharedPackagesFromDev[pkgName];
+          const remoteInstance = GlobalFederation.__INSTANCES__.find(
+            (instance) => instance.name === remoteInstanceName
+          );
+          try {
+            const remotePkgInfo = remoteInstance.options.shared[pkgName].find(
+              (shared) => shared.from === remoteInstanceName
+            );
+            remotePkgInfo.useIn.push(runtimeStore.name);
+            remotePkgInfo.useIn = Array.from(new Set(remotePkgInfo.useIn));
+            shareScopeMap[scope][pkgName][version] = remotePkgInfo;
+            return remotePkgInfo;
+          } catch {
+            return originalResolver();
+          }
+        };
+        return args;
+      },
+    };
+  };
+
+export default nxRuntimeLibraryControlPlugin;
diff --git a/src/utils/module-federation/public-api.ts b/src/utils/module-federation/public-api.ts
new file mode 100644
index 0000000000000..996daa5c8600c
--- /dev/null
+++ b/src/utils/module-federation/public-api.ts
@@ -0,0 +1,51 @@
+import {
+  AdditionalSharedConfig,
+  ModuleFederationConfig,
+  ModuleFederationLibrary,
+  Remotes,
+  SharedFunction,
+  SharedLibraryConfig,
+  SharedWorkspaceLibraryConfig,
+  WorkspaceLibrary,
+  WorkspaceLibrarySecondaryEntryPoint,
+} from './models';
+
+import {
+  applyAdditionalShared,
+  applySharedFunction,
+  getNpmPackageSharedConfig,
+  sharePackages,
+  shareWorkspaceLibraries,
+} from './share';
+
+import { mapRemotes, mapRemotesForSSR } from './remotes';
+
+import { getDependentPackagesForProject } from './dependencies';
+
+import { readRootPackageJson } from './package-json';
+
+import { withModuleFederation } from './with-module-federation/with-module-federation';
+import { withModuleFederationForSSR } from './with-module-federation/with-module-federation-ssr';
+
+export {
+  AdditionalSharedConfig,
+  applyAdditionalShared,
+  applySharedFunction,
+  getDependentPackagesForProject,
+  getNpmPackageSharedConfig,
+  mapRemotes,
+  mapRemotesForSSR,
+  ModuleFederationConfig,
+  ModuleFederationLibrary,
+  readRootPackageJson,
+  Remotes,
+  SharedFunction,
+  SharedLibraryConfig,
+  SharedWorkspaceLibraryConfig,
+  sharePackages,
+  shareWorkspaceLibraries,
+  withModuleFederation,
+  withModuleFederationForSSR,
+  WorkspaceLibrary,
+  WorkspaceLibrarySecondaryEntryPoint,
+};
diff --git a/src/utils/module-federation/remotes.ts b/src/utils/module-federation/remotes.ts
new file mode 100644
index 0000000000000..de98778fb9754
--- /dev/null
+++ b/src/utils/module-federation/remotes.ts
@@ -0,0 +1,102 @@
+import { extname } from 'path';
+import { Remotes } from './models';
+
+/**
+ * Map remote names to a format that can be understood and used by Module
+ * Federation.
+ *
+ * @param remotes - The remotes to map
+ * @param remoteEntryExt - The file extension of the remoteEntry file
+ * @param determineRemoteUrl - The function used to lookup the URL of the served remote
+ */
+export function mapRemotes(
+  remotes: Remotes,
+  remoteEntryExt: 'js' | 'mjs',
+  determineRemoteUrl: (remote: string) => string
+): Record<string, string> {
+  const mappedRemotes = {};
+
+  for (const remote of remotes) {
+    if (Array.isArray(remote)) {
+      mappedRemotes[remote[0]] = handleArrayRemote(remote, remoteEntryExt);
+    } else if (typeof remote === 'string') {
+      mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl);
+    }
+  }
+
+  return mappedRemotes;
+}
+
+// Helper function to deal with remotes that are arrays
+function handleArrayRemote(
+  remote: [string, string],
+  remoteEntryExt: 'js' | 'mjs'
+): string {
+  const [remoteName, remoteLocation] = remote;
+  const remoteLocationExt = extname(remoteLocation);
+
+  // If remote location already has .js or .mjs extension
+  if (['.js', '.mjs'].includes(remoteLocationExt)) {
+    return remoteLocation;
+  }
+
+  const baseRemote = remoteLocation.endsWith('/')
+    ? remoteLocation.slice(0, -1)
+    : remoteLocation;
+
+  const globalPrefix = `${remoteName.replace(/-/g, '_')}@`;
+
+  // if the remote is defined with anything other than http then we assume it's a promise based remote
+  // In that case we should use what the user provides as the remote location
+  if (!remoteLocation.startsWith('promise new Promise')) {
+    return `${globalPrefix}${baseRemote}/remoteEntry.${remoteEntryExt}`;
+  } else {
+    return remoteLocation;
+  }
+}
+
+// Helper function to deal with remotes that are strings
+function handleStringRemote(
+  remote: string,
+  determineRemoteUrl: (remote: string) => string
+): string {
+  const globalPrefix = `${remote.replace(/-/g, '_')}@`;
+
+  return `${globalPrefix}${determineRemoteUrl(remote)}`;
+}
+
+/**
+ * Map remote names to a format that can be understood and used by Module
+ * Federation.
+ *
+ * @param remotes - The remotes to map
+ * @param remoteEntryExt - The file extension of the remoteEntry file
+ * @param determineRemoteUrl - The function used to lookup the URL of the served remote
+ */
+export function mapRemotesForSSR(
+  remotes: Remotes,
+  remoteEntryExt: 'js' | 'mjs',
+  determineRemoteUrl: (remote: string) => string
+): Record<string, string> {
+  const mappedRemotes = {};
+
+  for (const remote of remotes) {
+    if (Array.isArray(remote)) {
+      const [remoteName, remoteLocation] = remote;
+      const remoteLocationExt = extname(remoteLocation);
+      mappedRemotes[remoteName] = `${remoteName}@${
+        ['.js', '.mjs'].includes(remoteLocationExt)
+          ? remoteLocation
+          : `${
+              remoteLocation.endsWith('/')
+                ? remoteLocation.slice(0, -1)
+                : remoteLocation
+            }/remoteEntry.${remoteEntryExt}`
+      }`;
+    } else if (typeof remote === 'string') {
+      mappedRemotes[remote] = `${remote}@${determineRemoteUrl(remote)}`;
+    }
+  }
+
+  return mappedRemotes;
+}
diff --git a/src/utils/module-federation/secondary-entry-points.ts b/src/utils/module-federation/secondary-entry-points.ts
new file mode 100644
index 0000000000000..06637211fd0e4
--- /dev/null
+++ b/src/utils/module-federation/secondary-entry-points.ts
@@ -0,0 +1,144 @@
+import { joinPathFragments, readJsonFile, workspaceRoot } from '@nx/devkit';
+import { existsSync, lstatSync, readdirSync } from 'fs';
+import { PackageJson, readModulePackageJson } from 'nx/src/utils/package-json';
+import { dirname, join, relative } from 'path';
+import type { WorkspaceLibrary } from './models';
+import { WorkspaceLibrarySecondaryEntryPoint } from './models';
+
+export function collectWorkspaceLibrarySecondaryEntryPoints(
+  library: WorkspaceLibrary,
+  tsconfigPathAliases: Record<string, string[]>
+): WorkspaceLibrarySecondaryEntryPoint[] {
+  const libraryRoot = join(workspaceRoot, library.root);
+  const needsSecondaryEntryPointsCollected = existsSync(
+    join(libraryRoot, 'ng-package.json')
+  );
+
+  const secondaryEntryPoints: WorkspaceLibrarySecondaryEntryPoint[] = [];
+  if (needsSecondaryEntryPointsCollected) {
+    const tsConfigAliasesForLibWithSecondaryEntryPoints = Object.entries(
+      tsconfigPathAliases
+    ).reduce((acc, [tsKey, tsPaths]) => {
+      if (!tsKey.startsWith(library.importKey)) {
+        return { ...acc };
+      }
+
+      if (tsPaths.some((path) => path.startsWith(`${library.root}/`))) {
+        acc = { ...acc, [tsKey]: tsPaths };
+      }
+
+      return acc;
+    }, {});
+
+    for (const [alias] of Object.entries(
+      tsConfigAliasesForLibWithSecondaryEntryPoints
+    )) {
+      const pathToLib = dirname(
+        join(workspaceRoot, tsconfigPathAliases[alias][0])
+      );
+      let searchDir = pathToLib;
+      while (searchDir !== libraryRoot) {
+        if (existsSync(join(searchDir, 'ng-package.json'))) {
+          secondaryEntryPoints.push({ name: alias, path: pathToLib });
+          break;
+        }
+        searchDir = dirname(searchDir);
+      }
+    }
+  }
+
+  return secondaryEntryPoints;
+}
+
+export function getNonNodeModulesSubDirs(directory: string): string[] {
+  return readdirSync(directory)
+    .filter((file) => file !== 'node_modules')
+    .map((file) => join(directory, file))
+    .filter((file) => lstatSync(file).isDirectory());
+}
+
+export function recursivelyCollectSecondaryEntryPointsFromDirectory(
+  pkgName: string,
+  pkgVersion: string,
+  pkgRoot: string,
+  mainEntryPointExports: any | undefined,
+  directories: string[],
+  collectedPackages: { name: string; version: string }[]
+): void {
+  for (const directory of directories) {
+    const packageJsonPath = join(directory, 'package.json');
+    const relativeEntryPointPath = relative(pkgRoot, directory);
+    const entryPointName = joinPathFragments(pkgName, relativeEntryPointPath);
+    if (existsSync(packageJsonPath)) {
+      try {
+        // require the secondary entry point to try to rule out sample code
+        require.resolve(entryPointName, { paths: [workspaceRoot] });
+        const { name } = readJsonFile(packageJsonPath);
+        // further check to make sure what we were able to require is the
+        // same as the package name
+        if (name === entryPointName) {
+          collectedPackages.push({ name, version: pkgVersion });
+        }
+      } catch {
+        // do nothing
+      }
+    } else if (mainEntryPointExports) {
+      // if the package.json doesn't exist, check if the directory is
+      // exported by the main entry point
+      const entryPointExportKey = `./${relativeEntryPointPath}`;
+      const entryPointInfo = mainEntryPointExports[entryPointExportKey];
+      if (entryPointInfo) {
+        collectedPackages.push({
+          name: entryPointName,
+          version: pkgVersion,
+        });
+      }
+    }
+
+    const subDirs = getNonNodeModulesSubDirs(directory);
+    recursivelyCollectSecondaryEntryPointsFromDirectory(
+      pkgName,
+      pkgVersion,
+      pkgRoot,
+      mainEntryPointExports,
+      subDirs,
+      collectedPackages
+    );
+  }
+}
+
+export function collectPackageSecondaryEntryPoints(
+  pkgName: string,
+  pkgVersion: string,
+  collectedPackages: { name: string; version: string }[]
+): void {
+  let pathToPackage: string;
+  let packageJsonPath: string;
+  let packageJson: PackageJson;
+  try {
+    ({ path: packageJsonPath, packageJson } = readModulePackageJson(pkgName));
+    pathToPackage = dirname(packageJsonPath);
+  } catch {
+    // the package.json might not resolve if the package has the "exports"
+    // entry and is not exporting the package.json file, fall back to trying
+    // to find it from the top-level node_modules
+    pathToPackage = join(workspaceRoot, 'node_modules', pkgName);
+    packageJsonPath = join(pathToPackage, 'package.json');
+    if (!existsSync(packageJsonPath)) {
+      // might not exist if it's nested in another package, just return here
+      return;
+    }
+    packageJson = readJsonFile(packageJsonPath);
+  }
+
+  const { exports } = packageJson;
+  const subDirs = getNonNodeModulesSubDirs(pathToPackage);
+  recursivelyCollectSecondaryEntryPointsFromDirectory(
+    pkgName,
+    pkgVersion,
+    pathToPackage,
+    exports,
+    subDirs,
+    collectedPackages
+  );
+}
diff --git a/src/utils/module-federation/share.spec.ts b/src/utils/module-federation/share.spec.ts
new file mode 100644
index 0000000000000..a87299dede0cc
--- /dev/null
+++ b/src/utils/module-federation/share.spec.ts
@@ -0,0 +1,381 @@
+import * as fs from 'fs';
+import * as nxFileutils from 'nx/src/devkit-exports';
+import { sharePackages, shareWorkspaceLibraries } from './share';
+import * as tsUtils from './typescript';
+
+jest.mock('nx/src/devkit-exports', () => {
+  return {
+    ...jest.requireActual('nx/src/devkit-exports'),
+    readJsonFile: jest.fn(),
+  };
+});
+
+describe('MF Share Utils', () => {
+  afterEach(() => jest.clearAllMocks());
+
+  describe('ShareWorkspaceLibraries', () => {
+    it('should error when the tsconfig file does not exist', () => {
+      // ARRANGE
+      jest
+        .spyOn(fs, 'existsSync')
+        .mockImplementation((p: string) => p?.endsWith('.node'));
+
+      // ACT
+      try {
+        shareWorkspaceLibraries([
+          { name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' },
+        ]);
+      } catch (error) {
+        // ASSERT
+        expect(error.message).toContain(
+          'NX MF: TsConfig Path for workspace libraries does not exist!'
+        );
+      }
+    });
+
+    it('should create an object with correct setup', () => {
+      // ARRANGE
+      jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+      jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+        '@myorg/shared': ['/libs/shared/src/index.ts'],
+      });
+
+      // ACT
+      const sharedLibraries = shareWorkspaceLibraries([
+        { name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' },
+      ]);
+
+      // ASSERT
+      expect(sharedLibraries.getAliases()).toHaveProperty('@myorg/shared');
+      expect(sharedLibraries.getAliases()['@myorg/shared']).toContain(
+        'libs/shared/src/index.ts'
+      );
+      expect(sharedLibraries.getLibraries('libs/shared')).toEqual({
+        '@myorg/shared': {
+          eager: undefined,
+          requiredVersion: false,
+        },
+      });
+    });
+
+    it('should order nested projects first', () => {
+      // ARRANGE
+      jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+      jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+        '@myorg/shared': ['/libs/shared/src/index.ts'],
+        '@myorg/shared/components': ['/libs/shared/components/src/index.ts'],
+      });
+
+      // ACT
+      const sharedLibraries = shareWorkspaceLibraries([
+        { name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' },
+        {
+          name: 'shared-components',
+          root: 'libs/shared/components',
+          importKey: '@myorg/shared/components',
+        },
+      ]);
+
+      // ASSERT
+      expect(Object.keys(sharedLibraries.getAliases())[0]).toEqual(
+        '@myorg/shared/components'
+      );
+    });
+
+    it('should handle path mappings with wildcards correctly in non-buildable libraries', () => {
+      // ARRANGE
+      jest.spyOn(fs, 'existsSync').mockImplementation(() => true);
+      jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+        '@myorg/shared': ['/libs/shared/src/index.ts'],
+        '@myorg/shared/*': ['/libs/shared/src/lib/*'],
+      });
+
+      // ACT
+      const sharedLibraries = shareWorkspaceLibraries([
+        { name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' },
+      ]);
+
+      // ASSERT
+      expect(sharedLibraries.getAliases()).toHaveProperty('@myorg/shared');
+      expect(sharedLibraries.getAliases()['@myorg/shared']).toContain(
+        'libs/shared/src/index.ts'
+      );
+      expect(sharedLibraries.getLibraries('libs/shared')).toEqual({
+        '@myorg/shared': {
+          eager: undefined,
+          requiredVersion: false,
+        },
+      });
+    });
+
+    it('should create an object with empty setup when tsconfig does not contain the shared lib', () => {
+      // ARRANGE
+      jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+      jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({});
+
+      // ACT
+      const sharedLibraries = shareWorkspaceLibraries([
+        { name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' },
+      ]);
+
+      // ASSERT
+      expect(sharedLibraries.getAliases()).toEqual({});
+      expect(sharedLibraries.getLibraries('libs/shared')).toEqual({});
+    });
+  });
+
+  describe('SharePackages', () => {
+    it('should throw when it cannot find root package.json', () => {
+      // ARRANGE
+      jest
+        .spyOn(fs, 'existsSync')
+        .mockImplementation((p: string) => p.endsWith('.node'));
+
+      // ACT
+      try {
+        sharePackages(['@angular/core']);
+      } catch (error) {
+        // ASSERT
+        expect(error.message).toEqual(
+          'NX MF: Could not find root package.json to determine dependency versions.'
+        );
+      }
+    });
+
+    it('should correctly map the shared packages to objects', () => {
+      // ARRANGE
+      jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+      jest.spyOn(nxFileutils, 'readJsonFile').mockImplementation((file) => ({
+        name: file.replace(/\\/g, '/').replace(/^.*node_modules[/]/, ''),
+        dependencies: {
+          '@angular/core': '~13.2.0',
+          '@angular/common': '~13.2.0',
+          rxjs: '~7.4.0',
+        },
+      }));
+      jest.spyOn(fs, 'readdirSync').mockReturnValue([]);
+
+      // ACT
+      const packages = sharePackages([
+        '@angular/core',
+        '@angular/common',
+        'rxjs',
+      ]);
+      // ASSERT
+      expect(packages).toEqual({
+        '@angular/core': {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~13.2.0',
+        },
+        '@angular/common': {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~13.2.0',
+        },
+        rxjs: {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~7.4.0',
+        },
+      });
+    });
+
+    // TODO: Get with colum and figure out why this stopped working
+    xit('should correctly map the shared packages to objects even with nested entry points', () => {
+      // ARRANGE
+
+      /**
+       * This creates a bunch of mocks that aims to test that
+       * the sharePackages function can handle nested
+       * entrypoints in the package that is being shared.
+       *
+       * This will set up a directory structure that matches
+       * the following:
+       *
+       * - @angular/core/
+       *   - package.json
+       * - @angular/common/
+       *   - http/
+       *     - testing/
+       *       - package.json
+       *   - package.json
+       * - rxjs
+       *   - package.json
+       *
+       * The result is that there would be 4 packages that
+       * need to be shared, as determined by the folders
+       * containing the package.json files
+       */
+      createMockedFSForNestedEntryPoints();
+
+      // ACT
+      const packages = sharePackages([
+        '@angular/core',
+        '@angular/common',
+        'rxjs',
+      ]);
+      // ASSERT
+      expect(packages).toEqual({
+        '@angular/core': {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~13.2.0',
+        },
+        '@angular/common': {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~13.2.0',
+        },
+        '@angular/common/http/testing': {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~13.2.0',
+        },
+        rxjs: {
+          singleton: true,
+          strictVersion: true,
+          requiredVersion: '~7.4.0',
+        },
+      });
+    });
+
+    it('should not throw when the main entry point package.json cannot be required', () => {
+      // ARRANGE
+      jest
+        .spyOn(fs, 'existsSync')
+        .mockImplementation(
+          (file: string) =>
+            !file.endsWith('non-existent-top-level-package/package.json')
+        );
+      jest.spyOn(nxFileutils, 'readJsonFile').mockImplementation((file) => {
+        return {
+          name: file
+            .replace(/\\/g, '/')
+            .replace(/^.*node_modules[/]/, '')
+            .replace('/package.json', ''),
+          dependencies: { '@angular/core': '~13.2.0' },
+        };
+      });
+
+      // ACT & ASSERT
+      expect(() =>
+        sharePackages(['non-existent-top-level-package'])
+      ).not.toThrow();
+    });
+  });
+
+  it('should using shared library version from root package.json if available', () => {
+    // ARRANGE
+    jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+    jest
+      .spyOn(nxFileutils, 'readJsonFile')
+      .mockImplementation((file: string) => {
+        if (file.endsWith('package.json')) {
+          return {
+            dependencies: {
+              '@myorg/shared': '1.0.0',
+            },
+          };
+        }
+      });
+
+    jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+      '@myorg/shared': ['/libs/shared/src/index.ts'],
+      '@myorg/shared/*': ['/libs/shared/src/lib/*'],
+    });
+
+    // ACT
+    const sharedLibraries = shareWorkspaceLibraries(
+      [{ name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' }],
+      '/'
+    );
+
+    // ASSERT
+    expect(sharedLibraries.getLibraries('libs/shared')).toEqual({
+      '@myorg/shared': {
+        eager: undefined,
+        requiredVersion: '1.0.0',
+        singleton: true,
+      },
+    });
+  });
+
+  it('should use shared library version from library package.json if project package.json does not have it', () => {
+    // ARRANGE
+    jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+    jest
+      .spyOn(nxFileutils, 'readJsonFile')
+      .mockImplementation((file: string) => {
+        if (file.endsWith('libs/shared/package.json')) {
+          return {
+            version: '1.0.0',
+          };
+        } else {
+          return {};
+        }
+      });
+
+    jest.spyOn(tsUtils, 'readTsPathMappings').mockReturnValue({
+      '@myorg/shared': ['/libs/shared/src/index.ts'],
+      '@myorg/shared/*': ['/libs/shared/src/lib/*'],
+    });
+
+    // ACT
+    const sharedLibraries = shareWorkspaceLibraries(
+      [{ name: 'shared', root: 'libs/shared', importKey: '@myorg/shared' }],
+      null
+    );
+
+    // ASSERT
+    expect(sharedLibraries.getLibraries('libs/shared')).toEqual({
+      '@myorg/shared': {
+        eager: undefined,
+        requiredVersion: '1.0.0',
+        singleton: true,
+      },
+    });
+  });
+});
+
+function createMockedFSForNestedEntryPoints() {
+  jest.spyOn(fs, 'existsSync').mockImplementation((file: string) => {
+    if (file.endsWith('http/package.json')) {
+      return false;
+    } else {
+      return true;
+    }
+  });
+
+  jest.spyOn(nxFileutils, 'readJsonFile').mockImplementation((file) => ({
+    name: file
+      .replace(/\\/g, '/')
+      .replace(/^.*node_modules[/]/, '')
+      .replace('/package.json', ''),
+    dependencies: {
+      '@angular/core': '~13.2.0',
+      '@angular/common': '~13.2.0',
+      rxjs: '~7.4.0',
+    },
+  }));
+
+  jest.spyOn(fs, 'readdirSync').mockImplementation((directoryPath: string) => {
+    const PACKAGE_SETUP = {
+      '@angular/core': [],
+      '@angular/common': ['http'],
+      http: ['testing'],
+      testing: [],
+    };
+
+    for (const key of Object.keys(PACKAGE_SETUP)) {
+      if (directoryPath.endsWith(key)) {
+        return PACKAGE_SETUP[key];
+      }
+    }
+    return [];
+  });
+
+  jest
+    .spyOn(fs, 'lstatSync')
+    .mockReturnValue({ isDirectory: () => true } as any);
+}
diff --git a/src/utils/module-federation/share.ts b/src/utils/module-federation/share.ts
new file mode 100644
index 0000000000000..c92c378490de9
--- /dev/null
+++ b/src/utils/module-federation/share.ts
@@ -0,0 +1,322 @@
+import {
+  joinPathFragments,
+  logger,
+  type ProjectGraph,
+  readJsonFile,
+  workspaceRoot,
+} from '@nx/devkit';
+import { NormalModuleReplacementPlugin } from '@rspack/core';
+import { existsSync } from 'fs';
+import type { PackageJson } from 'nx/src/utils/package-json';
+import { dirname, join, normalize } from 'path';
+import type {
+  SharedLibraryConfig,
+  SharedWorkspaceLibraryConfig,
+  WorkspaceLibrary,
+} from './models';
+import { AdditionalSharedConfig, SharedFunction } from './models';
+import { readRootPackageJson } from './package-json';
+import {
+  collectPackageSecondaryEntryPoints,
+  collectWorkspaceLibrarySecondaryEntryPoints,
+} from './secondary-entry-points';
+import { getRootTsConfigPath, readTsPathMappings } from './typescript';
+
+/**
+ * Build an object of functions to be used with the ModuleFederationPlugin to
+ * share Nx Workspace Libraries between Hosts and Remotes.
+ *
+ * @param workspaceLibs - The Nx Workspace Libraries to share
+ * @param tsConfigPath - The path to TS Config File that contains the Path Mappings for the Libraries
+ */
+export function shareWorkspaceLibraries(
+  workspaceLibs: WorkspaceLibrary[],
+  tsConfigPath = process.env.NX_TSCONFIG_PATH ?? getRootTsConfigPath()
+): SharedWorkspaceLibraryConfig {
+  if (!workspaceLibs) {
+    return getEmptySharedLibrariesConfig();
+  }
+
+  const tsconfigPathAliases = readTsPathMappings(tsConfigPath);
+  if (!Object.keys(tsconfigPathAliases).length) {
+    return getEmptySharedLibrariesConfig();
+  }
+
+  // Nested projects must come first, sort them as such
+  const sortedTsConfigPathAliases = {};
+  Object.keys(tsconfigPathAliases)
+    .sort((a, b) => {
+      return b.split('/').length - a.split('/').length;
+    })
+    .forEach(
+      (key) => (sortedTsConfigPathAliases[key] = tsconfigPathAliases[key])
+    );
+
+  const pathMappings: { name: string; path: string }[] = [];
+  for (const [key, paths] of Object.entries(sortedTsConfigPathAliases)) {
+    const library = workspaceLibs.find((lib) => lib.importKey === key);
+    if (!library) {
+      continue;
+    }
+
+    // This is for Angular Projects that use ng-package.json
+    // It will do nothing for React Projects
+    collectWorkspaceLibrarySecondaryEntryPoints(
+      library,
+      sortedTsConfigPathAliases
+    ).forEach(({ name, path }) =>
+      pathMappings.push({
+        name,
+        path,
+      })
+    );
+
+    pathMappings.push({
+      name: key,
+      path: normalize(join(workspaceRoot, paths[0])),
+    });
+  }
+
+  return {
+    getAliases: () =>
+      pathMappings.reduce(
+        (aliases, library) => ({
+          ...aliases,
+          // If the library path ends in a wildcard, remove it as webpack can't handle this in resolve.alias
+          // e.g. path/to/my/lib/* -> path/to/my/lib
+          [library.name]: library.path.replace(/\/\*$/, ''),
+        }),
+        {}
+      ),
+    getLibraries: (
+      projectRoot: string,
+      eager?: boolean
+    ): Record<string, SharedLibraryConfig> => {
+      let pkgJson: PackageJson = null;
+      if (
+        projectRoot &&
+        existsSync(
+          joinPathFragments(workspaceRoot, projectRoot, 'package.json')
+        )
+      ) {
+        pkgJson = readJsonFile(
+          joinPathFragments(workspaceRoot, projectRoot, 'package.json')
+        );
+      }
+      return pathMappings.reduce((libraries, library) => {
+        // Check to see if the library version is declared in the app's package.json
+        let version = pkgJson?.dependencies?.[library.name];
+        if (!version && workspaceLibs.length > 0) {
+          const workspaceLib = workspaceLibs.find(
+            (lib) => lib.importKey === library.name
+          );
+
+          const libPackageJsonPath = workspaceLib
+            ? join(workspaceLib.root, 'package.json')
+            : null;
+          if (libPackageJsonPath && existsSync(libPackageJsonPath)) {
+            pkgJson = readJsonFile(libPackageJsonPath);
+
+            if (pkgJson) {
+              version = pkgJson.version;
+            }
+          }
+        }
+
+        return {
+          ...libraries,
+          [library.name]: {
+            ...(version
+              ? {
+                  requiredVersion: version,
+                  singleton: true,
+                }
+              : { requiredVersion: false }),
+            eager,
+          },
+        };
+      }, {} as Record<string, SharedLibraryConfig>);
+    },
+    getReplacementPlugin: () =>
+      new NormalModuleReplacementPlugin(/./, (req) => {
+        if (!req.request.startsWith('.')) {
+          return;
+        }
+
+        const from = req.context;
+        const to = normalize(join(req.context, req.request));
+
+        for (const library of pathMappings) {
+          const libFolder = normalize(dirname(library.path));
+          if (!from.startsWith(libFolder) && to.startsWith(libFolder)) {
+            const newReq = library.name.endsWith('/*')
+              ? /**
+                 * req usually is in the form of "../../../path/to/file"
+                 * library.path is usually in the form of "/Users/username/path/to/Workspace/path/to/library"
+                 *
+                 * When a wildcard is used in the TS path mappings, we want to get everything after the import to
+                 * re-route the request correctly inline with the webpack resolve.alias
+                 */
+                join(
+                  library.name,
+                  req.request.split(
+                    library.path.replace(workspaceRoot, '').replace('/*', '')
+                  )[1]
+                )
+              : library.name;
+            req.request = newReq;
+          }
+        }
+      }),
+  };
+}
+
+/**
+ * Build the Module Federation Share Config for a specific package and the
+ * specified version of that package.
+ * @param pkgName - Name of the package to share
+ * @param version - Version of the package to require by other apps in the Module Federation setup
+ */
+export function getNpmPackageSharedConfig(
+  pkgName: string,
+  version: string
+): SharedLibraryConfig | undefined {
+  if (!version) {
+    logger.warn(
+      `Could not find a version for "${pkgName}" in the root "package.json" ` +
+        'when collecting shared packages for the Module Federation setup. ' +
+        'The package will not be shared.'
+    );
+
+    return undefined;
+  }
+
+  return { singleton: true, strictVersion: true, requiredVersion: version };
+}
+
+/**
+ * Create a dictionary of packages and their Module Federation Shared Config
+ * from an array of package names.
+ *
+ * Lookup the versions of the packages from the root package.json file in the
+ * workspace.
+ * @param packages - Array of package names as strings
+ */
+export function sharePackages(
+  packages: string[]
+): Record<string, SharedLibraryConfig> {
+  const pkgJson = readRootPackageJson();
+  const allPackages: { name: string; version: string }[] = [];
+  packages.forEach((pkg) => {
+    const pkgVersion =
+      pkgJson.dependencies?.[pkg] ?? pkgJson.devDependencies?.[pkg];
+    allPackages.push({ name: pkg, version: pkgVersion });
+    collectPackageSecondaryEntryPoints(pkg, pkgVersion, allPackages);
+  });
+
+  return allPackages.reduce((shared, pkg) => {
+    const config = getNpmPackageSharedConfig(pkg.name, pkg.version);
+    if (config) {
+      shared[pkg.name] = config;
+    }
+
+    return shared;
+  }, {} as Record<string, SharedLibraryConfig>);
+}
+
+/**
+ * Apply a custom function provided by the user that will modify the Shared Config
+ * of the dependencies for the Module Federation build.
+ *
+ * @param sharedConfig - The original Shared Config to be modified
+ * @param sharedFn - The custom function to run
+ */
+export function applySharedFunction(
+  sharedConfig: Record<string, SharedLibraryConfig>,
+  sharedFn: SharedFunction | undefined
+): void {
+  if (!sharedFn) {
+    return;
+  }
+
+  for (const [libraryName, library] of Object.entries(sharedConfig)) {
+    const mappedDependency = sharedFn(libraryName, library);
+    if (mappedDependency === false) {
+      delete sharedConfig[libraryName];
+      continue;
+    } else if (!mappedDependency) {
+      continue;
+    }
+
+    sharedConfig[libraryName] = mappedDependency;
+  }
+}
+
+/**
+ * Add additional dependencies to the shared package that may not have been
+ * discovered by the project graph.
+ *
+ * This can be useful for applications that use a Dependency Injection system
+ * that expects certain Singleton values to be present in the shared injection
+ * hierarchy.
+ *
+ * @param sharedConfig - The original Shared Config
+ * @param additionalShared - The additional dependencies to add
+ * @param projectGraph - The Nx project graph
+ */
+export function applyAdditionalShared(
+  sharedConfig: Record<string, SharedLibraryConfig>,
+  additionalShared: AdditionalSharedConfig | undefined,
+  projectGraph: ProjectGraph
+): void {
+  if (!additionalShared) {
+    return;
+  }
+
+  for (const shared of additionalShared) {
+    if (typeof shared === 'string') {
+      addStringDependencyToSharedConfig(sharedConfig, shared, projectGraph);
+    } else if (Array.isArray(shared)) {
+      sharedConfig[shared[0]] = shared[1];
+    } else if (typeof shared === 'object') {
+      sharedConfig[shared.libraryName] = shared.sharedConfig;
+    }
+  }
+}
+
+function addStringDependencyToSharedConfig(
+  sharedConfig: Record<string, SharedLibraryConfig>,
+  dependency: string,
+  projectGraph: ProjectGraph
+): void {
+  if (projectGraph.nodes[dependency]) {
+    sharedConfig[dependency] = { requiredVersion: false };
+  } else if (projectGraph.externalNodes?.[`npm:${dependency}`]) {
+    const pkgJson = readRootPackageJson();
+    const config = getNpmPackageSharedConfig(
+      dependency,
+      pkgJson.dependencies?.[dependency] ??
+        pkgJson.devDependencies?.[dependency]
+    );
+
+    if (!config) {
+      return;
+    }
+
+    sharedConfig[dependency] = config;
+  } else {
+    throw new Error(
+      `The specified dependency "${dependency}" in the additionalShared configuration does not exist in the project graph. ` +
+        `Please check your additionalShared configuration and make sure you are including valid workspace projects or npm packages.`
+    );
+  }
+}
+
+function getEmptySharedLibrariesConfig() {
+  return {
+    getAliases: () => ({}),
+    getLibraries: () => ({}),
+    getReplacementPlugin: () =>
+      new NormalModuleReplacementPlugin(/./, () => undefined),
+  };
+}
diff --git a/src/utils/module-federation/start-remote-proxies.ts b/src/utils/module-federation/start-remote-proxies.ts
new file mode 100644
index 0000000000000..a451f8ad7d716
--- /dev/null
+++ b/src/utils/module-federation/start-remote-proxies.ts
@@ -0,0 +1,62 @@
+import { logger } from '@nx/devkit';
+import type { Express } from 'express';
+import { existsSync, readFileSync } from 'fs';
+import { StaticRemotesConfig } from './parse-static-remotes-config';
+
+export function startRemoteProxies(
+  staticRemotesConfig: StaticRemotesConfig,
+  mappedLocationsOfRemotes: Record<string, string>,
+  sslOptions?: { pathToCert: string; pathToKey: string }
+) {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { createProxyMiddleware } = require('http-proxy-middleware');
+
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const express = require('express');
+  let sslCert: Buffer;
+  let sslKey: Buffer;
+  if (sslOptions && sslOptions.pathToCert && sslOptions.pathToKey) {
+    if (existsSync(sslOptions.pathToCert) && existsSync(sslOptions.pathToKey)) {
+      sslCert = readFileSync(sslOptions.pathToCert);
+      sslKey = readFileSync(sslOptions.pathToKey);
+    } else {
+      logger.warn(
+        `Encountered SSL options in project.json, however, the certificate files do not exist in the filesystem. Using http.`
+      );
+      logger.warn(
+        `Attempted to find '${sslOptions.pathToCert}' and '${sslOptions.pathToKey}'.`
+      );
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const http: typeof import('http') = require('http');
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const https: typeof import('https') = require('https');
+
+  logger.info(`NX Starting static remotes proxies...`);
+  for (const app of staticRemotesConfig.remotes) {
+    const expressProxy: Express = express();
+    expressProxy.use(
+      createProxyMiddleware({
+        target: mappedLocationsOfRemotes[app],
+        changeOrigin: true,
+        secure: sslCert ? false : undefined,
+      })
+    );
+    const proxyServer = (
+      sslCert
+        ? https.createServer(
+            {
+              cert: sslCert,
+              key: sslKey,
+            },
+            expressProxy
+          )
+        : http.createServer(expressProxy)
+    ).listen(staticRemotesConfig.config[app].port);
+    process.on('SIGTERM', () => proxyServer.close());
+    process.on('exit', () => proxyServer.close());
+  }
+  logger.info(`NX Static remotes proxies started successfully`);
+}
diff --git a/src/utils/module-federation/start-ssr-remote-proxies.ts b/src/utils/module-federation/start-ssr-remote-proxies.ts
new file mode 100644
index 0000000000000..83a85cc2883c5
--- /dev/null
+++ b/src/utils/module-federation/start-ssr-remote-proxies.ts
@@ -0,0 +1,77 @@
+import { logger } from '@nx/devkit';
+import type { Express } from 'express';
+import { existsSync, readFileSync } from 'fs';
+import type { StaticRemotesConfig } from './parse-static-remotes-config';
+
+export function startSsrRemoteProxies(
+  staticRemotesConfig: StaticRemotesConfig,
+  mappedLocationsOfRemotes: Record<string, string>,
+  sslOptions?: { pathToCert: string; pathToKey: string }
+) {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { createProxyMiddleware } = require('http-proxy-middleware');
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const express = require('express');
+
+  let sslCert: Buffer;
+  let sslKey: Buffer;
+  if (sslOptions && sslOptions.pathToCert && sslOptions.pathToKey) {
+    if (existsSync(sslOptions.pathToCert) && existsSync(sslOptions.pathToKey)) {
+      sslCert = readFileSync(sslOptions.pathToCert);
+      sslKey = readFileSync(sslOptions.pathToKey);
+    } else {
+      logger.warn(
+        `Encountered SSL options in project.json, however, the certificate files do not exist in the filesystem. Using http.`
+      );
+      logger.warn(
+        `Attempted to find '${sslOptions.pathToCert}' and '${sslOptions.pathToKey}'.`
+      );
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const http: typeof import('http') = require('http');
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const https: typeof import('https') = require('https');
+
+  logger.info(`NX Starting static remotes proxies...`);
+  for (const app of staticRemotesConfig.remotes) {
+    const expressProxy: Express = express();
+    /**
+     * SSR remotes have two output paths: one for the browser and one for the server.
+     * We need to handle paths for both of them.
+     * The browser output path is used to serve the client-side code.
+     * The server output path is used to serve the server-side code.
+     */
+
+    expressProxy.use(
+      createProxyMiddleware({
+        target: `${mappedLocationsOfRemotes[app]}`,
+        secure: sslCert ? false : undefined,
+        changeOrigin: true,
+        pathRewrite: (path) => {
+          if (path.includes('/server')) {
+            return path;
+          } else {
+            return `browser/${path}`;
+          }
+        },
+      })
+    );
+
+    const proxyServer = (
+      sslCert
+        ? https.createServer(
+            {
+              cert: sslCert,
+              key: sslKey,
+            },
+            expressProxy
+          )
+        : http.createServer(expressProxy)
+    ).listen(staticRemotesConfig.config[app].port);
+    process.on('SIGTERM', () => proxyServer.close());
+    process.on('exit', () => proxyServer.close());
+  }
+  logger.info(`Nx SSR Static remotes proxies started successfully`);
+}
diff --git a/src/utils/module-federation/typescript.spec.ts b/src/utils/module-federation/typescript.spec.ts
new file mode 100644
index 0000000000000..6c733405b65a3
--- /dev/null
+++ b/src/utils/module-federation/typescript.spec.ts
@@ -0,0 +1,45 @@
+import * as fs from 'fs';
+import { readTsPathMappings } from './typescript';
+
+let readConfigFileResult: any;
+let parseJsonConfigFileContentResult: any;
+jest.mock('typescript', () => ({
+  ...jest.requireActual('typescript'),
+  readConfigFile: jest.fn().mockImplementation(() => readConfigFileResult),
+  parseJsonConfigFileContent: jest
+    .fn()
+    .mockImplementation(() => parseJsonConfigFileContentResult),
+}));
+
+describe('readTsPathMappings', () => {
+  it('should normalize paths', () => {
+    jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+    readConfigFileResult = {
+      config: {
+        options: {
+          paths: {
+            '@myorg/lib1': ['./libs/lib1/src/index.ts'],
+            '@myorg/lib2': ['libs/lib2/src/index.ts'],
+          },
+        },
+      },
+    };
+    parseJsonConfigFileContentResult = {
+      options: {
+        paths: {
+          '@myorg/lib1': ['./libs/lib1/src/index.ts'],
+          '@myorg/lib2': ['libs/lib2/src/index.ts'],
+        },
+      },
+      fileNames: [],
+      errors: [],
+    };
+
+    const paths = readTsPathMappings('/path/to/tsconfig.json');
+
+    expect(paths).toEqual({
+      '@myorg/lib1': ['libs/lib1/src/index.ts'],
+      '@myorg/lib2': ['libs/lib2/src/index.ts'],
+    });
+  });
+});
diff --git a/src/utils/module-federation/typescript.ts b/src/utils/module-federation/typescript.ts
new file mode 100644
index 0000000000000..7a9efc49ee19a
--- /dev/null
+++ b/src/utils/module-federation/typescript.ts
@@ -0,0 +1,75 @@
+import { existsSync } from 'fs';
+import { ParsedCommandLine } from 'typescript';
+import { dirname, join } from 'path';
+import { workspaceRoot } from '@nx/devkit';
+
+const tsConfig: Map<string, ParsedCommandLine> = new Map();
+const tsPathMappings: Map<string, ParsedCommandLine['options']['paths']> =
+  new Map();
+
+export function readTsPathMappings(
+  tsConfigPath: string = process.env.NX_TSCONFIG_PATH ?? getRootTsConfigPath()
+): ParsedCommandLine['options']['paths'] {
+  if (tsPathMappings.has(tsConfigPath)) {
+    return tsPathMappings.get(tsConfigPath);
+  }
+
+  if (!tsConfig.has(tsConfigPath)) {
+    tsConfig.set(tsConfigPath, readTsConfiguration(tsConfigPath));
+  }
+  tsPathMappings.set(tsConfigPath, {});
+  Object.entries(tsConfig.get(tsConfigPath).options?.paths ?? {}).forEach(
+    ([alias, paths]) => {
+      tsPathMappings.set(tsConfigPath, {
+        ...tsPathMappings.get(tsConfigPath),
+        [alias]: paths.map((path) => path.replace(/^\.\//, '')),
+      });
+    }
+  );
+
+  return tsPathMappings.get(tsConfigPath);
+}
+
+function readTsConfiguration(tsConfigPath: string): ParsedCommandLine {
+  if (!existsSync(tsConfigPath)) {
+    throw new Error(
+      `NX MF: TsConfig Path for workspace libraries does not exist! (${tsConfigPath}).`
+    );
+  }
+
+  return readTsConfig(tsConfigPath);
+}
+
+let tsModule: typeof import('typescript');
+
+export function readTsConfig(tsConfigPath: string): ParsedCommandLine {
+  if (!tsModule) {
+    tsModule = require('typescript');
+  }
+  const readResult = tsModule.readConfigFile(
+    tsConfigPath,
+    tsModule.sys.readFile
+  );
+  return tsModule.parseJsonConfigFileContent(
+    readResult.config,
+    tsModule.sys,
+    dirname(tsConfigPath)
+  );
+}
+
+export function getRootTsConfigPath(): string | null {
+  const tsConfigFileName = getRootTsConfigFileName();
+
+  return tsConfigFileName ? join(workspaceRoot, tsConfigFileName) : null;
+}
+
+function getRootTsConfigFileName(): string | null {
+  for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
+    const tsConfigPath = join(workspaceRoot, tsConfigName);
+    if (existsSync(tsConfigPath)) {
+      return tsConfigName;
+    }
+  }
+
+  return null;
+}
diff --git a/src/utils/module-federation/with-module-federation/package-json.ts b/src/utils/module-federation/with-module-federation/package-json.ts
new file mode 100644
index 0000000000000..64d424bf87c4f
--- /dev/null
+++ b/src/utils/module-federation/with-module-federation/package-json.ts
@@ -0,0 +1,16 @@
+import { joinPathFragments, readJsonFile, workspaceRoot } from '@nx/devkit';
+import { existsSync } from 'fs';
+
+export function readRootPackageJson(): {
+  dependencies?: { [key: string]: string };
+  devDependencies?: { [key: string]: string };
+} {
+  const pkgJsonPath = joinPathFragments(workspaceRoot, 'package.json');
+  if (!existsSync(pkgJsonPath)) {
+    throw new Error(
+      'NX MFE: Could not find root package.json to determine dependency versions.'
+    );
+  }
+
+  return readJsonFile(pkgJsonPath);
+}
diff --git a/src/utils/module-federation/with-module-federation/utils.ts b/src/utils/module-federation/with-module-federation/utils.ts
new file mode 100644
index 0000000000000..41ac4f1b8f236
--- /dev/null
+++ b/src/utils/module-federation/with-module-federation/utils.ts
@@ -0,0 +1,131 @@
+import {
+  createProjectGraphAsync,
+  ProjectGraph,
+  readCachedProjectGraph,
+} from '@nx/devkit';
+import { readCachedProjectConfiguration } from 'nx/src/project-graph/project-graph';
+import { getDependentPackagesForProject } from '../dependencies';
+import { ModuleFederationConfig } from '../models';
+import { mapRemotes, mapRemotesForSSR } from '../remotes';
+import {
+  applyAdditionalShared,
+  applySharedFunction,
+  sharePackages,
+  shareWorkspaceLibraries,
+} from '../share';
+
+export function getFunctionDeterminateRemoteUrl(isServer = false) {
+  const target = 'serve';
+  const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.js';
+
+  return function (remote: string) {
+    const mappedStaticRemotesFromEnv = process.env
+      .NX_MF_DEV_SERVER_STATIC_REMOTES
+      ? JSON.parse(process.env.NX_MF_DEV_SERVER_STATIC_REMOTES)
+      : undefined;
+    if (mappedStaticRemotesFromEnv && mappedStaticRemotesFromEnv[remote]) {
+      return `${mappedStaticRemotesFromEnv[remote]}/${remoteEntry}`;
+    }
+
+    let remoteConfiguration = null;
+    try {
+      remoteConfiguration = readCachedProjectConfiguration(remote);
+    } catch (e) {
+      throw new Error(
+        `Cannot find remote: "${remote}". Check that the remote name is correct in your module federation config file.\n`
+      );
+    }
+    const serveTarget = remoteConfiguration?.targets?.[target];
+
+    if (!serveTarget) {
+      throw new Error(
+        `Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "${serveTarget}" target.\n
+      You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``
+      );
+    }
+
+    const host =
+      serveTarget.options?.host ??
+      `http${serveTarget.options.ssl ? 's' : ''}://localhost`;
+    const port = serveTarget.options?.port ?? 4201;
+    return `${
+      host.endsWith('/') ? host.slice(0, -1) : host
+    }:${port}/${remoteEntry}`;
+  };
+}
+
+export async function getModuleFederationConfig(
+  mfConfig: ModuleFederationConfig,
+  options: {
+    isServer: boolean;
+    determineRemoteUrl?: (remote: string) => string;
+  } = { isServer: false }
+) {
+  let projectGraph: ProjectGraph;
+  try {
+    projectGraph = readCachedProjectGraph();
+  } catch (e) {
+    projectGraph = await createProjectGraphAsync();
+  }
+
+  const project = projectGraph.nodes[mfConfig.name]?.data;
+
+  if (!project) {
+    throw Error(
+      `Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`
+    );
+  }
+
+  const dependencies = getDependentPackagesForProject(
+    projectGraph,
+    mfConfig.name
+  );
+
+  if (mfConfig.shared) {
+    dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter(
+      (lib) => mfConfig.shared(lib.importKey, {}) !== false
+    );
+    dependencies.npmPackages = dependencies.npmPackages.filter(
+      (pkg) => mfConfig.shared(pkg, {}) !== false
+    );
+  }
+
+  const sharedLibraries = shareWorkspaceLibraries(
+    dependencies.workspaceLibraries
+  );
+
+  const npmPackages = sharePackages(dependencies.npmPackages);
+
+  const sharedDependencies = {
+    ...sharedLibraries.getLibraries(project.root),
+    ...npmPackages,
+  };
+
+  applySharedFunction(sharedDependencies, mfConfig.shared);
+  applyAdditionalShared(
+    sharedDependencies,
+    mfConfig.additionalShared,
+    projectGraph
+  );
+
+  // Choose the correct mapRemotes function based on the server state.
+  const mapRemotesFunction = options.isServer ? mapRemotesForSSR : mapRemotes;
+
+  // Determine the URL function, either from provided options or by using a default.
+  const determineRemoteUrlFunction = options.determineRemoteUrl
+    ? options.determineRemoteUrl
+    : getFunctionDeterminateRemoteUrl(options.isServer);
+
+  // Map the remotes if they exist, otherwise default to an empty object.
+  let mappedRemotes = {};
+
+  if (mfConfig.remotes && mfConfig.remotes.length > 0) {
+    mappedRemotes = mapRemotesFunction(
+      mfConfig.remotes,
+      'js',
+      determineRemoteUrlFunction
+    );
+  }
+
+  return { sharedLibraries, sharedDependencies, mappedRemotes };
+}
diff --git a/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts b/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
new file mode 100644
index 0000000000000..b6fa214ae4fce
--- /dev/null
+++ b/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
@@ -0,0 +1,77 @@
+import { DefinePlugin } from '@rspack/core';
+import { SharedConfigContext } from '../../model';
+import {
+  ModuleFederationConfig,
+  NxModuleFederationConfigOverride,
+} from '../models';
+import { getModuleFederationConfig } from './utils';
+
+export async function withModuleFederationForSSR(
+  options: ModuleFederationConfig,
+  configOverride?: NxModuleFederationConfigOverride
+) {
+  if (global.NX_GRAPH_CREATION) {
+    return (config) => config;
+  }
+
+  const { sharedLibraries, sharedDependencies, mappedRemotes } =
+    await getModuleFederationConfig(options, {
+      isServer: true,
+    });
+
+  return (config, { context }: SharedConfigContext) => {
+    config.target = 'async-node';
+    config.output.uniqueName = options.name;
+    config.optimization = {
+      ...(config.optimization ?? {}),
+      runtimeChunk: false,
+    };
+
+    config.plugins.push(
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      new (require('@module-federation/enhanced/rspack').ModuleFederationPlugin)(
+        {
+          name: options.name,
+          filename: 'remoteEntry.js',
+          exposes: options.exposes,
+          remotes: mappedRemotes,
+          shared: {
+            ...sharedDependencies,
+          },
+          isServer: true,
+          /**
+           * Apply user-defined config overrides
+           */
+          ...(configOverride ? configOverride : {}),
+          runtimePlugins:
+            process.env.NX_MF_DEV_REMOTES &&
+            !options.disableNxRuntimeLibraryControlPlugin
+              ? [
+                  ...(configOverride?.runtimePlugins ?? []),
+                  require.resolve('@module-federation/node/runtimePlugin'),
+                  require.resolve(
+                    '@nx/rspack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'
+                  ),
+                ]
+              : [
+                  ...(configOverride?.runtimePlugins ?? []),
+                  require.resolve('@module-federation/node/runtimePlugin'),
+                ],
+          virtualRuntimeEntry: true,
+        },
+        {}
+      ),
+      sharedLibraries.getReplacementPlugin()
+    );
+
+    // The env var is only set from the module-federation-dev-server
+    // Attach the runtime plugin
+    config.plugins.push(
+      new DefinePlugin({
+        'process.env.NX_MF_DEV_REMOTES': process.env.NX_MF_DEV_REMOTES,
+      })
+    );
+
+    return config;
+  };
+}
diff --git a/src/utils/module-federation/with-module-federation/with-module-federation.ts b/src/utils/module-federation/with-module-federation/with-module-federation.ts
new file mode 100644
index 0000000000000..7e3245a76652b
--- /dev/null
+++ b/src/utils/module-federation/with-module-federation/with-module-federation.ts
@@ -0,0 +1,101 @@
+import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
+import type { Configuration } from '@rspack/core';
+import { DefinePlugin } from '@rspack/core';
+import { SharedConfigContext } from '../../model';
+import {
+  ModuleFederationConfig,
+  NxModuleFederationConfigOverride,
+} from '../models';
+import { getModuleFederationConfig } from './utils';
+
+const isVarOrWindow = (libType?: string) =>
+  libType === 'var' || libType === 'window';
+
+/**
+ * @param {ModuleFederationConfig} options
+ * @param {NxModuleFederationConfigOverride} configOverride
+ */
+export async function withModuleFederation(
+  options: ModuleFederationConfig,
+  configOverride?: NxModuleFederationConfigOverride
+) {
+  if (global.NX_GRAPH_CREATION) {
+    return function makeConfig(config: Configuration): Configuration {
+      return config;
+    };
+  }
+
+  const { sharedDependencies, sharedLibraries, mappedRemotes } =
+    await getModuleFederationConfig(options);
+  const isGlobal = isVarOrWindow(options.library?.type);
+
+  return function makeConfig(
+    config: Configuration,
+    { context }: SharedConfigContext
+  ): Configuration {
+    config.output.uniqueName = options.name;
+    config.output.publicPath = 'auto';
+
+    if (isGlobal) {
+      config.output.scriptType = 'text/javascript';
+    }
+
+    config.optimization = {
+      ...(config.optimization ?? {}),
+      runtimeChunk: false,
+    };
+
+    if (
+      config.mode === 'development' &&
+      Object.keys(mappedRemotes).length > 1 &&
+      !options.exposes
+    ) {
+      config.optimization.runtimeChunk = 'single';
+    }
+
+    config.plugins.push(
+      new ModuleFederationPlugin({
+        name: options.name,
+        filename: 'remoteEntry.js',
+        exposes: options.exposes,
+        remotes: mappedRemotes,
+        shared: {
+          ...sharedDependencies,
+        },
+        /**
+         * remoteType: 'script' is required for the remote to be loaded as a script tag.
+         * remotes will need to be defined as:
+         *  { appX: 'appX@http://localhost:3001/remoteEntry.js' }
+         *  { appY: 'appY@http://localhost:3002/remoteEntry.js' }
+         */
+        ...(isGlobal ? { remoteType: 'script' } : {}),
+        /**
+         * Apply user-defined config overrides
+         */
+        ...(configOverride ? configOverride : {}),
+        runtimePlugins:
+          process.env.NX_MF_DEV_REMOTES &&
+          !options.disableNxRuntimeLibraryControlPlugin
+            ? [
+                ...(configOverride?.runtimePlugins ?? []),
+                require.resolve(
+                  '@nx/rspack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'
+                ),
+              ]
+            : configOverride?.runtimePlugins,
+        virtualRuntimeEntry: true,
+      }),
+      sharedLibraries.getReplacementPlugin()
+    );
+
+    // The env var is only set from the module-federation-dev-server
+    // Attach the runtime plugin
+    config.plugins.push(
+      new DefinePlugin({
+        'process.env.NX_MF_DEV_REMOTES': process.env.NX_MF_DEV_REMOTES,
+      })
+    );
+
+    return config;
+  };
+}
diff --git a/src/utils/versions.ts b/src/utils/versions.ts
index d40a4de18c2cb..6805a48e2c7a6 100644
--- a/src/utils/versions.ts
+++ b/src/utils/versions.ts
@@ -1,8 +1,8 @@
-export const rspackCoreVersion = '^0.7.5';
-export const rspackDevServerVersion = '^0.7.5';
+export const rspackCoreVersion = '^1.0.2';
+export const rspackDevServerVersion = '^1.0.2';
 
 export const rspackPluginMinifyVersion = '^0.7.5';
-export const rspackPluginReactRefreshVersion = '^0.7.5';
+export const rspackPluginReactRefreshVersion = '^1.0.0';
 export const lessLoaderVersion = '~11.1.3';
 
 export const reactVersion = '~18.2.0';
diff --git a/src/utils/with-nx.ts b/src/utils/with-nx.ts
index 63db6c60a2476..ff3cbd3fa0e83 100644
--- a/src/utils/with-nx.ts
+++ b/src/utils/with-nx.ts
@@ -5,8 +5,10 @@ import {
   RspackPluginInstance,
   rspack,
 } from '@rspack/core';
+import { existsSync, readFileSync } from 'fs';
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import * as path from 'path';
+import { join } from 'path';
 import { GeneratePackageJsonPlugin } from '../plugins/generate-package-json-plugin';
 import { getCopyPatterns } from './get-copy-patterns';
 import { SharedConfigContext } from './model';
@@ -33,6 +35,22 @@ export function withNx(_opts = {}) {
 
     const plugins = config.plugins ?? [];
     if (options.extractLicenses) {
+      /**
+       * Needed to prevent an issue with Rspack and Workspaces where the
+       * workspace's root package.json file is added to the dependency tree
+       */
+      let rootPackageJsonName;
+      const pathToRootPackageJson = join(context.root, 'package.json');
+      if (existsSync(pathToRootPackageJson)) {
+        try {
+          const rootPackageJson = JSON.parse(
+            readFileSync(pathToRootPackageJson, 'utf-8')
+          );
+          rootPackageJsonName = rootPackageJson.name;
+        } catch {
+          // do nothing
+        }
+      }
       plugins.push(
         new LicenseWebpackPlugin({
           stats: {
@@ -40,6 +58,16 @@ export function withNx(_opts = {}) {
             errors: false,
           },
           outputFilename: `3rdpartylicenses.txt`,
+          /**
+           * Needed to prevent an issue with Rspack and Workspaces where the
+           * workspace's root package.json file is added to the dependency tree
+           */
+          excludedPackageTest: (packageName) => {
+            if (!rootPackageJsonName) {
+              return false;
+            }
+            return packageName === rootPackageJsonName;
+          },
         }) as unknown as RspackPluginInstance
       );
     }
@@ -59,12 +87,14 @@ export function withNx(_opts = {}) {
       );
     }
 
-    plugins.push(new rspack.CopyRspackPlugin({
-      patterns: getCopyPatterns(
-        normalizeAssets(options.assets, context.root, sourceRoot)
-      ),
-    }));
-    plugins.push(new rspack.ProgressPlugin())
+    plugins.push(
+      new rspack.CopyRspackPlugin({
+        patterns: getCopyPatterns(
+          normalizeAssets(options.assets, context.root, sourceRoot)
+        ),
+      })
+    );
+    plugins.push(new rspack.ProgressPlugin());
 
     options.fileReplacements.forEach((item) => {
       alias[item.replace] = item.with;
@@ -89,18 +119,17 @@ export function withNx(_opts = {}) {
       ...config,
       target: options.target,
       mode: options.mode,
-      context: context.root,
+      entry: {},
+      context: join(
+        context.root,
+        context.projectGraph.nodes[context.projectName].data.root
+      ),
       devtool:
         options.sourceMap === 'hidden'
           ? ('hidden-source-map' as const)
           : options.sourceMap
           ? ('source-map' as const)
           : (false as const),
-      entry: {
-        main: {
-          import: [path.join(context.root, options.main)],
-        },
-      },
       output: {
         path: path.join(context.root, options.outputPath),
         publicPath: '/',
@@ -126,8 +155,9 @@ export function withNx(_opts = {}) {
             : '[name][ext]',
       },
       devServer: {
-        port: 4200,
-        hot: true,
+        ...(config.devServer ?? {}),
+        port: config.devServer?.port ?? 4200,
+        hot: config.devServer?.hot ?? true,
       } as any,
       module: {
         rules: [
@@ -153,18 +183,18 @@ export function withNx(_opts = {}) {
               jsc: {
                 parser: {
                   syntax: 'typescript',
-                  decorators: true
+                  decorators: true,
                 },
                 transform: {
                   legacyDecorator: true,
-                  decoratorMetadata: true
+                  decoratorMetadata: true,
                 },
                 externalHelpers: true,
               },
             },
             type: 'javascript/auto',
           },
-        ]
+        ],
       },
       plugins: plugins,
       resolve: {
@@ -173,7 +203,7 @@ export function withNx(_opts = {}) {
         // once I can reproduce a small example repo with rspack only.
         alias,
         // We need to define the extensions that rspack can resolve
-        extensions: ["...", ".ts", ".tsx", ".jsx"]
+        extensions: ['...', '.ts', '.tsx', '.jsx'],
         // tsConfigPath: path.join(context.root, options.tsConfig),
       },
       infrastructureLogging: {
@@ -187,6 +217,13 @@ export function withNx(_opts = {}) {
       },
     };
 
+    const mainEntry = options.main
+      ? options.outputFileName
+        ? path.parse(options.outputFileName).name
+        : 'main'
+      : 'main';
+    updated.entry[mainEntry] = path.resolve(context.root, options.main);
+
     return updated;
   };
 }

From 88f01a9d8d2d4d7d614fe96cf33b9510319be3ac Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 4 Sep 2024 12:37:57 +0100
Subject: [PATCH 76/92] feat(rspack): add module federation support (#416)

* feat(rspack): add withModuleFederation util

* feat(rspack): add module federation required executors

* feat(rspack): add module federation support

* fix(rspack): dev server setup

* fix(rspack): cleanup package entry for module federation

* feat(rspack): migrate to rspack 1.0

* fix(rspack): ensure license plugin is not attempting to read root
---
 tests/rspack.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rspack.spec.ts b/tests/rspack.spec.ts
index 1d49a3cb69e7e..82bce59302c1d 100644
--- a/tests/rspack.spec.ts
+++ b/tests/rspack.spec.ts
@@ -136,13 +136,13 @@ describe('rspack e2e', () => {
     result = await runNxCommandAsync(`build ${app3}`);
     expect(result.stdout).toContain('Successfully ran target build');
     // Make sure expected files are present.
-    expect(listFiles(`dist/${app3}`)).toHaveLength(3);
+    expect(listFiles(`dist/${app3}`)).toHaveLength(2);
 
     result = await runNxCommandAsync(
       `build ${app3} --generatePackageJson=true`
     );
     expect(result.stdout).toContain('Successfully ran target build');
     // Make sure expected files are present.
-    expect(listFiles(`dist/${app3}`)).toHaveLength(5);
+    expect(listFiles(`dist/${app3}`)).toHaveLength(4);
   }, 200_000);
 });

From 44c553253b326deba566d19622ca22da810823da Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 5 Sep 2024 15:38:35 +0100
Subject: [PATCH 77/92] fix(rspack): add hook for dev server to log when
 compilation completed (#417)

---
 src/executors/dev-server/dev-server.impl.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/executors/dev-server/dev-server.impl.ts b/src/executors/dev-server/dev-server.impl.ts
index 49ee9047a9c09..2f1f1925b0bca 100644
--- a/src/executors/dev-server/dev-server.impl.ts
+++ b/src/executors/dev-server/dev-server.impl.ts
@@ -1,5 +1,6 @@
 import {
   ExecutorContext,
+  logger,
   parseTargetString,
   readTargetOptions,
 } from '@nx/devkit';
@@ -51,6 +52,8 @@ export default async function* runExecutor(
     port: devServerConfig.port,
   };
 
+  const baseUrl = `http://localhost:${options.port ?? 4200}`;
+
   return yield* createAsyncIterable(({ next }) => {
     const server = new RspackDevServer(
       {
@@ -58,13 +61,20 @@ export default async function* runExecutor(
         onListening: () => {
           next({
             success: true,
-            baseUrl: `http://localhost:${options.port ?? 4200}`,
+            baseUrl,
           });
         },
       },
 
       compiler
     );
+    server.compiler.hooks.done.tap('NX Rspack Dev Server', (stats) => {
+      if (stats.hasErrors()) {
+        logger.error(`NX Compilation failed. See above for more details.`);
+      } else {
+        logger.info(`NX Server ready at ${baseUrl}`);
+      }
+    });
     server.start();
   });
 }

From 819c3f5b90680a54d29b2c11a3730231c613410a Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 6 Sep 2024 18:30:02 +0100
Subject: [PATCH 78/92] feat(rspack): add module-federation-static-server
 (#418)

---
 executors.json                                |   5 +
 .../module-federation-dev-server.impl.ts      | 113 +----
 .../module-federation-dev-server/schema.d.ts  |  18 +
 .../module-federation-static-server.impl.ts   | 385 ++++++++++++++++++
 .../schema.d.ts                               |   3 +
 .../schema.json                               |  14 +
 .../module-federation/build-static.remotes.ts |  97 +++++
 7 files changed, 525 insertions(+), 110 deletions(-)
 create mode 100644 src/executors/module-federation-dev-server/schema.d.ts
 create mode 100644 src/executors/module-federation-static-server/module-federation-static-server.impl.ts
 create mode 100644 src/executors/module-federation-static-server/schema.d.ts
 create mode 100644 src/executors/module-federation-static-server/schema.json
 create mode 100644 src/utils/module-federation/build-static.remotes.ts

diff --git a/executors.json b/executors.json
index 8d1791db1b3be..5c88728a42916 100644
--- a/executors.json
+++ b/executors.json
@@ -25,6 +25,11 @@
       "implementation": "./src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl",
       "schema": "./src/executors/module-federation-ssr-dev-server/schema.json",
       "description": "Serve a host application along with it's known remotes."
+    },
+    "module-federation-static-server": {
+      "implementation": "./src/executors/module-federation-static-server/module-federation-static-server.impl",
+      "schema": "./src/executors/module-federation-static-server/schema.json",
+      "description": "Serve a host and its remotes statically."
     }
   }
 }
diff --git a/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
index d0ba24d81340d..2c77ff2bb940f 100644
--- a/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
+++ b/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
@@ -12,38 +12,20 @@ import {
 } from '@nx/devkit/src/utils/async-iterable';
 import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl';
 import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
-import { cpSync, createWriteStream, existsSync } from 'fs';
-import { fork } from 'node:child_process';
-import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
+import { cpSync, existsSync } from 'fs';
 import { extname, join } from 'path';
 import {
   getModuleFederationConfig,
   getRemotes,
 } from '../../utils/module-federation';
+import { buildStaticRemotes } from '../../utils/module-federation/build-static.remotes';
 import {
   parseStaticRemotesConfig,
   type StaticRemotesConfig,
 } from '../../utils/module-federation/parse-static-remotes-config';
 import { startRemoteProxies } from '../../utils/module-federation/start-remote-proxies';
 import devServerExecutor from '../dev-server/dev-server.impl';
-import { DevServerExecutorSchema } from '../dev-server/schema';
-
-type ModuleFederationDevServerOptions = DevServerExecutorSchema & {
-  // Module Federation Specific Options
-  devRemotes?: (
-    | string
-    | {
-        remoteName: string;
-        configuration: string;
-      }
-  )[];
-  skipRemotes?: string[];
-  static?: boolean;
-  isInitialHost?: boolean;
-  parallel?: number;
-  staticRemotesPort?: number;
-  pathToManifestFile?: string;
-};
+import { ModuleFederationDevServerOptions } from './schema';
 
 function getBuildOptions(buildTarget: string, context: ExecutorContext) {
   const target = parseTargetString(buildTarget, context);
@@ -171,95 +153,6 @@ async function startRemotes(
   return remoteIters;
 }
 
-async function buildStaticRemotes(
-  staticRemotesConfig: StaticRemotesConfig,
-  nxBin,
-  context: ExecutorContext,
-  options: ModuleFederationDevServerOptions
-) {
-  if (!staticRemotesConfig.remotes.length) {
-    return;
-  }
-  logger.info(
-    `NX Building ${staticRemotesConfig.remotes.length} static remotes...`
-  );
-  const mappedLocationOfRemotes: Record<string, string> = {};
-
-  for (const app of staticRemotesConfig.remotes) {
-    mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${
-      options.host
-    }:${options.staticRemotesPort}/${
-      staticRemotesConfig.config[app].urlSegment
-    }`;
-  }
-
-  await new Promise<void>((res, rej) => {
-    const staticProcess = fork(
-      nxBin,
-      [
-        'run-many',
-        `--target=build`,
-        `--projects=${staticRemotesConfig.remotes.join(',')}`,
-        ...(context.configurationName
-          ? [`--configuration=${context.configurationName}`]
-          : []),
-        ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
-      ],
-      {
-        cwd: context.root,
-        stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
-      }
-    );
-
-    // File to debug build failures e.g. 2024-01-01T00_00_0_0Z-build.log'
-    const remoteBuildLogFile = join(
-      workspaceDataDirectory,
-      // eslint-disable-next-line
-      `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`
-    );
-    const stdoutStream = createWriteStream(remoteBuildLogFile);
-
-    staticProcess.stdout.on('data', (data) => {
-      const ANSII_CODE_REGEX =
-        // eslint-disable-next-line no-control-regex
-        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
-      const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
-      stdoutStream.write(stdoutString);
-
-      // in addition to writing into the stdout stream, also show error directly in console
-      // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
-      if (stdoutString.includes('ERROR in')) {
-        logger.log(stdoutString);
-      }
-
-      if (stdoutString.includes('Successfully ran target build')) {
-        staticProcess.stdout.removeAllListeners('data');
-        logger.info(
-          `NX Built ${staticRemotesConfig.remotes.length} static remotes`
-        );
-        res();
-      }
-    });
-    staticProcess.stderr.on('data', (data) => logger.info(data.toString()));
-    staticProcess.once('exit', (code) => {
-      stdoutStream.end();
-      staticProcess.stdout.removeAllListeners('data');
-      staticProcess.stderr.removeAllListeners('data');
-      if (code !== 0) {
-        rej(
-          `Remote failed to start. A complete log can be found in: ${remoteBuildLogFile}`
-        );
-      } else {
-        res();
-      }
-    });
-    process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
-    process.on('exit', () => staticProcess.kill('SIGTERM'));
-  });
-
-  return mappedLocationOfRemotes;
-}
-
 export default async function* moduleFederationDevServer(
   options: ModuleFederationDevServerOptions,
   context: ExecutorContext
diff --git a/src/executors/module-federation-dev-server/schema.d.ts b/src/executors/module-federation-dev-server/schema.d.ts
new file mode 100644
index 0000000000000..61c4c0657eb06
--- /dev/null
+++ b/src/executors/module-federation-dev-server/schema.d.ts
@@ -0,0 +1,18 @@
+import { DevServerExecutorSchema } from '../dev-server/schema';
+
+export type ModuleFederationDevServerOptions = DevServerExecutorSchema & {
+  // Module Federation Specific Options
+  devRemotes?: (
+    | string
+    | {
+        remoteName: string;
+        configuration: string;
+      }
+  )[];
+  skipRemotes?: string[];
+  static?: boolean;
+  isInitialHost?: boolean;
+  parallel?: number;
+  staticRemotesPort?: number;
+  pathToManifestFile?: string;
+};
diff --git a/src/executors/module-federation-static-server/module-federation-static-server.impl.ts b/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
new file mode 100644
index 0000000000000..31628471e48a5
--- /dev/null
+++ b/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
@@ -0,0 +1,385 @@
+import {
+  logger,
+  parseTargetString,
+  readTargetOptions,
+  Target,
+  workspaceRoot,
+} from '@nx/devkit';
+import {
+  combineAsyncIterables,
+  createAsyncIterable,
+} from '@nx/devkit/src/utils/async-iterable';
+import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl';
+import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
+import { fork } from 'child_process';
+import type { Express } from 'express';
+import { cpSync, existsSync, readFileSync, rmSync } from 'fs';
+import * as process from 'node:process';
+import { ExecutorContext } from 'nx/src/config/misc-interfaces';
+import { basename, extname, join } from 'path';
+import {
+  getModuleFederationConfig,
+  getRemotes,
+} from '../../utils/module-federation';
+import { buildStaticRemotes } from '../../utils/module-federation/build-static.remotes';
+import {
+  parseStaticRemotesConfig,
+  StaticRemotesConfig,
+} from '../../utils/module-federation/parse-static-remotes-config';
+import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
+import type { RspackExecutorSchema } from '../rspack/schema';
+import { ModuleFederationStaticServerSchema } from './schema';
+
+function getBuildAndServeOptionsFromServeTarget(
+  serveTarget: string,
+  context: ExecutorContext
+) {
+  const target = parseTargetString(serveTarget, context);
+
+  const serveOptions: ModuleFederationDevServerOptions = readTargetOptions(
+    target,
+    context
+  );
+  const buildTarget = parseTargetString(serveOptions.buildTarget, context);
+
+  const buildOptions: RspackExecutorSchema = readTargetOptions(
+    buildTarget,
+    context
+  );
+
+  let pathToManifestFile = join(
+    context.root,
+    context.projectGraph.nodes[context.projectName].data.sourceRoot,
+    'assets/module-federation.manifest.json'
+  );
+  if (serveOptions.pathToManifestFile) {
+    const userPathToManifestFile = join(
+      context.root,
+      serveOptions.pathToManifestFile
+    );
+    if (!existsSync(userPathToManifestFile)) {
+      throw new Error(
+        `The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`
+      );
+    } else if (extname(serveOptions.pathToManifestFile) !== '.json') {
+      throw new Error(
+        `The Module Federation manifest file must be a JSON. Please ensure the file at ${userPathToManifestFile} is a JSON.`
+      );
+    }
+
+    pathToManifestFile = userPathToManifestFile;
+  }
+
+  return {
+    buildTarget,
+    buildOptions,
+    serveOptions,
+    pathToManifestFile,
+  };
+}
+
+async function buildHost(
+  nxBin: string,
+  buildTarget: Target,
+  context: ExecutorContext
+) {
+  await new Promise<void>((res, rej) => {
+    const staticProcess = fork(
+      nxBin,
+      [
+        `run`,
+        `${buildTarget.project}:${buildTarget.target}${
+          buildTarget.configuration
+            ? `:${buildTarget.configuration}`
+            : context.configurationName
+            ? `:${context.configurationName}`
+            : ''
+        }`,
+      ],
+      {
+        cwd: context.root,
+        stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+      }
+    );
+    staticProcess.stdout.on('data', (data) => {
+      const ANSII_CODE_REGEX =
+        // eslint-disable-next-line no-control-regex
+        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+      const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
+
+      // in addition to writing into the stdout stream, also show error directly in console
+      // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
+      if (stdoutString.includes('ERROR in')) {
+        logger.log(stdoutString);
+      }
+
+      if (stdoutString.includes('Successfully ran target build')) {
+        staticProcess.stdout.removeAllListeners('data');
+        logger.info(`NX Built host`);
+        res();
+      }
+    });
+    staticProcess.stderr.on('data', (data) => logger.info(data.toString()));
+    staticProcess.once('exit', (code) => {
+      staticProcess.stdout.removeAllListeners('data');
+      staticProcess.stderr.removeAllListeners('data');
+      if (code !== 0) {
+        rej(`Host failed to build. See above for details.`);
+      } else {
+        res();
+      }
+    });
+
+    process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
+    process.on('exit', () => staticProcess.kill('SIGTERM'));
+  });
+}
+
+function moveToTmpDirectory(
+  staticRemotesConfig: StaticRemotesConfig,
+  hostOutputPath: string,
+  hostUrlSegment: string
+) {
+  const commonOutputDirectory = join(
+    workspaceRoot,
+    'tmp/static-module-federation'
+  );
+  for (const app of staticRemotesConfig.remotes) {
+    const remoteConfig = staticRemotesConfig.config[app];
+    cpSync(
+      remoteConfig.outputPath,
+      join(commonOutputDirectory, remoteConfig.urlSegment),
+      {
+        force: true,
+        recursive: true,
+      }
+    );
+  }
+  cpSync(hostOutputPath, join(commonOutputDirectory, hostUrlSegment), {
+    force: true,
+    recursive: true,
+  });
+
+  const cleanup = () => {
+    rmSync(commonOutputDirectory, { force: true, recursive: true });
+  };
+  process.on('SIGTERM', () => {
+    cleanup();
+  });
+  process.on('exit', () => {
+    cleanup();
+  });
+
+  return commonOutputDirectory;
+}
+
+export function startProxies(
+  staticRemotesConfig: StaticRemotesConfig,
+  hostServeOptions: ModuleFederationDevServerOptions,
+  mappedLocationOfHost: string,
+  mappedLocationsOfRemotes: Record<string, string>,
+  sslOptions?: { pathToCert: string; pathToKey: string }
+) {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { createProxyMiddleware } = require('http-proxy-middleware');
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const express = require('express');
+  let sslCert: Buffer;
+  let sslKey: Buffer;
+  if (sslOptions && sslOptions.pathToCert && sslOptions.pathToKey) {
+    if (existsSync(sslOptions.pathToCert) && existsSync(sslOptions.pathToKey)) {
+      sslCert = readFileSync(sslOptions.pathToCert);
+      sslKey = readFileSync(sslOptions.pathToKey);
+    } else {
+      logger.warn(
+        `Encountered SSL options in project.json, however, the certificate files do not exist in the filesystem. Using http.`
+      );
+      logger.warn(
+        `Attempted to find '${sslOptions.pathToCert}' and '${sslOptions.pathToKey}'.`
+      );
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const http = require('http');
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const https = require('https');
+
+  logger.info(`NX Starting static remotes proxies...`);
+  for (const app of staticRemotesConfig.remotes) {
+    const expressProxy: Express = express();
+    expressProxy.use(
+      createProxyMiddleware({
+        target: mappedLocationsOfRemotes[app],
+        changeOrigin: true,
+        secure: sslCert ? false : undefined,
+      })
+    );
+    const proxyServer = (sslCert ? https : http)
+      .createServer({ cert: sslCert, key: sslKey }, expressProxy)
+      .listen(staticRemotesConfig.config[app].port);
+    process.on('SIGTERM', () => proxyServer.close());
+    process.on('exit', () => proxyServer.close());
+  }
+  logger.info(`NX Static remotes proxies started successfully`);
+  logger.info(`NX Starting static host proxy...`);
+  const expressProxy: Express = express();
+  expressProxy.use(
+    createProxyMiddleware({
+      target: mappedLocationOfHost,
+      changeOrigin: true,
+      secure: sslCert ? false : undefined,
+    })
+  );
+  const proxyServer = (sslCert ? https : http)
+    .createServer({ cert: sslCert, key: sslKey }, expressProxy)
+    .listen(hostServeOptions.port);
+  process.on('SIGTERM', () => proxyServer.close());
+  process.on('exit', () => proxyServer.close());
+  logger.info('NX Static host proxy started successfully');
+}
+
+export default async function* moduleFederationStaticServer(
+  schema: ModuleFederationStaticServerSchema,
+  context: ExecutorContext
+) {
+  // Force Node to resolve to look for the nx binary that is inside node_modules
+  const nxBin = require.resolve('nx/bin/nx');
+
+  // Get the remotes from the module federation config
+  const p = context.projectsConfigurations.projects[context.projectName];
+  const options = getBuildAndServeOptionsFromServeTarget(
+    schema.serveTarget,
+    context
+  );
+
+  const moduleFederationConfig = getModuleFederationConfig(
+    options.buildOptions.tsConfig,
+    context.root,
+    p.root,
+    'react'
+  );
+
+  const remotes = getRemotes(
+    [],
+    options.serveOptions.skipRemotes,
+    moduleFederationConfig,
+    {
+      projectName: context.projectName,
+      projectGraph: context.projectGraph,
+      root: context.root,
+    },
+    options.pathToManifestFile
+  );
+
+  const staticRemotesConfig = parseStaticRemotesConfig(
+    [...remotes.staticRemotes, ...remotes.dynamicRemotes],
+    context
+  );
+
+  options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
+  const mappedLocationsOfStaticRemotes = await buildStaticRemotes(
+    staticRemotesConfig,
+    nxBin,
+    context,
+    options.serveOptions
+  );
+
+  // Build the host
+  const hostUrlSegment = basename(options.buildOptions.outputPath);
+  const mappedLocationOfHost = `http${options.serveOptions.ssl ? 's' : ''}://${
+    options.serveOptions.host
+  }:${options.serveOptions.staticRemotesPort}/${hostUrlSegment}`;
+  await buildHost(nxBin, options.buildTarget, context);
+
+  // Move to a temporary directory
+  const commonOutputDirectory = moveToTmpDirectory(
+    staticRemotesConfig,
+    options.buildOptions.outputPath,
+    hostUrlSegment
+  );
+
+  // File Serve the temporary directory
+  const staticFileServerIter = fileServerExecutor(
+    {
+      cors: true,
+      watch: false,
+      staticFilePath: commonOutputDirectory,
+      parallel: false,
+      spa: false,
+      withDeps: false,
+      host: options.serveOptions.host,
+      port: options.serveOptions.staticRemotesPort,
+      ssl: options.serveOptions.ssl,
+      sslCert: options.serveOptions.sslCert,
+      sslKey: options.serveOptions.sslKey,
+      cacheSeconds: -1,
+    },
+    context
+  );
+
+  // express proxy all of it
+  startProxies(
+    staticRemotesConfig,
+    options.serveOptions,
+    mappedLocationOfHost,
+    mappedLocationsOfStaticRemotes,
+    options.serveOptions.ssl
+      ? {
+          pathToCert: join(workspaceRoot, options.serveOptions.sslCert),
+          pathToKey: join(workspaceRoot, options.serveOptions.sslKey),
+        }
+      : undefined
+  );
+
+  return yield* combineAsyncIterables(
+    staticFileServerIter,
+    createAsyncIterable<{ success: true; baseUrl: string }>(
+      async ({ next, done }) => {
+        const host = options.serveOptions.host ?? 'localhost';
+        const baseUrl = `http${options.serveOptions.ssl ? 's' : ''}://${host}:${
+          options.serveOptions.port
+        }`;
+
+        if (remotes.remotePorts.length === 0) {
+          const portsToWaitFor = [options.serveOptions.staticRemotesPort];
+          await Promise.all(
+            portsToWaitFor.map((port) =>
+              waitForPortOpen(port, {
+                retries: 480,
+                retryDelay: 2500,
+                host: host,
+              })
+            )
+          );
+
+          logger.info(`NX Server ready at ${baseUrl}`);
+          next({ success: true, baseUrl: baseUrl });
+          done();
+          return;
+        }
+
+        try {
+          const portsToWaitFor = staticFileServerIter
+            ? [options.serveOptions.staticRemotesPort, ...remotes.remotePorts]
+            : [...remotes.remotePorts];
+          await Promise.all(
+            portsToWaitFor.map((port) =>
+              waitForPortOpen(port, {
+                retries: 480,
+                retryDelay: 2500,
+                host: host,
+              })
+            )
+          );
+
+          logger.info(`NX Server ready at ${baseUrl}`);
+          next({ success: true, baseUrl: baseUrl });
+        } catch (err) {
+          throw new Error(`Failed to start. Check above for any errors.`);
+        } finally {
+          done();
+        }
+      }
+    )
+  );
+}
diff --git a/src/executors/module-federation-static-server/schema.d.ts b/src/executors/module-federation-static-server/schema.d.ts
new file mode 100644
index 0000000000000..8386a0f2006ed
--- /dev/null
+++ b/src/executors/module-federation-static-server/schema.d.ts
@@ -0,0 +1,3 @@
+export interface ModuleFederationStaticServerSchema {
+  serveTarget: string;
+}
diff --git a/src/executors/module-federation-static-server/schema.json b/src/executors/module-federation-static-server/schema.json
new file mode 100644
index 0000000000000..329ac0a6226d5
--- /dev/null
+++ b/src/executors/module-federation-static-server/schema.json
@@ -0,0 +1,14 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "title": "Module Federation Static Dev Server",
+  "description": "Serve a host application statically along with it's remotes.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "serveTarget": {
+      "type": "string"
+    }
+  },
+  "required": ["serveTarget"]
+}
diff --git a/src/utils/module-federation/build-static.remotes.ts b/src/utils/module-federation/build-static.remotes.ts
new file mode 100644
index 0000000000000..e4d1aa96e239d
--- /dev/null
+++ b/src/utils/module-federation/build-static.remotes.ts
@@ -0,0 +1,97 @@
+import { ExecutorContext } from '@nx/devkit';
+import { createWriteStream } from 'fs';
+import { fork } from 'node:child_process';
+import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
+import { logger } from 'nx/src/utils/logger';
+import { join } from 'path';
+import { ModuleFederationDevServerOptions } from '../../executors/module-federation-dev-server/schema';
+import type { StaticRemotesConfig } from './parse-static-remotes-config';
+
+export async function buildStaticRemotes(
+  staticRemotesConfig: StaticRemotesConfig,
+  nxBin,
+  context: ExecutorContext,
+  options: ModuleFederationDevServerOptions
+) {
+  if (!staticRemotesConfig.remotes.length) {
+    return;
+  }
+  logger.info(
+    `NX Building ${staticRemotesConfig.remotes.length} static remotes...`
+  );
+  const mappedLocationOfRemotes: Record<string, string> = {};
+
+  for (const app of staticRemotesConfig.remotes) {
+    mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${
+      options.host
+    }:${options.staticRemotesPort}/${
+      staticRemotesConfig.config[app].urlSegment
+    }`;
+  }
+
+  await new Promise<void>((res, rej) => {
+    const staticProcess = fork(
+      nxBin,
+      [
+        'run-many',
+        `--target=build`,
+        `--projects=${staticRemotesConfig.remotes.join(',')}`,
+        ...(context.configurationName
+          ? [`--configuration=${context.configurationName}`]
+          : []),
+        ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
+      ],
+      {
+        cwd: context.root,
+        stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+      }
+    );
+
+    // File to debug build failures e.g. 2024-01-01T00_00_0_0Z-build.log'
+    const remoteBuildLogFile = join(
+      workspaceDataDirectory,
+      // eslint-disable-next-line
+      `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`
+    );
+    const stdoutStream = createWriteStream(remoteBuildLogFile);
+
+    staticProcess.stdout.on('data', (data) => {
+      const ANSII_CODE_REGEX =
+        // eslint-disable-next-line no-control-regex
+        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+      const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
+      stdoutStream.write(stdoutString);
+
+      // in addition to writing into the stdout stream, also show error directly in console
+      // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
+      if (stdoutString.includes('ERROR in')) {
+        logger.log(stdoutString);
+      }
+
+      if (stdoutString.includes('Successfully ran target build')) {
+        staticProcess.stdout.removeAllListeners('data');
+        logger.info(
+          `NX Built ${staticRemotesConfig.remotes.length} static remotes`
+        );
+        res();
+      }
+    });
+    staticProcess.stderr.on('data', (data) => logger.info(data.toString()));
+    staticProcess.once('exit', (code) => {
+      stdoutStream.end();
+      staticProcess.stdout.removeAllListeners('data');
+      staticProcess.stderr.removeAllListeners('data');
+      if (code !== 0) {
+        rej(
+          `Remote failed to start. A complete log can be found in: ${remoteBuildLogFile}`
+        );
+      } else {
+        res();
+      }
+    });
+    process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
+    process.on('exit', () => staticProcess.kill('SIGTERM'));
+  });
+
+  return mappedLocationOfRemotes;
+}

From f3ac0852c1edeee4aa83527866af48d80bccde80 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Mon, 9 Sep 2024 16:03:42 +0100
Subject: [PATCH 79/92] fix(rspack): ensure process is default import (#420)

---
 .../module-federation-static-server.impl.ts         | 11 ++++++++++-
 src/utils/with-web.ts                               | 13 +++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/executors/module-federation-static-server/module-federation-static-server.impl.ts b/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
index 31628471e48a5..41b8c549492c6 100644
--- a/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
+++ b/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
@@ -14,7 +14,6 @@ import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
 import { fork } from 'child_process';
 import type { Express } from 'express';
 import { cpSync, existsSync, readFileSync, rmSync } from 'fs';
-import * as process from 'node:process';
 import { ExecutorContext } from 'nx/src/config/misc-interfaces';
 import { basename, extname, join } from 'path';
 import {
@@ -228,6 +227,16 @@ export function startProxies(
       target: mappedLocationOfHost,
       changeOrigin: true,
       secure: sslCert ? false : undefined,
+      pathRewrite: (path) => {
+        let pathRewrite = path;
+        for (const app of staticRemotesConfig.remotes) {
+          if (path.endsWith(app)) {
+            pathRewrite = '/';
+            break;
+          }
+        }
+        return pathRewrite;
+      },
     })
   );
   const proxyServer = (sslCert ? https : http)
diff --git a/src/utils/with-web.ts b/src/utils/with-web.ts
index 244984ad4a75e..1d735a4d52744 100644
--- a/src/utils/with-web.ts
+++ b/src/utils/with-web.ts
@@ -40,6 +40,9 @@ export function withWeb(opts: WithWebOptions = {}) {
 
     return {
       ...config,
+      experiments: {
+        css: true,
+      },
       module: {
         ...config.module,
         rules: [
@@ -51,9 +54,11 @@ export function withWeb(opts: WithWebOptions = {}) {
           {
             test: /\.css$/,
             type: 'css',
-            use: [{
-              loader: require.resolve('postcss-loader'),
-            }]
+            use: [
+              {
+                loader: require.resolve('postcss-loader'),
+              },
+            ],
           },
           {
             test: /\.scss$|\.sass$/,
@@ -114,7 +119,7 @@ export function withWeb(opts: WithWebOptions = {}) {
         }),
         new rspack.DefinePlugin({
           'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
-        })
+        }),
       ],
     };
   };

From c85cc7b5f4eabcdd16ef1d96634373b3812555bc Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 18 Sep 2024 10:22:51 +0100
Subject: [PATCH 80/92] chore(repo): move packages/rspack to packages/rspack to
 prepare to be imported

---
 .eslintrc.json => packages/rspack/.eslintrc.json                  | 0
 README.md => packages/rspack/README.md                            | 0
 executors.json => packages/rspack/executors.json                  | 0
 generators.json => packages/rspack/generators.json                | 0
 jest.config.ts => packages/rspack/jest.config.ts                  | 0
 migrations.json => packages/rspack/migrations.json                | 0
 module-federation.ts => packages/rspack/module-federation.ts      | 0
 package.json => packages/rspack/package.json                      | 0
 plugin.ts => packages/rspack/plugin.ts                            | 0
 project.json => packages/rspack/project.json                      | 0
 .../rspack/src}/executors/dev-server/dev-server.impl.ts           | 0
 .../rspack/src}/executors/dev-server/lib/get-dev-server-config.ts | 0
 .../rspack/src}/executors/dev-server/lib/serve-path.ts            | 0
 {src => packages/rspack/src}/executors/dev-server/schema.d.ts     | 0
 {src => packages/rspack/src}/executors/dev-server/schema.json     | 0
 .../module-federation-dev-server.impl.ts                          | 0
 .../src}/executors/module-federation-dev-server/schema.d.ts       | 0
 .../src}/executors/module-federation-dev-server/schema.json       | 0
 .../module-federation-ssr-dev-server.impl.ts                      | 0
 .../src}/executors/module-federation-ssr-dev-server/schema.json   | 0
 .../module-federation-static-server.impl.ts                       | 0
 .../src}/executors/module-federation-static-server/schema.d.ts    | 0
 .../src}/executors/module-federation-static-server/schema.json    | 0
 {src => packages/rspack/src}/executors/rspack/rspack.impl.ts      | 0
 {src => packages/rspack/src}/executors/rspack/schema.d.ts         | 0
 {src => packages/rspack/src}/executors/rspack/schema.json         | 0
 .../ssr-dev-server/lib/wait-until-server-is-listening.ts          | 0
 {src => packages/rspack/src}/executors/ssr-dev-server/schema.d.ts | 0
 {src => packages/rspack/src}/executors/ssr-dev-server/schema.json | 0
 .../rspack/src}/executors/ssr-dev-server/ssr-dev-server.impl.ts   | 0
 .../rspack/src}/generators/application/application.ts             | 0
 .../rspack/src}/generators/application/lib/create-ts-config.ts    | 0
 .../src}/generators/application/lib/normalize-options.spec.ts     | 0
 .../rspack/src}/generators/application/lib/normalize-options.ts   | 0
 {src => packages/rspack/src}/generators/application/schema.d.ts   | 0
 {src => packages/rspack/src}/generators/application/schema.json   | 0
 .../rspack/src}/generators/configuration/configuration.ts         | 0
 {src => packages/rspack/src}/generators/configuration/schema.d.ts | 0
 {src => packages/rspack/src}/generators/configuration/schema.json | 0
 {src => packages/rspack/src}/generators/init/init.ts              | 0
 {src => packages/rspack/src}/generators/init/schema.d.ts          | 0
 {src => packages/rspack/src}/generators/init/schema.json          | 0
 {src => packages/rspack/src}/generators/preset/preset.ts          | 0
 {src => packages/rspack/src}/generators/preset/schema.d.ts        | 0
 {src => packages/rspack/src}/generators/preset/schema.json        | 0
 {src => packages/rspack/src}/index.ts                             | 0
 .../update-16-0-0-add-nx-packages.spec.ts                         | 0
 .../update-16-0-0-add-nx-packages.ts                              | 0
 .../rspack/src}/plugins/generate-package-json-plugin.ts           | 0
 {src => packages/rspack/src}/plugins/plugin.ts                    | 0
 {src => packages/rspack/src}/utils/config.ts                      | 0
 {src => packages/rspack/src}/utils/create-compiler.ts             | 0
 {src => packages/rspack/src}/utils/generator-utils.ts             | 0
 {src => packages/rspack/src}/utils/get-copy-patterns.ts           | 0
 {src => packages/rspack/src}/utils/jest-utils.ts                  | 0
 {src => packages/rspack/src}/utils/mode-utils.ts                  | 0
 {src => packages/rspack/src}/utils/model.ts                       | 0
 .../rspack/src}/utils/module-federation/build-static.remotes.ts   | 0
 .../rspack/src}/utils/module-federation/dependencies.spec.ts      | 0
 .../rspack/src}/utils/module-federation/dependencies.ts           | 0
 .../rspack/src}/utils/module-federation/get-remotes-for-host.ts   | 0
 {src => packages/rspack/src}/utils/module-federation/index.ts     | 0
 .../rspack/src}/utils/module-federation/models/index.ts           | 0
 .../rspack/src}/utils/module-federation/package-json.ts           | 0
 .../src}/utils/module-federation/parse-static-remotes-config.ts   | 0
 .../module-federation/plugins/runtime-library-control.plugin.ts   | 0
 .../rspack/src}/utils/module-federation/public-api.ts             | 0
 {src => packages/rspack/src}/utils/module-federation/remotes.ts   | 0
 .../rspack/src}/utils/module-federation/secondary-entry-points.ts | 0
 .../rspack/src}/utils/module-federation/share.spec.ts             | 0
 {src => packages/rspack/src}/utils/module-federation/share.ts     | 0
 .../rspack/src}/utils/module-federation/start-remote-proxies.ts   | 0
 .../src}/utils/module-federation/start-ssr-remote-proxies.ts      | 0
 .../rspack/src}/utils/module-federation/typescript.spec.ts        | 0
 .../rspack/src}/utils/module-federation/typescript.ts             | 0
 .../module-federation/with-module-federation/package-json.ts      | 0
 .../src}/utils/module-federation/with-module-federation/utils.ts  | 0
 .../with-module-federation/with-module-federation-ssr.ts          | 0
 .../with-module-federation/with-module-federation.ts              | 0
 {src => packages/rspack/src}/utils/normalize-assets.ts            | 0
 {src => packages/rspack/src}/utils/read-rspack-options.ts         | 0
 .../rspack/src}/utils/resolve-user-defined-rspack-config.ts       | 0
 {src => packages/rspack/src}/utils/versions.ts                    | 0
 {src => packages/rspack/src}/utils/with-nx.ts                     | 0
 {src => packages/rspack/src}/utils/with-react.ts                  | 0
 {src => packages/rspack/src}/utils/with-web.ts                    | 0
 tsconfig.json => packages/rspack/tsconfig.json                    | 0
 tsconfig.lib.json => packages/rspack/tsconfig.lib.json            | 0
 tsconfig.spec.json => packages/rspack/tsconfig.spec.json          | 0
 89 files changed, 0 insertions(+), 0 deletions(-)
 rename .eslintrc.json => packages/rspack/.eslintrc.json (100%)
 rename README.md => packages/rspack/README.md (100%)
 rename executors.json => packages/rspack/executors.json (100%)
 rename generators.json => packages/rspack/generators.json (100%)
 rename jest.config.ts => packages/rspack/jest.config.ts (100%)
 rename migrations.json => packages/rspack/migrations.json (100%)
 rename module-federation.ts => packages/rspack/module-federation.ts (100%)
 rename package.json => packages/rspack/package.json (100%)
 rename plugin.ts => packages/rspack/plugin.ts (100%)
 rename project.json => packages/rspack/project.json (100%)
 rename {src => packages/rspack/src}/executors/dev-server/dev-server.impl.ts (100%)
 rename {src => packages/rspack/src}/executors/dev-server/lib/get-dev-server-config.ts (100%)
 rename {src => packages/rspack/src}/executors/dev-server/lib/serve-path.ts (100%)
 rename {src => packages/rspack/src}/executors/dev-server/schema.d.ts (100%)
 rename {src => packages/rspack/src}/executors/dev-server/schema.json (100%)
 rename {src => packages/rspack/src}/executors/module-federation-dev-server/module-federation-dev-server.impl.ts (100%)
 rename {src => packages/rspack/src}/executors/module-federation-dev-server/schema.d.ts (100%)
 rename {src => packages/rspack/src}/executors/module-federation-dev-server/schema.json (100%)
 rename {src => packages/rspack/src}/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts (100%)
 rename {src => packages/rspack/src}/executors/module-federation-ssr-dev-server/schema.json (100%)
 rename {src => packages/rspack/src}/executors/module-federation-static-server/module-federation-static-server.impl.ts (100%)
 rename {src => packages/rspack/src}/executors/module-federation-static-server/schema.d.ts (100%)
 rename {src => packages/rspack/src}/executors/module-federation-static-server/schema.json (100%)
 rename {src => packages/rspack/src}/executors/rspack/rspack.impl.ts (100%)
 rename {src => packages/rspack/src}/executors/rspack/schema.d.ts (100%)
 rename {src => packages/rspack/src}/executors/rspack/schema.json (100%)
 rename {src => packages/rspack/src}/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts (100%)
 rename {src => packages/rspack/src}/executors/ssr-dev-server/schema.d.ts (100%)
 rename {src => packages/rspack/src}/executors/ssr-dev-server/schema.json (100%)
 rename {src => packages/rspack/src}/executors/ssr-dev-server/ssr-dev-server.impl.ts (100%)
 rename {src => packages/rspack/src}/generators/application/application.ts (100%)
 rename {src => packages/rspack/src}/generators/application/lib/create-ts-config.ts (100%)
 rename {src => packages/rspack/src}/generators/application/lib/normalize-options.spec.ts (100%)
 rename {src => packages/rspack/src}/generators/application/lib/normalize-options.ts (100%)
 rename {src => packages/rspack/src}/generators/application/schema.d.ts (100%)
 rename {src => packages/rspack/src}/generators/application/schema.json (100%)
 rename {src => packages/rspack/src}/generators/configuration/configuration.ts (100%)
 rename {src => packages/rspack/src}/generators/configuration/schema.d.ts (100%)
 rename {src => packages/rspack/src}/generators/configuration/schema.json (100%)
 rename {src => packages/rspack/src}/generators/init/init.ts (100%)
 rename {src => packages/rspack/src}/generators/init/schema.d.ts (100%)
 rename {src => packages/rspack/src}/generators/init/schema.json (100%)
 rename {src => packages/rspack/src}/generators/preset/preset.ts (100%)
 rename {src => packages/rspack/src}/generators/preset/schema.d.ts (100%)
 rename {src => packages/rspack/src}/generators/preset/schema.json (100%)
 rename {src => packages/rspack/src}/index.ts (100%)
 rename {src => packages/rspack/src}/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts (100%)
 rename {src => packages/rspack/src}/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts (100%)
 rename {src => packages/rspack/src}/plugins/generate-package-json-plugin.ts (100%)
 rename {src => packages/rspack/src}/plugins/plugin.ts (100%)
 rename {src => packages/rspack/src}/utils/config.ts (100%)
 rename {src => packages/rspack/src}/utils/create-compiler.ts (100%)
 rename {src => packages/rspack/src}/utils/generator-utils.ts (100%)
 rename {src => packages/rspack/src}/utils/get-copy-patterns.ts (100%)
 rename {src => packages/rspack/src}/utils/jest-utils.ts (100%)
 rename {src => packages/rspack/src}/utils/mode-utils.ts (100%)
 rename {src => packages/rspack/src}/utils/model.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/build-static.remotes.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/dependencies.spec.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/dependencies.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/get-remotes-for-host.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/index.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/models/index.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/package-json.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/parse-static-remotes-config.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/plugins/runtime-library-control.plugin.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/public-api.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/remotes.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/secondary-entry-points.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/share.spec.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/share.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/start-remote-proxies.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/start-ssr-remote-proxies.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/typescript.spec.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/typescript.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/with-module-federation/package-json.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/with-module-federation/utils.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/with-module-federation/with-module-federation-ssr.ts (100%)
 rename {src => packages/rspack/src}/utils/module-federation/with-module-federation/with-module-federation.ts (100%)
 rename {src => packages/rspack/src}/utils/normalize-assets.ts (100%)
 rename {src => packages/rspack/src}/utils/read-rspack-options.ts (100%)
 rename {src => packages/rspack/src}/utils/resolve-user-defined-rspack-config.ts (100%)
 rename {src => packages/rspack/src}/utils/versions.ts (100%)
 rename {src => packages/rspack/src}/utils/with-nx.ts (100%)
 rename {src => packages/rspack/src}/utils/with-react.ts (100%)
 rename {src => packages/rspack/src}/utils/with-web.ts (100%)
 rename tsconfig.json => packages/rspack/tsconfig.json (100%)
 rename tsconfig.lib.json => packages/rspack/tsconfig.lib.json (100%)
 rename tsconfig.spec.json => packages/rspack/tsconfig.spec.json (100%)

diff --git a/.eslintrc.json b/packages/rspack/.eslintrc.json
similarity index 100%
rename from .eslintrc.json
rename to packages/rspack/.eslintrc.json
diff --git a/README.md b/packages/rspack/README.md
similarity index 100%
rename from README.md
rename to packages/rspack/README.md
diff --git a/executors.json b/packages/rspack/executors.json
similarity index 100%
rename from executors.json
rename to packages/rspack/executors.json
diff --git a/generators.json b/packages/rspack/generators.json
similarity index 100%
rename from generators.json
rename to packages/rspack/generators.json
diff --git a/jest.config.ts b/packages/rspack/jest.config.ts
similarity index 100%
rename from jest.config.ts
rename to packages/rspack/jest.config.ts
diff --git a/migrations.json b/packages/rspack/migrations.json
similarity index 100%
rename from migrations.json
rename to packages/rspack/migrations.json
diff --git a/module-federation.ts b/packages/rspack/module-federation.ts
similarity index 100%
rename from module-federation.ts
rename to packages/rspack/module-federation.ts
diff --git a/package.json b/packages/rspack/package.json
similarity index 100%
rename from package.json
rename to packages/rspack/package.json
diff --git a/plugin.ts b/packages/rspack/plugin.ts
similarity index 100%
rename from plugin.ts
rename to packages/rspack/plugin.ts
diff --git a/project.json b/packages/rspack/project.json
similarity index 100%
rename from project.json
rename to packages/rspack/project.json
diff --git a/src/executors/dev-server/dev-server.impl.ts b/packages/rspack/src/executors/dev-server/dev-server.impl.ts
similarity index 100%
rename from src/executors/dev-server/dev-server.impl.ts
rename to packages/rspack/src/executors/dev-server/dev-server.impl.ts
diff --git a/src/executors/dev-server/lib/get-dev-server-config.ts b/packages/rspack/src/executors/dev-server/lib/get-dev-server-config.ts
similarity index 100%
rename from src/executors/dev-server/lib/get-dev-server-config.ts
rename to packages/rspack/src/executors/dev-server/lib/get-dev-server-config.ts
diff --git a/src/executors/dev-server/lib/serve-path.ts b/packages/rspack/src/executors/dev-server/lib/serve-path.ts
similarity index 100%
rename from src/executors/dev-server/lib/serve-path.ts
rename to packages/rspack/src/executors/dev-server/lib/serve-path.ts
diff --git a/src/executors/dev-server/schema.d.ts b/packages/rspack/src/executors/dev-server/schema.d.ts
similarity index 100%
rename from src/executors/dev-server/schema.d.ts
rename to packages/rspack/src/executors/dev-server/schema.d.ts
diff --git a/src/executors/dev-server/schema.json b/packages/rspack/src/executors/dev-server/schema.json
similarity index 100%
rename from src/executors/dev-server/schema.json
rename to packages/rspack/src/executors/dev-server/schema.json
diff --git a/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
similarity index 100%
rename from src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
rename to packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
diff --git a/src/executors/module-federation-dev-server/schema.d.ts b/packages/rspack/src/executors/module-federation-dev-server/schema.d.ts
similarity index 100%
rename from src/executors/module-federation-dev-server/schema.d.ts
rename to packages/rspack/src/executors/module-federation-dev-server/schema.d.ts
diff --git a/src/executors/module-federation-dev-server/schema.json b/packages/rspack/src/executors/module-federation-dev-server/schema.json
similarity index 100%
rename from src/executors/module-federation-dev-server/schema.json
rename to packages/rspack/src/executors/module-federation-dev-server/schema.json
diff --git a/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts b/packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
similarity index 100%
rename from src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
rename to packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
diff --git a/src/executors/module-federation-ssr-dev-server/schema.json b/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json
similarity index 100%
rename from src/executors/module-federation-ssr-dev-server/schema.json
rename to packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json
diff --git a/src/executors/module-federation-static-server/module-federation-static-server.impl.ts b/packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
similarity index 100%
rename from src/executors/module-federation-static-server/module-federation-static-server.impl.ts
rename to packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts
diff --git a/src/executors/module-federation-static-server/schema.d.ts b/packages/rspack/src/executors/module-federation-static-server/schema.d.ts
similarity index 100%
rename from src/executors/module-federation-static-server/schema.d.ts
rename to packages/rspack/src/executors/module-federation-static-server/schema.d.ts
diff --git a/src/executors/module-federation-static-server/schema.json b/packages/rspack/src/executors/module-federation-static-server/schema.json
similarity index 100%
rename from src/executors/module-federation-static-server/schema.json
rename to packages/rspack/src/executors/module-federation-static-server/schema.json
diff --git a/src/executors/rspack/rspack.impl.ts b/packages/rspack/src/executors/rspack/rspack.impl.ts
similarity index 100%
rename from src/executors/rspack/rspack.impl.ts
rename to packages/rspack/src/executors/rspack/rspack.impl.ts
diff --git a/src/executors/rspack/schema.d.ts b/packages/rspack/src/executors/rspack/schema.d.ts
similarity index 100%
rename from src/executors/rspack/schema.d.ts
rename to packages/rspack/src/executors/rspack/schema.d.ts
diff --git a/src/executors/rspack/schema.json b/packages/rspack/src/executors/rspack/schema.json
similarity index 100%
rename from src/executors/rspack/schema.json
rename to packages/rspack/src/executors/rspack/schema.json
diff --git a/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts b/packages/rspack/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
similarity index 100%
rename from src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
rename to packages/rspack/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
diff --git a/src/executors/ssr-dev-server/schema.d.ts b/packages/rspack/src/executors/ssr-dev-server/schema.d.ts
similarity index 100%
rename from src/executors/ssr-dev-server/schema.d.ts
rename to packages/rspack/src/executors/ssr-dev-server/schema.d.ts
diff --git a/src/executors/ssr-dev-server/schema.json b/packages/rspack/src/executors/ssr-dev-server/schema.json
similarity index 100%
rename from src/executors/ssr-dev-server/schema.json
rename to packages/rspack/src/executors/ssr-dev-server/schema.json
diff --git a/src/executors/ssr-dev-server/ssr-dev-server.impl.ts b/packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts
similarity index 100%
rename from src/executors/ssr-dev-server/ssr-dev-server.impl.ts
rename to packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts
diff --git a/src/generators/application/application.ts b/packages/rspack/src/generators/application/application.ts
similarity index 100%
rename from src/generators/application/application.ts
rename to packages/rspack/src/generators/application/application.ts
diff --git a/src/generators/application/lib/create-ts-config.ts b/packages/rspack/src/generators/application/lib/create-ts-config.ts
similarity index 100%
rename from src/generators/application/lib/create-ts-config.ts
rename to packages/rspack/src/generators/application/lib/create-ts-config.ts
diff --git a/src/generators/application/lib/normalize-options.spec.ts b/packages/rspack/src/generators/application/lib/normalize-options.spec.ts
similarity index 100%
rename from src/generators/application/lib/normalize-options.spec.ts
rename to packages/rspack/src/generators/application/lib/normalize-options.spec.ts
diff --git a/src/generators/application/lib/normalize-options.ts b/packages/rspack/src/generators/application/lib/normalize-options.ts
similarity index 100%
rename from src/generators/application/lib/normalize-options.ts
rename to packages/rspack/src/generators/application/lib/normalize-options.ts
diff --git a/src/generators/application/schema.d.ts b/packages/rspack/src/generators/application/schema.d.ts
similarity index 100%
rename from src/generators/application/schema.d.ts
rename to packages/rspack/src/generators/application/schema.d.ts
diff --git a/src/generators/application/schema.json b/packages/rspack/src/generators/application/schema.json
similarity index 100%
rename from src/generators/application/schema.json
rename to packages/rspack/src/generators/application/schema.json
diff --git a/src/generators/configuration/configuration.ts b/packages/rspack/src/generators/configuration/configuration.ts
similarity index 100%
rename from src/generators/configuration/configuration.ts
rename to packages/rspack/src/generators/configuration/configuration.ts
diff --git a/src/generators/configuration/schema.d.ts b/packages/rspack/src/generators/configuration/schema.d.ts
similarity index 100%
rename from src/generators/configuration/schema.d.ts
rename to packages/rspack/src/generators/configuration/schema.d.ts
diff --git a/src/generators/configuration/schema.json b/packages/rspack/src/generators/configuration/schema.json
similarity index 100%
rename from src/generators/configuration/schema.json
rename to packages/rspack/src/generators/configuration/schema.json
diff --git a/src/generators/init/init.ts b/packages/rspack/src/generators/init/init.ts
similarity index 100%
rename from src/generators/init/init.ts
rename to packages/rspack/src/generators/init/init.ts
diff --git a/src/generators/init/schema.d.ts b/packages/rspack/src/generators/init/schema.d.ts
similarity index 100%
rename from src/generators/init/schema.d.ts
rename to packages/rspack/src/generators/init/schema.d.ts
diff --git a/src/generators/init/schema.json b/packages/rspack/src/generators/init/schema.json
similarity index 100%
rename from src/generators/init/schema.json
rename to packages/rspack/src/generators/init/schema.json
diff --git a/src/generators/preset/preset.ts b/packages/rspack/src/generators/preset/preset.ts
similarity index 100%
rename from src/generators/preset/preset.ts
rename to packages/rspack/src/generators/preset/preset.ts
diff --git a/src/generators/preset/schema.d.ts b/packages/rspack/src/generators/preset/schema.d.ts
similarity index 100%
rename from src/generators/preset/schema.d.ts
rename to packages/rspack/src/generators/preset/schema.d.ts
diff --git a/src/generators/preset/schema.json b/packages/rspack/src/generators/preset/schema.json
similarity index 100%
rename from src/generators/preset/schema.json
rename to packages/rspack/src/generators/preset/schema.json
diff --git a/src/index.ts b/packages/rspack/src/index.ts
similarity index 100%
rename from src/index.ts
rename to packages/rspack/src/index.ts
diff --git a/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts b/packages/rspack/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
similarity index 100%
rename from src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
rename to packages/rspack/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
diff --git a/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts b/packages/rspack/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
similarity index 100%
rename from src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
rename to packages/rspack/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
diff --git a/src/plugins/generate-package-json-plugin.ts b/packages/rspack/src/plugins/generate-package-json-plugin.ts
similarity index 100%
rename from src/plugins/generate-package-json-plugin.ts
rename to packages/rspack/src/plugins/generate-package-json-plugin.ts
diff --git a/src/plugins/plugin.ts b/packages/rspack/src/plugins/plugin.ts
similarity index 100%
rename from src/plugins/plugin.ts
rename to packages/rspack/src/plugins/plugin.ts
diff --git a/src/utils/config.ts b/packages/rspack/src/utils/config.ts
similarity index 100%
rename from src/utils/config.ts
rename to packages/rspack/src/utils/config.ts
diff --git a/src/utils/create-compiler.ts b/packages/rspack/src/utils/create-compiler.ts
similarity index 100%
rename from src/utils/create-compiler.ts
rename to packages/rspack/src/utils/create-compiler.ts
diff --git a/src/utils/generator-utils.ts b/packages/rspack/src/utils/generator-utils.ts
similarity index 100%
rename from src/utils/generator-utils.ts
rename to packages/rspack/src/utils/generator-utils.ts
diff --git a/src/utils/get-copy-patterns.ts b/packages/rspack/src/utils/get-copy-patterns.ts
similarity index 100%
rename from src/utils/get-copy-patterns.ts
rename to packages/rspack/src/utils/get-copy-patterns.ts
diff --git a/src/utils/jest-utils.ts b/packages/rspack/src/utils/jest-utils.ts
similarity index 100%
rename from src/utils/jest-utils.ts
rename to packages/rspack/src/utils/jest-utils.ts
diff --git a/src/utils/mode-utils.ts b/packages/rspack/src/utils/mode-utils.ts
similarity index 100%
rename from src/utils/mode-utils.ts
rename to packages/rspack/src/utils/mode-utils.ts
diff --git a/src/utils/model.ts b/packages/rspack/src/utils/model.ts
similarity index 100%
rename from src/utils/model.ts
rename to packages/rspack/src/utils/model.ts
diff --git a/src/utils/module-federation/build-static.remotes.ts b/packages/rspack/src/utils/module-federation/build-static.remotes.ts
similarity index 100%
rename from src/utils/module-federation/build-static.remotes.ts
rename to packages/rspack/src/utils/module-federation/build-static.remotes.ts
diff --git a/src/utils/module-federation/dependencies.spec.ts b/packages/rspack/src/utils/module-federation/dependencies.spec.ts
similarity index 100%
rename from src/utils/module-federation/dependencies.spec.ts
rename to packages/rspack/src/utils/module-federation/dependencies.spec.ts
diff --git a/src/utils/module-federation/dependencies.ts b/packages/rspack/src/utils/module-federation/dependencies.ts
similarity index 100%
rename from src/utils/module-federation/dependencies.ts
rename to packages/rspack/src/utils/module-federation/dependencies.ts
diff --git a/src/utils/module-federation/get-remotes-for-host.ts b/packages/rspack/src/utils/module-federation/get-remotes-for-host.ts
similarity index 100%
rename from src/utils/module-federation/get-remotes-for-host.ts
rename to packages/rspack/src/utils/module-federation/get-remotes-for-host.ts
diff --git a/src/utils/module-federation/index.ts b/packages/rspack/src/utils/module-federation/index.ts
similarity index 100%
rename from src/utils/module-federation/index.ts
rename to packages/rspack/src/utils/module-federation/index.ts
diff --git a/src/utils/module-federation/models/index.ts b/packages/rspack/src/utils/module-federation/models/index.ts
similarity index 100%
rename from src/utils/module-federation/models/index.ts
rename to packages/rspack/src/utils/module-federation/models/index.ts
diff --git a/src/utils/module-federation/package-json.ts b/packages/rspack/src/utils/module-federation/package-json.ts
similarity index 100%
rename from src/utils/module-federation/package-json.ts
rename to packages/rspack/src/utils/module-federation/package-json.ts
diff --git a/src/utils/module-federation/parse-static-remotes-config.ts b/packages/rspack/src/utils/module-federation/parse-static-remotes-config.ts
similarity index 100%
rename from src/utils/module-federation/parse-static-remotes-config.ts
rename to packages/rspack/src/utils/module-federation/parse-static-remotes-config.ts
diff --git a/src/utils/module-federation/plugins/runtime-library-control.plugin.ts b/packages/rspack/src/utils/module-federation/plugins/runtime-library-control.plugin.ts
similarity index 100%
rename from src/utils/module-federation/plugins/runtime-library-control.plugin.ts
rename to packages/rspack/src/utils/module-federation/plugins/runtime-library-control.plugin.ts
diff --git a/src/utils/module-federation/public-api.ts b/packages/rspack/src/utils/module-federation/public-api.ts
similarity index 100%
rename from src/utils/module-federation/public-api.ts
rename to packages/rspack/src/utils/module-federation/public-api.ts
diff --git a/src/utils/module-federation/remotes.ts b/packages/rspack/src/utils/module-federation/remotes.ts
similarity index 100%
rename from src/utils/module-federation/remotes.ts
rename to packages/rspack/src/utils/module-federation/remotes.ts
diff --git a/src/utils/module-federation/secondary-entry-points.ts b/packages/rspack/src/utils/module-federation/secondary-entry-points.ts
similarity index 100%
rename from src/utils/module-federation/secondary-entry-points.ts
rename to packages/rspack/src/utils/module-federation/secondary-entry-points.ts
diff --git a/src/utils/module-federation/share.spec.ts b/packages/rspack/src/utils/module-federation/share.spec.ts
similarity index 100%
rename from src/utils/module-federation/share.spec.ts
rename to packages/rspack/src/utils/module-federation/share.spec.ts
diff --git a/src/utils/module-federation/share.ts b/packages/rspack/src/utils/module-federation/share.ts
similarity index 100%
rename from src/utils/module-federation/share.ts
rename to packages/rspack/src/utils/module-federation/share.ts
diff --git a/src/utils/module-federation/start-remote-proxies.ts b/packages/rspack/src/utils/module-federation/start-remote-proxies.ts
similarity index 100%
rename from src/utils/module-federation/start-remote-proxies.ts
rename to packages/rspack/src/utils/module-federation/start-remote-proxies.ts
diff --git a/src/utils/module-federation/start-ssr-remote-proxies.ts b/packages/rspack/src/utils/module-federation/start-ssr-remote-proxies.ts
similarity index 100%
rename from src/utils/module-federation/start-ssr-remote-proxies.ts
rename to packages/rspack/src/utils/module-federation/start-ssr-remote-proxies.ts
diff --git a/src/utils/module-federation/typescript.spec.ts b/packages/rspack/src/utils/module-federation/typescript.spec.ts
similarity index 100%
rename from src/utils/module-federation/typescript.spec.ts
rename to packages/rspack/src/utils/module-federation/typescript.spec.ts
diff --git a/src/utils/module-federation/typescript.ts b/packages/rspack/src/utils/module-federation/typescript.ts
similarity index 100%
rename from src/utils/module-federation/typescript.ts
rename to packages/rspack/src/utils/module-federation/typescript.ts
diff --git a/src/utils/module-federation/with-module-federation/package-json.ts b/packages/rspack/src/utils/module-federation/with-module-federation/package-json.ts
similarity index 100%
rename from src/utils/module-federation/with-module-federation/package-json.ts
rename to packages/rspack/src/utils/module-federation/with-module-federation/package-json.ts
diff --git a/src/utils/module-federation/with-module-federation/utils.ts b/packages/rspack/src/utils/module-federation/with-module-federation/utils.ts
similarity index 100%
rename from src/utils/module-federation/with-module-federation/utils.ts
rename to packages/rspack/src/utils/module-federation/with-module-federation/utils.ts
diff --git a/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts b/packages/rspack/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
similarity index 100%
rename from src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
rename to packages/rspack/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
diff --git a/src/utils/module-federation/with-module-federation/with-module-federation.ts b/packages/rspack/src/utils/module-federation/with-module-federation/with-module-federation.ts
similarity index 100%
rename from src/utils/module-federation/with-module-federation/with-module-federation.ts
rename to packages/rspack/src/utils/module-federation/with-module-federation/with-module-federation.ts
diff --git a/src/utils/normalize-assets.ts b/packages/rspack/src/utils/normalize-assets.ts
similarity index 100%
rename from src/utils/normalize-assets.ts
rename to packages/rspack/src/utils/normalize-assets.ts
diff --git a/src/utils/read-rspack-options.ts b/packages/rspack/src/utils/read-rspack-options.ts
similarity index 100%
rename from src/utils/read-rspack-options.ts
rename to packages/rspack/src/utils/read-rspack-options.ts
diff --git a/src/utils/resolve-user-defined-rspack-config.ts b/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts
similarity index 100%
rename from src/utils/resolve-user-defined-rspack-config.ts
rename to packages/rspack/src/utils/resolve-user-defined-rspack-config.ts
diff --git a/src/utils/versions.ts b/packages/rspack/src/utils/versions.ts
similarity index 100%
rename from src/utils/versions.ts
rename to packages/rspack/src/utils/versions.ts
diff --git a/src/utils/with-nx.ts b/packages/rspack/src/utils/with-nx.ts
similarity index 100%
rename from src/utils/with-nx.ts
rename to packages/rspack/src/utils/with-nx.ts
diff --git a/src/utils/with-react.ts b/packages/rspack/src/utils/with-react.ts
similarity index 100%
rename from src/utils/with-react.ts
rename to packages/rspack/src/utils/with-react.ts
diff --git a/src/utils/with-web.ts b/packages/rspack/src/utils/with-web.ts
similarity index 100%
rename from src/utils/with-web.ts
rename to packages/rspack/src/utils/with-web.ts
diff --git a/tsconfig.json b/packages/rspack/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to packages/rspack/tsconfig.json
diff --git a/tsconfig.lib.json b/packages/rspack/tsconfig.lib.json
similarity index 100%
rename from tsconfig.lib.json
rename to packages/rspack/tsconfig.lib.json
diff --git a/tsconfig.spec.json b/packages/rspack/tsconfig.spec.json
similarity index 100%
rename from tsconfig.spec.json
rename to packages/rspack/tsconfig.spec.json

From 4c1fed42aa119803f52cd8d7ef991cc8b7e218d2 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 18 Sep 2024 10:24:02 +0100
Subject: [PATCH 81/92] chore(repo): move packages-legacy/rspack to
 packages-legacy/rspack to prepare to be imported

---
 README.md => packages-legacy/rspack/README.md             | 0
 executors.json => packages-legacy/rspack/executors.json   | 0
 generators.json => packages-legacy/rspack/generators.json | 0
 index.ts => packages-legacy/rspack/index.ts               | 0
 package.json => packages-legacy/rspack/package.json       | 0
 project.json => packages-legacy/rspack/project.json       | 0
 tsconfig.json => packages-legacy/rspack/tsconfig.json     | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename README.md => packages-legacy/rspack/README.md (100%)
 rename executors.json => packages-legacy/rspack/executors.json (100%)
 rename generators.json => packages-legacy/rspack/generators.json (100%)
 rename index.ts => packages-legacy/rspack/index.ts (100%)
 rename package.json => packages-legacy/rspack/package.json (100%)
 rename project.json => packages-legacy/rspack/project.json (100%)
 rename tsconfig.json => packages-legacy/rspack/tsconfig.json (100%)

diff --git a/README.md b/packages-legacy/rspack/README.md
similarity index 100%
rename from README.md
rename to packages-legacy/rspack/README.md
diff --git a/executors.json b/packages-legacy/rspack/executors.json
similarity index 100%
rename from executors.json
rename to packages-legacy/rspack/executors.json
diff --git a/generators.json b/packages-legacy/rspack/generators.json
similarity index 100%
rename from generators.json
rename to packages-legacy/rspack/generators.json
diff --git a/index.ts b/packages-legacy/rspack/index.ts
similarity index 100%
rename from index.ts
rename to packages-legacy/rspack/index.ts
diff --git a/package.json b/packages-legacy/rspack/package.json
similarity index 100%
rename from package.json
rename to packages-legacy/rspack/package.json
diff --git a/project.json b/packages-legacy/rspack/project.json
similarity index 100%
rename from project.json
rename to packages-legacy/rspack/project.json
diff --git a/tsconfig.json b/packages-legacy/rspack/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to packages-legacy/rspack/tsconfig.json

From c9f3070aa8f681620bbf6bbd9010a679e949804e Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 18 Sep 2024 10:24:57 +0100
Subject: [PATCH 82/92] chore(repo): move e2e/rspack-e2e to e2e/rspack to
 prepare to be imported

---
 jest.config.ts => e2e/rspack/jest.config.ts         | 0
 project.json => e2e/rspack/project.json             | 0
 {tests => e2e/rspack/tests}/rspack.spec.ts          | 0
 tsconfig.json => e2e/rspack/tsconfig.json           | 0
 tsconfig.spec.json => e2e/rspack/tsconfig.spec.json | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename jest.config.ts => e2e/rspack/jest.config.ts (100%)
 rename project.json => e2e/rspack/project.json (100%)
 rename {tests => e2e/rspack/tests}/rspack.spec.ts (100%)
 rename tsconfig.json => e2e/rspack/tsconfig.json (100%)
 rename tsconfig.spec.json => e2e/rspack/tsconfig.spec.json (100%)

diff --git a/jest.config.ts b/e2e/rspack/jest.config.ts
similarity index 100%
rename from jest.config.ts
rename to e2e/rspack/jest.config.ts
diff --git a/project.json b/e2e/rspack/project.json
similarity index 100%
rename from project.json
rename to e2e/rspack/project.json
diff --git a/tests/rspack.spec.ts b/e2e/rspack/tests/rspack.spec.ts
similarity index 100%
rename from tests/rspack.spec.ts
rename to e2e/rspack/tests/rspack.spec.ts
diff --git a/tsconfig.json b/e2e/rspack/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to e2e/rspack/tsconfig.json
diff --git a/tsconfig.spec.json b/e2e/rspack/tsconfig.spec.json
similarity index 100%
rename from tsconfig.spec.json
rename to e2e/rspack/tsconfig.spec.json

From 099608f896618fd581c5b3995570ad5dadaa1993 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 10 Sep 2024 17:29:49 +0100
Subject: [PATCH 83/92] chore(repo): fix e2e setup

---
 e2e/rspack/jest.config.ts         |  9 +++--
 e2e/rspack/project.json           | 17 +++------
 e2e/rspack/tests/rspack.spec.ts   | 57 +++++++++++++++----------------
 e2e/rspack/tsconfig.json          |  3 ++
 e2e/utils/create-project-utils.ts |  1 +
 5 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/e2e/rspack/jest.config.ts b/e2e/rspack/jest.config.ts
index b76e60a2dfc6b..75b517b2d57f7 100644
--- a/e2e/rspack/jest.config.ts
+++ b/e2e/rspack/jest.config.ts
@@ -1,8 +1,11 @@
 /* eslint-disable */
 export default {
-  displayName: 'rspack-e2e',
-  preset: '../../jest.preset.js',
+  displayName: 'e2e-rspack',
+  preset: '../jest.preset.e2e.js',
+  maxWorkers: 1,
   globals: {},
+  globalSetup: '../utils/global-setup.ts',
+  globalTeardown: '../utils/global-teardown.ts',
   transform: {
     '^.+\\.[tj]s$': [
       'ts-jest',
@@ -12,5 +15,5 @@ export default {
     ],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/e2e/rspack-e2e',
+  coverageDirectory: '../../coverage/e2e/e2e-rspack',
 };
diff --git a/e2e/rspack/project.json b/e2e/rspack/project.json
index a3f6d87970d28..51c879eec91cd 100644
--- a/e2e/rspack/project.json
+++ b/e2e/rspack/project.json
@@ -1,19 +1,10 @@
 {
-  "name": "rspack-e2e",
+  "name": "e2e-rspack",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "e2e/rspack-e2e/src",
-  "targets": {
-    "e2e": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "e2e/rspack-e2e/jest.config.ts",
-        "runInBand": true,
-        "passWithNoTests": false
-      },
-      "dependsOn": ["rspack:build"]
-    }
-  },
+  "sourceRoot": "e2e/rspack",
+  "// targets": "to see all targets run: nx show project e2e-rspack --web",
+  "targets": {},
   "tags": [],
   "implicitDependencies": ["rspack"]
 }
diff --git a/e2e/rspack/tests/rspack.spec.ts b/e2e/rspack/tests/rspack.spec.ts
index 82bce59302c1d..acb1f6aaffbe0 100644
--- a/e2e/rspack/tests/rspack.spec.ts
+++ b/e2e/rspack/tests/rspack.spec.ts
@@ -1,18 +1,21 @@
 import { getPackageManagerCommand } from '@nx/devkit';
 import {
   checkFilesExist,
-  ensureNxProject,
+  cleanupProject,
   listFiles,
-  runNxCommandAsync,
+  newProject,
   tmpProjPath,
   uniq,
   updateFile,
-} from '@nx/plugin/testing';
+  runCLI,
+} from '@nx/e2e/utils';
 import { execSync } from 'child_process';
 import { writeFileSync } from 'fs';
 import { join } from 'path';
 
 describe('rspack e2e', () => {
+  let proj: string;
+
   // Setting up individual workspaces per
   // test can cause e2e runs to take a long time.
   // For this reason, we recommend each suite only
@@ -20,18 +23,14 @@ describe('rspack e2e', () => {
   // on a unique project in the workspace, such that they
   // are not dependant on one another.
   beforeAll(() => {
-    ensureNxProject('@nx/rspack', 'dist/packages/rspack');
+    proj = newProject({ packages: ['@nx/rspack'] });
   });
 
-  afterAll(() => {
-    // `nx reset` kills the daemon, and performs
-    // some work which can help clean up e2e leftovers
-    runNxCommandAsync('reset');
-  });
+  afterAll(() => cleanupProject());
 
   it('should create rspack root project and additional apps', async () => {
     const project = uniq('myapp');
-    await runNxCommandAsync(
+    runCLI(
       `generate @nx/rspack:preset ${project} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress`
     );
 
@@ -61,18 +60,18 @@ describe('rspack e2e', () => {
       { cwd: tmpProjPath() }
     );
 
-    let result = await runNxCommandAsync(`build ${project}`, {
+    let result = runCLI(`build ${project}`, {
       env: { NODE_ENV: 'production' },
     });
-    expect(result.stdout).toContain('Successfully ran target build');
+    expect(result).toContain('Successfully ran target build');
     // Make sure expected files are present.
     expect(listFiles(`dist/${project}`)).toHaveLength(5);
 
-    result = await runNxCommandAsync(`test ${project}`);
-    expect(result.stdout).toContain('Successfully ran target test');
+    result = runCLI(`test ${project}`);
+    expect(result).toContain('Successfully ran target test');
 
     // TODO(Colum): re-enable when cypress issue is resolved
-    // result = await runNxCommandAsync(`e2e e2e`);
+    // result = runCLI(`e2e e2e`);
     // expect(result.stdout).toContain('Successfully ran target e2e');
 
     // Update app and make sure previous dist files are not present.
@@ -80,15 +79,15 @@ describe('rspack e2e', () => {
       return `${content}\nconsole.log('hello');
     `;
     });
-    result = await runNxCommandAsync(`build ${project}`, {
+    result = runCLI(`build ${project}`, {
       env: { NODE_ENV: 'production' },
     });
-    expect(result.stdout).toContain('Successfully ran target build');
+    expect(result).toContain('Successfully ran target build');
     expect(listFiles(`dist/${project}`)).toHaveLength(5); // same length as before
 
     // Generate a new app and check that the files are correct
     const app2 = uniq('app2');
-    await runNxCommandAsync(
+    runCLI(
       `generate @nx/rspack:app ${app2} --framework=react --unitTestRunner=jest --e2eTestRunner=cypress --style=css`
     );
     checkFilesExist(`${app2}/project.json`, `${app2}-e2e/project.json`);
@@ -112,36 +111,34 @@ describe('rspack e2e', () => {
       `
     );
 
-    result = await runNxCommandAsync(`build ${app2}`, {
+    result = runCLI(`build ${app2}`, {
       env: { NODE_ENV: 'production' },
     });
-    expect(result.stdout).toContain('Successfully ran target build');
+    expect(result).toContain('Successfully ran target build');
     // Make sure expected files are present.
     expect(listFiles(`dist/${app2}`)).toHaveLength(5);
 
-    result = await runNxCommandAsync(`test ${app2}`);
-    expect(result.stdout).toContain('Successfully ran target test');
+    result = runCLI(`test ${app2}`);
+    expect(result).toContain('Successfully ran target test');
 
     // TODO(Colum): re-enable when cypress issue is resolved
-    // result = await runNxCommandAsync(`e2e ${app2}-e2e`);
+    // result = runCLI(`e2e ${app2}-e2e`);
     // expect(result.stdout).toContain('Successfully ran target e2e');
 
     // Generate a Nest app and verify build output
     const app3 = uniq('app3');
-    await runNxCommandAsync(
+    runCLI(
       `generate @nx/rspack:app ${app3} --framework=nest --unitTestRunner=jest --no-interactive`
     );
     checkFilesExist(`${app3}/project.json`);
 
-    result = await runNxCommandAsync(`build ${app3}`);
-    expect(result.stdout).toContain('Successfully ran target build');
+    result = runCLI(`build ${app3}`);
+    expect(result).toContain('Successfully ran target build');
     // Make sure expected files are present.
     expect(listFiles(`dist/${app3}`)).toHaveLength(2);
 
-    result = await runNxCommandAsync(
-      `build ${app3} --generatePackageJson=true`
-    );
-    expect(result.stdout).toContain('Successfully ran target build');
+    result = runCLI(`build ${app3} --generatePackageJson=true`);
+    expect(result).toContain('Successfully ran target build');
     // Make sure expected files are present.
     expect(listFiles(`dist/${app3}`)).toHaveLength(4);
   }, 200_000);
diff --git a/e2e/rspack/tsconfig.json b/e2e/rspack/tsconfig.json
index b9c9d95376eb4..f6e253991353b 100644
--- a/e2e/rspack/tsconfig.json
+++ b/e2e/rspack/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "types": ["node", "jest"]
+  },
   "files": [],
   "include": [],
   "references": [
diff --git a/e2e/utils/create-project-utils.ts b/e2e/utils/create-project-utils.ts
index ff89a41e51b19..73c41a95d1a16 100644
--- a/e2e/utils/create-project-utils.ts
+++ b/e2e/utils/create-project-utils.ts
@@ -56,6 +56,7 @@ const nxPackages = [
   `@nx/rollup`,
   `@nx/react`,
   `@nx/remix`,
+  `@nx/rspack`,
   `@nx/storybook`,
   `@nx/vue`,
   `@nx/vite`,

From 1b819aa628ef1ae5c7f57a25bf4bb9f5309298cd Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 10 Sep 2024 17:30:34 +0100
Subject: [PATCH 84/92] chore(repo): add rspack commit scope

---
 scripts/commitizen.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/commitizen.js b/scripts/commitizen.js
index c9e3e48004614..a591f1ba25395 100644
--- a/scripts/commitizen.js
+++ b/scripts/commitizen.js
@@ -20,6 +20,7 @@ const scopes = [
   { value: 'react',             name: 'react:                 anything React specific' },
   { value: 'react-native',      name: 'react-native:          anything React Native specific' },
   { value: 'remix',             name: 'remix:                 anything Remix specific' },
+  { value: 'rspack',             name: 'rspack:               anything Rspack specific' },
   { value: 'expo',              name: 'expo:                  anything Expo specific' },
   { value: 'release',           name: 'release:               anything related to nx release' },
   { value: 'repo',              name: 'repo:                  anything related to managing the repo itself' },

From 9cbc1af01421b11ec0356271da856854f54fc18b Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 10 Sep 2024 17:52:48 +0100
Subject: [PATCH 85/92] chore(rspack): configure correctly

---
 docs/shared/packages/rspack/rspack-plugin.md | 100 +++
 package.json                                 |   4 +
 packages/rspack/README.md                    |  58 +-
 packages/rspack/package.json                 |   8 +-
 packages/rspack/project.json                 |  34 +-
 packages/rspack/src/plugins/plugin.ts        |   5 +-
 packages/rspack/src/utils/versions.ts        |   4 +-
 pnpm-lock.yaml                               | 615 +++++++++++++++++--
 8 files changed, 703 insertions(+), 125 deletions(-)
 create mode 100644 docs/shared/packages/rspack/rspack-plugin.md

diff --git a/docs/shared/packages/rspack/rspack-plugin.md b/docs/shared/packages/rspack/rspack-plugin.md
new file mode 100644
index 0000000000000..48d806fc2875b
--- /dev/null
+++ b/docs/shared/packages/rspack/rspack-plugin.md
@@ -0,0 +1,100 @@
+---
+title: Overview of the Nx Rspack Plugin
+description: The Nx Plugin for Rspack contains executors, generators, and utilities for managing Rspack projects in an Nx Workspace.
+---
+
+The Nx Plugin for Rspack contains executors, generators, and utilities for managing Rspack projects in an Nx Workspace.
+
+## Setting Up @nx/rspack
+
+### Installation
+
+{% callout type="note" title="Keep Nx Package Versions In Sync" %}
+Make sure to install the `@nx/rspack` version that matches the version of `nx` in your repository. If the version numbers get out of sync, you can encounter some difficult to debug errors. You can [fix Nx version mismatches with this recipe](/recipes/tips-n-tricks/keep-nx-versions-in-sync).
+{% /callout %}
+
+In any Nx workspace, you can install `@nx/rspack` by running the following command:
+
+{% tabs %}
+{% tab label="Nx 18+" %}
+
+```shell {% skipRescope=true %}
+nx add @nx/rspack
+```
+
+This will install the correct version of `@nx/rspack`.
+
+
+### How @nx/rspack Infers Tasks
+
+The `@nx/rspack` plugin will create a task for any project that has a Rspack configuration file present. Any of the following files will be recognized as a Rspack configuration file:
+
+- `rspack.config.js`
+- `rspack.config.ts`
+- `rspack.config.mjs`
+- `rspack.config.mts`
+- `rspack.config.cjs`
+- `rspack.config.cts`
+
+### View Inferred Tasks
+
+To view inferred tasks for a project, open the [project details view](/concepts/inferred-tasks) in Nx Console or run `nx show project my-project --web` in the command line.
+
+### @nx/rspack Configuration
+
+The `@nx/rspack/plugin` is configured in the `plugins` array in `nx.json`.
+
+```json {% fileName="nx.json" %}
+{
+  "plugins": [
+    {
+      "plugin": "@nx/rspack/plugin",
+      "options": {
+        "buildTargetName": "build",
+        "previewTargetName": "preview",
+        "serveTargetName": "serve",
+        "serveStaticTargetName": "serve-static"
+      }
+    }
+  ]
+}
+```
+
+The `buildTargetName`, `previewTargetName`, `serveTargetName` and `serveStaticTargetName` options control the names of the inferred Rspack tasks. The default names are `build`, `preview`, `serve` and `serve-static`.
+
+{% /tab %}
+{% tab label="Nx < 18" %}
+
+Install the `@nx/rspack` package with your package manager.
+
+```shell
+npm add -D @nx/rspack
+```
+
+{% /tab %}
+{% /tabs %}
+
+## Using @nx/rspack
+
+### Generate a new project using Rspack
+
+You can generate a [React](/nx-api/react) application or library that uses Rspack. The [`@nx/react:app`](/nx-api/react/generators/application) and [`@nx/react:lib`](/nx-api/react/generators/library) generators accept the `bundler` option, where you can pass `rspack`. This will generate a new application configured to use Rspack, and it will also install all the necessary dependencies, including the `@nx/rspack` plugin.
+
+To generate a React application using Rspack, run the following:
+
+```bash
+nx g @nx/react:app my-app --bundler=rspack
+```
+
+To generate a React library using Rspack, run the following:
+
+```bash
+nx g @nx/react:lib my-lib --bundler=rspack
+```
+
+### Modify an existing React project to use Rspack
+
+You can use the `@nx/rspack:rspack-project` generator to change your React to use Rspack. This generator will modify your project's configuration to use Rspack, and it will also install all the necessary dependencies, including the `@nx/rspack` plugin.
+
+You can read more about this generator on the [`@nx/rspack:rspack-project`](/nx-api/rspack/generators/rspack-project) generator page.
+
diff --git a/package.json b/package.json
index 72be4153d32ba..0ad28e16dfe47 100644
--- a/package.json
+++ b/package.json
@@ -96,6 +96,10 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-url": "^8.0.2",
+    "@rspack/core": "^1.0.4",
+    "@rspack/dev-server": "^1.0.4",
+    "@rspack/plugin-minify": "^0.7.5",
+    "@rspack/plugin-react-refresh": "^1.0.0",
     "@schematics/angular": "~18.2.0",
     "@storybook/addon-essentials": "^8.2.8",
     "@storybook/addon-interactions": "^8.2.8",
diff --git a/packages/rspack/README.md b/packages/rspack/README.md
index 0c85e576b3bff..7774238d9c6e5 100644
--- a/packages/rspack/README.md
+++ b/packages/rspack/README.md
@@ -1,3 +1,26 @@
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
+
+{{links}}
+
+<hr>
+
+# Nx: Smart Monorepos · Fast CI
+
+Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+
+This package is a [Rspack plugin for Nx](https://nx.dev/nx-api/rspack).
+
+{{content}}
+
+
+
+
+
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
 <hr>
@@ -43,39 +66,6 @@ First, install the plugin:
 npm install --save-dev @nx/rspack
 ```
 
-Then, run the `rspack-project` generator:
-
-```bash
-npx nx g @nx/rspack:rspack-project --skipValidation
-```
-
-**Note:** The `--skipValidation` option allows you to overwrite existing build targets.
-
-## Workspace libraries
-
-The `@nx/rspack` executor support importing workspace libs into the app.
-
-```bash
-npx nx g @nx/react:lib mylib
-```
-
-Import the new library in your app.
-
-```typescript jsx
-// src/app/app.tsx
-import { Mylib } from '@rspack-demo/mylib';
-
-// ...
-
-export default function App() {
-  return <MyLib />;
-}
-```
-
-Now, run the dev server again to see the new library in action.
-
-```bash
-npm start
-```
+Then, r
 
 **Note:** You must restart the server if you make any changes to your library.
diff --git a/packages/rspack/package.json b/packages/rspack/package.json
index 7eac341977a16..b479760b89bd2 100644
--- a/packages/rspack/package.json
+++ b/packages/rspack/package.json
@@ -19,16 +19,16 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "^19.5.7",
-    "@nx/devkit": "^19.5.7",
+    "@nx/js": "file:../js",
+    "@nx/devkit": "file:../devkit",
+    "@nx/eslint": "file:../eslint",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
     "postcss-loader": "^8.1.1",
-    "@nx/eslint": "^19.5.7",
-    "@rspack/core": "^1.0.2",
+    "@rspack/core": "^1.0.4",
     "@rspack/plugin-react-refresh": "^1.0.0",
     "@rspack/plugin-minify": "^0.7.5",
     "chalk": "~4.1.0"
diff --git a/packages/rspack/project.json b/packages/rspack/project.json
index c37ff26e4ecdf..54e1479666f75 100644
--- a/packages/rspack/project.json
+++ b/packages/rspack/project.json
@@ -4,15 +4,23 @@
   "sourceRoot": "packages/rspack/src",
   "projectType": "library",
   "targets": {
-    "build": {
-      "outputs": ["{workspaceRoot}/dist/packages/rspack"],
+    "add-extra-dependencies": {
+      "outputs": ["{workspaceRoot}/build/packages/rspack"],
       "command": "node ./scripts/add-dependency-to-build.js rspack @nrwl/rspack"
     },
+    "build": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/build/packages/rspack"],
+      "options": {
+        "command": "node ./scripts/copy-readme.js rspack"
+      }
+    },
     "build-base": {
+      "dependsOn": ["^build-base"],
       "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/packages/rspack",
+        "outputPath": "build/packages/rspack",
         "main": "packages/rspack/src/index.ts",
         "tsConfig": "packages/rspack/tsconfig.lib.json",
         "assets": [
@@ -36,26 +44,6 @@
           "LICENSE"
         ]
       }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "packages/rspack/jest.config.ts"
-      }
-    },
-    "publish": {
-      "executor": "nx:run-commands",
-      "options": {
-        "parallel": false,
-        "commands": [
-          "node tools/scripts/publish.mjs rspack {args.ver} {args.tag}"
-        ]
-      }
     }
   },
   "tags": []
diff --git a/packages/rspack/src/plugins/plugin.ts b/packages/rspack/src/plugins/plugin.ts
index 8c9869de40212..1e05fdaafeee2 100644
--- a/packages/rspack/src/plugins/plugin.ts
+++ b/packages/rspack/src/plugins/plugin.ts
@@ -49,7 +49,10 @@ export const createNodesV2: CreateNodesV2<RspackPluginOptions> = [
   rspackConfigGlob,
   async (configFilePaths, options, context) => {
     const optionsHash = hashObject(options);
-    const cachePath = join(workspaceDataDirectory, `vite-${optionsHash}.hash`);
+    const cachePath = join(
+      workspaceDataDirectory,
+      `rspack-${optionsHash}.hash`
+    );
     const targetsCache = readTargetsCache(cachePath);
     try {
       return await createNodesFromFiles(
diff --git a/packages/rspack/src/utils/versions.ts b/packages/rspack/src/utils/versions.ts
index 6805a48e2c7a6..86a31a47441f2 100644
--- a/packages/rspack/src/utils/versions.ts
+++ b/packages/rspack/src/utils/versions.ts
@@ -1,5 +1,5 @@
-export const rspackCoreVersion = '^1.0.2';
-export const rspackDevServerVersion = '^1.0.2';
+export const rspackCoreVersion = '^1.0.4';
+export const rspackDevServerVersion = '^1.0.4';
 
 export const rspackPluginMinifyVersion = '^0.7.5';
 export const rspackPluginReactRefreshVersion = '^1.0.0';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9301b4401e7f1..bc21072395695 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -177,7 +177,7 @@ importers:
         version: 0.1802.1(chokidar@3.6.0)
       '@angular-devkit/build-angular':
         specifier: ~18.2.0
-        version: 18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4)
+        version: 18.2.1(i4nybqm3kkiqpjmu5wki5rez3q)
       '@angular-devkit/core':
         specifier: ~18.2.0
         version: 18.2.1(chokidar@3.6.0)
@@ -300,7 +300,7 @@ importers:
         version: 3.10.0(rollup@4.14.3)
       '@nx/angular':
         specifier: 19.7.0-beta.6
-        version: 19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+        version: 19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(i4nybqm3kkiqpjmu5wki5rez3q))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@nx/cypress':
         specifier: 19.7.0-beta.6
         version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(cypress@13.13.0)(eslint@8.57.0)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
@@ -324,10 +324,10 @@ importers:
         version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/next':
         specifier: 19.7.0-beta.6
-        version: 19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+        version: 19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       '@nx/playwright':
         specifier: 19.7.0-beta.6
-        version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@playwright/test@1.36.1)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(vite@5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(vitest@1.3.1(@types/node@18.19.8)(jsdom@20.0.3(bufferutil@4.0.7)(utf-8-validate@5.0.10))(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+        version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@playwright/test@1.36.1)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(vite@5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(vitest@1.3.1(@types/node@18.19.8)(jsdom@20.0.3(bufferutil@4.0.7)(utf-8-validate@5.0.10))(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@nx/react':
         specifier: 19.7.0-beta.6
         version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(eslint@8.57.0)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
@@ -342,7 +342,7 @@ importers:
         version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/webpack':
         specifier: 19.7.0-beta.6
-        version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+        version: 19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@phenomnomnominal/tsquery':
         specifier: ~5.0.1
         version: 5.0.1(typescript@5.5.3)
@@ -382,6 +382,18 @@ importers:
       '@rollup/plugin-url':
         specifier: ^8.0.2
         version: 8.0.2(rollup@4.14.3)
+      '@rspack/core':
+        specifier: ^1.0.4
+        version: 1.0.4(@swc/helpers@0.5.11)
+      '@rspack/dev-server':
+        specifier: ^1.0.4
+        version: 1.0.4(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@types/express@4.17.14)(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      '@rspack/plugin-minify':
+        specifier: ^0.7.5
+        version: 0.7.5
+      '@rspack/plugin-react-refresh':
+        specifier: ^1.0.0
+        version: 1.0.0(react-refresh@0.10.0)
       '@schematics/angular':
         specifier: ~18.2.0
         version: 18.2.1(chokidar@3.6.0)
@@ -402,7 +414,7 @@ importers:
         version: 8.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.14.3)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(vite@5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))
       '@storybook/react-webpack5':
         specifier: ^8.2.8
-        version: 8.2.9(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+        version: 8.2.9(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@storybook/types':
         specifier: ^8.2.8
         version: 8.2.9(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))
@@ -990,7 +1002,7 @@ importers:
         version: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
       webpack-dev-server:
         specifier: 5.0.4
-        version: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0)
+        version: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       webpack-merge:
         specifier: ^5.8.0
         version: 5.8.0
@@ -3444,6 +3456,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/android-arm64@0.16.3':
+    resolution: {integrity: sha512-RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm64@0.17.6':
     resolution: {integrity: sha512-YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg==}
     engines: {node: '>=12'}
@@ -3492,6 +3510,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm@0.16.3':
+    resolution: {integrity: sha512-mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-arm@0.17.6':
     resolution: {integrity: sha512-bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g==}
     engines: {node: '>=12'}
@@ -3540,6 +3564,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-x64@0.16.3':
+    resolution: {integrity: sha512-SFpTUcIT1bIJuCCBMCQWq1bL2gPTjWoLZdjmIhjdcQHaUfV41OQfho6Ici5uvvkMmZRXIUGpM3GxysP/EU7ifQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/android-x64@0.17.6':
     resolution: {integrity: sha512-MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ==}
     engines: {node: '>=12'}
@@ -3588,6 +3618,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/darwin-arm64@0.16.3':
+    resolution: {integrity: sha512-DO8WykMyB+N9mIDfI/Hug70Dk1KipavlGAecxS3jDUwAbTpDXj0Lcwzw9svkhxfpCagDmpaTMgxWK8/C/XcXvw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-arm64@0.17.6':
     resolution: {integrity: sha512-bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA==}
     engines: {node: '>=12'}
@@ -3636,6 +3672,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.16.3':
+    resolution: {integrity: sha512-uEqZQ2omc6BvWqdCiyZ5+XmxuHEi1SPzpVxXCSSV2+Sh7sbXbpeNhHIeFrIpRjAs0lI1FmA1iIOxFozKBhKgRQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.17.6':
     resolution: {integrity: sha512-xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg==}
     engines: {node: '>=12'}
@@ -3684,6 +3726,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/freebsd-arm64@0.16.3':
+    resolution: {integrity: sha512-nJansp3sSXakNkOD5i5mIz2Is/HjzIhFs49b1tjrPrpCmwgBmH9SSzhC/Z1UqlkivqMYkhfPwMw1dGFUuwmXhw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-arm64@0.17.6':
     resolution: {integrity: sha512-EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg==}
     engines: {node: '>=12'}
@@ -3732,6 +3780,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.16.3':
+    resolution: {integrity: sha512-TfoDzLw+QHfc4a8aKtGSQ96Wa+6eimljjkq9HKR0rHlU83vw8aldMOUSJTUDxbcUdcgnJzPaX8/vGWm7vyV7ug==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.17.6':
     resolution: {integrity: sha512-Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q==}
     engines: {node: '>=12'}
@@ -3780,6 +3834,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/linux-arm64@0.16.3':
+    resolution: {integrity: sha512-7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm64@0.17.6':
     resolution: {integrity: sha512-bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w==}
     engines: {node: '>=12'}
@@ -3828,6 +3888,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm@0.16.3':
+    resolution: {integrity: sha512-VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-arm@0.17.6':
     resolution: {integrity: sha512-7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw==}
     engines: {node: '>=12'}
@@ -3876,6 +3942,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.16.3':
+    resolution: {integrity: sha512-X8FDDxM9cqda2rJE+iblQhIMYY49LfvW4kaEjoFbTTQ4Go8G96Smj2w3BRTwA8IHGoi9dPOPGAX63dhuv19UqA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.17.6':
     resolution: {integrity: sha512-ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ==}
     engines: {node: '>=12'}
@@ -3924,6 +3996,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.16.3':
+    resolution: {integrity: sha512-hIbeejCOyO0X9ujfIIOKjBjNAs9XD/YdJ9JXAy1lHA+8UXuOqbFe4ErMCqMr8dhlMGBuvcQYGF7+kO7waj2KHw==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.17.6':
     resolution: {integrity: sha512-y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ==}
     engines: {node: '>=12'}
@@ -3972,6 +4050,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.16.3':
+    resolution: {integrity: sha512-znFRzICT/V8VZQMt6rjb21MtAVJv/3dmKRMlohlShrbVXdBuOdDrGb+C2cZGQAR8RFyRe7HS6klmHq103WpmVw==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.17.6':
     resolution: {integrity: sha512-09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA==}
     engines: {node: '>=12'}
@@ -4020,6 +4104,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.16.3':
+    resolution: {integrity: sha512-EV7LuEybxhXrVTDpbqWF2yehYRNz5e5p+u3oQUS2+ZFpknyi1NXxr8URk4ykR8Efm7iu04//4sBg249yNOwy5Q==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.17.6':
     resolution: {integrity: sha512-AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg==}
     engines: {node: '>=12'}
@@ -4068,6 +4158,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.16.3':
+    resolution: {integrity: sha512-uDxqFOcLzFIJ+r/pkTTSE9lsCEaV/Y6rMlQjUI9BkzASEChYL/aSQjZjchtEmdnVxDKETnUAmsaZ4pqK1eE5BQ==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.17.6':
     resolution: {integrity: sha512-Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ==}
     engines: {node: '>=12'}
@@ -4116,6 +4212,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.16.3':
+    resolution: {integrity: sha512-NbeREhzSxYwFhnCAQOQZmajsPYtX71Ufej3IQ8W2Gxskfz9DK58ENEju4SbpIj48VenktRASC52N5Fhyf/aliQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.17.6':
     resolution: {integrity: sha512-SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q==}
     engines: {node: '>=12'}
@@ -4164,6 +4266,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-x64@0.16.3':
+    resolution: {integrity: sha512-SDiG0nCixYO9JgpehoKgScwic7vXXndfasjnD5DLbp1xltANzqZ425l7LSdHynt19UWOcDjG9wJJzSElsPvk0w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/linux-x64@0.17.6':
     resolution: {integrity: sha512-a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw==}
     engines: {node: '>=12'}
@@ -4212,6 +4320,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/netbsd-x64@0.16.3':
+    resolution: {integrity: sha512-AzbsJqiHEq1I/tUvOfAzCY15h4/7Ivp3ff/o1GpP16n48JMNAtbW0qui2WCgoIZArEHD0SUQ95gvR0oSO7ZbdA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.17.6':
     resolution: {integrity: sha512-EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A==}
     engines: {node: '>=12'}
@@ -4266,6 +4380,12 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.16.3':
+    resolution: {integrity: sha512-gSABi8qHl8k3Cbi/4toAzHiykuBuWLZs43JomTcXkjMZVkp0gj3gg9mO+9HJW/8GB5H89RX/V0QP4JGL7YEEVg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.17.6':
     resolution: {integrity: sha512-xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw==}
     engines: {node: '>=12'}
@@ -4314,6 +4434,12 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/sunos-x64@0.16.3':
+    resolution: {integrity: sha512-SF9Kch5Ete4reovvRO6yNjMxrvlfT0F0Flm+NPoUw5Z4Q3r1d23LFTgaLwm3Cp0iGbrU/MoUI+ZqwCv5XJijCw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/sunos-x64@0.17.6':
     resolution: {integrity: sha512-gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw==}
     engines: {node: '>=12'}
@@ -4362,6 +4488,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/win32-arm64@0.16.3':
+    resolution: {integrity: sha512-u5aBonZIyGopAZyOnoPAA6fGsDeHByZ9CnEzyML9NqntK6D/xl5jteZUKm/p6nD09+v3pTM6TuUIqSPcChk5gg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-arm64@0.17.6':
     resolution: {integrity: sha512-G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg==}
     engines: {node: '>=12'}
@@ -4410,6 +4542,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.16.3':
+    resolution: {integrity: sha512-GlgVq1WpvOEhNioh74TKelwla9KDuAaLZrdxuuUgsP2vayxeLgVc+rbpIv0IYF4+tlIzq2vRhofV+KGLD+37EQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.17.6':
     resolution: {integrity: sha512-96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg==}
     engines: {node: '>=12'}
@@ -4458,6 +4596,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-x64@0.16.3':
+    resolution: {integrity: sha512-5/JuTd8OWW8UzEtyf19fbrtMJENza+C9JoPIkvItgTBQ1FO2ZLvjbPO6Xs54vk0s5JB5QsfieUEshRQfu7ZHow==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
   '@esbuild/win32-x64@0.17.6':
     resolution: {integrity: sha512-n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA==}
     engines: {node: '>=12'}
@@ -4961,18 +5105,30 @@ packages:
       vue-tsc:
         optional: true
 
+  '@module-federation/runtime-tools@0.5.1':
+    resolution: {integrity: sha512-nfBedkoZ3/SWyO0hnmaxuz0R0iGPSikHZOAZ0N/dVSQaIzlffUo35B5nlC2wgWIc0JdMZfkwkjZRrnuuDIJbzg==}
+
   '@module-federation/runtime-tools@0.6.1':
     resolution: {integrity: sha512-pnc0VZb3jjxrRI1t/K+QfSQ4Viim6VwoQQIeefBLzd2SIMD/LhrYfGzz/glrVHGnAFpxOE/pVANdqlknTMAerw==}
 
+  '@module-federation/runtime@0.5.1':
+    resolution: {integrity: sha512-xgiMUWwGLWDrvZc9JibuEbXIbhXg6z2oUkemogSvQ4LKvrl/n0kbqP1Blk669mXzyWbqtSp6PpvNdwaE1aN5xQ==}
+
   '@module-federation/runtime@0.6.1':
     resolution: {integrity: sha512-57NvdAwrQagw7bEAjvIav8sU0srTT5O+ul8hl86j2a3I5gYBF6NN2QGx4w5d/exgXUcqmUQZBV6I3q5NrcRzfg==}
 
+  '@module-federation/sdk@0.5.1':
+    resolution: {integrity: sha512-exvchtjNURJJkpqjQ3/opdbfeT2wPKvrbnGnyRkrwW5o3FH1LaST1tkiNviT6OXTexGaVc2DahbdniQHVtQ7pA==}
+
   '@module-federation/sdk@0.6.1':
     resolution: {integrity: sha512-OjDW2sYz4iaZnu4rpTlYDzjXAQiLLzCPwIFM+UFvRtdgWN08Bjn5sDRgMzP2x2ziLzonwmEFDEK9Sl2h85NtJg==}
 
   '@module-federation/third-party-dts-extractor@0.6.1':
     resolution: {integrity: sha512-65Xs4CRXkxLyGYhC4+XJ2Y7qcDsReI+xWt7bREe057PI/ZYp9FAbBO3M5E1eLVHeDdwcU5IQ9RigzGau527VbQ==}
 
+  '@module-federation/webpack-bundler-runtime@0.5.1':
+    resolution: {integrity: sha512-mMhRFH0k2VjwHt3Jol9JkUsmI/4XlrAoBG3E0o7HoyoPYv1UFOWyqAflfANcUPgbYpvqmyLzDcO+3IT36LXnrA==}
+
   '@module-federation/webpack-bundler-runtime@0.6.1':
     resolution: {integrity: sha512-Gl8iSAS/xvdlicQPFA7URkwUU2HhjQ1L7tHL7s9TWecuDb12Pj0DMkRqE3QimYvitXtvgDqk9B7YUz+diYuCFA==}
 
@@ -6806,6 +6962,84 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  '@rspack/binding-darwin-arm64@1.0.4':
+    resolution: {integrity: sha512-HR4OVarDhLYAd3GRus26mGjaoEkvFGSdhRHWPXkTqPWT1QIx+cMTDe2dUnEb/CZyvpH0afLBlVHrxqUBNiLT/Q==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rspack/binding-darwin-x64@1.0.4':
+    resolution: {integrity: sha512-3L/vrzrcBpg1h7SqD+9m7CB0UlkDt3aOyJGZc0vwLOQM8IezRsawEoidyN9KyYhpDzBZHzLAUnsva33BcbFJYQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rspack/binding-linux-arm64-gnu@1.0.4':
+    resolution: {integrity: sha512-Ggo2tLJKOFNsdcg9H3eYSUy03Wrq0PMVIlm50p/LLAMlfYm3kxBDNv7fP13fxlUe/oqXtFcVOlmMezbMH4oz8w==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rspack/binding-linux-arm64-musl@1.0.4':
+    resolution: {integrity: sha512-2FeDh8/THJTH2N4XpFC9oRvdDlkOw6bQ+vS8x1jLUXj+CDwqmUiECjh+78o4qwe1EH2egWDmkq84RQ+KoR37mQ==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rspack/binding-linux-x64-gnu@1.0.4':
+    resolution: {integrity: sha512-k2YQ579fDfXBw4KJMvZQQPShFUSln7wqtG59ltNLBejgFSxOtlMfLhY5oSuRvFCtsAS4SQUPOmUmfW/0dpCa7A==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rspack/binding-linux-x64-musl@1.0.4':
+    resolution: {integrity: sha512-1Pmuq3qnE45U7uhCJNtRbDiQVF+U4BXbsA+ISNd3Gp/MUZqpuOOgrND9OWw7d+xKRifzEMtd81DaPMkrcXyRvw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rspack/binding-win32-arm64-msvc@1.0.4':
+    resolution: {integrity: sha512-3tBP4xTAe8XRAlchMj2nlQXy2GOICA5StFK0kQMRId4V3xfgjlKDb/dMHMEHH4R1to1f9er9R0cRydUNP5AnbQ==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rspack/binding-win32-ia32-msvc@1.0.4':
+    resolution: {integrity: sha512-VCXXhOh9aWg31RfvJL87cvqIeL8h+gG2LPkXCJ8kzvQItLg6vlXABCGHf3NlaVUnDtAHnhsAT1sOHiD8G/kMfg==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rspack/binding-win32-x64-msvc@1.0.4':
+    resolution: {integrity: sha512-hlhAZVpL1MmGJUZ730JvOL6zc12BlfIIwRNnn0PkCrNSxNOYknkfKVix8CfPU9r8L2W8MOJfsbtjteCiJmJnQA==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rspack/binding@1.0.4':
+    resolution: {integrity: sha512-YbVyVWvYXCAqUqIyBPEwl+M0js4BqVAxqnsRiZG861MXrqNyYbGOMTcc3Pc6D0SW/gkcWugGWzQ5jgMjAIhHzw==}
+
+  '@rspack/core@1.0.4':
+    resolution: {integrity: sha512-/R3JenF5wJSj3DPxiewyIPGzuZV336XpRORjUAOvbHPK6zea8Eeqcx6RopWM6TMikRYdZOHThKV99tyi4QLsMg==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@swc/helpers': '>=0.5.1'
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+
+  '@rspack/dev-server@1.0.4':
+    resolution: {integrity: sha512-4VzafpG/avv9z42BmFc8Cto6QSxgDO4WtypRP5JgGc35vUEpPEzFjQGHPbBr8u8CuGoqjZ4GXsqDzsVxx/q8pg==}
+    peerDependencies:
+      '@rspack/core': '*'
+
+  '@rspack/lite-tapable@1.0.0':
+    resolution: {integrity: sha512-7MZf4lburSUZoEenwazwUDKHhqyfnLCGnQ/tKcUtztfmVzfjZfRn/EaiT0AKkYGnL2U8AGsw89oUeVyvaOLVCw==}
+    engines: {node: '>=16.0.0'}
+
+  '@rspack/plugin-minify@0.7.5':
+    resolution: {integrity: sha512-BgsLdb4vUOQjOukMEBM/8NZZlC9MU/Rs6lt2ZQwZ1lF8vNyuLGPSTtGYM4+fcU3YWRmMgietIEHQDEGkdMlG0g==}
+    deprecated: this package is deprecated use terser-webpack-plugin instead
+
+  '@rspack/plugin-react-refresh@1.0.0':
+    resolution: {integrity: sha512-WvXkLewW5G0Mlo5H1b251yDh5FFiH4NDAbYlFpvFjcuXX2AchZRf9zdw57BDE/ADyWsJgA8kixN/zZWBTN3iYA==}
+    peerDependencies:
+      react-refresh: '>=0.10.0 <1.0.0'
+    peerDependenciesMeta:
+      react-refresh:
+        optional: true
+
   '@rtsao/scc@1.1.0':
     resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
 
@@ -7734,6 +7968,9 @@ packages:
   '@types/responselike@1.0.0':
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
 
+  '@types/retry@0.12.0':
+    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
+
   '@types/retry@0.12.2':
     resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==}
 
@@ -10617,6 +10854,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.16.3:
+    resolution: {integrity: sha512-71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg==}
+    engines: {node: '>=12'}
+    hasBin: true
+
   esbuild@0.17.6:
     resolution: {integrity: sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==}
     engines: {node: '>=12'}
@@ -14354,6 +14596,10 @@ packages:
     resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
     engines: {node: '>=8'}
 
+  p-retry@4.6.2:
+    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
+    engines: {node: '>=8'}
+
   p-retry@6.2.0:
     resolution: {integrity: sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==}
     engines: {node: '>=16.17'}
@@ -16943,6 +17189,11 @@ packages:
       uglify-js:
         optional: true
 
+  terser@5.16.1:
+    resolution: {integrity: sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   terser@5.17.1:
     resolution: {integrity: sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==}
     engines: {node: '>=10'}
@@ -18138,6 +18389,15 @@ packages:
       webpack:
         optional: true
 
+  webpack-dev-middleware@7.4.2:
+    resolution: {integrity: sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==}
+    engines: {node: '>= 18.12.0'}
+    peerDependencies:
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+
   webpack-dev-server@5.0.4:
     resolution: {integrity: sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==}
     engines: {node: '>= 18.12.0'}
@@ -18604,11 +18864,11 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@angular-devkit/build-angular@18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4)':
+  '@angular-devkit/build-angular@18.2.1(i4nybqm3kkiqpjmu5wki5rez3q)':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@angular-devkit/architect': 0.1802.1(chokidar@3.6.0)
-      '@angular-devkit/build-webpack': 0.1802.1(chokidar@3.6.0)(webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
+      '@angular-devkit/build-webpack': 0.1802.1(chokidar@3.6.0)(webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       '@angular-devkit/core': 18.2.1(chokidar@3.6.0)
       '@angular/build': 18.2.1(@angular/compiler-cli@18.2.1(@angular/compiler@18.2.1(@angular/core@18.2.1(rxjs@7.8.1)(zone.js@0.14.3)))(typescript@5.5.3))(@types/node@18.19.8)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(stylus@0.59.0)(tailwindcss@3.4.4(ts-node@10.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(typescript@5.5.3)))(terser@5.31.6)(typescript@5.5.3)
       '@angular/compiler-cli': 18.2.1(@angular/compiler@18.2.1(@angular/core@18.2.1(rxjs@7.8.1)(zone.js@0.14.3)))(typescript@5.5.3)
@@ -18630,7 +18890,7 @@ snapshots:
       browserslist: 4.23.0
       copy-webpack-plugin: 12.0.2(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       critters: 0.0.24
-      css-loader: 7.1.2(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
+      css-loader: 7.1.2(@rspack/core@1.0.4(@swc/helpers@0.5.11))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       esbuild-wasm: 0.23.0
       fast-glob: 3.3.2
       http-proxy-middleware: 3.0.0
@@ -18639,7 +18899,7 @@ snapshots:
       jsonc-parser: 3.3.1
       karma-source-map-support: 1.4.0
       less: 4.2.0
-      less-loader: 12.2.0(less@4.2.0)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
+      less-loader: 12.2.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(less@4.2.0)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       license-webpack-plugin: 4.0.2(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       loader-utils: 3.3.1
       magic-string: 0.30.11
@@ -18651,11 +18911,11 @@ snapshots:
       picomatch: 4.0.2
       piscina: 4.6.1
       postcss: 8.4.41
-      postcss-loader: 8.1.1(postcss@8.4.41)(typescript@5.5.3)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
+      postcss-loader: 8.1.1(@rspack/core@1.0.4(@swc/helpers@0.5.11))(postcss@8.4.41)(typescript@5.5.3)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       resolve-url-loader: 5.0.0
       rxjs: 7.8.1
       sass: 1.77.6
-      sass-loader: 16.0.0(sass@1.77.6)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
+      sass-loader: 16.0.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(sass@1.77.6)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       semver: 7.6.3
       source-map-loader: 5.0.0(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       source-map-support: 0.5.21
@@ -18694,12 +18954,12 @@ snapshots:
       - utf-8-validate
       - webpack-cli
 
-  '@angular-devkit/build-webpack@0.1802.1(chokidar@3.6.0)(webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))':
+  '@angular-devkit/build-webpack@0.1802.1(chokidar@3.6.0)(webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))':
     dependencies:
       '@angular-devkit/architect': 0.1802.1(chokidar@3.6.0)
       rxjs: 7.8.1
       webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
-      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0)
+      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
     transitivePeerDependencies:
       - chokidar
 
@@ -22991,6 +23251,9 @@ snapshots:
   '@esbuild/aix-ppc64@0.23.0':
     optional: true
 
+  '@esbuild/android-arm64@0.16.3':
+    optional: true
+
   '@esbuild/android-arm64@0.17.6':
     optional: true
 
@@ -23015,6 +23278,9 @@ snapshots:
   '@esbuild/android-arm64@0.23.0':
     optional: true
 
+  '@esbuild/android-arm@0.16.3':
+    optional: true
+
   '@esbuild/android-arm@0.17.6':
     optional: true
 
@@ -23039,6 +23305,9 @@ snapshots:
   '@esbuild/android-arm@0.23.0':
     optional: true
 
+  '@esbuild/android-x64@0.16.3':
+    optional: true
+
   '@esbuild/android-x64@0.17.6':
     optional: true
 
@@ -23063,6 +23332,9 @@ snapshots:
   '@esbuild/android-x64@0.23.0':
     optional: true
 
+  '@esbuild/darwin-arm64@0.16.3':
+    optional: true
+
   '@esbuild/darwin-arm64@0.17.6':
     optional: true
 
@@ -23087,6 +23359,9 @@ snapshots:
   '@esbuild/darwin-arm64@0.23.0':
     optional: true
 
+  '@esbuild/darwin-x64@0.16.3':
+    optional: true
+
   '@esbuild/darwin-x64@0.17.6':
     optional: true
 
@@ -23111,6 +23386,9 @@ snapshots:
   '@esbuild/darwin-x64@0.23.0':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.16.3':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.17.6':
     optional: true
 
@@ -23135,6 +23413,9 @@ snapshots:
   '@esbuild/freebsd-arm64@0.23.0':
     optional: true
 
+  '@esbuild/freebsd-x64@0.16.3':
+    optional: true
+
   '@esbuild/freebsd-x64@0.17.6':
     optional: true
 
@@ -23159,6 +23440,9 @@ snapshots:
   '@esbuild/freebsd-x64@0.23.0':
     optional: true
 
+  '@esbuild/linux-arm64@0.16.3':
+    optional: true
+
   '@esbuild/linux-arm64@0.17.6':
     optional: true
 
@@ -23183,6 +23467,9 @@ snapshots:
   '@esbuild/linux-arm64@0.23.0':
     optional: true
 
+  '@esbuild/linux-arm@0.16.3':
+    optional: true
+
   '@esbuild/linux-arm@0.17.6':
     optional: true
 
@@ -23207,6 +23494,9 @@ snapshots:
   '@esbuild/linux-arm@0.23.0':
     optional: true
 
+  '@esbuild/linux-ia32@0.16.3':
+    optional: true
+
   '@esbuild/linux-ia32@0.17.6':
     optional: true
 
@@ -23231,6 +23521,9 @@ snapshots:
   '@esbuild/linux-ia32@0.23.0':
     optional: true
 
+  '@esbuild/linux-loong64@0.16.3':
+    optional: true
+
   '@esbuild/linux-loong64@0.17.6':
     optional: true
 
@@ -23255,6 +23548,9 @@ snapshots:
   '@esbuild/linux-loong64@0.23.0':
     optional: true
 
+  '@esbuild/linux-mips64el@0.16.3':
+    optional: true
+
   '@esbuild/linux-mips64el@0.17.6':
     optional: true
 
@@ -23279,6 +23575,9 @@ snapshots:
   '@esbuild/linux-mips64el@0.23.0':
     optional: true
 
+  '@esbuild/linux-ppc64@0.16.3':
+    optional: true
+
   '@esbuild/linux-ppc64@0.17.6':
     optional: true
 
@@ -23303,6 +23602,9 @@ snapshots:
   '@esbuild/linux-ppc64@0.23.0':
     optional: true
 
+  '@esbuild/linux-riscv64@0.16.3':
+    optional: true
+
   '@esbuild/linux-riscv64@0.17.6':
     optional: true
 
@@ -23327,6 +23629,9 @@ snapshots:
   '@esbuild/linux-riscv64@0.23.0':
     optional: true
 
+  '@esbuild/linux-s390x@0.16.3':
+    optional: true
+
   '@esbuild/linux-s390x@0.17.6':
     optional: true
 
@@ -23351,6 +23656,9 @@ snapshots:
   '@esbuild/linux-s390x@0.23.0':
     optional: true
 
+  '@esbuild/linux-x64@0.16.3':
+    optional: true
+
   '@esbuild/linux-x64@0.17.6':
     optional: true
 
@@ -23375,6 +23683,9 @@ snapshots:
   '@esbuild/linux-x64@0.23.0':
     optional: true
 
+  '@esbuild/netbsd-x64@0.16.3':
+    optional: true
+
   '@esbuild/netbsd-x64@0.17.6':
     optional: true
 
@@ -23402,6 +23713,9 @@ snapshots:
   '@esbuild/openbsd-arm64@0.23.0':
     optional: true
 
+  '@esbuild/openbsd-x64@0.16.3':
+    optional: true
+
   '@esbuild/openbsd-x64@0.17.6':
     optional: true
 
@@ -23426,6 +23740,9 @@ snapshots:
   '@esbuild/openbsd-x64@0.23.0':
     optional: true
 
+  '@esbuild/sunos-x64@0.16.3':
+    optional: true
+
   '@esbuild/sunos-x64@0.17.6':
     optional: true
 
@@ -23450,6 +23767,9 @@ snapshots:
   '@esbuild/sunos-x64@0.23.0':
     optional: true
 
+  '@esbuild/win32-arm64@0.16.3':
+    optional: true
+
   '@esbuild/win32-arm64@0.17.6':
     optional: true
 
@@ -23474,6 +23794,9 @@ snapshots:
   '@esbuild/win32-arm64@0.23.0':
     optional: true
 
+  '@esbuild/win32-ia32@0.16.3':
+    optional: true
+
   '@esbuild/win32-ia32@0.17.6':
     optional: true
 
@@ -23498,6 +23821,9 @@ snapshots:
   '@esbuild/win32-ia32@0.23.0':
     optional: true
 
+  '@esbuild/win32-x64@0.16.3':
+    optional: true
+
   '@esbuild/win32-x64@0.17.6':
     optional: true
 
@@ -24203,15 +24529,26 @@ snapshots:
       - supports-color
       - utf-8-validate
 
+  '@module-federation/runtime-tools@0.5.1':
+    dependencies:
+      '@module-federation/runtime': 0.5.1
+      '@module-federation/webpack-bundler-runtime': 0.5.1
+
   '@module-federation/runtime-tools@0.6.1':
     dependencies:
       '@module-federation/runtime': 0.6.1
       '@module-federation/webpack-bundler-runtime': 0.6.1
 
+  '@module-federation/runtime@0.5.1':
+    dependencies:
+      '@module-federation/sdk': 0.5.1
+
   '@module-federation/runtime@0.6.1':
     dependencies:
       '@module-federation/sdk': 0.6.1
 
+  '@module-federation/sdk@0.5.1': {}
+
   '@module-federation/sdk@0.6.1': {}
 
   '@module-federation/third-party-dts-extractor@0.6.1':
@@ -24220,6 +24557,11 @@ snapshots:
       fs-extra: 9.1.0
       resolve: 1.22.8
 
+  '@module-federation/webpack-bundler-runtime@0.5.1':
+    dependencies:
+      '@module-federation/runtime': 0.5.1
+      '@module-federation/sdk': 0.5.1
+
   '@module-federation/webpack-bundler-runtime@0.6.1':
     dependencies:
       '@module-federation/runtime': 0.6.1
@@ -24854,9 +25196,9 @@ snapshots:
       - bluebird
       - supports-color
 
-  '@nrwl/angular@19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@nrwl/angular@19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(i4nybqm3kkiqpjmu5wki5rez3q))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
-      '@nx/angular': 19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nx/angular': 19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(i4nybqm3kkiqpjmu5wki5rez3q))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       tslib: 2.6.3
     transitivePeerDependencies:
       - '@angular-devkit/build-angular'
@@ -25006,9 +25348,9 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nrwl/next@19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))':
+  '@nrwl/next@19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))':
     dependencies:
-      '@nx/next': 19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      '@nx/next': 19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
     transitivePeerDependencies:
       - '@babel/core'
       - '@babel/traverse'
@@ -25132,9 +25474,9 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nrwl/webpack@19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@nrwl/webpack@19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
-      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@parcel/css'
@@ -25373,18 +25715,18 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@nx/angular@19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@nx/angular@19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(i4nybqm3kkiqpjmu5wki5rez3q))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
-      '@angular-devkit/build-angular': 18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4)
+      '@angular-devkit/build-angular': 18.2.1(i4nybqm3kkiqpjmu5wki5rez3q)
       '@angular-devkit/core': 18.2.1(chokidar@3.6.0)
       '@angular-devkit/schematics': 18.2.1(chokidar@3.6.0)
       '@module-federation/enhanced': 0.6.1(bufferutil@4.0.7)(typescript@5.5.3)(utf-8-validate@5.0.10)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
-      '@nrwl/angular': 19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(nbnhu3obym3pwwcpmcxt3pwbc4))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nrwl/angular': 19.7.0-beta.6(@angular-devkit/build-angular@18.2.1(i4nybqm3kkiqpjmu5wki5rez3q))(@angular-devkit/core@18.2.1(chokidar@3.6.0))(@angular-devkit/schematics@18.2.1(chokidar@3.6.0))(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@schematics/angular@18.2.1(chokidar@3.6.0))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(rxjs@7.8.1)(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@nx/devkit': 19.7.0-beta.6(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))
       '@nx/eslint': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(eslint@8.57.0)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/js': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/web': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
-      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@nx/workspace': 19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))
       '@phenomnomnominal/tsquery': 5.0.1(typescript@5.5.3)
       '@schematics/angular': 18.2.1(chokidar@3.6.0)
@@ -25711,16 +26053,16 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/next@19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))':
+  '@nx/next@19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))':
     dependencies:
       '@babel/plugin-proposal-decorators': 7.23.9(@babel/core@7.23.2)
-      '@nrwl/next': 19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      '@nrwl/next': 19.7.0-beta.6(@babel/core@7.23.2)(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(next@14.2.5(@babel/core@7.23.2)(@playwright/test@1.36.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       '@nx/devkit': 19.7.0-beta.6(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))
       '@nx/eslint': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(eslint@8.57.0)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/js': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/react': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(eslint@8.57.0)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       '@nx/web': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
-      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@nx/workspace': 19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))
       '@phenomnomnominal/tsquery': 5.0.1(typescript@5.5.3)
       '@svgr/webpack': 8.0.1(typescript@5.5.3)
@@ -25826,13 +26168,13 @@ snapshots:
   '@nx/nx-win32-x64-msvc@19.7.0-beta.6':
     optional: true
 
-  '@nx/playwright@19.7.0-beta.6(@babel/traverse@7.25.4)(@playwright/test@1.36.1)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(vite@5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(vitest@1.3.1(@types/node@18.19.8)(jsdom@20.0.3(bufferutil@4.0.7)(utf-8-validate@5.0.10))(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@nx/playwright@19.7.0-beta.6(@babel/traverse@7.25.4)(@playwright/test@1.36.1)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.19.5)(eslint@8.57.0)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(vite@5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(vitest@1.3.1(@types/node@18.19.8)(jsdom@20.0.3(bufferutil@4.0.7)(utf-8-validate@5.0.10))(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
       '@nx/devkit': 19.7.0-beta.6(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))
       '@nx/eslint': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(@zkochan/js-yaml@0.0.7)(eslint@8.57.0)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/js': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@nx/vite': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(vite@5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))(vitest@1.3.1(@types/node@18.19.8)(jsdom@20.0.3(bufferutil@4.0.7)(utf-8-validate@5.0.10))(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(terser@5.31.6))
-      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nx/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@phenomnomnominal/tsquery': 5.0.1(typescript@5.5.3)
       minimatch: 9.0.3
       tslib: 2.6.3
@@ -25973,12 +26315,12 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/webpack@19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@nx/webpack@19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
       '@babel/core': 7.25.2
       '@module-federation/enhanced': 0.6.1(bufferutil@4.0.7)(typescript@5.5.3)(utf-8-validate@5.0.10)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       '@module-federation/sdk': 0.6.1
-      '@nrwl/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@nrwl/webpack': 19.7.0-beta.6(@babel/traverse@7.25.4)(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(bufferutil@4.0.7)(esbuild@0.19.5)(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(utf-8-validate@5.0.10)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@nx/devkit': 19.7.0-beta.6(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))
       '@nx/js': 19.7.0-beta.6(@babel/traverse@7.25.4)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@18.19.8)(nx@19.7.0-beta.6(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.7)(typescript@5.5.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.5.3)(verdaccio@5.31.0(encoding@0.1.13)(typanion@3.14.0))
       '@phenomnomnominal/tsquery': 5.0.1(typescript@5.5.3)
@@ -25988,7 +26330,7 @@ snapshots:
       browserslist: 4.23.3
       chalk: 4.1.2
       copy-webpack-plugin: 10.2.4(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
-      css-loader: 6.10.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      css-loader: 6.10.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       css-minimizer-webpack-plugin: 5.0.0(esbuild@0.19.5)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       express: 4.19.2
       fork-ts-checker-webpack-plugin: 7.2.13(typescript@5.5.3)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
@@ -26014,7 +26356,7 @@ snapshots:
       tsconfig-paths-webpack-plugin: 4.0.0
       tslib: 2.6.3
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
-      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0)
+      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       webpack-node-externals: 3.0.0
       webpack-subresource-integrity: 5.1.0(html-webpack-plugin@5.5.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
     transitivePeerDependencies:
@@ -26404,7 +26746,7 @@ snapshots:
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
     optionalDependencies:
       type-fest: 3.13.1
-      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0)
+      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       webpack-hot-middleware: 2.25.3
 
   '@pnpm/lockfile-types@6.0.0':
@@ -26778,7 +27120,7 @@ snapshots:
     dependencies:
       serialize-javascript: 6.0.2
       smob: 1.4.1
-      terser: 5.31.0
+      terser: 5.31.6
     optionalDependencies:
       rollup: 4.18.0
 
@@ -26967,6 +27309,90 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  '@rspack/binding-darwin-arm64@1.0.4':
+    optional: true
+
+  '@rspack/binding-darwin-x64@1.0.4':
+    optional: true
+
+  '@rspack/binding-linux-arm64-gnu@1.0.4':
+    optional: true
+
+  '@rspack/binding-linux-arm64-musl@1.0.4':
+    optional: true
+
+  '@rspack/binding-linux-x64-gnu@1.0.4':
+    optional: true
+
+  '@rspack/binding-linux-x64-musl@1.0.4':
+    optional: true
+
+  '@rspack/binding-win32-arm64-msvc@1.0.4':
+    optional: true
+
+  '@rspack/binding-win32-ia32-msvc@1.0.4':
+    optional: true
+
+  '@rspack/binding-win32-x64-msvc@1.0.4':
+    optional: true
+
+  '@rspack/binding@1.0.4':
+    optionalDependencies:
+      '@rspack/binding-darwin-arm64': 1.0.4
+      '@rspack/binding-darwin-x64': 1.0.4
+      '@rspack/binding-linux-arm64-gnu': 1.0.4
+      '@rspack/binding-linux-arm64-musl': 1.0.4
+      '@rspack/binding-linux-x64-gnu': 1.0.4
+      '@rspack/binding-linux-x64-musl': 1.0.4
+      '@rspack/binding-win32-arm64-msvc': 1.0.4
+      '@rspack/binding-win32-ia32-msvc': 1.0.4
+      '@rspack/binding-win32-x64-msvc': 1.0.4
+
+  '@rspack/core@1.0.4(@swc/helpers@0.5.11)':
+    dependencies:
+      '@module-federation/runtime-tools': 0.5.1
+      '@rspack/binding': 1.0.4
+      '@rspack/lite-tapable': 1.0.0
+      caniuse-lite: 1.0.30001651
+    optionalDependencies:
+      '@swc/helpers': 0.5.11
+
+  '@rspack/dev-server@1.0.4(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@types/express@4.17.14)(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))':
+    dependencies:
+      '@rspack/core': 1.0.4(@swc/helpers@0.5.11)
+      chokidar: 3.6.0
+      connect-history-api-fallback: 2.0.0
+      express: 4.19.2
+      http-proxy-middleware: 2.0.6(@types/express@4.17.14)
+      mime-types: 2.1.35
+      p-retry: 4.6.2
+      webpack-dev-middleware: 7.4.2(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@5.0.10)
+    transitivePeerDependencies:
+      - '@types/express'
+      - bufferutil
+      - debug
+      - supports-color
+      - utf-8-validate
+      - webpack
+      - webpack-cli
+
+  '@rspack/lite-tapable@1.0.0': {}
+
+  '@rspack/plugin-minify@0.7.5':
+    dependencies:
+      esbuild: 0.16.3
+      terser: 5.16.1
+      webpack-sources: 3.2.3
+
+  '@rspack/plugin-react-refresh@1.0.0(react-refresh@0.10.0)':
+    dependencies:
+      error-stack-parser: 2.1.4
+      html-entities: 2.5.2
+    optionalDependencies:
+      react-refresh: 0.10.0
+
   '@rtsao/scc@1.1.0': {}
 
   '@rushstack/eslint-patch@1.7.2': {}
@@ -27163,7 +27589,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/builder-webpack5@8.2.9(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@storybook/builder-webpack5@8.2.9(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
       '@storybook/core-webpack': 8.2.9(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))
       '@types/node': 18.19.8
@@ -27172,7 +27598,7 @@ snapshots:
       case-sensitive-paths-webpack-plugin: 2.4.0
       cjs-module-lexer: 1.2.3
       constants-browserify: 1.0.0
-      css-loader: 6.10.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      css-loader: 6.10.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       es-module-lexer: 1.5.4
       express: 4.19.2
       fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.5.3)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
@@ -27363,9 +27789,9 @@ snapshots:
       - typescript
       - vite-plugin-glimmerx
 
-  '@storybook/react-webpack5@8.2.9(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
+  '@storybook/react-webpack5@8.2.9(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))':
     dependencies:
-      '@storybook/builder-webpack5': 8.2.9(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      '@storybook/builder-webpack5': 8.2.9(@rspack/core@1.0.4(@swc/helpers@0.5.11))(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@storybook/preset-react-webpack': 8.2.9(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       '@storybook/react': 8.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.9(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(utf-8-validate@5.0.10))(typescript@5.5.3)
       '@types/node': 18.19.8
@@ -28203,6 +28629,8 @@ snapshots:
     dependencies:
       '@types/node': 18.19.8
 
+  '@types/retry@0.12.0': {}
+
   '@types/retry@0.12.2': {}
 
   '@types/semver@7.5.2': {}
@@ -29088,7 +29516,7 @@ snapshots:
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
       webpack-cli: 5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)
     optionalDependencies:
-      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0)
+      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
 
   '@widgetbot/embed-api@1.2.15':
     dependencies:
@@ -29612,7 +30040,7 @@ snapshots:
   autoprefixer@10.4.19(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
-      caniuse-lite: 1.0.30001599
+      caniuse-lite: 1.0.30001651
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.0.1
@@ -30090,28 +30518,28 @@ snapshots:
 
   browserslist@4.21.5:
     dependencies:
-      caniuse-lite: 1.0.30001599
+      caniuse-lite: 1.0.30001651
       electron-to-chromium: 1.4.470
       node-releases: 2.0.12
       update-browserslist-db: 1.0.11(browserslist@4.21.5)
 
   browserslist@4.21.7:
     dependencies:
-      caniuse-lite: 1.0.30001599
+      caniuse-lite: 1.0.30001651
       electron-to-chromium: 1.4.417
       node-releases: 2.0.12
       update-browserslist-db: 1.0.11(browserslist@4.21.7)
 
   browserslist@4.22.2:
     dependencies:
-      caniuse-lite: 1.0.30001599
+      caniuse-lite: 1.0.30001651
       electron-to-chromium: 1.4.640
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.22.2)
 
   browserslist@4.23.0:
     dependencies:
-      caniuse-lite: 1.0.30001599
+      caniuse-lite: 1.0.30001651
       electron-to-chromium: 1.4.708
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.23.0)
@@ -30311,7 +30739,7 @@ snapshots:
   caniuse-api@3.0.0:
     dependencies:
       browserslist: 4.23.0
-      caniuse-lite: 1.0.30001599
+      caniuse-lite: 1.0.30001651
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
 
@@ -30992,7 +31420,7 @@ snapshots:
       postcss: 8.4.38
       postcss-selector-parser: 6.0.15
 
-  css-loader@6.10.0(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)):
+  css-loader@6.10.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.38)
       postcss: 8.4.38
@@ -31003,9 +31431,10 @@ snapshots:
       postcss-value-parser: 4.2.0
       semver: 7.6.3
     optionalDependencies:
+      '@rspack/core': 1.0.4(@swc/helpers@0.5.11)
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
 
-  css-loader@7.1.2(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
+  css-loader@7.1.2(@rspack/core@1.0.4(@swc/helpers@0.5.11))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.38)
       postcss: 8.4.38
@@ -31016,6 +31445,7 @@ snapshots:
       postcss-value-parser: 4.2.0
       semver: 7.6.3
     optionalDependencies:
+      '@rspack/core': 1.0.4(@swc/helpers@0.5.11)
       webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
 
   css-minimizer-webpack-plugin@5.0.0(esbuild@0.19.5)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)):
@@ -31859,6 +32289,31 @@ snapshots:
 
   esbuild-wasm@0.23.0: {}
 
+  esbuild@0.16.3:
+    optionalDependencies:
+      '@esbuild/android-arm': 0.16.3
+      '@esbuild/android-arm64': 0.16.3
+      '@esbuild/android-x64': 0.16.3
+      '@esbuild/darwin-arm64': 0.16.3
+      '@esbuild/darwin-x64': 0.16.3
+      '@esbuild/freebsd-arm64': 0.16.3
+      '@esbuild/freebsd-x64': 0.16.3
+      '@esbuild/linux-arm': 0.16.3
+      '@esbuild/linux-arm64': 0.16.3
+      '@esbuild/linux-ia32': 0.16.3
+      '@esbuild/linux-loong64': 0.16.3
+      '@esbuild/linux-mips64el': 0.16.3
+      '@esbuild/linux-ppc64': 0.16.3
+      '@esbuild/linux-riscv64': 0.16.3
+      '@esbuild/linux-s390x': 0.16.3
+      '@esbuild/linux-x64': 0.16.3
+      '@esbuild/netbsd-x64': 0.16.3
+      '@esbuild/openbsd-x64': 0.16.3
+      '@esbuild/sunos-x64': 0.16.3
+      '@esbuild/win32-arm64': 0.16.3
+      '@esbuild/win32-ia32': 0.16.3
+      '@esbuild/win32-x64': 0.16.3
+
   esbuild@0.17.6:
     optionalDependencies:
       '@esbuild/android-arm': 0.17.6
@@ -33677,6 +34132,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  http-proxy-middleware@2.0.6(@types/express@4.17.14):
+    dependencies:
+      '@types/http-proxy': 1.17.14
+      http-proxy: 1.18.1(debug@4.3.4)
+      is-glob: 4.0.3
+      is-plain-obj: 3.0.0
+      micromatch: 4.0.5
+    optionalDependencies:
+      '@types/express': 4.17.14
+    transitivePeerDependencies:
+      - debug
+
   http-proxy-middleware@2.0.6(@types/express@4.17.21):
     dependencies:
       '@types/http-proxy': 1.17.14
@@ -35082,10 +35549,11 @@ snapshots:
       less: 4.1.3
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
 
-  less-loader@12.2.0(less@4.2.0)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
+  less-loader@12.2.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(less@4.2.0)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
     dependencies:
       less: 4.2.0
     optionalDependencies:
+      '@rspack/core': 1.0.4(@swc/helpers@0.5.11)
       webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
 
   less@4.1.3:
@@ -35765,7 +36233,7 @@ snapshots:
 
   metro-minify-terser@0.80.5:
     dependencies:
-      terser: 5.31.0
+      terser: 5.31.6
 
   metro-resolver@0.80.5: {}
 
@@ -37254,6 +37722,11 @@ snapshots:
       eventemitter3: 4.0.7
       p-timeout: 3.2.0
 
+  p-retry@4.6.2:
+    dependencies:
+      '@types/retry': 0.12.0
+      retry: 0.13.1
+
   p-retry@6.2.0:
     dependencies:
       '@types/retry': 0.12.2
@@ -37790,13 +38263,14 @@ snapshots:
       semver: 7.6.3
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
 
-  postcss-loader@8.1.1(postcss@8.4.41)(typescript@5.5.3)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
+  postcss-loader@8.1.1(@rspack/core@1.0.4(@swc/helpers@0.5.11))(postcss@8.4.41)(typescript@5.5.3)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
     dependencies:
       cosmiconfig: 9.0.0(typescript@5.5.3)
       jiti: 1.21.0
       postcss: 8.4.41
       semver: 7.6.3
     optionalDependencies:
+      '@rspack/core': 1.0.4(@swc/helpers@0.5.11)
       webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
     transitivePeerDependencies:
       - typescript
@@ -39123,10 +39597,11 @@ snapshots:
     optionalDependencies:
       sass: 1.55.0
 
-  sass-loader@16.0.0(sass@1.77.6)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
+  sass-loader@16.0.0(@rspack/core@1.0.4(@swc/helpers@0.5.11))(sass@1.77.6)(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
     dependencies:
       neo-async: 2.6.2
     optionalDependencies:
+      '@rspack/core': 1.0.4(@swc/helpers@0.5.11)
       sass: 1.77.6
       webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
 
@@ -40188,12 +40663,19 @@ snapshots:
       jest-worker: 27.5.1
       schema-utils: 3.2.0
       serialize-javascript: 6.0.2
-      terser: 5.31.0
+      terser: 5.31.6
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
     optionalDependencies:
       '@swc/core': 1.5.7(@swc/helpers@0.5.11)
       esbuild: 0.19.5
 
+  terser@5.16.1:
+    dependencies:
+      '@jridgewell/source-map': 0.3.3
+      acorn: 8.11.3
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
   terser@5.17.1:
     dependencies:
       '@jridgewell/source-map': 0.3.3
@@ -41463,7 +41945,7 @@ snapshots:
       webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
       webpack-merge: 5.10.0
     optionalDependencies:
-      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0)
+      webpack-dev-server: 5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
 
   webpack-dev-middleware@6.1.3(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)):
     dependencies:
@@ -41508,7 +41990,18 @@ snapshots:
     optionalDependencies:
       webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
 
-  webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
+  webpack-dev-middleware@7.4.2(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)):
+    dependencies:
+      colorette: 2.0.20
+      memfs: 4.9.2
+      mime-types: 2.1.35
+      on-finished: 2.4.1
+      range-parser: 1.2.1
+      schema-utils: 4.2.0
+    optionalDependencies:
+      webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
+
+  webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)):
     dependencies:
       '@types/bonjour': 3.5.13
       '@types/connect-history-api-fallback': 1.5.4
@@ -41538,10 +42031,10 @@ snapshots:
       serve-index: 1.9.1
       sockjs: 0.3.24
       spdy: 4.0.2
-      webpack-dev-middleware: 7.2.1(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
+      webpack-dev-middleware: 7.2.1(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@5.0.10)
     optionalDependencies:
-      webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
+      webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
       webpack-cli: 5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)
     transitivePeerDependencies:
       - bufferutil
@@ -41549,7 +42042,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4)(webpack@5.88.0):
+  webpack-dev-server@5.0.4(bufferutil@4.0.7)(utf-8-validate@5.0.10)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))):
     dependencies:
       '@types/bonjour': 3.5.13
       '@types/connect-history-api-fallback': 1.5.4
@@ -41579,10 +42072,10 @@ snapshots:
       serve-index: 1.9.1
       sockjs: 0.3.24
       spdy: 4.0.2
-      webpack-dev-middleware: 7.2.1(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
+      webpack-dev-middleware: 7.2.1(webpack@5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)))
       ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@5.0.10)
     optionalDependencies:
-      webpack: 5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4)
+      webpack: 5.93.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.23.0)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))
       webpack-cli: 5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0)
     transitivePeerDependencies:
       - bufferutil

From a38eca293059c61039f557ed5d86c629b6e8d521 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 10 Sep 2024 17:58:55 +0100
Subject: [PATCH 86/92] chore(rspack): final fixes

---
 packages-legacy/rspack/project.json           |  9 +++++----
 packages/nx/package.json                      |  2 ++
 packages/nx/src/utils/plugins/core-plugins.ts |  4 ++++
 packages/rspack/package.json                  | 10 +++++++---
 tsconfig.base.json                            |  2 ++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages-legacy/rspack/project.json b/packages-legacy/rspack/project.json
index b96a4cbe1f87a..3b58e4e07caca 100644
--- a/packages-legacy/rspack/project.json
+++ b/packages-legacy/rspack/project.json
@@ -5,12 +5,16 @@
   "projectType": "library",
   "targets": {
     "build": {
+      "outputs": ["{workspaceRoot}/build/packages/{projectName}/README.md"],
+      "command": "node ./scripts/copy-readme.js remix-legacy"
+    },
+    "build-base": {
       "executor": "@nrwl/js:tsc",
       "dependsOn": ["^build"],
       "options": {
         "main": "packages-legacy/rspack/index.ts",
         "tsConfig": "packages-legacy/rspack/tsconfig.json",
-        "outputPath": "dist/packages/rspack-legacy",
+        "outputPath": "build/packages/rspack-legacy",
         "updateBuildableProjectDepsInPackageJson": false,
         "assets": [
           "packages-legacy/rspack/*.md",
@@ -28,9 +32,6 @@
           "LICENSE"
         ]
       }
-    },
-    "publish": {
-      "command": "node tools/scripts/publish.mjs rspack-legacy {args.ver} {args.tag}"
     }
   },
   "tags": []
diff --git a/packages/nx/package.json b/packages/nx/package.json
index d389ce2022040..128d6a2febcce 100644
--- a/packages/nx/package.json
+++ b/packages/nx/package.json
@@ -143,6 +143,8 @@
       "@nrwl/rollup",
       "@nx/remix",
       "@nrwl/remix",
+      "@nx/rspack",
+      "@nrwl/rspack",
       "@nx/storybook",
       "@nrwl/storybook",
       "@nrwl/tao",
diff --git a/packages/nx/src/utils/plugins/core-plugins.ts b/packages/nx/src/utils/plugins/core-plugins.ts
index 64da8777b8626..aaf628a9aec10 100644
--- a/packages/nx/src/utils/plugins/core-plugins.ts
+++ b/packages/nx/src/utils/plugins/core-plugins.ts
@@ -85,6 +85,10 @@ export const CORE_PLUGINS: CorePlugin[] = [
     name: '@nx/rollup',
     capabilities: 'executors,generators',
   },
+  {
+    name: '@nx/rspack',
+    capabilities: 'executors,generators',
+  },
   {
     name: '@nx/storybook',
     capabilities: 'executors,generators',
diff --git a/packages/rspack/package.json b/packages/rspack/package.json
index b479760b89bd2..abb45f0f1f235 100644
--- a/packages/rspack/package.json
+++ b/packages/rspack/package.json
@@ -4,13 +4,17 @@
   "type": "commonjs",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nrwl/nx-labs.git",
+    "url": "https://github.com/nrwl/nx.git",
     "directory": "packages/rspack"
   },
+  "bugs": {
+    "url": "https://github.com/nrwl/nx/issues"
+  },
   "keywords": [
     "Monorepo",
-    "Next",
-    "Vercel"
+    "Rspack",
+    "Bundling",
+    "Module Federation"
   ],
   "author": "Jack Hsu",
   "license": "MIT",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 66ff46902c8b9..3100238695673 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -126,6 +126,8 @@
       "@nx/remix/*": ["packages/remix/*"],
       "@nx/rollup": ["packages/rollup"],
       "@nx/rollup/*": ["packages/rollup/*"],
+      "@nx/rspack": ["packages/rspack/src"],
+      "@nx/rspack/*": ["packages/rspack/src/*"],
       "@nx/storybook": ["packages/storybook"],
       "@nx/storybook/*": ["packages/storybook/*"],
       "@nx/typedoc-theme": ["typedoc-theme/src/index.ts"],

From 6c032ab8001aa5ac11187c1ea4e996f4e9c6785e Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 10 Sep 2024 17:59:30 +0100
Subject: [PATCH 87/92] docs(rspack): add docs for rspack

---
 docs/generated/manifests/menus.json           | 124 +++++++++++
 docs/generated/manifests/nx-api.json          | 116 ++++++++++
 docs/generated/packages-metadata.json         | 115 ++++++++++
 .../packages/rspack/documents/overview.md     |  98 +++++++++
 .../packages/rspack/executors/dev-server.json |  55 +++++
 .../module-federation-dev-server.json         | 100 +++++++++
 .../module-federation-ssr-dev-server.json     |  85 ++++++++
 .../module-federation-static-server.json      |  20 ++
 .../packages/rspack/executors/rspack.json     | 202 ++++++++++++++++++
 .../rspack/executors/ssr-dev-server.json      |  46 ++++
 .../rspack/generators/application.json        |  98 +++++++++
 .../rspack/generators/configuration.json      |  78 +++++++
 .../packages/rspack/generators/init.json      |  39 ++++
 .../packages/rspack/generators/preset.json    |  70 ++++++
 docs/map.json                                 |  13 ++
 docs/shared/packages/rspack/rspack-plugin.md  |   6 +-
 docs/shared/reference/sitemap.md              |  15 ++
 .../pages/nx-api/rspack/documents/index.tsx   |  72 -------
 .../nx-api/rspack/documents/overview.tsx      |  93 --------
 .../rspack/documents/rspack-config-setup.tsx  |  94 --------
 .../rspack/documents/rspack-plugins.tsx       |  93 --------
 .../nx-api/rspack/executors/dev-server.tsx    |  79 -------
 .../pages/nx-api/rspack/executors/index.tsx   |  72 -------
 .../pages/nx-api/rspack/executors/rspack.tsx  |  79 -------
 .../nx-api/rspack/generators/application.tsx  |  79 -------
 .../rspack/generators/configuration.tsx       |  79 -------
 .../pages/nx-api/rspack/generators/index.tsx  |  72 -------
 .../pages/nx-api/rspack/generators/init.tsx   |  79 -------
 nx-dev/nx-dev/pages/nx-api/rspack/index.tsx   |  71 ------
 packages-legacy/rspack/project.json           |   2 +-
 packages/rspack/README.md                     |   4 -
 packages/rspack/executors.json                |   4 +-
 packages/rspack/package.json                  |   1 +
 .../src/executors/dev-server/schema.json      |  12 +-
 .../module-federation-dev-server/schema.json  |   4 +-
 .../schema.json                               |   5 +-
 .../rspack/src/executors/rspack/schema.json   |  32 +--
 .../src/executors/ssr-dev-server/schema.json  |   5 +-
 .../src/generators/application/schema.json    |   1 +
 .../src/generators/configuration/schema.json  |   3 +-
 .../rspack/src/generators/init/schema.json    |   3 +-
 .../rspack/src/generators/preset/schema.json  |   1 +
 42 files changed, 1298 insertions(+), 1021 deletions(-)
 create mode 100644 docs/generated/packages/rspack/documents/overview.md
 create mode 100644 docs/generated/packages/rspack/executors/dev-server.json
 create mode 100644 docs/generated/packages/rspack/executors/module-federation-dev-server.json
 create mode 100644 docs/generated/packages/rspack/executors/module-federation-ssr-dev-server.json
 create mode 100644 docs/generated/packages/rspack/executors/module-federation-static-server.json
 create mode 100644 docs/generated/packages/rspack/executors/rspack.json
 create mode 100644 docs/generated/packages/rspack/executors/ssr-dev-server.json
 create mode 100644 docs/generated/packages/rspack/generators/application.json
 create mode 100644 docs/generated/packages/rspack/generators/configuration.json
 create mode 100644 docs/generated/packages/rspack/generators/init.json
 create mode 100644 docs/generated/packages/rspack/generators/preset.json
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/documents/index.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/documents/overview.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-config-setup.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-plugins.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/executors/dev-server.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/executors/index.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/executors/rspack.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/generators/application.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/generators/configuration.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/generators/index.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/generators/init.tsx
 delete mode 100644 nx-dev/nx-dev/pages/nx-api/rspack/index.tsx

diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
index 6209a08abebb7..c76917ba8576a 100644
--- a/docs/generated/manifests/menus.json
+++ b/docs/generated/manifests/menus.json
@@ -9753,6 +9753,130 @@
         "isExternal": false,
         "disableCollapsible": false
       },
+      {
+        "id": "rspack",
+        "path": "/nx-api/rspack",
+        "name": "rspack",
+        "children": [
+          {
+            "id": "documents",
+            "path": "/nx-api/rspack/documents",
+            "name": "documents",
+            "children": [
+              {
+                "name": "Overview",
+                "path": "/nx-api/rspack/documents/overview",
+                "id": "overview",
+                "isExternal": false,
+                "children": [],
+                "disableCollapsible": false
+              }
+            ],
+            "isExternal": false,
+            "disableCollapsible": false
+          },
+          {
+            "id": "executors",
+            "path": "/nx-api/rspack/executors",
+            "name": "executors",
+            "children": [
+              {
+                "id": "rspack",
+                "path": "/nx-api/rspack/executors/rspack",
+                "name": "rspack",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "dev-server",
+                "path": "/nx-api/rspack/executors/dev-server",
+                "name": "dev-server",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "ssr-dev-server",
+                "path": "/nx-api/rspack/executors/ssr-dev-server",
+                "name": "ssr-dev-server",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "module-federation-dev-server",
+                "path": "/nx-api/rspack/executors/module-federation-dev-server",
+                "name": "module-federation-dev-server",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "module-federation-ssr-dev-server",
+                "path": "/nx-api/rspack/executors/module-federation-ssr-dev-server",
+                "name": "module-federation-ssr-dev-server",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "module-federation-static-server",
+                "path": "/nx-api/rspack/executors/module-federation-static-server",
+                "name": "module-federation-static-server",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              }
+            ],
+            "isExternal": false,
+            "disableCollapsible": false
+          },
+          {
+            "id": "generators",
+            "path": "/nx-api/rspack/generators",
+            "name": "generators",
+            "children": [
+              {
+                "id": "configuration",
+                "path": "/nx-api/rspack/generators/configuration",
+                "name": "configuration",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "init",
+                "path": "/nx-api/rspack/generators/init",
+                "name": "init",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "preset",
+                "path": "/nx-api/rspack/generators/preset",
+                "name": "preset",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "application",
+                "path": "/nx-api/rspack/generators/application",
+                "name": "application",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              }
+            ],
+            "isExternal": false,
+            "disableCollapsible": false
+          }
+        ],
+        "isExternal": false,
+        "disableCollapsible": false
+      },
       {
         "id": "storybook",
         "path": "/nx-api/storybook",
diff --git a/docs/generated/manifests/nx-api.json b/docs/generated/manifests/nx-api.json
index ef366a035478a..b34294a9e2b25 100644
--- a/docs/generated/manifests/nx-api.json
+++ b/docs/generated/manifests/nx-api.json
@@ -2886,6 +2886,122 @@
     },
     "path": "/nx-api/rollup"
   },
+  "rspack": {
+    "githubRoot": "https://github.com/nrwl/nx/blob/master",
+    "name": "rspack",
+    "packageName": "@nx/rspack",
+    "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
+    "documents": {
+      "/nx-api/rspack/documents/overview": {
+        "id": "overview",
+        "name": "Overview",
+        "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
+        "file": "generated/packages/rspack/documents/overview",
+        "itemList": [],
+        "isExternal": false,
+        "path": "/nx-api/rspack/documents/overview",
+        "tags": [],
+        "originalFilePath": "shared/packages/rspack/rspack-plugin"
+      }
+    },
+    "root": "/packages/rspack",
+    "source": "/packages/rspack/src",
+    "executors": {
+      "/nx-api/rspack/executors/rspack": {
+        "description": "Run Rspack via an executor for a project.",
+        "file": "generated/packages/rspack/executors/rspack.json",
+        "hidden": false,
+        "name": "rspack",
+        "originalFilePath": "/packages/rspack/src/executors/rspack/schema.json",
+        "path": "/nx-api/rspack/executors/rspack",
+        "type": "executor"
+      },
+      "/nx-api/rspack/executors/dev-server": {
+        "description": "Run @rspack/dev-server to serve a project.",
+        "file": "generated/packages/rspack/executors/dev-server.json",
+        "hidden": false,
+        "name": "dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/dev-server/schema.json",
+        "path": "/nx-api/rspack/executors/dev-server",
+        "type": "executor"
+      },
+      "/nx-api/rspack/executors/ssr-dev-server": {
+        "description": "Serve a SSR application.",
+        "file": "generated/packages/rspack/executors/ssr-dev-server.json",
+        "hidden": false,
+        "name": "ssr-dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/ssr-dev-server/schema.json",
+        "path": "/nx-api/rspack/executors/ssr-dev-server",
+        "type": "executor"
+      },
+      "/nx-api/rspack/executors/module-federation-dev-server": {
+        "description": "Serve a host or remote application.",
+        "file": "generated/packages/rspack/executors/module-federation-dev-server.json",
+        "hidden": false,
+        "name": "module-federation-dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/module-federation-dev-server/schema.json",
+        "path": "/nx-api/rspack/executors/module-federation-dev-server",
+        "type": "executor"
+      },
+      "/nx-api/rspack/executors/module-federation-ssr-dev-server": {
+        "description": "Serve a host application along with it's known remotes.",
+        "file": "generated/packages/rspack/executors/module-federation-ssr-dev-server.json",
+        "hidden": false,
+        "name": "module-federation-ssr-dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json",
+        "path": "/nx-api/rspack/executors/module-federation-ssr-dev-server",
+        "type": "executor"
+      },
+      "/nx-api/rspack/executors/module-federation-static-server": {
+        "description": "Serve a host and its remotes statically.",
+        "file": "generated/packages/rspack/executors/module-federation-static-server.json",
+        "hidden": false,
+        "name": "module-federation-static-server",
+        "originalFilePath": "/packages/rspack/src/executors/module-federation-static-server/schema.json",
+        "path": "/nx-api/rspack/executors/module-federation-static-server",
+        "type": "executor"
+      }
+    },
+    "generators": {
+      "/nx-api/rspack/generators/configuration": {
+        "description": "Rspack configuration generator.",
+        "file": "generated/packages/rspack/generators/configuration.json",
+        "hidden": false,
+        "name": "configuration",
+        "originalFilePath": "/packages/rspack/src/generators/configuration/schema.json",
+        "path": "/nx-api/rspack/generators/configuration",
+        "type": "generator"
+      },
+      "/nx-api/rspack/generators/init": {
+        "description": "Rspack init generator.",
+        "file": "generated/packages/rspack/generators/init.json",
+        "hidden": true,
+        "name": "init",
+        "originalFilePath": "/packages/rspack/src/generators/init/schema.json",
+        "path": "/nx-api/rspack/generators/init",
+        "type": "generator"
+      },
+      "/nx-api/rspack/generators/preset": {
+        "description": "React preset generator.",
+        "file": "generated/packages/rspack/generators/preset.json",
+        "hidden": true,
+        "name": "preset",
+        "originalFilePath": "/packages/rspack/src/generators/preset/schema.json",
+        "path": "/nx-api/rspack/generators/preset",
+        "type": "generator"
+      },
+      "/nx-api/rspack/generators/application": {
+        "description": "React application generator.",
+        "file": "generated/packages/rspack/generators/application.json",
+        "hidden": false,
+        "name": "application",
+        "originalFilePath": "/packages/rspack/src/generators/application/schema.json",
+        "path": "/nx-api/rspack/generators/application",
+        "type": "generator"
+      }
+    },
+    "path": "/nx-api/rspack"
+  },
   "storybook": {
     "githubRoot": "https://github.com/nrwl/nx/blob/master",
     "name": "storybook",
diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
index 06f3052829a5d..2c8ac9813c533 100644
--- a/docs/generated/packages-metadata.json
+++ b/docs/generated/packages-metadata.json
@@ -2861,6 +2861,121 @@
     "root": "/packages/rollup",
     "source": "/packages/rollup/src"
   },
+  {
+    "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
+    "documents": [
+      {
+        "id": "overview",
+        "name": "Overview",
+        "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
+        "file": "generated/packages/rspack/documents/overview",
+        "itemList": [],
+        "isExternal": false,
+        "path": "rspack/documents/overview",
+        "tags": [],
+        "originalFilePath": "shared/packages/rspack/rspack-plugin"
+      }
+    ],
+    "executors": [
+      {
+        "description": "Run Rspack via an executor for a project.",
+        "file": "generated/packages/rspack/executors/rspack.json",
+        "hidden": false,
+        "name": "rspack",
+        "originalFilePath": "/packages/rspack/src/executors/rspack/schema.json",
+        "path": "rspack/executors/rspack",
+        "type": "executor"
+      },
+      {
+        "description": "Run @rspack/dev-server to serve a project.",
+        "file": "generated/packages/rspack/executors/dev-server.json",
+        "hidden": false,
+        "name": "dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/dev-server/schema.json",
+        "path": "rspack/executors/dev-server",
+        "type": "executor"
+      },
+      {
+        "description": "Serve a SSR application.",
+        "file": "generated/packages/rspack/executors/ssr-dev-server.json",
+        "hidden": false,
+        "name": "ssr-dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/ssr-dev-server/schema.json",
+        "path": "rspack/executors/ssr-dev-server",
+        "type": "executor"
+      },
+      {
+        "description": "Serve a host or remote application.",
+        "file": "generated/packages/rspack/executors/module-federation-dev-server.json",
+        "hidden": false,
+        "name": "module-federation-dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/module-federation-dev-server/schema.json",
+        "path": "rspack/executors/module-federation-dev-server",
+        "type": "executor"
+      },
+      {
+        "description": "Serve a host application along with it's known remotes.",
+        "file": "generated/packages/rspack/executors/module-federation-ssr-dev-server.json",
+        "hidden": false,
+        "name": "module-federation-ssr-dev-server",
+        "originalFilePath": "/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json",
+        "path": "rspack/executors/module-federation-ssr-dev-server",
+        "type": "executor"
+      },
+      {
+        "description": "Serve a host and its remotes statically.",
+        "file": "generated/packages/rspack/executors/module-federation-static-server.json",
+        "hidden": false,
+        "name": "module-federation-static-server",
+        "originalFilePath": "/packages/rspack/src/executors/module-federation-static-server/schema.json",
+        "path": "rspack/executors/module-federation-static-server",
+        "type": "executor"
+      }
+    ],
+    "generators": [
+      {
+        "description": "Rspack configuration generator.",
+        "file": "generated/packages/rspack/generators/configuration.json",
+        "hidden": false,
+        "name": "configuration",
+        "originalFilePath": "/packages/rspack/src/generators/configuration/schema.json",
+        "path": "rspack/generators/configuration",
+        "type": "generator"
+      },
+      {
+        "description": "Rspack init generator.",
+        "file": "generated/packages/rspack/generators/init.json",
+        "hidden": true,
+        "name": "init",
+        "originalFilePath": "/packages/rspack/src/generators/init/schema.json",
+        "path": "rspack/generators/init",
+        "type": "generator"
+      },
+      {
+        "description": "React preset generator.",
+        "file": "generated/packages/rspack/generators/preset.json",
+        "hidden": true,
+        "name": "preset",
+        "originalFilePath": "/packages/rspack/src/generators/preset/schema.json",
+        "path": "rspack/generators/preset",
+        "type": "generator"
+      },
+      {
+        "description": "React application generator.",
+        "file": "generated/packages/rspack/generators/application.json",
+        "hidden": false,
+        "name": "application",
+        "originalFilePath": "/packages/rspack/src/generators/application/schema.json",
+        "path": "rspack/generators/application",
+        "type": "generator"
+      }
+    ],
+    "githubRoot": "https://github.com/nrwl/nx/blob/master",
+    "name": "rspack",
+    "packageName": "@nx/rspack",
+    "root": "/packages/rspack",
+    "source": "/packages/rspack/src"
+  },
   {
     "description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
     "documents": [
diff --git a/docs/generated/packages/rspack/documents/overview.md b/docs/generated/packages/rspack/documents/overview.md
new file mode 100644
index 0000000000000..95e3375773c14
--- /dev/null
+++ b/docs/generated/packages/rspack/documents/overview.md
@@ -0,0 +1,98 @@
+---
+title: Overview of the Nx Rspack Plugin
+description: The Nx Plugin for Rspack contains executors, generators, and utilities for managing Rspack projects in an Nx Workspace.
+---
+
+The Nx Plugin for Rspack contains executors, generators, and utilities for managing Rspack projects in an Nx Workspace.
+
+## Setting Up @nx/rspack
+
+### Installation
+
+{% callout type="note" title="Keep Nx Package Versions In Sync" %}
+Make sure to install the `@nx/rspack` version that matches the version of `nx` in your repository. If the version numbers get out of sync, you can encounter some difficult to debug errors. You can [fix Nx version mismatches with this recipe](/recipes/tips-n-tricks/keep-nx-versions-in-sync).
+{% /callout %}
+
+In any Nx workspace, you can install `@nx/rspack` by running the following command:
+
+{% tabs %}
+{% tab label="Nx 18+" %}
+
+```shell {% skipRescope=true %}
+nx add @nx/rspack
+```
+
+This will install the correct version of `@nx/rspack`.
+
+### How @nx/rspack Infers Tasks
+
+The `@nx/rspack` plugin will create a task for any project that has a Rspack configuration file present. Any of the following files will be recognized as a Rspack configuration file:
+
+- `rspack.config.js`
+- `rspack.config.ts`
+- `rspack.config.mjs`
+- `rspack.config.mts`
+- `rspack.config.cjs`
+- `rspack.config.cts`
+
+### View Inferred Tasks
+
+To view inferred tasks for a project, open the [project details view](/concepts/inferred-tasks) in Nx Console or run `nx show project my-project --web` in the command line.
+
+### @nx/rspack Configuration
+
+The `@nx/rspack/plugin` is configured in the `plugins` array in `nx.json`.
+
+```json {% fileName="nx.json" %}
+{
+  "plugins": [
+    {
+      "plugin": "@nx/rspack/plugin",
+      "options": {
+        "buildTargetName": "build",
+        "previewTargetName": "preview",
+        "serveTargetName": "serve",
+        "serveStaticTargetName": "serve-static"
+      }
+    }
+  ]
+}
+```
+
+The `buildTargetName`, `previewTargetName`, `serveTargetName` and `serveStaticTargetName` options control the names of the inferred Rspack tasks. The default names are `build`, `preview`, `serve` and `serve-static`.
+
+{% /tab %}
+{% tab label="Nx < 18" %}
+
+Install the `@nx/rspack` package with your package manager.
+
+```shell
+npm add -D @nx/rspack
+```
+
+{% /tab %}
+{% /tabs %}
+
+## Using @nx/rspack
+
+### Generate a new project using Rspack
+
+You can generate a [React](/nx-api/react) application or library that uses Rspack. The [`@nx/react:app`](/nx-api/react/generators/application) and [`@nx/react:lib`](/nx-api/react/generators/library) generators accept the `bundler` option, where you can pass `rspack`. This will generate a new application configured to use Rspack, and it will also install all the necessary dependencies, including the `@nx/rspack` plugin.
+
+To generate a React application using Rspack, run the following:
+
+```bash
+nx g @nx/react:app my-app --bundler=rspack
+```
+
+To generate a React library using Rspack, run the following:
+
+```bash
+nx g @nx/react:lib my-lib --bundler=rspack
+```
+
+### Modify an existing React project to use Rspack
+
+You can use the `@nx/rspack:configuration` generator to change your React to use Rspack. This generator will modify your project's configuration to use Rspack, and it will also install all the necessary dependencies, including the `@nx/rspack` plugin.
+
+You can read more about this generator on the [`@nx/rspack:configuration`](/nx-api/rspack/generators/configuration) generator page.
diff --git a/docs/generated/packages/rspack/executors/dev-server.json b/docs/generated/packages/rspack/executors/dev-server.json
new file mode 100644
index 0000000000000..fd9399c7db558
--- /dev/null
+++ b/docs/generated/packages/rspack/executors/dev-server.json
@@ -0,0 +1,55 @@
+{
+  "name": "dev-server",
+  "implementation": "/packages/rspack/src/executors/dev-server/dev-server.impl.ts",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "version": 2,
+    "title": "Rspack dev-server executor",
+    "description": "Run @rspack/dev-server to serve a project.",
+    "type": "object",
+    "properties": {
+      "buildTarget": {
+        "type": "string",
+        "description": "The build target for rspack."
+      },
+      "port": {
+        "type": "number",
+        "description": "The port to for the dev-server to listen on."
+      },
+      "mode": {
+        "type": "string",
+        "description": "Mode to run the server in.",
+        "enum": ["development", "production", "none"]
+      },
+      "host": {
+        "type": "string",
+        "description": "Host to listen on.",
+        "default": "localhost"
+      },
+      "ssl": {
+        "type": "boolean",
+        "description": "Serve using `HTTPS`.",
+        "default": false
+      },
+      "sslKey": {
+        "type": "string",
+        "description": "SSL key to use for serving `HTTPS`."
+      },
+      "sslCert": {
+        "type": "string",
+        "description": "SSL certificate to use for serving `HTTPS`."
+      },
+      "publicHost": {
+        "type": "string",
+        "description": "Public URL where the application will be served."
+      }
+    },
+    "required": ["buildTarget"],
+    "presets": []
+  },
+  "description": "Run @rspack/dev-server to serve a project.",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/executors/dev-server/schema.json",
+  "type": "executor"
+}
diff --git a/docs/generated/packages/rspack/executors/module-federation-dev-server.json b/docs/generated/packages/rspack/executors/module-federation-dev-server.json
new file mode 100644
index 0000000000000..571c583e136a2
--- /dev/null
+++ b/docs/generated/packages/rspack/executors/module-federation-dev-server.json
@@ -0,0 +1,100 @@
+{
+  "name": "module-federation-dev-server",
+  "implementation": "/packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts",
+  "schema": {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
+    "title": "Rspack Module Federation Dev Server",
+    "description": "Serve a module federation application.",
+    "cli": "nx",
+    "type": "object",
+    "properties": {
+      "devRemotes": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            { "type": "string" },
+            {
+              "type": "object",
+              "properties": {
+                "remoteName": { "type": "string" },
+                "configuration": { "type": "string" }
+              },
+              "required": ["remoteName"],
+              "additionalProperties": false
+            }
+          ]
+        },
+        "description": "List of remote applications to run in development mode (i.e. using serve target).",
+        "x-priority": "important"
+      },
+      "skipRemotes": {
+        "type": "array",
+        "items": { "type": "string" },
+        "description": "List of remote applications to not automatically serve, either statically or in development mode. This will not remove the remotes from the `module-federation.config` file, and therefore the application may still try to fetch these remotes.\nThis option is useful if you have other means for serving the `remote` application(s).\n**NOTE:** Remotes that are not in the workspace will be skipped automatically.",
+        "x-priority": "important"
+      },
+      "buildTarget": {
+        "type": "string",
+        "description": "Target which builds the application.",
+        "x-priority": "important"
+      },
+      "port": {
+        "type": "number",
+        "description": "Port to listen on.",
+        "default": 4200,
+        "x-priority": "important"
+      },
+      "host": {
+        "type": "string",
+        "description": "Host to listen on.",
+        "default": "localhost"
+      },
+      "ssl": {
+        "type": "boolean",
+        "description": "Serve using `HTTPS`.",
+        "default": false
+      },
+      "sslKey": {
+        "type": "string",
+        "description": "SSL key to use for serving `HTTPS`."
+      },
+      "sslCert": {
+        "type": "string",
+        "description": "SSL certificate to use for serving `HTTPS`."
+      },
+      "publicHost": {
+        "type": "string",
+        "description": "Public URL where the application will be served."
+      },
+      "static": {
+        "type": "boolean",
+        "description": "Whether to use a static file server instead of the rspack-dev-server. This should be used for remote applications that are also host applications."
+      },
+      "isInitialHost": {
+        "type": "boolean",
+        "description": "Whether the host that is running this executor is the first in the project tree to do so.",
+        "default": true,
+        "x-priority": "internal"
+      },
+      "parallel": {
+        "type": "number",
+        "description": "Max number of parallel processes for building static remotes"
+      },
+      "staticRemotesPort": {
+        "type": "number",
+        "description": "The port at which to serve the file-server for the static remotes."
+      },
+      "pathToManifestFile": {
+        "type": "string",
+        "description": "Path to a Module Federation manifest file (e.g. `my/path/to/module-federation.manifest.json`) containing the dynamic remote applications relative to the workspace root."
+      }
+    },
+    "presets": []
+  },
+  "description": "Serve a host or remote application.",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/executors/module-federation-dev-server/schema.json",
+  "type": "executor"
+}
diff --git a/docs/generated/packages/rspack/executors/module-federation-ssr-dev-server.json b/docs/generated/packages/rspack/executors/module-federation-ssr-dev-server.json
new file mode 100644
index 0000000000000..f91a75342f7f6
--- /dev/null
+++ b/docs/generated/packages/rspack/executors/module-federation-ssr-dev-server.json
@@ -0,0 +1,85 @@
+{
+  "name": "module-federation-ssr-dev-server",
+  "implementation": "/packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts",
+  "schema": {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
+    "title": "Module Federation SSR Dev Server",
+    "description": "Serve a SSR host application along with its known remotes.",
+    "cli": "nx",
+    "type": "object",
+    "properties": {
+      "browserTarget": {
+        "type": "string",
+        "description": "Target which builds the browser application.",
+        "x-priority": "important"
+      },
+      "serverTarget": {
+        "type": "string",
+        "description": "Target which builds the server application.",
+        "x-priority": "important"
+      },
+      "port": {
+        "type": "number",
+        "description": "The port to be set on `process.env.PORT` for use in the server.",
+        "default": 4200,
+        "x-priority": "important"
+      },
+      "devRemotes": {
+        "type": "array",
+        "items": { "type": "string" },
+        "description": "List of remote applications to run in development mode (i.e. using serve target).",
+        "x-priority": "important"
+      },
+      "skipRemotes": {
+        "type": "array",
+        "items": { "type": "string" },
+        "description": "List of remote applications to not automatically serve, either statically or in development mode.",
+        "x-priority": "important"
+      },
+      "host": {
+        "type": "string",
+        "description": "Host to listen on.",
+        "default": "localhost"
+      },
+      "staticRemotesPort": {
+        "type": "number",
+        "description": "The port at which to serve the file-server for the static remotes."
+      },
+      "pathToManifestFile": {
+        "type": "string",
+        "description": "Path to a Module Federation manifest file (e.g. `my/path/to/module-federation.manifest.json`) containing the dynamic remote applications relative to the workspace root."
+      },
+      "ssl": {
+        "type": "boolean",
+        "description": "Serve using HTTPS.",
+        "default": false
+      },
+      "sslKey": {
+        "type": "string",
+        "description": "SSL key to use for serving HTTPS."
+      },
+      "sslCert": {
+        "type": "string",
+        "description": "SSL certificate to use for serving HTTPS."
+      },
+      "publicHost": {
+        "type": "string",
+        "description": "Public URL where the application will be served."
+      },
+      "isInitialHost": {
+        "type": "boolean",
+        "description": "Whether the host that is running this executor is the first in the project tree to do so.",
+        "default": true,
+        "x-priority": "internal"
+      }
+    },
+    "required": ["browserTarget", "serverTarget"],
+    "presets": []
+  },
+  "description": "Serve a host application along with it's known remotes.",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json",
+  "type": "executor"
+}
diff --git a/docs/generated/packages/rspack/executors/module-federation-static-server.json b/docs/generated/packages/rspack/executors/module-federation-static-server.json
new file mode 100644
index 0000000000000..83d2a7072f677
--- /dev/null
+++ b/docs/generated/packages/rspack/executors/module-federation-static-server.json
@@ -0,0 +1,20 @@
+{
+  "name": "module-federation-static-server",
+  "implementation": "/packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts",
+  "schema": {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
+    "title": "Module Federation Static Dev Server",
+    "description": "Serve a host application statically along with it's remotes.",
+    "cli": "nx",
+    "type": "object",
+    "properties": { "serveTarget": { "type": "string" } },
+    "required": ["serveTarget"],
+    "presets": []
+  },
+  "description": "Serve a host and its remotes statically.",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/executors/module-federation-static-server/schema.json",
+  "type": "executor"
+}
diff --git a/docs/generated/packages/rspack/executors/rspack.json b/docs/generated/packages/rspack/executors/rspack.json
new file mode 100644
index 0000000000000..78308a42bc2f1
--- /dev/null
+++ b/docs/generated/packages/rspack/executors/rspack.json
@@ -0,0 +1,202 @@
+{
+  "name": "rspack",
+  "implementation": "/packages/rspack/src/executors/rspack/rspack.impl.ts",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "version": 2,
+    "title": "Rspack build executor",
+    "description": "Run Rspack via an executor for a project.",
+    "type": "object",
+    "properties": {
+      "target": {
+        "type": "string",
+        "description": "The platform to target (e.g. web, node).",
+        "enum": ["web", "node"]
+      },
+      "main": { "type": "string", "description": "The main entry file." },
+      "outputPath": {
+        "type": "string",
+        "description": "The output path for the bundle."
+      },
+      "outputFileName": {
+        "type": "string",
+        "description": "The main output entry file"
+      },
+      "tsConfig": {
+        "type": "string",
+        "description": "The tsconfig file to build the project."
+      },
+      "typeCheck": {
+        "type": "boolean",
+        "description": "Skip the type checking."
+      },
+      "indexHtml": {
+        "type": "string",
+        "description": "The path to the index.html file."
+      },
+      "index": {
+        "type": "string",
+        "description": "HTML File which will be contain the application.",
+        "x-completion-type": "file",
+        "x-completion-glob": "**/*@(.html|.htm)"
+      },
+      "baseHref": {
+        "type": "string",
+        "description": "Base url for the application being built."
+      },
+      "deployUrl": {
+        "type": "string",
+        "description": "URL where the application will be deployed."
+      },
+      "rspackConfig": {
+        "type": "string",
+        "description": "The path to the rspack config file."
+      },
+      "optimization": {
+        "description": "Enables optimization of the build output.",
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "scripts": {
+                "type": "boolean",
+                "description": "Enables optimization of the scripts output.",
+                "default": true
+              },
+              "styles": {
+                "type": "boolean",
+                "description": "Enables optimization of the styles output.",
+                "default": true
+              }
+            },
+            "additionalProperties": false
+          },
+          { "type": "boolean" }
+        ]
+      },
+      "sourceMap": {
+        "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
+        "default": true,
+        "oneOf": [{ "type": "boolean" }, { "type": "string" }]
+      },
+      "assets": {
+        "type": "array",
+        "description": "List of static application assets.",
+        "default": [],
+        "items": {
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "glob": {
+                  "type": "string",
+                  "description": "The pattern to match."
+                },
+                "input": {
+                  "type": "string",
+                  "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+                },
+                "ignore": {
+                  "description": "An array of globs to ignore.",
+                  "type": "array",
+                  "items": { "type": "string" }
+                },
+                "output": {
+                  "type": "string",
+                  "description": "Absolute path within the output."
+                },
+                "watch": {
+                  "type": "boolean",
+                  "description": "Enable re-building when files change.",
+                  "default": false
+                }
+              },
+              "additionalProperties": false,
+              "required": ["glob", "input", "output"]
+            },
+            { "type": "string" }
+          ]
+        }
+      },
+      "extractLicenses": {
+        "type": "boolean",
+        "description": "Extract all licenses in a separate file.",
+        "default": true
+      },
+      "fileReplacements": {
+        "description": "Replace files with other files in the build.",
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "replace": {
+              "type": "string",
+              "description": "The file to be replaced.",
+              "x-completion-type": "file"
+            },
+            "with": {
+              "type": "string",
+              "description": "The file to replace with.",
+              "x-completion-type": "file"
+            }
+          },
+          "additionalProperties": false,
+          "required": ["replace", "with"]
+        },
+        "default": []
+      },
+      "mode": {
+        "type": "string",
+        "description": "Mode to run the build in.",
+        "enum": ["development", "production", "none"]
+      },
+      "generatePackageJson": {
+        "type": "boolean",
+        "description": "Generates a `package.json` and pruned lock file with the project's `node_module` dependencies populated for installing in a container. If a `package.json` exists in the project's directory, it will be reused with dependencies populated."
+      }
+    },
+    "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
+    "definitions": {
+      "assetPattern": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "glob": {
+                "type": "string",
+                "description": "The pattern to match."
+              },
+              "input": {
+                "type": "string",
+                "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+              },
+              "ignore": {
+                "description": "An array of globs to ignore.",
+                "type": "array",
+                "items": { "type": "string" }
+              },
+              "output": {
+                "type": "string",
+                "description": "Absolute path within the output."
+              },
+              "watch": {
+                "type": "boolean",
+                "description": "Enable re-building when files change.",
+                "default": false
+              }
+            },
+            "additionalProperties": false,
+            "required": ["glob", "input", "output"]
+          },
+          { "type": "string" }
+        ]
+      }
+    },
+    "presets": []
+  },
+  "description": "Run Rspack via an executor for a project.",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/executors/rspack/schema.json",
+  "type": "executor"
+}
diff --git a/docs/generated/packages/rspack/executors/ssr-dev-server.json b/docs/generated/packages/rspack/executors/ssr-dev-server.json
new file mode 100644
index 0000000000000..cd0f60eca23f7
--- /dev/null
+++ b/docs/generated/packages/rspack/executors/ssr-dev-server.json
@@ -0,0 +1,46 @@
+{
+  "name": "ssr-dev-server",
+  "implementation": "/packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts",
+  "schema": {
+    "outputCapture": "direct-nodejs",
+    "title": "Rspack SSR Dev Server",
+    "description": "Serve a SSR application using rspack.",
+    "cli": "nx",
+    "type": "object",
+    "properties": {
+      "browserTarget": {
+        "type": "string",
+        "description": "Target which builds the browser application.",
+        "x-priority": "important"
+      },
+      "serverTarget": {
+        "type": "string",
+        "description": "Target which builds the server application.",
+        "x-priority": "important"
+      },
+      "port": {
+        "type": "number",
+        "description": "The port to be set on `process.env.PORT` for use in the server.",
+        "default": 4200,
+        "x-priority": "important"
+      },
+      "browserTargetOptions": {
+        "type": "object",
+        "description": "Additional options to pass into the browser build target.",
+        "default": {}
+      },
+      "serverTargetOptions": {
+        "type": "object",
+        "description": "Additional options to pass into the server build target.",
+        "default": {}
+      }
+    },
+    "required": ["browserTarget", "serverTarget"],
+    "presets": []
+  },
+  "description": "Serve a SSR application.",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/executors/ssr-dev-server/schema.json",
+  "type": "executor"
+}
diff --git a/docs/generated/packages/rspack/generators/application.json b/docs/generated/packages/rspack/generators/application.json
new file mode 100644
index 0000000000000..5671e424cd53d
--- /dev/null
+++ b/docs/generated/packages/rspack/generators/application.json
@@ -0,0 +1,98 @@
+{
+  "name": "application",
+  "factory": "./src/generators/application/application",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "$id": "Application",
+    "title": "Application generator for React + rspack",
+    "type": "object",
+    "description": "React + Rspack application generator.",
+    "examples": [
+      {
+        "command": "nx g app myapp --directory=myorg",
+        "description": "Generate `apps/myorg/myapp` and `apps/myorg/myapp-e2e`"
+      }
+    ],
+    "properties": {
+      "name": {
+        "description": "The name of the application.",
+        "type": "string",
+        "$default": { "$source": "argv", "index": 0 },
+        "x-prompt": "What name would you like to use for the application?",
+        "pattern": "^[a-zA-Z].*$",
+        "x-priority": "important"
+      },
+      "framework": {
+        "type": "string",
+        "description": "The framework to use for the application.",
+        "x-prompt": "What framework do you want to use when generating this application?",
+        "enum": ["none", "react", "web", "nest"],
+        "alias": ["uiFramework"],
+        "x-priority": "important",
+        "default": "react"
+      },
+      "style": {
+        "description": "The file extension to be used for style files.",
+        "type": "string",
+        "default": "css",
+        "alias": "s",
+        "x-prompt": {
+          "message": "Which stylesheet format would you like to use?",
+          "type": "list",
+          "items": [
+            { "value": "css", "label": "CSS" },
+            {
+              "value": "scss",
+              "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
+            },
+            {
+              "value": "styl",
+              "label": "Stylus(.styl)     [ http://stylus-lang.com                   ]"
+            },
+            {
+              "value": "less",
+              "label": "LESS              [ http://lesscss.org                       ]"
+            },
+            { "value": "none", "label": "None" }
+          ]
+        }
+      },
+      "unitTestRunner": {
+        "type": "string",
+        "description": "The unit test runner to use.",
+        "enum": ["none", "jest"],
+        "default": "jest"
+      },
+      "e2eTestRunner": {
+        "type": "string",
+        "description": "The e2e test runner to use.",
+        "enum": ["none", "cypress"],
+        "default": "cypress"
+      },
+      "directory": {
+        "type": "string",
+        "description": "The directory to nest the app under."
+      },
+      "tags": {
+        "type": "string",
+        "description": "Add tags to the application (used for linting).",
+        "alias": "t"
+      },
+      "monorepo": {
+        "type": "boolean",
+        "description": "Creates an integrated monorepo.",
+        "aliases": ["integrated"]
+      },
+      "rootProject": { "type": "boolean", "x-priority": "internal" }
+    },
+    "required": ["name"],
+    "presets": []
+  },
+  "aliases": ["app"],
+  "x-type": "application",
+  "description": "React application generator.",
+  "implementation": "/packages/rspack/src/generators/application/application.ts",
+  "hidden": false,
+  "path": "/packages/rspack/src/generators/application/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/rspack/generators/configuration.json b/docs/generated/packages/rspack/generators/configuration.json
new file mode 100644
index 0000000000000..8b2b66ec0ef6c
--- /dev/null
+++ b/docs/generated/packages/rspack/generators/configuration.json
@@ -0,0 +1,78 @@
+{
+  "name": "configuration",
+  "factory": "./src/generators/configuration/configuration",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "$id": "Rspack",
+    "title": "Nx Rspack Configuration Generator",
+    "description": "Rspack configuration generator.",
+    "type": "object",
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The name of the project.",
+        "$default": { "$source": "argv", "index": 0 },
+        "x-dropdown": "project",
+        "x-prompt": "What is the name of the project to set up a rspack for?",
+        "x-priority": "important"
+      },
+      "framework": {
+        "type": "string",
+        "description": "The framework used by the project.",
+        "x-prompt": "What framework is the project you want to convert using?",
+        "enum": ["none", "react", "web", "nest"],
+        "alias": ["uiFramework"],
+        "x-priority": "important"
+      },
+      "main": {
+        "type": "string",
+        "description": "Path relative to the workspace root for the main entry file. Defaults to '<projectRoot>/src/main.ts'.",
+        "x-priority": "important"
+      },
+      "tsConfig": {
+        "type": "string",
+        "description": "Path relative to the workspace root for the tsconfig file to build with. Defaults to '<projectRoot>/tsconfig.app.json'.",
+        "x-priority": "important"
+      },
+      "target": {
+        "type": "string",
+        "description": "Target platform for the build, same as the rspack config option.",
+        "enum": ["node", "web"],
+        "default": "web"
+      },
+      "devServer": {
+        "type": "boolean",
+        "description": "Add a serve target to run a local rspack dev-server",
+        "default": false
+      },
+      "style": {
+        "type": "string",
+        "description": "The style solution to use.",
+        "enum": ["none", "css", "scss", "less"]
+      },
+      "newProject": {
+        "type": "boolean",
+        "description": "Is this a new project?",
+        "default": false,
+        "hidden": true
+      },
+      "buildTarget": {
+        "type": "string",
+        "description": "The build target of the project to be transformed to use the @nx/vite:build executor."
+      },
+      "serveTarget": {
+        "type": "string",
+        "description": "The serve target of the project to be transformed to use the @nx/vite:dev-server and @nx/vite:preview-server executors."
+      },
+      "rootProject": { "type": "boolean", "x-priority": "internal" }
+    },
+    "required": ["project"],
+    "presets": []
+  },
+  "description": "Rspack configuration generator.",
+  "implementation": "/packages/rspack/src/generators/configuration/configuration.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/rspack/src/generators/configuration/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/rspack/generators/init.json b/docs/generated/packages/rspack/generators/init.json
new file mode 100644
index 0000000000000..332b01a133fe8
--- /dev/null
+++ b/docs/generated/packages/rspack/generators/init.json
@@ -0,0 +1,39 @@
+{
+  "name": "init",
+  "factory": "./src/generators/init/init",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "$id": "Init",
+    "title": "Nx Rspack Init Generator",
+    "type": "object",
+    "description": "Rspack init generator.",
+    "properties": {
+      "framework": {
+        "type": "string",
+        "description": "The UI framework used by the project.",
+        "enum": ["none", "react", "web", "nest"],
+        "alias": ["uiFramework"]
+      },
+      "style": {
+        "type": "string",
+        "description": "The style solution to use.",
+        "enum": ["none", "css", "scss", "less", "styl"]
+      },
+      "rootProject": { "type": "boolean", "x-priority": "internal" },
+      "keepExistingVersions": {
+        "type": "boolean",
+        "x-priority": "internal",
+        "description": "Keep existing dependencies versions",
+        "default": false
+      }
+    },
+    "required": [],
+    "presets": []
+  },
+  "description": "Rspack init generator.",
+  "hidden": true,
+  "implementation": "/packages/rspack/src/generators/init/init.ts",
+  "aliases": [],
+  "path": "/packages/rspack/src/generators/init/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/rspack/generators/preset.json b/docs/generated/packages/rspack/generators/preset.json
new file mode 100644
index 0000000000000..33703949ce2a4
--- /dev/null
+++ b/docs/generated/packages/rspack/generators/preset.json
@@ -0,0 +1,70 @@
+{
+  "name": "preset",
+  "factory": "./src/generators/preset/preset",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "$id": "Preset",
+    "title": "Standalone React and rspack preset",
+    "description": "React + Rspack preset generator.",
+    "type": "object",
+    "properties": {
+      "name": {
+        "type": "string",
+        "description": "",
+        "$default": { "$source": "argv", "index": 0 },
+        "x-priority": "important"
+      },
+      "framework": {
+        "type": "string",
+        "description": "The framework to use for the application.",
+        "enum": ["none", "react", "web", "nest"],
+        "alias": ["uiFramework"],
+        "x-priority": "important",
+        "default": "react"
+      },
+      "less": { "type": "boolean", "description": "Use less for styling." },
+      "sass": { "type": "boolean", "description": "Use sass for styling." },
+      "stylus": { "type": "boolean", "description": "Use stylus for styling." },
+      "unitTestRunner": {
+        "type": "string",
+        "description": "The unit test runner to use.",
+        "enum": ["none", "jest"],
+        "default": "jest"
+      },
+      "e2eTestRunner": {
+        "type": "string",
+        "description": "The e2e test runner to use.",
+        "enum": ["none", "cypress"],
+        "default": "cypress"
+      },
+      "directory": {
+        "type": "string",
+        "description": "The directory to nest the app under."
+      },
+      "tags": {
+        "type": "string",
+        "description": "Add tags to the project (used for linting).",
+        "alias": "t"
+      },
+      "monorepo": {
+        "type": "boolean",
+        "description": "Creates an integrated monorepo.",
+        "default": false,
+        "aliases": ["integrated"]
+      },
+      "rootProject": {
+        "type": "boolean",
+        "x-priority": "internal",
+        "default": true
+      }
+    },
+    "required": ["name"],
+    "presets": []
+  },
+  "description": "React preset generator.",
+  "hidden": true,
+  "implementation": "/packages/rspack/src/generators/preset/preset.ts",
+  "aliases": [],
+  "path": "/packages/rspack/src/generators/preset/schema.json",
+  "type": "generator"
+}
diff --git a/docs/map.json b/docs/map.json
index 4fe5012ac0ca6..26588b53950e9 100644
--- a/docs/map.json
+++ b/docs/map.json
@@ -2519,6 +2519,19 @@
             }
           ]
         },
+        {
+          "name": "rspack",
+          "id": "rspack",
+          "description": "Rspack package.",
+          "itemList": [
+            {
+              "name": "Overview",
+              "id": "overview",
+              "path": "/nx-api/rspack",
+              "file": "shared/packages/rspack/rspack-plugin"
+            }
+          ]
+        },
         {
           "name": "detox",
           "id": "detox",
diff --git a/docs/shared/packages/rspack/rspack-plugin.md b/docs/shared/packages/rspack/rspack-plugin.md
index 48d806fc2875b..95e3375773c14 100644
--- a/docs/shared/packages/rspack/rspack-plugin.md
+++ b/docs/shared/packages/rspack/rspack-plugin.md
@@ -24,7 +24,6 @@ nx add @nx/rspack
 
 This will install the correct version of `@nx/rspack`.
 
-
 ### How @nx/rspack Infers Tasks
 
 The `@nx/rspack` plugin will create a task for any project that has a Rspack configuration file present. Any of the following files will be recognized as a Rspack configuration file:
@@ -94,7 +93,6 @@ nx g @nx/react:lib my-lib --bundler=rspack
 
 ### Modify an existing React project to use Rspack
 
-You can use the `@nx/rspack:rspack-project` generator to change your React to use Rspack. This generator will modify your project's configuration to use Rspack, and it will also install all the necessary dependencies, including the `@nx/rspack` plugin.
-
-You can read more about this generator on the [`@nx/rspack:rspack-project`](/nx-api/rspack/generators/rspack-project) generator page.
+You can use the `@nx/rspack:configuration` generator to change your React to use Rspack. This generator will modify your project's configuration to use Rspack, and it will also install all the necessary dependencies, including the `@nx/rspack` plugin.
 
+You can read more about this generator on the [`@nx/rspack:configuration`](/nx-api/rspack/generators/configuration) generator page.
diff --git a/docs/shared/reference/sitemap.md b/docs/shared/reference/sitemap.md
index 2059beb0ec394..e483c1c31b4d7 100644
--- a/docs/shared/reference/sitemap.md
+++ b/docs/shared/reference/sitemap.md
@@ -677,6 +677,21 @@
       - [init](/nx-api/rollup/generators/init)
       - [configuration](/nx-api/rollup/generators/configuration)
       - [convert-to-inferred](/nx-api/rollup/generators/convert-to-inferred)
+  - [rspack](/nx-api/rspack)
+    - [documents](/nx-api/rspack/documents)
+      - [Overview](/nx-api/rspack/documents/overview)
+    - [executors](/nx-api/rspack/executors)
+      - [rspack](/nx-api/rspack/executors/rspack)
+      - [dev-server](/nx-api/rspack/executors/dev-server)
+      - [ssr-dev-server](/nx-api/rspack/executors/ssr-dev-server)
+      - [module-federation-dev-server](/nx-api/rspack/executors/module-federation-dev-server)
+      - [module-federation-ssr-dev-server](/nx-api/rspack/executors/module-federation-ssr-dev-server)
+      - [module-federation-static-server](/nx-api/rspack/executors/module-federation-static-server)
+    - [generators](/nx-api/rspack/generators)
+      - [configuration](/nx-api/rspack/generators/configuration)
+      - [init](/nx-api/rspack/generators/init)
+      - [preset](/nx-api/rspack/generators/preset)
+      - [application](/nx-api/rspack/generators/application)
   - [storybook](/nx-api/storybook)
     - [documents](/nx-api/storybook/documents)
       - [Overview](/nx-api/storybook/documents/overview)
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/documents/index.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/documents/index.tsx
deleted file mode 100644
index 3775bf3c1fa3e..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/documents/index.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function DocumentsIndex({
-  menu,
-  pkg,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: { menu: Menu; package: ProcessedPackageMetadata } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaSubList pkg={vm.package} type={'document'} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps(): Promise<{
-  props: {
-    menu: MenuItem[];
-    pkg: ProcessedPackageMetadata;
-  };
-}> {
-  return {
-    props: {
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-      pkg,
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/documents/overview.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/documents/overview.tsx
deleted file mode 100644
index 5a9091d157600..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/documents/overview.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { DocViewer } from '@nx/nx-dev/feature-doc-viewer';
-import { ProcessedDocument, RelatedDocument } from '@nx/nx-dev/models-document';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { content } from '../../../../lib/rspack/content/overview';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { fetchGithubStarCount } from '../../../../lib/githubStars.api';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function Overview({
-  document,
-  menu,
-  relatedDocuments,
-  widgetData,
-}: {
-  document: ProcessedDocument;
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  relatedDocuments: RelatedDocument[];
-  widgetData: { githubStarsCount: number };
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    document: ProcessedDocument;
-    menu: Menu;
-    relatedDocuments: RelatedDocument[];
-  } = {
-    document,
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    relatedDocuments,
-  };
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <DocViewer
-            document={vm.document}
-            relatedDocuments={vm.relatedDocuments}
-            widgetData={widgetData}
-          />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  const document = {
-    content: content,
-    description: '',
-    filePath: '',
-    id: 'overview',
-    name: 'Overview of the Nx Rspack Plugin',
-    relatedDocuments: {},
-    tags: [],
-  };
-
-  return {
-    props: {
-      pkg,
-      document,
-      widgetData: {
-        githubStarsCount: await fetchGithubStarCount(),
-      },
-      relatedDocuments: [],
-      menu: menusApi.getMenu('nx-api', ''),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-config-setup.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-config-setup.tsx
deleted file mode 100644
index 251cbbc8d9861..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-config-setup.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { DocViewer } from '@nx/nx-dev/feature-doc-viewer';
-import { ProcessedDocument, RelatedDocument } from '@nx/nx-dev/models-document';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { content } from '../../../../lib/rspack/content/rspack-config-setup';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { fetchGithubStarCount } from '../../../../lib/githubStars.api';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function RspackConfigSetup({
-  document,
-  menu,
-  relatedDocuments,
-  widgetData,
-}: {
-  document: ProcessedDocument;
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  relatedDocuments: RelatedDocument[];
-  widgetData: { githubStarsCount: number };
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    document: ProcessedDocument;
-    menu: Menu;
-    relatedDocuments: RelatedDocument[];
-  } = {
-    document,
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    relatedDocuments,
-  };
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <DocViewer
-            document={vm.document}
-            relatedDocuments={vm.relatedDocuments}
-            widgetData={widgetData}
-          />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  const document = {
-    content: content,
-    description:
-      'A guide on how to configure Rspack on your Nx workspace, and instructions on how to customize your Rspack configuration.',
-    filePath: '',
-    id: 'rspack-plugins',
-    name: ' How to configure Rspack on your Nx workspace',
-    relatedDocuments: {},
-    tags: [],
-  };
-
-  return {
-    props: {
-      pkg,
-      document,
-      widgetData: {
-        githubStarsCount: await fetchGithubStarCount(),
-      },
-      relatedDocuments: [],
-      menu: menusApi.getMenu('nx-api', ''),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-plugins.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-plugins.tsx
deleted file mode 100644
index dbf1f2e61fd52..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/documents/rspack-plugins.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { DocViewer } from '@nx/nx-dev/feature-doc-viewer';
-import { ProcessedDocument, RelatedDocument } from '@nx/nx-dev/models-document';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { content } from '../../../../lib/rspack/content/rspack-plugin';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { fetchGithubStarCount } from '../../../../lib/githubStars.api';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function RspackPlugins({
-  document,
-  menu,
-  relatedDocuments,
-  widgetData,
-}: {
-  document: ProcessedDocument;
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  relatedDocuments: RelatedDocument[];
-  widgetData: { githubStarsCount: number };
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    document: ProcessedDocument;
-    menu: Menu;
-    relatedDocuments: RelatedDocument[];
-  } = {
-    document,
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    relatedDocuments,
-  };
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <DocViewer
-            document={vm.document}
-            relatedDocuments={vm.relatedDocuments}
-            widgetData={widgetData}
-          />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  const document = {
-    content: content,
-    description: 'Rspack plugins',
-    filePath: '',
-    id: 'rspack-plugins',
-    name: 'Rspack plugins',
-    relatedDocuments: {},
-    tags: [],
-  };
-
-  return {
-    props: {
-      pkg,
-      document,
-      widgetData: {
-        githubStarsCount: await fetchGithubStarCount(),
-      },
-      relatedDocuments: [],
-      menu: menusApi.getMenu('nx-api', ''),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/executors/dev-server.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/executors/dev-server.tsx
deleted file mode 100644
index fa20030839bc1..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/executors/dev-server.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { PackageSchemaViewer } from '@nx/nx-dev/feature-package-schema-viewer';
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import {
-  ProcessedPackageMetadata,
-  SchemaMetadata,
-} from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { schema } from '../../../../lib/rspack/schema/executors/dev-server';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function DevServerExecutor({
-  menu,
-  pkg,
-  schema,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  schema: SchemaMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    menu: Menu;
-    package: ProcessedPackageMetadata;
-    schema: SchemaMetadata;
-  } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-    schema: schema,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaViewer pkg={vm.package} schema={vm.schema} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  return {
-    props: {
-      pkg,
-      schema,
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/executors/index.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/executors/index.tsx
deleted file mode 100644
index 672c136c2270b..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/executors/index.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function ExecutorsIndex({
-  menu,
-  pkg,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: { menu: Menu; package: ProcessedPackageMetadata } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaSubList pkg={vm.package} type={'executor'} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps(): Promise<{
-  props: {
-    menu: MenuItem[];
-    pkg: ProcessedPackageMetadata;
-  };
-}> {
-  return {
-    props: {
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-      pkg,
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/executors/rspack.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/executors/rspack.tsx
deleted file mode 100644
index e5e43ce6a71e2..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/executors/rspack.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { PackageSchemaViewer } from '@nx/nx-dev/feature-package-schema-viewer';
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import {
-  ProcessedPackageMetadata,
-  SchemaMetadata,
-} from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { schema } from '../../../../lib/rspack/schema/executors/rspack';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function RspackExecutor({
-  menu,
-  pkg,
-  schema,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  schema: SchemaMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    menu: Menu;
-    package: ProcessedPackageMetadata;
-    schema: SchemaMetadata;
-  } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-    schema: schema,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaViewer pkg={vm.package} schema={vm.schema} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  return {
-    props: {
-      pkg,
-      schema,
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/generators/application.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/generators/application.tsx
deleted file mode 100644
index 325c9ea2d3af1..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/generators/application.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { PackageSchemaViewer } from '@nx/nx-dev/feature-package-schema-viewer';
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import {
-  ProcessedPackageMetadata,
-  SchemaMetadata,
-} from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { schema } from '../../../../lib/rspack/schema/generators/application';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function ApplicationGenerator({
-  menu,
-  pkg,
-  schema,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  schema: SchemaMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    menu: Menu;
-    package: ProcessedPackageMetadata;
-    schema: SchemaMetadata;
-  } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-    schema: schema,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaViewer pkg={vm.package} schema={vm.schema} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  return {
-    props: {
-      pkg,
-      schema,
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/generators/configuration.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/generators/configuration.tsx
deleted file mode 100644
index 6515cd1252854..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/generators/configuration.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { PackageSchemaViewer } from '@nx/nx-dev/feature-package-schema-viewer';
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import {
-  ProcessedPackageMetadata,
-  SchemaMetadata,
-} from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { schema } from '../../../../lib/rspack/schema/generators/configuration';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function ConfigurationGenerator({
-  menu,
-  pkg,
-  schema,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  schema: SchemaMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    menu: Menu;
-    package: ProcessedPackageMetadata;
-    schema: SchemaMetadata;
-  } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-    schema: schema,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaViewer pkg={vm.package} schema={vm.schema} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  return {
-    props: {
-      pkg,
-      schema,
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/generators/index.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/generators/index.tsx
deleted file mode 100644
index 8c656663f617f..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/generators/index.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function GeneratorsIndex({
-  menu,
-  pkg,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: { menu: Menu; package: ProcessedPackageMetadata } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaSubList pkg={vm.package} type={'generator'} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps(): Promise<{
-  props: {
-    menu: MenuItem[];
-    pkg: ProcessedPackageMetadata;
-  };
-}> {
-  return {
-    props: {
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-      pkg,
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/generators/init.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/generators/init.tsx
deleted file mode 100644
index 3b29972ac104e..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/generators/init.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { PackageSchemaViewer } from '@nx/nx-dev/feature-package-schema-viewer';
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import {
-  ProcessedPackageMetadata,
-  SchemaMetadata,
-} from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../../lib/menus.api';
-import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
-import { schema } from '../../../../lib/rspack/schema/generators/init';
-import { pkg } from '../../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function InitGenerator({
-  menu,
-  pkg,
-  schema,
-}: {
-  menu: MenuItem[];
-  pkg: ProcessedPackageMetadata;
-  schema: SchemaMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: {
-    menu: Menu;
-    package: ProcessedPackageMetadata;
-    schema: SchemaMetadata;
-  } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-    schema: schema,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaViewer pkg={vm.package} schema={vm.schema} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  return {
-    props: {
-      pkg,
-      schema,
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-    },
-  };
-}
diff --git a/nx-dev/nx-dev/pages/nx-api/rspack/index.tsx b/nx-dev/nx-dev/pages/nx-api/rspack/index.tsx
deleted file mode 100644
index 1610634f02ebb..0000000000000
--- a/nx-dev/nx-dev/pages/nx-api/rspack/index.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { PackageSchemaList } from '@nx/nx-dev/feature-package-schema-viewer';
-import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
-import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
-import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
-import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
-import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
-import { menusApi } from '../../../lib/menus.api';
-import { useNavToggle } from '../../../lib/navigation-toggle.effect';
-import { content } from '../../../lib/rspack/content/overview';
-import { pkg } from '../../../lib/rspack/pkg';
-import { ScrollableContent } from '@nx/ui-scrollable-content';
-
-export default function RspackIndex({
-  overview,
-  menu,
-  pkg,
-}: {
-  menu: MenuItem[];
-  overview: string;
-  pkg: ProcessedPackageMetadata;
-}): JSX.Element {
-  const { toggleNav, navIsOpen } = useNavToggle();
-
-  const vm: { menu: Menu; package: ProcessedPackageMetadata } = {
-    menu: {
-      sections: sortCorePackagesFirst<MenuSection>(
-        getPackagesSections(menu),
-        'id'
-      ),
-    },
-    package: pkg,
-  };
-
-  /**
-   * Show either the docviewer or the package view depending on:
-   * - docviewer: it is a documentation document
-   * - packageviewer: it is package generated documentation
-   */
-
-  return (
-    <div id="shell" className="flex h-full flex-col">
-      <div className="w-full flex-shrink-0">
-        <DocumentationHeader isNavOpen={navIsOpen} toggleNav={toggleNav} />
-      </div>
-      <main
-        id="main"
-        role="main"
-        className="flex h-full flex-1 overflow-y-hidden"
-      >
-        <SidebarContainer
-          menu={vm.menu}
-          navIsOpen={navIsOpen}
-          toggleNav={toggleNav}
-        />
-        <ScrollableContent resetScrollOnNavigation={true}>
-          <PackageSchemaList pkg={vm.package} overview={overview} />
-        </ScrollableContent>
-      </main>
-    </div>
-  );
-}
-
-export async function getStaticProps() {
-  return {
-    props: {
-      menu: menusApi.getMenu('nx-api', 'nx-api'),
-      overview: content,
-      pkg,
-    },
-  };
-}
diff --git a/packages-legacy/rspack/project.json b/packages-legacy/rspack/project.json
index 3b58e4e07caca..9c4f8ea14b46f 100644
--- a/packages-legacy/rspack/project.json
+++ b/packages-legacy/rspack/project.json
@@ -6,7 +6,7 @@
   "targets": {
     "build": {
       "outputs": ["{workspaceRoot}/build/packages/{projectName}/README.md"],
-      "command": "node ./scripts/copy-readme.js remix-legacy"
+      "command": "node ./scripts/copy-readme.js rspack-legacy"
     },
     "build-base": {
       "executor": "@nrwl/js:tsc",
diff --git a/packages/rspack/README.md b/packages/rspack/README.md
index 7774238d9c6e5..123c6c283384c 100644
--- a/packages/rspack/README.md
+++ b/packages/rspack/README.md
@@ -17,10 +17,6 @@ This package is a [Rspack plugin for Nx](https://nx.dev/nx-api/rspack).
 
 {{content}}
 
-
-
-
-
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
 <hr>
diff --git a/packages/rspack/executors.json b/packages/rspack/executors.json
index 5c88728a42916..df7d79d1b8c13 100644
--- a/packages/rspack/executors.json
+++ b/packages/rspack/executors.json
@@ -4,12 +4,12 @@
     "rspack": {
       "implementation": "./src/executors/rspack/rspack.impl",
       "schema": "./src/executors/rspack/schema.json",
-      "description": "rspack executor"
+      "description": "Run Rspack via an executor for a project."
     },
     "dev-server": {
       "implementation": "./src/executors/dev-server/dev-server.impl",
       "schema": "./src/executors/dev-server/schema.json",
-      "description": "dev-server executor"
+      "description": "Run @rspack/dev-server to serve a project."
     },
     "ssr-dev-server": {
       "implementation": "./src/executors/ssr-dev-server/ssr-dev-server.impl",
diff --git a/packages/rspack/package.json b/packages/rspack/package.json
index abb45f0f1f235..48d97a6d6538a 100644
--- a/packages/rspack/package.json
+++ b/packages/rspack/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@nx/rspack",
+  "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
   "version": "0.0.1",
   "type": "commonjs",
   "repository": {
diff --git a/packages/rspack/src/executors/dev-server/schema.json b/packages/rspack/src/executors/dev-server/schema.json
index f8c605c749da2..f636780ae0bf4 100644
--- a/packages/rspack/src/executors/dev-server/schema.json
+++ b/packages/rspack/src/executors/dev-server/schema.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "version": 2,
   "title": "Rspack dev-server executor",
-  "description": "",
+  "description": "Run @rspack/dev-server to serve a project.",
   "type": "object",
   "properties": {
     "buildTarget": {
@@ -16,11 +16,7 @@
     "mode": {
       "type": "string",
       "description": "Mode to run the server in.",
-      "enum": [
-        "development",
-        "production",
-        "none"
-      ]
+      "enum": ["development", "production", "none"]
     },
     "host": {
       "type": "string",
@@ -45,7 +41,5 @@
       "description": "Public URL where the application will be served."
     }
   },
-  "required": [
-    "buildTarget"
-  ]
+  "required": ["buildTarget"]
 }
diff --git a/packages/rspack/src/executors/module-federation-dev-server/schema.json b/packages/rspack/src/executors/module-federation-dev-server/schema.json
index b507657924e69..75b019a5e6654 100644
--- a/packages/rspack/src/executors/module-federation-dev-server/schema.json
+++ b/packages/rspack/src/executors/module-federation-dev-server/schema.json
@@ -23,9 +23,7 @@
                 "type": "string"
               }
             },
-            "required": [
-              "remoteName"
-            ],
+            "required": ["remoteName"],
             "additionalProperties": false
           }
         ]
diff --git a/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json b/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json
index db2c9ce882671..8f86f09ec874e 100644
--- a/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json
+++ b/packages/rspack/src/executors/module-federation-ssr-dev-server/schema.json
@@ -75,8 +75,5 @@
       "x-priority": "internal"
     }
   },
-  "required": [
-    "browserTarget",
-    "serverTarget"
-  ]
+  "required": ["browserTarget", "serverTarget"]
 }
diff --git a/packages/rspack/src/executors/rspack/schema.json b/packages/rspack/src/executors/rspack/schema.json
index c51421bb07201..2faa51e02df7c 100644
--- a/packages/rspack/src/executors/rspack/schema.json
+++ b/packages/rspack/src/executors/rspack/schema.json
@@ -2,16 +2,13 @@
   "$schema": "http://json-schema.org/schema",
   "version": 2,
   "title": "Rspack build executor",
-  "description": "",
+  "description": "Run Rspack via an executor for a project.",
   "type": "object",
   "properties": {
     "target": {
       "type": "string",
       "description": "The platform to target (e.g. web, node).",
-      "enum": [
-        "web",
-        "node"
-      ]
+      "enum": ["web", "node"]
     },
     "main": {
       "type": "string",
@@ -122,34 +119,21 @@
           }
         },
         "additionalProperties": false,
-        "required": [
-          "replace",
-          "with"
-        ]
+        "required": ["replace", "with"]
       },
       "default": []
     },
     "mode": {
       "type": "string",
       "description": "Mode to run the build in.",
-      "enum": [
-        "development",
-        "production",
-        "none"
-      ]
+      "enum": ["development", "production", "none"]
     },
     "generatePackageJson": {
       "type": "boolean",
       "description": "Generates a `package.json` and pruned lock file with the project's `node_module` dependencies populated for installing in a container. If a `package.json` exists in the project's directory, it will be reused with dependencies populated."
     }
   },
-  "required": [
-    "target",
-    "main",
-    "outputPath",
-    "tsConfig",
-    "rspackConfig"
-  ],
+  "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -182,11 +166,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
diff --git a/packages/rspack/src/executors/ssr-dev-server/schema.json b/packages/rspack/src/executors/ssr-dev-server/schema.json
index dfa4f20810b4d..fc22ad14d251a 100644
--- a/packages/rspack/src/executors/ssr-dev-server/schema.json
+++ b/packages/rspack/src/executors/ssr-dev-server/schema.json
@@ -32,8 +32,5 @@
       "default": {}
     }
   },
-  "required": [
-    "browserTarget",
-    "serverTarget"
-  ]
+  "required": ["browserTarget", "serverTarget"]
 }
diff --git a/packages/rspack/src/generators/application/schema.json b/packages/rspack/src/generators/application/schema.json
index b193d1b3305df..aac817b81adef 100644
--- a/packages/rspack/src/generators/application/schema.json
+++ b/packages/rspack/src/generators/application/schema.json
@@ -3,6 +3,7 @@
   "$id": "Application",
   "title": "Application generator for React + rspack",
   "type": "object",
+  "description": "React + Rspack application generator.",
   "examples": [
     {
       "command": "nx g app myapp --directory=myorg",
diff --git a/packages/rspack/src/generators/configuration/schema.json b/packages/rspack/src/generators/configuration/schema.json
index 90c4189b21b77..79ec519f70d8d 100644
--- a/packages/rspack/src/generators/configuration/schema.json
+++ b/packages/rspack/src/generators/configuration/schema.json
@@ -1,7 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "Rspack",
-  "title": "",
+  "title": "Nx Rspack Configuration Generator",
+  "description": "Rspack configuration generator.",
   "type": "object",
   "properties": {
     "project": {
diff --git a/packages/rspack/src/generators/init/schema.json b/packages/rspack/src/generators/init/schema.json
index a91c05545cbae..5242ea96dfc67 100644
--- a/packages/rspack/src/generators/init/schema.json
+++ b/packages/rspack/src/generators/init/schema.json
@@ -1,8 +1,9 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "Init",
-  "title": "",
+  "title": "Nx Rspack Init Generator",
   "type": "object",
+  "description": "Rspack init generator.",
   "properties": {
     "framework": {
       "type": "string",
diff --git a/packages/rspack/src/generators/preset/schema.json b/packages/rspack/src/generators/preset/schema.json
index 45b542f2d2944..f9216a4fccbe7 100644
--- a/packages/rspack/src/generators/preset/schema.json
+++ b/packages/rspack/src/generators/preset/schema.json
@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "Preset",
   "title": "Standalone React and rspack preset",
+  "description": "React + Rspack preset generator.",
   "type": "object",
   "properties": {
     "name": {

From c544a34c2b096b584983e528a5e72eb803780d96 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 11 Sep 2024 10:24:19 +0100
Subject: [PATCH 88/92] chore(rspack): fix rspack e2e

---
 e2e/rspack/tests/rspack.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e2e/rspack/tests/rspack.spec.ts b/e2e/rspack/tests/rspack.spec.ts
index acb1f6aaffbe0..abeac82f237a9 100644
--- a/e2e/rspack/tests/rspack.spec.ts
+++ b/e2e/rspack/tests/rspack.spec.ts
@@ -8,6 +8,7 @@ import {
   uniq,
   updateFile,
   runCLI,
+  runCommand,
 } from '@nx/e2e/utils';
 import { execSync } from 'child_process';
 import { writeFileSync } from 'fs';
@@ -54,10 +55,9 @@ describe('rspack e2e', () => {
     );
 
     const pm = getPackageManagerCommand();
-    execSync(
+    runCommand(
       pm.addDev +
-        ' @babel/preset-react @babel/preset-env @babel/preset-typescript',
-      { cwd: tmpProjPath() }
+        ' @babel/preset-react @babel/preset-env @babel/preset-typescript'
     );
 
     let result = runCLI(`build ${project}`, {

From 392b4b82bc2dfc6580b089e8bdf1a4067ca76588 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 13 Sep 2024 10:38:14 +0100
Subject: [PATCH 89/92] chore(react): add rspack bundler test

---
 e2e/react/src/react.test.ts | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/e2e/react/src/react.test.ts b/e2e/react/src/react.test.ts
index 043bf20b1f09b..c0865cc1776c8 100644
--- a/e2e/react/src/react.test.ts
+++ b/e2e/react/src/react.test.ts
@@ -63,6 +63,41 @@ describe('React Applications', () => {
       }
     }, 250_000);
 
+    it('should be able to use Rspack to build and test apps', async () => {
+      const appName = uniq('app');
+      const libName = uniq('lib');
+
+      runCLI(
+        `generate @nx/react:app ${appName} --bundler=rspack --unit-test-runner=vitest --no-interactive --skipFormat`
+      );
+      runCLI(
+        `generate @nx/react:lib ${libName} --bundler=none --no-interactive --unit-test-runner=vitest --skipFormat`
+      );
+
+      // Library generated with Vite
+      checkFilesExist(`libs/${libName}/vite.config.ts`);
+
+      const mainPath = `apps/${appName}/src/main.tsx`;
+      updateFile(
+        mainPath,
+        `
+        import '@${proj}/${libName}';
+        ${readFile(mainPath)}
+      `
+      );
+
+      runCLI(`build ${appName}`);
+
+      checkFilesExist(`dist/apps/${appName}/index.html`);
+
+      if (runE2ETests()) {
+        // TODO(Colum): investigate why webkit is failing
+        const e2eResults = runCLI(`e2e ${appName}-e2e --project=chromium`);
+        expect(e2eResults).toContain('Successfully ran target e2e for project');
+        expect(await killPorts()).toBeTruthy();
+      }
+    }, 250_000);
+
     it('should be able to generate a react app + lib (with CSR and SSR)', async () => {
       const appName = uniq('app');
       const libName = uniq('lib');

From b1dae521015fc042b80f951abb47649d08c98330 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 26 Sep 2024 09:38:22 +0100
Subject: [PATCH 90/92] fix(rspack): pin rspack to 1.0.5

---
 package.json                          | 4 ++--
 packages/rspack/src/utils/versions.ts | 4 ++--
 pnpm-lock.yaml                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index eedd50cfa283a..2ab47bca463fc 100644
--- a/package.json
+++ b/package.json
@@ -100,8 +100,8 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-url": "^8.0.2",
-    "@rspack/core": "^1.0.4",
-    "@rspack/dev-server": "^1.0.4",
+    "@rspack/core": "1.0.5",
+    "@rspack/dev-server": "1.0.5",
     "@rspack/plugin-minify": "^0.7.5",
     "@rspack/plugin-react-refresh": "^1.0.0",
     "@schematics/angular": "~18.2.0",
diff --git a/packages/rspack/src/utils/versions.ts b/packages/rspack/src/utils/versions.ts
index 86a31a47441f2..3a9137a86232f 100644
--- a/packages/rspack/src/utils/versions.ts
+++ b/packages/rspack/src/utils/versions.ts
@@ -1,5 +1,5 @@
-export const rspackCoreVersion = '^1.0.4';
-export const rspackDevServerVersion = '^1.0.4';
+export const rspackCoreVersion = '1.0.5';
+export const rspackDevServerVersion = '1.0.5';
 
 export const rspackPluginMinifyVersion = '^0.7.5';
 export const rspackPluginReactRefreshVersion = '^1.0.0';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2f9fa75b77aa9..cc379276bfba6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -392,10 +392,10 @@ importers:
         specifier: ^8.0.2
         version: 8.0.2(rollup@4.22.0)
       '@rspack/core':
-        specifier: ^1.0.4
+        specifier: 1.0.5
         version: 1.0.5(@swc/helpers@0.5.11)
       '@rspack/dev-server':
-        specifier: ^1.0.4
+        specifier: 1.0.5
         version: 1.0.5(@rspack/core@1.0.5(@swc/helpers@0.5.11))(@types/express@4.17.14)(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.19.5)(webpack-cli@5.1.4))
       '@rspack/plugin-minify':
         specifier: ^0.7.5

From 4ae8886a04fa035defab5db4b7c8a68144be9a8f Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 26 Sep 2024 15:26:12 +0100
Subject: [PATCH 91/92] chore(react): fix e2e

---
 e2e/react/src/react.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e2e/react/src/react.test.ts b/e2e/react/src/react.test.ts
index 5e686ffb6b764..f9949b19cb874 100644
--- a/e2e/react/src/react.test.ts
+++ b/e2e/react/src/react.test.ts
@@ -75,9 +75,9 @@ describe('React Applications', () => {
       );
 
       // Library generated with Vite
-      checkFilesExist(`libs/${libName}/vite.config.ts`);
+      checkFilesExist(`${libName}/vite.config.ts`);
 
-      const mainPath = `apps/${appName}/src/main.tsx`;
+      const mainPath = `${appName}/src/main.tsx`;
       updateFile(
         mainPath,
         `
@@ -88,7 +88,7 @@ describe('React Applications', () => {
 
       runCLI(`build ${appName}`);
 
-      checkFilesExist(`dist/apps/${appName}/index.html`);
+      checkFilesExist(`dist/${appName}/index.html`);
 
       if (runE2ETests()) {
         // TODO(Colum): investigate why webkit is failing

From e9cdc076dda1edd487dbc59a8ff08aaea71a5187 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 26 Sep 2024 17:07:13 +0100
Subject: [PATCH 92/92] chore(react): fix e2e

---
 e2e/react/src/react.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/react/src/react.test.ts b/e2e/react/src/react.test.ts
index f9949b19cb874..e627fda2f5eff 100644
--- a/e2e/react/src/react.test.ts
+++ b/e2e/react/src/react.test.ts
@@ -92,7 +92,7 @@ describe('React Applications', () => {
 
       if (runE2ETests()) {
         // TODO(Colum): investigate why webkit is failing
-        const e2eResults = runCLI(`e2e ${appName}-e2e --project=chromium`);
+        const e2eResults = runCLI(`e2e ${appName}-e2e -- --project=chromium`);
         expect(e2eResults).toContain('Successfully ran target e2e for project');
         expect(await killPorts()).toBeTruthy();
       }