Skip to content

Commit b719489

Browse files
committed
Merge remote-tracking branch 'origin/improvement/ARTESCA-16560-rspack-bump' into w/131.0/improvement/ARTESCA-16560-rspack-bump
2 parents 1b4766e + 0a38dac commit b719489

File tree

8 files changed

+6306
-3745
lines changed

8 files changed

+6306
-3745
lines changed

images/metalk8s-ui/conf/nginx.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ server {
2525

2626
location / {
2727
try_files $uri $uri/ /shell/index.html;
28-
# sub_filter </head>
29-
# '</head><script language="javascript">window.shellUIRemoteEntryUrl = "/shell/remoteEntry.js?" + Date.now();</script>';
30-
# sub_filter_once on;
3128
}
3229

3330
# Make sure documentation does not go through Shell UI

shell-ui/package-lock.json

Lines changed: 4147 additions & 2443 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shell-ui/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"@babel/preset-react": "^7.12.10",
1818
"@babel/preset-typescript": "^7.21.0",
1919
"@module-federation/enhanced": "^0.2.3",
20-
"@rsdoctor/rspack-plugin": "^0.3.5",
21-
"@rspack/cli": "^0.7.5",
22-
"@rspack/core": "^0.7.5",
20+
"@rsdoctor/rspack-plugin": "^1.3.15",
21+
"@rspack/cli": "^1.6.7",
22+
"@rspack/core": "^1.6.7",
2323
"@testing-library/dom": "^10.4.0",
2424
"@testing-library/jest-dom": "^5.11.9",
2525
"@testing-library/react": "^15.0.7",
@@ -64,6 +64,7 @@
6464
"zod": "^4.0.17"
6565
},
6666
"optionalDependencies": {
67-
"@rspack/binding-linux-x64-musl": "^1.5.8"
67+
"@rspack/binding-linux-x64-gnu": "^1.6.7",
68+
"@rspack/binding-linux-x64-musl": "^1.6.7"
6869
}
6970
}

shell-ui/rspack.config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'path';
22
import packageJson from './package.json';
33
import { Configuration } from '@rspack/cli';
4-
import rspack from '@rspack/core';
4+
import * as rspack from '@rspack/core';
55
import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
66
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
77

@@ -13,6 +13,9 @@ const controlPlaneBaseUrl = `https://${controlPlaneIP}:8443`;
1313
const isProduction = process.env.NODE_ENV === 'production';
1414

1515
const config: Configuration = {
16+
experiments: {
17+
css: true,
18+
},
1619
entry: './src/index.tsx',
1720
mode: isProduction ? 'production' : 'development',
1821
devtool: isProduction ? false : 'source-map',

tests/post/steps/test_ingress.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,16 +574,14 @@ def server_returns(host, context, status_code, reason):
574574
def shell_ui_returns(host, context):
575575
response = context.get("response")
576576
assert response is not None
577-
assert 'window.shellUIRemoteEntryUrl = "/shell/mf-manifest.json' in response.text
577+
assert 'window.shellUIRemoteEntryUrl="/shell/mf-manifest.json' in response.text
578578

579579

580580
@then("the server should not respond with shell-ui index")
581581
def shell_ui_not_returns(host, context):
582582
response = context.get("response")
583583
assert response is not None
584-
assert (
585-
'window.shellUIRemoteEntryUrl = "/shell/mf-manifest.json' not in response.text
586-
)
584+
assert 'window.shellUIRemoteEntryUrl="/shell/mf-manifest.json' not in response.text
587585

588586

589587
@then("the server should not respond")

0 commit comments

Comments
 (0)