diff --git a/examples/basehref-examples/rspack-app/rspack.config.ts b/examples/basehref-examples/rspack-app/rspack.config.ts index a2ed4ed8..472d259d 100644 --- a/examples/basehref-examples/rspack-app/rspack.config.ts +++ b/examples/basehref-examples/rspack-app/rspack.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "@rspack/cli"; import { rspack } from "@rspack/core"; -import * as RefreshPlugin from "@rspack/plugin-react-refresh"; +import { ReactRefreshRspackPlugin } from "@rspack/plugin-react-refresh"; import { withZephyr } from "zephyr-rspack-plugin"; const isDev = process.env.NODE_ENV === "development"; @@ -58,7 +58,7 @@ export default withZephyr()( template: "./index.html", publicPath, }), - isDev ? new RefreshPlugin() : null, + isDev ? new ReactRefreshRspackPlugin() : null, ].filter(Boolean), optimization: { minimizer: [ diff --git a/examples/basehref-examples/vite-app/package.json b/examples/basehref-examples/vite-app/package.json index 1160e755..dd8bf550 100644 --- a/examples/basehref-examples/vite-app/package.json +++ b/examples/basehref-examples/vite-app/package.json @@ -16,8 +16,8 @@ "react-dom": "catalog:react18" }, "devDependencies": { - "@types/react": "catalog:react18", - "@types/react-dom": "catalog:react18", + "@types/react": "catalog:react19", + "@types/react-dom": "catalog:react19", "@vitejs/plugin-react": "catalog:vite5", "typescript": "catalog:typescript", "vite": "catalog:vite5", diff --git a/examples/basehref-examples/webpack-app/package.json b/examples/basehref-examples/webpack-app/package.json index b914fb87..eede1101 100644 --- a/examples/basehref-examples/webpack-app/package.json +++ b/examples/basehref-examples/webpack-app/package.json @@ -9,16 +9,16 @@ "build:base": "webpack --mode=production --env publicPath=/app/" }, "dependencies": { - "react": "catalog:react18", - "react-dom": "catalog:react18" + "react": "catalog:react19", + "react-dom": "catalog:react19" }, "devDependencies": { "@babel/core": "catalog:babel", "@babel/preset-env": "catalog:babel", "@babel/preset-react": "catalog:babel", "@babel/preset-typescript": "catalog:babel", - "@types/react": "catalog:react18", - "@types/react-dom": "catalog:react18", + "@types/react": "catalog:react19", + "@types/react-dom": "catalog:react19", "babel-loader": "catalog:babel", "css-loader": "catalog:webpack5", "html-webpack-plugin": "catalog:webpack5", diff --git a/examples/create-default-webpack-mf/app1/package.json b/examples/create-default-webpack-mf/app1/package.json index 7e8fad39..47c1c30b 100755 --- a/examples/create-default-webpack-mf/app1/package.json +++ b/examples/create-default-webpack-mf/app1/package.json @@ -8,8 +8,8 @@ "build": "webpack --mode production" }, "dependencies": { - "react": "catalog:react18", - "react-dom": "catalog:react18", + "react": "catalog:react19", + "react-dom": "catalog:react19", "zephyr-webpack-plugin": "catalog:zephyr", "external-remotes-plugin": "^1.0.0" }, diff --git a/examples/create-default-webpack-mf/app2/package.json b/examples/create-default-webpack-mf/app2/package.json index 370ebd6f..abb96de4 100755 --- a/examples/create-default-webpack-mf/app2/package.json +++ b/examples/create-default-webpack-mf/app2/package.json @@ -8,8 +8,8 @@ "build": "webpack --mode production" }, "dependencies": { - "react": "catalog:react18", - "react-dom": "catalog:react18", + "react": "catalog:react19", + "react-dom": "catalog:react19", "zephyr-webpack-plugin": "catalog:zephyr" }, "devDependencies": { diff --git a/examples/create-mf-app-rspack/package.json b/examples/create-mf-app-rspack/package.json index 1435cca2..867ef67d 100644 --- a/examples/create-mf-app-rspack/package.json +++ b/examples/create-mf-app-rspack/package.json @@ -16,19 +16,19 @@ "@rspack/cli": "catalog:rspack", "@rspack/core": "catalog:rspack", "@rspack/plugin-react-refresh": "catalog:rspack", - "@types/react": "catalog:react18", - "@types/react-dom": "catalog:react18", + "@types/react": "catalog:react19", + "@types/react-dom": "catalog:react19", "autoprefixer": "catalog:postcss", "cross-env": "catalog:common", "css-loader": "catalog:common", "postcss": "catalog:postcss", "postcss-loader": "catalog:postcss", - "react-refresh": "catalog:react18", + "react-refresh": "catalog:react19", "style-loader": "catalog:common" }, "dependencies": { - "react": "catalog:react18", - "react-dom": "catalog:react18", + "react": "catalog:react19", + "react-dom": "catalog:react19", "zephyr-rspack-plugin": "catalog:zephyr" } } diff --git a/examples/create-nx-rspack-workspace-mf/apps/host/src/app/app.tsx b/examples/create-nx-rspack-workspace-mf/apps/host/src/app/app.tsx index 1e06f7f0..cb085ff8 100644 --- a/examples/create-nx-rspack-workspace-mf/apps/host/src/app/app.tsx +++ b/examples/create-nx-rspack-workspace-mf/apps/host/src/app/app.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import NxWelcome from './nx-welcome'; -import { Link, Route, Routes } from 'react-router-dom'; +import { Link, Route, Routes } from 'react-router'; const Remote1 = React.lazy(() => import('remote1/Module')); diff --git a/examples/create-nx-rspack-workspace-mf/apps/host/src/bootstrap.tsx b/examples/create-nx-rspack-workspace-mf/apps/host/src/bootstrap.tsx index 9124761f..ac7c20bd 100644 --- a/examples/create-nx-rspack-workspace-mf/apps/host/src/bootstrap.tsx +++ b/examples/create-nx-rspack-workspace-mf/apps/host/src/bootstrap.tsx @@ -1,6 +1,6 @@ import { StrictMode } from 'react'; import * as ReactDOM from 'react-dom/client'; -import { BrowserRouter } from 'react-router-dom'; +import { BrowserRouter } from 'react-router'; import App from './app/app'; diff --git a/examples/create-nx-rspack-workspace-mf/apps/host/src/remotes.d.ts b/examples/create-nx-rspack-workspace-mf/apps/host/src/remotes.d.ts new file mode 100644 index 00000000..c4cbc387 --- /dev/null +++ b/examples/create-nx-rspack-workspace-mf/apps/host/src/remotes.d.ts @@ -0,0 +1,2 @@ +declare module 'remote1/Module'; +declare module 'remote2/Module'; diff --git a/examples/create-nx-rspack-workspace-mf/apps/host/tsconfig.json b/examples/create-nx-rspack-workspace-mf/apps/host/tsconfig.json index 21b50710..baf73716 100644 --- a/examples/create-nx-rspack-workspace-mf/apps/host/tsconfig.json +++ b/examples/create-nx-rspack-workspace-mf/apps/host/tsconfig.json @@ -4,7 +4,10 @@ "allowJs": false, "esModuleInterop": false, "allowSyntheticDefaultImports": true, - "strict": true + "strict": true, + "paths": { + "react": [ "./node_modules/@types/react" ] + } }, "files": [], "include": [], diff --git a/examples/create-nx-rspack-workspace-mf/migrations.json b/examples/create-nx-rspack-workspace-mf/migrations.json new file mode 100644 index 00000000..09f04a1a --- /dev/null +++ b/examples/create-nx-rspack-workspace-mf/migrations.json @@ -0,0 +1,125 @@ +{ + "migrations": [ + { + "cli": "nx", + "version": "17.0.0-beta.1", + "description": "Updates the default cache directory to .nx/cache", + "implementation": "./src/migrations/update-17-0-0/move-cache-directory", + "package": "nx", + "name": "17.0.0-move-cache-directory" + }, + { + "cli": "nx", + "version": "17.0.0-beta.3", + "description": "Use minimal config for tasksRunnerOptions", + "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options", + "package": "nx", + "name": "17.0.0-use-minimal-config-for-tasks-runner-options" + }, + { + "version": "17.0.0-rc.1", + "description": "Migration for v17.0.0-rc.1", + "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope", + "package": "nx", + "name": "rm-default-collection-npm-scope" + }, + { + "cli": "nx", + "version": "17.3.0-beta.6", + "description": "Updates the nx wrapper.", + "implementation": "./src/migrations/update-17-3-0/update-nxw", + "package": "nx", + "name": "17.3.0-update-nx-wrapper" + }, + { + "cli": "nx", + "version": "18.0.0-beta.2", + "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace", + "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces", + "x-repair-skip": true, + "package": "nx", + "name": "18.0.0-disable-adding-plugins-for-existing-workspaces" + }, + { + "version": "18.1.0-beta.3", + "description": "Moves affected.defaultBase to defaultBase in `nx.json`", + "implementation": "./src/migrations/update-17-2-0/move-default-base", + "package": "nx", + "name": "move-default-base-to-nx-json-root" + }, + { + "cli": "nx", + "version": "19.2.0-beta.2", + "description": "Updates the default workspace data directory to .nx/workspace-data", + "implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory", + "package": "nx", + "name": "19-2-0-move-graph-cache-directory" + }, + { + "cli": "nx", + "version": "19.2.2-beta.0", + "description": "Updates the nx wrapper.", + "implementation": "./src/migrations/update-17-3-0/update-nxw", + "package": "nx", + "name": "19-2-2-update-nx-wrapper" + }, + { + "version": "19.2.4-beta.0", + "description": "Set project name in nx.json explicitly", + "implementation": "./src/migrations/update-19-2-4/set-project-name", + "x-repair-skip": true, + "package": "nx", + "name": "19-2-4-set-project-name" + }, + { + "version": "20.0.0-beta.7", + "description": "Migration for v20.0.0-beta.7", + "implementation": "./src/migrations/update-20-0-0/move-use-daemon-process", + "package": "nx", + "name": "move-use-daemon-process" + }, + { + "version": "20.0.1", + "description": "Set `useLegacyCache` to true for migrating workspaces", + "implementation": "./src/migrations/update-20-0-1/use-legacy-cache", + "x-repair-skip": true, + "package": "nx", + "name": "use-legacy-cache" + }, + { + "version": "21.0.0-beta.8", + "description": "Removes the legacy cache configuration from nx.json", + "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", + "package": "nx", + "name": "remove-legacy-cache" + }, + { + "version": "21.0.0-beta.8", + "description": "Removes the legacy cache configuration from nx.json", + "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", + "package": "nx", + "name": "remove-custom-tasks-runner" + }, + { + "version": "21.0.0-beta.11", + "description": "Updates release version config based on the breaking changes in Nx v21", + "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", + "package": "nx", + "name": "release-version-config-changes" + }, + { + "version": "21.0.0-beta.11", + "description": "Updates release changelog config based on the breaking changes in Nx v21", + "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", + "package": "nx", + "name": "release-changelog-config-changes" + }, + { + "version": "21.1.0-beta.2", + "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", + "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", + "package": "nx", + "name": "21-1-0-add-ignore-entries-for-nx-rule-files" + } + ] +} diff --git a/examples/create-nx-rspack-workspace-mf/package.json b/examples/create-nx-rspack-workspace-mf/package.json index bed4062d..e3c29dc3 100644 --- a/examples/create-nx-rspack-workspace-mf/package.json +++ b/examples/create-nx-rspack-workspace-mf/package.json @@ -8,29 +8,28 @@ "private": true, "devDependencies": { "@module-federation/enhanced": "catalog:module-federation", - "@nx/cypress": "catalog:nx", - "@nx/eslint": "catalog:nx", - "@nx/eslint-plugin": "catalog:nx", - "@nx/jest": "catalog:nx", - "@nx/js": "catalog:nx", - "@nx/react": "catalog:nx", - "@nx/rspack": "catalog:nx", - "@nx/web": "catalog:nx", - "@nx/workspace": "catalog:nx", + "@nx/cypress": "21.1.3", + "@nx/eslint": "21.1.3", + "@nx/eslint-plugin": "21.1.3", + "@nx/jest": "21.1.3", + "@nx/js": "21.1.3", + "@nx/react": "21.1.3", + "@nx/rspack": "21.1.3", + "@nx/web": "21.1.3", + "@nx/workspace": "21.1.3", "@rspack/cli": "catalog:rspack", "@rspack/core": "catalog:rspack", "@rspack/dev-server": "catalog:rspack", - "@rspack/plugin-minify": "catalog:rspack", "@rspack/plugin-react-refresh": "catalog:rspack", "@swc-node/register": "catalog:swc", "@swc/cli": "catalog:swc", "@swc/core": "catalog:swc", "@swc/helpers": "catalog:swc", - "@testing-library/react": "catalog:react18", + "@testing-library/react": "catalog:react19", "@types/jest": "catalog:jest", "@types/node": "catalog:typescript", - "@types/react": "^18.3.20", - "@types/react-dom": "^18.3.5", + "@types/react": "^19.1.0", + "@types/react-dom": "^19.1.0", "@typescript-eslint/eslint-plugin": "catalog:eslint", "@typescript-eslint/parser": "catalog:eslint", "babel-jest": "catalog:jest", @@ -44,17 +43,17 @@ "eslint-plugin-react-hooks": "catalog:eslint", "jest": "catalog:jest", "jest-environment-jsdom": "catalog:jest", - "nx": "catalog:nx", + "nx": "21.1.3", "prettier": "catalog:prettier2", - "react-refresh": "catalog:react18", + "react-refresh": "catalog:react19", "ts-jest": "catalog:jest", "ts-node": "catalog:typescript", "typescript": "catalog:typescript" }, "dependencies": { - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-router-dom": "^6.30.0", + "react": "catalog:react19", + "react-dom": "catalog:react19", + "react-router": "^7.6.1", "tslib": "catalog:typescript", "zephyr-rspack-plugin": "catalog:zephyr" } diff --git a/examples/create-nx-workspace-mf/migrations.json b/examples/create-nx-workspace-mf/migrations.json new file mode 100644 index 00000000..4742b913 --- /dev/null +++ b/examples/create-nx-workspace-mf/migrations.json @@ -0,0 +1,54 @@ +{ + "migrations": [ + { + "version": "20.0.0-beta.7", + "description": "Migration for v20.0.0-beta.7", + "implementation": "./src/migrations/update-20-0-0/move-use-daemon-process", + "package": "nx", + "name": "move-use-daemon-process" + }, + { + "version": "20.0.1", + "description": "Set `useLegacyCache` to true for migrating workspaces", + "implementation": "./src/migrations/update-20-0-1/use-legacy-cache", + "x-repair-skip": true, + "package": "nx", + "name": "use-legacy-cache" + }, + { + "version": "21.0.0-beta.8", + "description": "Removes the legacy cache configuration from nx.json", + "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", + "package": "nx", + "name": "remove-legacy-cache" + }, + { + "version": "21.0.0-beta.8", + "description": "Removes the legacy cache configuration from nx.json", + "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", + "package": "nx", + "name": "remove-custom-tasks-runner" + }, + { + "version": "21.0.0-beta.11", + "description": "Updates release version config based on the breaking changes in Nx v21", + "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", + "package": "nx", + "name": "release-version-config-changes" + }, + { + "version": "21.0.0-beta.11", + "description": "Updates release changelog config based on the breaking changes in Nx v21", + "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", + "package": "nx", + "name": "release-changelog-config-changes" + }, + { + "version": "21.1.0-beta.2", + "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", + "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", + "package": "nx", + "name": "21-1-0-add-ignore-entries-for-nx-rule-files" + } + ] +} diff --git a/examples/create-nx-workspace-mf/package.json b/examples/create-nx-workspace-mf/package.json index e23897d7..b236328e 100644 --- a/examples/create-nx-workspace-mf/package.json +++ b/examples/create-nx-workspace-mf/package.json @@ -12,21 +12,21 @@ "devDependencies": { "@babel/core": "catalog:babel", "@babel/preset-react": "catalog:babel", - "@nx/eslint": "catalog:nx", - "@nx/eslint-plugin": "catalog:nx", - "@nx/jest": "catalog:nx", - "@nx/js": "catalog:nx", - "@nx/react": "catalog:nx", - "@nx/web": "catalog:nx", - "@nx/webpack": "catalog:nx", - "@nx/workspace": "catalog:nx", - "@pmmmwh/react-refresh-webpack-plugin": "catalog:react18", + "@nx/eslint": "21.1.3", + "@nx/eslint-plugin": "21.1.3", + "@nx/jest": "21.1.3", + "@nx/js": "21.1.3", + "@nx/react": "21.1.3", + "@nx/web": "21.1.3", + "@nx/webpack": "21.1.3", + "@nx/workspace": "21.1.3", + "@pmmmwh/react-refresh-webpack-plugin": "catalog:react19", "@svgr/webpack": "catalog:webpack5", "@swc-node/register": "catalog:swc", "@swc/cli": "catalog:swc", "@swc/core": "catalog:swc", "@swc/helpers": "catalog:swc", - "@testing-library/react": "catalog:react18", + "@testing-library/react": "catalog:react19", "@types/jest": "catalog:jest", "@types/node": "catalog:typescript", "@types/react": "^18.3.20", @@ -42,18 +42,18 @@ "eslint-plugin-react-hooks": "catalog:eslint", "jest": "catalog:jest", "jest-environment-jsdom": "catalog:jest", - "nx": "catalog:nx", + "nx": "21.1.3", "prettier": "catalog:prettier2", - "react-refresh": "catalog:react18", + "react-refresh": "catalog:react19", "ts-jest": "catalog:jest", "ts-node": "catalog:typescript", "typescript": "catalog:typescript", "url-loader": "catalog:webpack5" }, "dependencies": { - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-router-dom": "^6.30.0", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-router": "^7.6.2", "tslib": "catalog:typescript", "zephyr-webpack-plugin": "catalog:zephyr" } diff --git a/examples/modernjs-app/package.json b/examples/modernjs-app/package.json index 277c94c6..ad7ea470 100644 --- a/examples/modernjs-app/package.json +++ b/examples/modernjs-app/package.json @@ -11,25 +11,22 @@ "lint": "biome check", "upgrade": "modern upgrade" }, - "engines": { - "node": ">=16.18.1" - }, "dependencies": { - "@modern-js/plugin-ssg": "^2.65.0", - "@modern-js/runtime": "^2.65.0", - "react": "^19.0.0", - "react-dom": "^19.0.0" + "@modern-js/plugin-ssg": "^2.67.8", + "@modern-js/runtime": "^2.67.8", + "react": "catalog:react19", + "react-dom": "catalog:react19" }, "devDependencies": { "@biomejs/biome": "1.9.4", - "@modern-js/app-tools": "^2.65.0", - "@modern-js/tsconfig": "^2.65.0", + "@modern-js/app-tools": "^2.67.8", + "@modern-js/tsconfig": "^2.67.8", "@types/jest": "~29.5.14", - "@types/node": "~18.11.19", - "@types/react": "^19.0.10", - "@types/react-dom": "~19.0.4", + "@types/node": "catalog:typescript", + "@types/react": "catalog:react19", + "@types/react-dom": "catalog:react19", "rimraf": "^6.0.1", - "typescript": "~5.7.3", + "typescript": "catalog:typescript", "zephyr-modernjs-plugin": "catalog:zephyr", "zephyr-rspack-plugin": "catalog:zephyr" } diff --git a/examples/modernjs-app/src/routes/page.tsx b/examples/modernjs-app/src/routes/page.tsx index 671330ca..3bd58f57 100644 --- a/examples/modernjs-app/src/routes/page.tsx +++ b/examples/modernjs-app/src/routes/page.tsx @@ -3,7 +3,6 @@ import './index.css'; const Index = () => (
- {/* @ts-expect-error https://github.com/nfl/react-helmet/issues/646 */} =21.0.0" - }, "engines-annotation": "Mostly required by sharp which needs a Node-API v9 compatible runtime", "private": true, "trustedDependencies": [ @@ -32,8 +29,8 @@ "vite-plugin-zephyr": "catalog:zephyr" }, "devDependencies": { - "@builder.io/qwik": "^1.5.2", - "@builder.io/qwik-city": "^1.5.2", + "@builder.io/qwik": "^1.14.1", + "@builder.io/qwik-city": "^1.14.1", "@netlify/edge-functions": "^2.0.0", "@types/eslint": "catalog:eslint", "@types/node": "catalog:typescript", @@ -46,8 +43,8 @@ "prettier": "catalog:prettier3", "typescript": "catalog:typescript", "undici": "catalog:common", - "vite": "catalog:vite5", - "vite-plugin-inspect": "catalog:vite5", - "vite-tsconfig-paths": "catalog:vite5" + "vite": "catalog:vite6", + "vite-plugin-inspect": "catalog:vite6", + "vite-tsconfig-paths": "catalog:vite6" } } diff --git a/examples/qwik-1.5/public/_headers b/examples/qwik/public/_headers similarity index 100% rename from examples/qwik-1.5/public/_headers rename to examples/qwik/public/_headers diff --git a/examples/qwik-1.5/public/favicon.svg b/examples/qwik/public/favicon.svg similarity index 100% rename from examples/qwik-1.5/public/favicon.svg rename to examples/qwik/public/favicon.svg diff --git a/examples/qwik-1.5/public/fonts/poppins-400.woff2 b/examples/qwik/public/fonts/poppins-400.woff2 similarity index 100% rename from examples/qwik-1.5/public/fonts/poppins-400.woff2 rename to examples/qwik/public/fonts/poppins-400.woff2 diff --git a/examples/qwik-1.5/public/fonts/poppins-500.woff2 b/examples/qwik/public/fonts/poppins-500.woff2 similarity index 100% rename from examples/qwik-1.5/public/fonts/poppins-500.woff2 rename to examples/qwik/public/fonts/poppins-500.woff2 diff --git a/examples/qwik-1.5/public/fonts/poppins-700.woff2 b/examples/qwik/public/fonts/poppins-700.woff2 similarity index 100% rename from examples/qwik-1.5/public/fonts/poppins-700.woff2 rename to examples/qwik/public/fonts/poppins-700.woff2 diff --git a/examples/qwik-1.5/public/manifest.json b/examples/qwik/public/manifest.json similarity index 100% rename from examples/qwik-1.5/public/manifest.json rename to examples/qwik/public/manifest.json diff --git a/examples/qwik-1.5/public/robots.txt b/examples/qwik/public/robots.txt similarity index 100% rename from examples/qwik-1.5/public/robots.txt rename to examples/qwik/public/robots.txt diff --git a/examples/qwik-1.5/src/components/router-head/router-head.tsx b/examples/qwik/src/components/router-head/router-head.tsx similarity index 98% rename from examples/qwik-1.5/src/components/router-head/router-head.tsx rename to examples/qwik/src/components/router-head/router-head.tsx index 8d6134aa..38556d59 100644 --- a/examples/qwik-1.5/src/components/router-head/router-head.tsx +++ b/examples/qwik/src/components/router-head/router-head.tsx @@ -28,10 +28,10 @@ export const RouterHead = component$(() => { {head.styles.map((s) => (