diff --git a/runtime/react/.gitignore b/runtime/react/.gitignore index 87d1ced2..59712290 100644 --- a/runtime/react/.gitignore +++ b/runtime/react/.gitignore @@ -1,2 +1,4 @@ .tmagic -entry-dist +dist +*.local +*.local.* diff --git a/runtime/react/package.json b/runtime/react/package.json index 03c90aac..d2b9a3e4 100644 --- a/runtime/react/package.json +++ b/runtime/react/package.json @@ -11,7 +11,7 @@ "dev:react": "vite --force", "serve": "vite preview", "build": "rimraf ./dist && node scripts/build.mjs --type=all && npm run build:client", - "build:libs": "tmagic entry && node scripts/build.mjs --type=res", + "build:libs": "npm run tmagic && node scripts/build.mjs --type=res", "build:client": "vite build --config ./page/vite.config.ts && vite build --config ./playground/vite.config.ts" }, "dependencies": { diff --git a/runtime/react/scripts/build.mjs b/runtime/react/scripts/build.mjs index 7853c7cb..b7db81f0 100644 --- a/runtime/react/scripts/build.mjs +++ b/runtime/react/scripts/build.mjs @@ -2,6 +2,7 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { build as buildVite } from 'vite'; +import fse from 'fs-extra'; import minimist from 'minimist'; import resViteConfig from './vite.res.config.mjs'; @@ -12,9 +13,9 @@ const dirname = path.dirname(fileURLToPath(import.meta.url)); const buildList = []; -const buildRes = args.type === 'res' || args.type === 'all'; +if (args.type === 'res' || args.type === 'all') { + fse.removeSync(path.resolve(dirname, '../dist/entry')); -if (buildRes) { for (const mode of ['value', 'config', 'event', 'ds:value', 'ds:config', 'ds:event']) { buildList.push( buildVite({ diff --git a/runtime/react/scripts/vite.res.config.mjs b/runtime/react/scripts/vite.res.config.mjs index 843a830e..6c8d253d 100644 --- a/runtime/react/scripts/vite.res.config.mjs +++ b/runtime/react/scripts/vite.res.config.mjs @@ -14,9 +14,6 @@ export default defineConfig((mode) => { const fileName = mode.replace(':', '-'); - const publicPath = path.resolve(dirname, '../dist/entry', fileName); - fse.removeSync(publicPath); - return { plugins: [ { @@ -24,7 +21,10 @@ export default defineConfig((mode) => { apply: 'build', enforce: 'post', closeBundle() { - fse.copySync(publicPath, path.resolve(dirname, `../../../playground/public/entry/react/${fileName}`)); + fse.copySync( + path.resolve(dirname, '../dist/entry', fileName), + path.resolve(dirname, '../../../playground/public/entry/react/', fileName), + ); }, }, ], diff --git a/runtime/react/tmagic.config.ts b/runtime/react/tmagic.config.ts index cf070b21..beef6790 100644 --- a/runtime/react/tmagic.config.ts +++ b/runtime/react/tmagic.config.ts @@ -8,16 +8,16 @@ export default defineConfig({ }, packages: [ { - button: '@tmagic/react-button' , - container: '@tmagic/react-container' , - img: '@tmagic/react-img' , - 'iterator-container': '@tmagic/react-iterator-container' , - overlay: '@tmagic/react-overlay' , - page: '@tmagic/react-page' , - 'page-fragment': '@tmagic/react-page-fragment' , - 'page-fragment-container': '@tmagic/react-page-fragment-container' , - 'qrcode': '@tmagic/react-qrcode' , - 'text': '@tmagic/react-text' , - } + button: '@tmagic/react-button', + container: '@tmagic/react-container', + img: '@tmagic/react-img', + 'iterator-container': '@tmagic/react-iterator-container', + overlay: '@tmagic/react-overlay', + page: '@tmagic/react-page', + 'page-fragment': '@tmagic/react-page-fragment', + 'page-fragment-container': '@tmagic/react-page-fragment-container', + 'qrcode': '@tmagic/react-qrcode', + 'text': '@tmagic/react-text', + }, ], }); diff --git a/runtime/vue/.gitignore b/runtime/vue/.gitignore index 07083d9a..59712290 100644 --- a/runtime/vue/.gitignore +++ b/runtime/vue/.gitignore @@ -1,2 +1,4 @@ .tmagic dist +*.local +*.local.* diff --git a/runtime/vue/package.json b/runtime/vue/package.json index b3bd6b59..526be365 100644 --- a/runtime/vue/package.json +++ b/runtime/vue/package.json @@ -11,7 +11,7 @@ "dev": "vite --force", "serve": "vite preview", "build": "rimraf ./dist && node scripts/build.mjs --type=all && npm run build:client", - "build:libs": "tmagic entry && node scripts/build.mjs --type=res", + "build:libs": "npm run tmagic && node scripts/build.mjs --type=res", "build:client": "vite build --config ./page/vite.config.ts && vite build --config ./playground/vite.config.ts" }, "dependencies": { diff --git a/runtime/vue/scripts/build.mjs b/runtime/vue/scripts/build.mjs index 7853c7cb..b7db81f0 100644 --- a/runtime/vue/scripts/build.mjs +++ b/runtime/vue/scripts/build.mjs @@ -2,6 +2,7 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { build as buildVite } from 'vite'; +import fse from 'fs-extra'; import minimist from 'minimist'; import resViteConfig from './vite.res.config.mjs'; @@ -12,9 +13,9 @@ const dirname = path.dirname(fileURLToPath(import.meta.url)); const buildList = []; -const buildRes = args.type === 'res' || args.type === 'all'; +if (args.type === 'res' || args.type === 'all') { + fse.removeSync(path.resolve(dirname, '../dist/entry')); -if (buildRes) { for (const mode of ['value', 'config', 'event', 'ds:value', 'ds:config', 'ds:event']) { buildList.push( buildVite({ diff --git a/runtime/vue/scripts/vite.res.config.mjs b/runtime/vue/scripts/vite.res.config.mjs index d9df9e61..5427b3bd 100644 --- a/runtime/vue/scripts/vite.res.config.mjs +++ b/runtime/vue/scripts/vite.res.config.mjs @@ -14,9 +14,6 @@ export default defineConfig((mode) => { const fileName = mode.replace(':', '-'); - const publicPath = path.resolve(dirname, '../dist/entry', fileName); - fse.removeSync(publicPath); - return { plugins: [ { @@ -24,7 +21,10 @@ export default defineConfig((mode) => { apply: 'build', enforce: 'post', closeBundle() { - fse.copySync(publicPath, path.resolve(dirname, `../../../playground/public/entry/vue/${fileName}`)); + fse.copySync( + path.resolve(dirname, '../dist/entry', fileName), + path.resolve(dirname, '../../../playground/public/entry/vue/', fileName), + ); }, }, ], diff --git a/runtime/vue/tmagic.config.ts b/runtime/vue/tmagic.config.ts index 511404b6..41791a17 100644 --- a/runtime/vue/tmagic.config.ts +++ b/runtime/vue/tmagic.config.ts @@ -9,16 +9,16 @@ export default defineConfig({ }, packages: [ { - button: '@tmagic/vue-button' , - container: '@tmagic/vue-container' , + button: '@tmagic/vue-button', + container: '@tmagic/vue-container', img: '@tmagic/vue-img' , - 'iterator-container': '@tmagic/vue-iterator-container' , - overlay: '@tmagic/vue-overlay' , - page: '@tmagic/vue-page' , - 'page-fragment': '@tmagic/vue-page-fragment' , - 'page-fragment-container': '@tmagic/vue-page-fragment-container' , - 'qrcode': '@tmagic/vue-qrcode' , - 'text': '@tmagic/vue-text' , - } + 'iterator-container': '@tmagic/vue-iterator-container', + overlay: '@tmagic/vue-overlay', + page: '@tmagic/vue-page', + 'page-fragment': '@tmagic/vue-page-fragment', + 'page-fragment-container': '@tmagic/vue-page-fragment-container', + 'qrcode': '@tmagic/vue-qrcode', + 'text': '@tmagic/vue-text', + }, ], });