chore: fix conflicts

Author: ScriptedAlchemy

apps/website-new/package.json

@@ -8,17 +8,18 @@
     "preview": "rspress preview"
   },
   "dependencies": {
-    "framer-motion": "^10.0.0",
-    "rspress": "2.0.0-beta.20",
-    "tailwindcss": "^3.2.7",
-    "xgplayer": "^3.0.16",
-    "rspress-plugin-annotation-words": "0.0.1",
-    "@rsbuild/plugin-sass": "^1.3.2",
+    "@builder.io/qwik": "^1.15.0",
     "@module-federation/error-codes": "workspace:*",
-    "@rspress/plugin-llms": "2.0.0-beta.20",
     "@module-federation/rspress-plugin": "workspace:*",
+    "@rsbuild/plugin-sass": "^1.3.2",
+    "@rspress/plugin-llms": "2.0.0-beta.20",
+    "framer-motion": "^10.0.0",
     "react": "^19.1.0",
-    "react-dom": "^19.1.0"
+    "react-dom": "^19.1.0",
+    "rspress": "2.0.0-beta.20",
+    "rspress-plugin-annotation-words": "0.0.1",
+    "tailwindcss": "^3.2.7",
+    "xgplayer": "^3.0.16"
   },
   "devDependencies": {
     "@types/node": "^20",

packages/chrome-devtools/package.json

@@ -76,8 +76,8 @@
     "@types/dagre": "^0.7.52",
     "@types/jest": "~29.2.4",
     "@types/node": "~20.12.12",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.3.0",
+    "@types/react": "~18.3.23",
+    "@types/react-dom": "~18.3.7",
     "lint-staged": "~13.1.0",
     "prettier": "~3.3.3",
     "rimraf": "~6.0.1",

packages/chrome-devtools/tsconfig.base.json

@@ -8,7 +8,8 @@
       "@/*": ["./src/*"],
       "@shared/*": ["./shared/*"]
     },
-    "allowJs": false
+    "allowJs": false,
+    "skipLibCheck": true
   },
   "exclude": ["**/node_modules"]
 }

packages/enhanced/test/configCases/sharing/consume-multiple-versions-ignore-warnings/index.js

@@ -48,7 +48,7 @@ it('should be able to consume different shared module version depending on conte
     ),
   ).toBe(true);
   expect(() => require('my-module3')).toThrowError(
-    'Invalid loadShareSync function',
+    'loadShareSync failed! The function should not be called unless you set "eager:true"',
   );
   expect(require('my-module4')).toBe('[email protected]');
   // expectWarning();

packages/enhanced/test/configCases/sharing/consume-multiple-versions/bootstrap.js

@@ -171,7 +171,7 @@ it('should be able to consume different shared module version depending on conte
     ),
   ).toBe(true);
   expect(() => require('my-module3')).toThrowError(
-    'Invalid loadShareSync function',
+    'loadShareSync failed! The function should not be called unless you set "eager:true"',
   );
   expect(require('my-module4')).toBe('[email protected]');
   // expectWarning();

packages/enhanced/test/configCases/sharing/consume-multiple-versions/index.js

@@ -171,7 +171,7 @@ it('should be able to consume different shared module version depending on conte
     ),
   ).toBe(true);
   expect(() => require('my-module3')).toThrowError(
-    'Invalid loadShareSync function',
+    'loadShareSync failed! The function should not be called unless you set "eager:true"',
   );
   expect(require('my-module4')).toBe('[email protected]');
   // expectWarning();

packages/enhanced/test/configCases/sharing/layers-consume-loader/tests/prefixed-share.test.js

@@ -4,11 +4,11 @@
 it('should consume thing1 from multi-pkg with multi-pkg-layer', async () => {
   const { version, layer } = await import('multi-pkg/thing1');
   expect(version).toBe('2.0.0');
-  expect(layer).toBeUndefined();
+  expect(layer).toBe('multi-pkg-layer');
 });
 
 it('should consume thing2 from multi-pkg with multi-pkg-layer', async () => {
   const { version, layer } = await import('multi-pkg/thing2');
   expect(version).toBe('2.0.0');
-  expect(layer).toBeUndefined();
+  expect(layer).toBe('multi-pkg-layer');
 });

packages/enhanced/test/unit/sharing/ConsumeSharedPlugin/ConsumeSharedPlugin.filtering.test.ts

@@ -2,8 +2,8 @@
  * @jest-environment node
  */
 
-import ConsumeSharedPlugin from '../../../src/lib/sharing/ConsumeSharedPlugin';
-import ConsumeSharedModule from '../../../src/lib/sharing/ConsumeSharedModule';
+import ConsumeSharedPlugin from '../../../../src/lib/sharing/ConsumeSharedPlugin';
+import ConsumeSharedModule from '../../../../src/lib/sharing/ConsumeSharedModule';
 // Import removed as we define them locally
 import path from 'path';
 import { vol } from 'memfs';
@@ -13,11 +13,14 @@ jest.mock('fs', () => require('memfs').fs);
 jest.mock('fs/promises', () => require('memfs').fs.promises);
 
 // Mock FederationRuntimePlugin to avoid complex dependencies
-jest.mock('../../../src/lib/container/runtime/FederationRuntimePlugin', () => {
-  return jest.fn().mockImplementation(() => ({
-    apply: jest.fn(),
-  }));
-});
+jest.mock(
+  '../../../../src/lib/container/runtime/FederationRuntimePlugin',
+  () => {
+    return jest.fn().mockImplementation(() => ({
+      apply: jest.fn(),
+    }));
+  },
+);
 
 // Mock webpack internals for file system operations
 jest.mock('@module-federation/sdk/normalize-webpack-path', () => ({

packages/managers/__tests__/__snapshots__/SharedManager.spec.ts.snap

@@ -7,6 +7,6 @@ exports[`SharedManager normalizedOptions 1`] = `
   "requiredVersion": "^18.0.0",
   "shareScope": "default",
   "singleton": false,
-  "version": "18.3.1",
+  "version": "19.0.0",
 }
 `;