Skip to content

Commit 78f0a09

Browse files
committed
Merge branch 'improvement/change-ui-dev-configuration-2' into tmp/octopus/w/132.0/improvement/change-ui-dev-configuration-2
2 parents 931b374 + 51e9024 commit 78f0a09

File tree

15 files changed

+604
-95
lines changed

15 files changed

+604
-95
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"biome.lsp.bin": "shell-ui/node_modules/.bin/biome"
3+
}

shell-ui/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ node_modules
22
build
33
@mf-types
44
build_ts/
5+
6+
dev.proxy.json
7+
public/dev.deployed-ui-apps.json
8+
public/dev.config.json

shell-ui/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ FROM nginx:${NGINX_IMAGE_VERSION}
2424
WORKDIR /usr/share/nginx/html/
2525
RUN rm -rf ./*
2626
RUN mkdir shell
27-
COPY public/shell/config.json ./shell
2827
COPY --from=build-step /home/node/build ./shell
2928
COPY conf/nginx.conf /etc/nginx/conf.d/default.conf
3029
ENTRYPOINT [ "/docker-entrypoint.sh" ]

shell-ui/biome.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
3+
"vcs": {
4+
"enabled": true,
5+
"clientKind": "git",
6+
"useIgnoreFile": true
7+
},
8+
"files": { "ignoreUnknown": false },
9+
"formatter": {
10+
"enabled": true,
11+
"formatWithErrors": false,
12+
"indentStyle": "space",
13+
"indentWidth": 2,
14+
"lineEnding": "lf",
15+
"lineWidth": 120,
16+
"useEditorconfig": true
17+
},
18+
"linter": {
19+
"enabled": true,
20+
"rules": { "recommended": true },
21+
"domains": {
22+
"next": "recommended",
23+
"react": "recommended"
24+
}
25+
},
26+
"javascript": {
27+
"formatter": {
28+
"jsxQuoteStyle": "double",
29+
"quoteProperties": "asNeeded",
30+
"trailingCommas": "all",
31+
"semicolons": "always",
32+
"arrowParentheses": "always",
33+
"quoteStyle": "single"
34+
}
35+
},
36+
"html": { "formatter": { "selfCloseVoidElements": "always" } },
37+
"assist": {
38+
"enabled": true,
39+
"actions": { "source": { "organizeImports": "on" } }
40+
}
41+
}

shell-ui/package-lock.json

Lines changed: 168 additions & 4 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@babel/preset-env": "^7.12.11",
1717
"@babel/preset-react": "^7.12.10",
1818
"@babel/preset-typescript": "^7.21.0",
19+
"@biomejs/biome": "2.3.11",
1920
"@module-federation/enhanced": "^0.21.6",
2021
"@rsdoctor/rspack-plugin": "^1.3.15",
2122
"@rspack/cli": "^1.6.7",
@@ -45,8 +46,8 @@
4546
"ts-node": "^10.9.2"
4647
},
4748
"dependencies": {
48-
"@scality/module-federation": "^1.5.0",
4949
"@scality/core-ui": "0.193.0",
50+
"@scality/module-federation": "1.6.1",
5051
"downshift": "^8.0.0",
5152
"history": "^5.3.0",
5253
"jest-environment-jsdom": "^29.7.0",
File renamed without changes.

0 commit comments

Comments
 (0)