Skip to content

Commit 4fd1480

Browse files
yomybabyyomybaby
committed
Merge branch 'main' into 25.14
# Conflicts: # electron-app/package.json # index.html # manifest.json # package.json # react/package.json # version.json
2 parents 7a5d767 + c79de8f commit 4fd1480

133 files changed

Lines changed: 4170 additions & 1983 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ site := $(or $(site),main)
88
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
99
current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
1010

11-
KEYCHAIN_NAME := bai-build-$(shell uuidgen).keychain
11+
KEYCHAIN_NAME := bai-build-$(shell openssl rand -hex 16 | sed -E 's/(.{8})(.{4})(.{4})(.{4})(.{12})/\1-\2-\3-\4-\5/').keychain
1212
BAI_APP_SIGN_KEYCHAIN_FILE := $(shell mktemp -d)/keychain.p12
1313
BAI_APP_SIGN_KEYCHAIN =
1414

@@ -47,6 +47,9 @@ versiontag:
4747
compile_keepversion:
4848
@pnpm run build
4949
compile: versiontag
50+
@if [ ! -f "./config.toml" ]; then \
51+
cp config.toml.sample config.toml; \
52+
fi
5053
@pnpm run build
5154
compile_wsproxy:
5255
@cd ./src/wsproxy; pnpm dlx webpack-cli --config webpack.config.js
@@ -196,6 +199,6 @@ build_docker: compile
196199
i18n:
197200
@pnpm dlx i18next-scanner --config ./i18n.config.js
198201
clean:
199-
@cd app; rm -rf ./backend*; rm -rf ./Backend*
200-
@cd build;rm -rf ./unbundle ./bundle ./rollup ./electron-app
202+
@rm -rf ./app/backend*; rm -rf ./app/Backend*
203+
@rm -rf ./build/unbundle ./build/bundle ./build/rollup ./build/electron-app
201204
@rm -rf ./react/build

‎backend.ai-webui.code-workspace‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313
"i18n-ally.enabledFrameworks": ["react", "custom"],
1414
"i18n-ally.keystyle": "nested",
1515
"i18n-ally.dirStructure": "auto",
16-
"files.exclude": {
17-
"packages/backend.ai-ui": true,
18-
},
16+
"i18n-ally.displayLanguage": "en",
17+
"i18n-ally.sourceLanguage": "en",
1918
"i18n-ally.regex.usageMatch": [
2019
"<Trans\\b[^>]*?\\bi18nKey\\s*=\\s*\\{['\"`]({key})['\"`]\\}", // <Trans i18nKey={'key'}>
2120
"<Trans\\b[^>]*?\\bi18nKey\\s*=\\s*['\"`]({key})['\"`]", // <Trans i18nKey="key">
2221
"(?:^|[^\\w\\d])t\\s*\\(\\s*['\"`]({key})['\"`]", // t('key') / obj.t('key')
2322
"(?:^|[^\\w\\d])_t\\s*\\(\\s*['\"`]({key})['\"`]", // _t('key') / obj._t('key') for Lit components
2423
],
24+
"files.exclude": {
25+
"packages/backend.ai-ui": true,
26+
},
2527
},
2628
}

‎electron-app/main.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ let es6Path;
3939
let electronPath;
4040
let mainIndex;
4141
if (process.env.serveMode == 'dev') {
42-
ProxyManager = require('./build/electron-app/app/wsproxy/wsproxy.js');
43-
versions = require('./version');
44-
es6Path = npjoin(__dirname, 'build/electron-app/app'); // ES6 module loader with custom protocol
45-
electronPath = npjoin(__dirname, 'build/electron-app');
46-
mainIndex = 'build/electron-app/app/index.html';
42+
ProxyManager = require(path.join(__dirname, 'app/wsproxy/wsproxy.js'));
43+
versions = require(path.join(__dirname, 'app/version'));
44+
es6Path = npjoin(__dirname, 'app'); // ES6 module loader with custom protocol
45+
electronPath = npjoin(__dirname);
46+
mainIndex = 'app/index.html';
4747
} else {
4848
ProxyManager = require('./app/wsproxy/wsproxy.js');
4949
versions = require('./app/version');

‎electron-app/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
{
22
"name": "backend.ai-webui",
33
"productName": "Backend.AI Desktop",
4-
"version": "25.14.0-rc.3",
4+
"version": "25.14.0-alpha.0",
55
"repository": "https://github.com/lablup/backend.ai-webui.git",
66
"author": "Lablup Inc. <contact@lablup.com>",
77
"license": "LGPL-3.0-or-later",
88
"main": "main.js",
9-
"scripts": {
10-
},
9+
"scripts": {},
1110
"dependencies": {
1211
"@vanillawc/wc-codemirror": "^2.1.0",
1312
"markty": "^0.0.4",

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
NODE_ENV: 'production'
3333
}
3434
};
35-
globalThis.packageVersion = "25.14.0-rc.3";
36-
globalThis.buildNumber = "6919";
35+
globalThis.packageVersion = "25.14.0-alpha.0";
36+
globalThis.buildNumber = "6927";
3737
globalThis.litNonce = "{{nonce}}";
3838
globalThis.baiNonce = "{{nonce}}";
3939
</script>

‎manifest.json‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"manifest_version": 9,
44
"name": "Backend.AI Web UI",
55
"short_name": "BackendAIWebUI",
6-
"version": "25.14.0-rc.3",
6+
"version": "25.14.0-alpha.0",
77
"start_url": "/",
88
"display": "standalone",
99
"background_color": "#fff",
@@ -16,19 +16,23 @@
1616
},
1717
{
1818
"src": "./manifest/backend-ai.iconset/icon_32x32@2x.png",
19-
"sizes": "32x32",
20-
"type": "image/png"
21-
}, {
22-
"src": "./manifest/backend-ai.iconset/icon_128x128@2x.png",
23-
"sizes": "128x128",
24-
"type": "image/png"
25-
}, {
26-
"src": "./manifest/backend-ai.iconset/icon_256x256@2x.png",
27-
"sizes": "256x256",
28-
"type": "image/png"
29-
}, {
30-
"src": "./manifest/backend-ai.iconset/icon_512x512@2x.png",
31-
"sizes": "512x512",
32-
"type": "image/png"
33-
}]
19+
"sizes": "32x32",
20+
"type": "image/png"
21+
},
22+
{
23+
"src": "./manifest/backend-ai.iconset/icon_128x128@2x.png",
24+
"sizes": "128x128",
25+
"type": "image/png"
26+
},
27+
{
28+
"src": "./manifest/backend-ai.iconset/icon_256x256@2x.png",
29+
"sizes": "256x256",
30+
"type": "image/png"
31+
},
32+
{
33+
"src": "./manifest/backend-ai.iconset/icon_512x512@2x.png",
34+
"sizes": "512x512",
35+
"type": "image/png"
36+
}
37+
]
3438
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "backend.ai-webui",
33
"productName": "Backend.AI Desktop",
4-
"version": "25.14.0-rc.3",
4+
"version": "25.14.0-alpha.0",
55
"repository": "https://github.com/lablup/backend.ai-webui.git",
66
"author": "Lablup Inc. <contact@lablup.com>",
77
"license": "LGPL-3.0-or-later",
@@ -21,7 +21,7 @@
2121
"server:d": "eval \"$(node scripts/dev-config.js env)\" && node scripts/dev-config.js update && PORT=$BAI_WEBUI_DEV_REACT_PORT PROXY=http://localhost:$BAI_WEBUI_DEV_WEBDEV_PORT pnpm --prefix ./react run start",
2222
"server:d-ie11": "web-dev-server --node-resolve --open --watch --port 3081 --hostname $BAI_WEBUI_DEV_HOST --esbuild-target auto --app-index demo/index.html --file-extensions .ts",
2323
"build:d": "eval \"$(node scripts/dev-config.js env)\" && node scripts/dev-config.js update && concurrently -c \"auto\" --names \"webcomponent,react-relay,webdev\" \"./node_modules/typescript/bin/tsc --watch\" \"cd react && pnpm run relay:watch\" \"web-dev-server --node-resolve --port $BAI_WEBUI_DEV_WEBDEV_PORT --hostname localhost --esbuild-target auto --app-index index.html --file-extensions .ts\"",
24-
"electron:d": "electron . --dev",
24+
"electron:d": "electron build/electron-app --dev",
2525
"relay": "relay-compiler",
2626
"copywc": "mkdir -p build/rollup/src/lib && cp -r node_modules/@webcomponents/webcomponentsjs/bundles build/rollup/src/lib && cp -r node_modules/@webcomponents/webcomponentsjs/bundles src/lib && cp node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js build/rollup/src/lib && cp -r node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js src/lib",
2727
"copywa": "mkdir -p build/rollup/src/lib/web-animations-js && mkdir -p src/lib/web-animations-js && cp node_modules/web-animations-js/web-animations-next-lite.min.js src/lib/web-animations-js && cp src/lib/web-animations-js/web-animations-next-lite.min.js build/rollup/src/lib/web-animations-js",

‎packages/backend.ai-ui/package.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,29 @@
5555
},
5656
"peerDependencies": {
5757
"@ant-design/icons": "^5.6.1",
58+
"antd": "^5.24.5",
59+
"antd-style": "^3.7.1",
60+
"graphql": "^16.10.0",
61+
"i18next": "^24.2.3",
62+
"react": "^19.0.0",
63+
"react-dom": "^19.0.0",
64+
"react-i18next": "^15.4.1",
65+
"react-relay": "^20.1.0",
66+
"relay-runtime": "^20.1.0"
67+
},
68+
"dependencies": {
5869
"@dnd-kit/core": "^6.1.0",
5970
"@dnd-kit/modifiers": "^7.0.0",
6071
"@dnd-kit/sortable": "^8.0.0",
6172
"@dnd-kit/utilities": "^3.2.2",
6273
"ahooks": "^3.8.4",
63-
"antd": "^5.24.5",
64-
"antd-style": "^3.7.1",
6574
"big.js": "^7.0.1",
6675
"classnames": "^2.5.1",
6776
"dayjs": "^1.11.13",
68-
"graphql": "^16.10.0",
69-
"i18next": "^24.2.3",
7077
"lodash": "^4.17.21",
7178
"lucide-react": "^0.484.0",
72-
"react": "^19.0.0",
73-
"react-dom": "^19.0.0",
74-
"react-i18next": "^15.4.1",
75-
"react-relay": "^20.1.0",
7679
"react-resizable": "^3.0.5",
77-
"relay-runtime": "^20.1.0"
80+
"react-copy-to-clipboard": "^5.1.0"
7881
},
7982
"devDependencies": {
8083
"@jest/expect": "30.0.0-beta.3",
@@ -89,6 +92,7 @@
8992
"@types/big.js": "^6.2.2",
9093
"@types/lodash": "^4.17.13",
9194
"@types/react": "^19.0.0",
95+
"@types/react-copy-to-clipboard": "^5.0.7",
9296
"@types/react-dom": "^19.0.3",
9397
"@types/react-relay": "^18.2.1",
9498
"@types/react-resizable": "^3.0.8",

‎packages/backend.ai-ui/src/components/BAIBoardItemTitle.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const BAIBoardItemTitle: React.FC<BAIBoardItemTitleProps> = ({
3434
gap="xs"
3535
wrap="wrap"
3636
>
37-
<BAIFlex gap={'xs'} align="center">
37+
<BAIFlex gap={'xs'} align="center" wrap="wrap">
3838
{typeof title === 'string' ? (
3939
<Typography.Title level={5} style={{ margin: 0 }}>
4040
{title}

0 commit comments

Comments
 (0)