Skip to content

Commit 9205f37

Browse files
ScriptedAlchemyScriptedAlchemy
committed
Merge remote-tracking branch 'origin/main' into fork/mitchellrj/fix-reduce-csp-false-positives
# Conflicts: # apps/modernjs/CHANGELOG.md # apps/modernjs/package.json # apps/router-demo/router-remote5-2005/CHANGELOG.md # apps/router-demo/router-remote5-2005/package.json # apps/website-new/CHANGELOG.md # apps/website-new/package.json # packages/bridge/bridge-react-webpack-plugin/CHANGELOG.md # packages/bridge/bridge-react-webpack-plugin/package.json # packages/bridge/bridge-react/CHANGELOG.md # packages/bridge/bridge-react/package.json # packages/bridge/bridge-shared/CHANGELOG.md # packages/bridge/bridge-shared/package.json # packages/bridge/vue3-bridge/CHANGELOG.md # packages/bridge/vue3-bridge/package.json # packages/chrome-devtools/CHANGELOG.md # packages/chrome-devtools/package.json # packages/cli/CHANGELOG.md # packages/cli/package.json # packages/create-module-federation/CHANGELOG.md # packages/create-module-federation/package.json # packages/data-prefetch/CHANGELOG.md # packages/data-prefetch/package.json # packages/dts-plugin/CHANGELOG.md # packages/dts-plugin/package.json # packages/enhanced/CHANGELOG.md # packages/enhanced/package.json # packages/error-codes/CHANGELOG.md # packages/error-codes/package.json # packages/esbuild/CHANGELOG.md # packages/esbuild/package.json # packages/managers/CHANGELOG.md # packages/managers/package.json # packages/manifest/CHANGELOG.md # packages/manifest/package.json # packages/modernjs/CHANGELOG.md # packages/modernjs/package.json # packages/nextjs-mf/CHANGELOG.md # packages/nextjs-mf/package.json # packages/node/CHANGELOG.md # packages/node/package.json # packages/retry-plugin/CHANGELOG.md # packages/retry-plugin/package.json # packages/rsbuild-plugin/CHANGELOG.md # packages/rsbuild-plugin/package.json # packages/rspack/CHANGELOG.md # packages/rspack/package.json # packages/runtime-core/CHANGELOG.md # packages/runtime-core/package.json # packages/runtime-plugins/inject-external-runtime-core-plugin/CHANGELOG.md # packages/runtime-plugins/inject-external-runtime-core-plugin/package.json # packages/runtime-tools/CHANGELOG.md # packages/runtime-tools/package.json # packages/runtime/CHANGELOG.md # packages/runtime/package.json # packages/sdk/CHANGELOG.md # packages/sdk/package.json # packages/storybook-addon/CHANGELOG.md # packages/storybook-addon/package.json # packages/third-party-dts-extractor/CHANGELOG.md # packages/third-party-dts-extractor/package.json # packages/utilities/CHANGELOG.md # packages/utilities/package.json # packages/webpack-bundler-runtime/CHANGELOG.md # packages/webpack-bundler-runtime/package.json # pnpm-lock.yaml
2 parents 05ff51b + 89536ac commit 9205f37

File tree

89 files changed

+3119
-3652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3119
-3652
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Build and test Packages
4949
run: |
5050
git fetch origin main
51-
npx nx run-many --targets=build --projects=tag:type:pkg
51+
npx nx run-many --targets=build --projects=tag:type:pkg --skip-nx-cache
5252
ls -l packages/*/dist packages/*/package.json
5353
5454
- name: Release

‎apps/manifest-demo/webpack-host/runtimePlugin.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,13 @@ export default function (): FederationRuntimePlugin {
1212

1313
return args;
1414
},
15+
createLink({ url }) {
16+
const link = document.createElement('link');
17+
link.setAttribute('href', url);
18+
link.setAttribute('rel', 'preload');
19+
link.setAttribute('as', 'script');
20+
link.setAttribute('crossorigin', 'anonymous');
21+
return link;
22+
},
1523
};
1624
}

‎apps/modernjs-ssr/dynamic-nested-remote/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.26.0",
29-
"@modern-js/runtime": "2.65.1",
29+
"@modern-js/runtime": "2.67.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.65.1",
37+
"@modern-js/app-tools": "2.67.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.65.1",
39+
"@modern-js/tsconfig": "2.67.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/dynamic-remote-new-version/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.26.0",
29-
"@modern-js/runtime": "2.65.1",
29+
"@modern-js/runtime": "2.67.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.65.1",
37+
"@modern-js/app-tools": "2.67.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.65.1",
39+
"@modern-js/tsconfig": "2.67.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/dynamic-remote/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.26.0",
29-
"@modern-js/runtime": "2.65.1",
29+
"@modern-js/runtime": "2.67.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.65.1",
37+
"@modern-js/app-tools": "2.67.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.65.1",
39+
"@modern-js/tsconfig": "2.67.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/host/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.26.0",
29-
"@modern-js/runtime": "2.65.1",
29+
"@modern-js/runtime": "2.67.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.65.1",
37+
"@modern-js/app-tools": "2.67.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.65.1",
39+
"@modern-js/tsconfig": "2.67.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/nested-remote/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.26.0",
29-
"@modern-js/runtime": "2.65.1",
29+
"@modern-js/runtime": "2.67.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.65.1",
37+
"@modern-js/app-tools": "2.67.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.65.1",
39+
"@modern-js/tsconfig": "2.67.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/remote-new-version/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.26.0",
29-
"@modern-js/runtime": "2.65.1",
29+
"@modern-js/runtime": "2.67.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.65.1",
37+
"@modern-js/app-tools": "2.67.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.65.1",
39+
"@modern-js/tsconfig": "2.67.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/remote/modern.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ export default defineConfig({
66
dev: {
77
port: 3051,
88
},
9+
output: {
10+
assetPrefix: 'http://localhost:8080',
11+
},
912
runtime: {
1013
router: true,
1114
},

‎apps/modernjs-ssr/remote/module-federation.config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { createModuleFederationConfig } from '@module-federation/modern-js';
22
export default createModuleFederationConfig({
33
name: 'remote',
4-
filename: 'remoteEntry.js',
4+
manifest: {
5+
filePath: 'static',
6+
},
7+
filename: 'static/remoteEntry.js',
58
exposes: {
69
'./Image': './src/components/Image.tsx',
710
'./Button': './src/components/Button.tsx',

0 commit comments

Comments
 (0)