Skip to content

[WC-3513] Enable react and rspack #2371

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.

Sign up for GitHub

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

Open
leonardomendix wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WC-3513] Enable react and rspack #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion automation/run-e2e/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
command: >
bash -c "
mx update-widgets --loose-version-check /source/${MPR_PATH:?MPR_PATH is required} &&
mxbuild ${MODERN_CLIENT:+${MODERN_CLIENT}} --output=/tmp/automation.mda /source/${MPR_PATH}
mxbuild ${MODERN_CLIENT:+${MODERN_CLIENT}} ${ENABLE_RSPACK_BUNDLER:+${ENABLE_RSPACK_BUNDLER}} --output=/tmp/automation.mda /source/${MPR_PATH}
"

# mxruntime: serve the compiled app on RUNTIME_PORT.
Expand Down
4 changes: 3 additions & 1 deletion automation/run-e2e/docker/mxbuild.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ FROM --platform=$BUILDPLATFORM eclipse-temurin:21-jdk-jammy
ARG MENDIX_VERSION
ARG BUILDPLATFORM

ENV LD_PRELOAD=libfontconfig.so.1

SHELL ["/bin/bash", "-c"]
RUN \
echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATFORM}..." \
Expand All @@ -26,7 +28,7 @@ echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATF
\
rm -rf /var/lib/apt/lists/* && \
apt-get update --allow-insecure-repositories -qqy && \
apt-get install -qqy --allow-unauthenticated libicu70 && \
apt-get install -qqy --allow-unauthenticated libicu70 libgdiplus libfontconfig1 && \
apt-get -qqy remove --auto-remove wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
Expand Down
4 changes: 3 additions & 1 deletion automation/run-e2e/docker/mxbuildRC.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ FROM eclipse-temurin:21-jdk-jammy

ARG MENDIX_VERSION

ENV LD_PRELOAD=libfontconfig.so.1

COPY --link mxbuild.tar.gz /tmp/mxbuild.tar.gz

SHELL ["/bin/bash", "-c"]
Expand All @@ -11,7 +13,7 @@ RUN \
tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
\
apt-get update -qqy && \
apt-get install -qqy libicu70 && \
apt-get install -qqy libicu70 libgdiplus libfontconfig1 && \
apt-get -qqy remove --auto-remove wget && \
apt-get clean && \
\
Expand Down
3 changes: 2 additions & 1 deletion automation/run-e2e/lib/ci.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ async function runWithCompose({ mendixVersion, ip, freePort }) {
WORKSPACE: workspace,
MPR_PATH: mprRelPath,
RUNTIME_PORT: String(freePort),
...(process.env.MODERN_CLIENT ? { MODERN_CLIENT: `--modern-client` } : {})
...(process.env.MODERN_CLIENT ? { MODERN_CLIENT: `--modern-web-client` } : {}),
...(process.env.ENABLE_RSPACK_BUNDLER ? { ENABLE_RSPACK_BUNDLER: `--enable-rspack-bundler` } : {})
};

try {
Expand Down
3 changes: 2 additions & 1 deletion automation/run-e2e/lib/docker-utils.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

const mprPath = `/source/${projectFile}`;
const modernClient = process.env.MODERN_CLIENT || "";
const enableRspackBundler = process.env.ENABLE_RSPACK_BUNDLER ? "--enable-rspack-bundler" : "";

const subCommands = [
// 1. Update widgets in project.
Expand All @@ -59,7 +60,7 @@
// a. Check errors.
// b. Prepare `deployment` dir for mxruntime.
// Output file is not used, so put it to tmp.
`mxbuild ${modernClient} --output=/tmp/automation.mda ${mprPath}`
`mxbuild ${modernClient} ${enableRspackBundler} --output=/tmp/automation.mda ${mprPath}`
];
const args = [
`--tty`,
Expand Down Expand Up @@ -120,7 +121,7 @@
if (response.ok) {
attempts = 0;
}
} catch (e) {

Check warning on line 124 in automation/run-e2e/lib/docker-utils.mjs

View workflow job for this annotation

GitHub Actions / Run code quality check 

'e' is defined but never used
console.log(`Could not reach http://${ip}:${freePort}, trying again...`);
}
await new Promise(resolve => setTimeout(resolve, 3000));
Expand Down
4 changes: 3 additions & 1 deletion automation/scripts/update-screenshots-local.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,8 @@ async function buildWidget(widgetName, widgetPkg) {
async function buildDeploymentBundle(mendixVersion) {
const mxbuildImage = `mxbuild:${mendixVersion}`;
const spinner = new Spinner(`Building deployment bundle ${DIM(`(${mxbuildImage})`)}`).start();
const modernClientFlag = process.env.MODERN_CLIENT ? "--modern-web-client" : "";
const enableRspackBundlerFlag = process.env.ENABLE_RSPACK_BUNDLER ? "--enable-rspack-bundler" : "";

try {
const mprFiles = fs.readdirSync(PATHS.testProject);
Expand All @@ -601,7 +603,7 @@ async function buildDeploymentBundle(mendixVersion) {
"docker run --tty --rm",
`--volume ${REPO_ROOT}:/source`,
mxbuildImage,
`bash -c "mx update-widgets --loose-version-check ${mprPath} && mxbuild --output=/source/automation.mda ${mprPath}"`
`bash -c "mx update-widgets --loose-version-check ${mprPath} && mxbuild ${modernClientFlag} ${enableRspackBundlerFlag} --output=/source/automation.mda ${mprPath}"`
].join(" ");

log(`Running: ${cmd}`);
Expand Down
4 changes: 2 additions & 2 deletions packages/pluggableWidgets/badge-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
},
"testProject": {
"githubUrl": "https://github.com/mendix/testProjects",
"branchName": "badge-web"
"branchName": "badge-web-mx11"
},
"scripts": {
"build": "cross-env MPKOUTPUT=Badge.mpk pluggable-widgets-tools build:web",
"create-gh-release": "rui-create-gh-release",
"create-translation": "rui-create-translation",
"dev": "cross-env MPKOUTPUT=Badge.mpk pluggable-widgets-tools start:web",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
"lint": "eslint src/ package.json",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/combobox-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"create-gh-release": "rui-create-gh-release",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:web",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
"lint": "eslint src/ package.json",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-date-filter-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:ts",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:ts",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:ts",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:ts",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-number-filter-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:ts",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:ts",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-text-filter-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:ts",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:ts",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:ts",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:ts",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/dropdown-sort-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:ts",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:ts",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
4 changes: 2 additions & 2 deletions packages/pluggableWidgets/gallery-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
},
"testProject": {
"githubUrl": "https://github.com/mendix/testProjects",
"branchName": "gallery-web/dw3.0-dropdown-rework"
"branchName": "gallery-web/gallery-web-mx11"
},
"scripts": {
"build": "pluggable-widgets-tools build:web",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:web",
"e2e": "run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/tree-node-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build": "pluggable-widgets-tools build:web",
"create-translation": "rui-create-translation",
"dev": "pluggable-widgets-tools start:web",
"e2e": "MENDIX_VERSION=11.9.1 run-e2e ci",
"e2e": "MENDIX_VERSION=11.12.2 MODERN_CLIENT=--modern-web-client ENABLE_RSPACK_BUNDLER=1 run-e2e ci",
"e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
"e2edev": "MENDIX_VERSION=11.9.1 run-e2e dev --with-preps",
"format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
Expand Down
Loading