Skip to content

feat(chore): updated libs #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions examples/basehref-examples/rspack-app/rspack.config.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -58,7 +58,7 @@ export default withZephyr()(
template: "./index.html",
publicPath,
}),
isDev ? new RefreshPlugin() : null,
isDev ? new ReactRefreshRspackPlugin() : null,
].filter(Boolean),
optimization: {
minimizer: [
Expand Down
4 changes: 2 additions & 2 deletions examples/basehref-examples/vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions examples/basehref-examples/webpack-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions examples/create-default-webpack-mf/app1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/create-default-webpack-mf/app2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions examples/create-mf-app-rspack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
declare module 'remote1/Module';
declare module 'remote2/Module';
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"allowJs": false,
"esModuleInterop": false,
"allowSyntheticDefaultImports": true,
"strict": true
"strict": true,
"paths": {
"react": [ "./node_modules/@types/react" ]
}
},
"files": [],
"include": [],
Expand Down
125 changes: 125 additions & 0 deletions examples/create-nx-rspack-workspace-mf/migrations.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
35 changes: 17 additions & 18 deletions examples/create-nx-rspack-workspace-mf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
Expand Down
54 changes: 54 additions & 0 deletions examples/create-nx-workspace-mf/migrations.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading