From 997219fee2a70898602a8b0bd6bfebc00dff2875 Mon Sep 17 00:00:00 2001 From: hexqi Date: Sat, 8 Jun 2024 15:35:14 +0800 Subject: [PATCH 1/5] feat: remove env --- designer-demo/{ => env}/.env.alpha | 0 designer-demo/{ => env}/.env.development | 0 designer-demo/{ => env}/.env.production | 0 designer-demo/vite.config.js | 5 ++++- 4 files changed, 4 insertions(+), 1 deletion(-) rename designer-demo/{ => env}/.env.alpha (100%) rename designer-demo/{ => env}/.env.development (100%) rename designer-demo/{ => env}/.env.production (100%) diff --git a/designer-demo/.env.alpha b/designer-demo/env/.env.alpha similarity index 100% rename from designer-demo/.env.alpha rename to designer-demo/env/.env.alpha diff --git a/designer-demo/.env.development b/designer-demo/env/.env.development similarity index 100% rename from designer-demo/.env.development rename to designer-demo/env/.env.development diff --git a/designer-demo/.env.production b/designer-demo/env/.env.production similarity index 100% rename from designer-demo/.env.production rename to designer-demo/env/.env.production diff --git a/designer-demo/vite.config.js b/designer-demo/vite.config.js index ebdd4e92c6..8eb8e1b2c4 100644 --- a/designer-demo/vite.config.js +++ b/designer-demo/vite.config.js @@ -3,8 +3,9 @@ import { defineConfig, mergeConfig, loadEnv } from 'vite' import { getDefaultConfig } from '@opentiny/tiny-engine-vite-config' export default defineConfig((options) => { + const envDir = path.resolve(process.cwd(), 'env') const extOptions = { - ...loadEnv(options.mode, process.cwd(), ''), + ...loadEnv(options.mode, envDir, 'VITE_'), iconDirs: [path.resolve(__dirname, './node_modules/@opentiny/tiny-engine/assets/')] } const defaultConfig = getDefaultConfig(options, extOptions) @@ -64,6 +65,8 @@ export default defineConfig((options) => { } const config = { + envDir, + publicDir: path.resolve(__dirname, './public'), server: { port: 8090 }, From 7bc9da156bc1224e3b678c3aa0d63da2e6cecadc Mon Sep 17 00:00:00 2001 From: hexqi Date: Sat, 8 Jun 2024 15:35:43 +0800 Subject: [PATCH 2/5] docs: remove doc --- .../REGISTRY_README.md => packages/entry/docs/registry.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename designer-demo/REGISTRY_README.md => packages/entry/docs/registry.md (100%) diff --git a/designer-demo/REGISTRY_README.md b/packages/entry/docs/registry.md similarity index 100% rename from designer-demo/REGISTRY_README.md rename to packages/entry/docs/registry.md From 76996b1fc0fc4830a141361b6a95caa3756abca1 Mon Sep 17 00:00:00 2001 From: hexqi Date: Sat, 8 Jun 2024 15:36:07 +0800 Subject: [PATCH 3/5] fix: material --- designer-demo/registry.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-demo/registry.js b/designer-demo/registry.js index 51d460149d..1d54f09a53 100644 --- a/designer-demo/registry.js +++ b/designer-demo/registry.js @@ -47,7 +47,9 @@ export default { config: { id: 'engine.config', theme: 'light', - material: [], + material: ['/mock/bundle.json'], + scripts: [], + styles: [] }, layout: { id: 'engine.layout' }, toolbars: [ From 25feac0f8e1036d1c265e33852444ed7669e46a2 Mon Sep 17 00:00:00 2001 From: hexqi Date: Sat, 8 Jun 2024 15:46:01 +0800 Subject: [PATCH 4/5] chore: remove html to public --- designer-demo/{ => public}/canvas.html | 0 designer-demo/{ => public}/index.html | 0 designer-demo/{ => public}/preview.html | 0 packages/build/vite-config/src/default-config.js | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename designer-demo/{ => public}/canvas.html (100%) rename designer-demo/{ => public}/index.html (100%) rename designer-demo/{ => public}/preview.html (100%) diff --git a/designer-demo/canvas.html b/designer-demo/public/canvas.html similarity index 100% rename from designer-demo/canvas.html rename to designer-demo/public/canvas.html diff --git a/designer-demo/index.html b/designer-demo/public/index.html similarity index 100% rename from designer-demo/index.html rename to designer-demo/public/index.html diff --git a/designer-demo/preview.html b/designer-demo/public/preview.html similarity index 100% rename from designer-demo/preview.html rename to designer-demo/public/preview.html diff --git a/packages/build/vite-config/src/default-config.js b/packages/build/vite-config/src/default-config.js index 64c2f95aab..35a0a8673c 100644 --- a/packages/build/vite-config/src/default-config.js +++ b/packages/build/vite-config/src/default-config.js @@ -35,7 +35,7 @@ const config = { server: { // 这里保证本地启动服务是localhost,支持js多线程和谷歌浏览器读写本地文件api port: 8080, - open: '/?type=app&id=918&tenant=1', + open: '/index.html?type=app&id=918&tenant=1', proxy: { '/app-center/v1/api': { target: origin, From 722b5fe20fddca53ad5283eb57dc179d9f29bd9e Mon Sep 17 00:00:00 2001 From: hexqi Date: Sat, 8 Jun 2024 16:01:46 +0800 Subject: [PATCH 5/5] Revert "chore: remove html to public" This reverts commit 25feac0f8e1036d1c265e33852444ed7669e46a2. --- designer-demo/{public => }/canvas.html | 0 designer-demo/{public => }/index.html | 0 designer-demo/{public => }/preview.html | 0 packages/build/vite-config/src/default-config.js | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename designer-demo/{public => }/canvas.html (100%) rename designer-demo/{public => }/index.html (100%) rename designer-demo/{public => }/preview.html (100%) diff --git a/designer-demo/public/canvas.html b/designer-demo/canvas.html similarity index 100% rename from designer-demo/public/canvas.html rename to designer-demo/canvas.html diff --git a/designer-demo/public/index.html b/designer-demo/index.html similarity index 100% rename from designer-demo/public/index.html rename to designer-demo/index.html diff --git a/designer-demo/public/preview.html b/designer-demo/preview.html similarity index 100% rename from designer-demo/public/preview.html rename to designer-demo/preview.html diff --git a/packages/build/vite-config/src/default-config.js b/packages/build/vite-config/src/default-config.js index 35a0a8673c..64c2f95aab 100644 --- a/packages/build/vite-config/src/default-config.js +++ b/packages/build/vite-config/src/default-config.js @@ -35,7 +35,7 @@ const config = { server: { // 这里保证本地启动服务是localhost,支持js多线程和谷歌浏览器读写本地文件api port: 8080, - open: '/index.html?type=app&id=918&tenant=1', + open: '/?type=app&id=918&tenant=1', proxy: { '/app-center/v1/api': { target: origin,