From e8b8d35cbd5b37a52ae2bc17ea8e6dafb019b670 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Thu, 4 Aug 2022 15:35:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(runtime):=20vue2/react=E4=BD=BF=E7=94=A8ta?= =?UTF-8?q?mgic-cli=E7=94=9F=E6=88=90=E7=BB=84=E4=BB=B6=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/ui-vue2/src/button/Button.vue | 8 +- pnpm-lock.yaml | 78 +++- runtime/react/.env.admin | 2 - runtime/react/.gitignore | 6 +- runtime/react/build.vite.config.ts | 73 +++ runtime/react/dev.vite.config.ts | 63 +++ runtime/react/package.json | 25 +- runtime/react/page.html | 13 - .../react/{src/playground => page}/App.tsx | 2 - runtime/react/page/index.html | 31 ++ runtime/react/{src => }/page/main.tsx | 8 +- runtime/react/playground.html | 27 -- .../react/{src/page => playground}/App.tsx | 6 +- runtime/react/playground/index.html | 46 ++ runtime/react/playground/main.tsx | 121 +++++ runtime/react/scripts/build.js | 22 - runtime/react/scripts/dev.js | 22 - runtime/react/scripts/units.js | 25 - runtime/react/src/page/App.css | 16 - runtime/react/src/playground/App.css | 23 - runtime/react/src/playground/main.tsx | 119 ----- runtime/react/src/vite-env.d.ts | 1 - runtime/react/tmagic.config.ts | 8 + runtime/react/tsconfig.json | 2 +- runtime/react/vite.config.ts | 95 ---- runtime/scripts/generateEntry.js | 430 ------------------ runtime/vue2/.env.admin | 2 - runtime/vue2/.gitignore | 6 +- runtime/vue2/build.vite.config.ts | 76 ++++ runtime/vue2/dev.vite.config.ts | 62 +++ runtime/vue2/package.json | 25 +- runtime/vue2/page.html | 13 - runtime/vue2/{src => }/page/App.vue | 19 - runtime/vue2/page/index.html | 31 ++ runtime/vue2/{src => }/page/main.ts | 13 +- runtime/vue2/{src => page}/shims-vue.d.ts | 0 runtime/vue2/{src => page}/utils/index.ts | 0 runtime/vue2/{src => page}/utils/request.ts | 0 runtime/vue2/playground.html | 29 -- runtime/vue2/{src => }/playground/App.vue | 0 runtime/vue2/playground/index.html | 48 ++ runtime/vue2/{src => }/playground/main.ts | 8 +- runtime/vue2/playground/shims-vue.d.ts | 6 + runtime/vue2/scripts/build.js | 22 - runtime/vue2/scripts/dev.js | 22 - runtime/vue2/scripts/units.js | 25 - runtime/vue2/src/index.d.ts | 28 -- runtime/vue2/src/vite-env.d.ts | 1 - runtime/vue2/tmagic.config.ts | 8 + runtime/vue2/vite.config.ts | 96 ---- runtime/vue3/package.json | 4 +- 52 files changed, 702 insertions(+), 1116 deletions(-) delete mode 100644 runtime/react/.env.admin create mode 100644 runtime/react/build.vite.config.ts create mode 100644 runtime/react/dev.vite.config.ts delete mode 100644 runtime/react/page.html rename runtime/react/{src/playground => page}/App.tsx (98%) create mode 100644 runtime/react/page/index.html rename runtime/react/{src => }/page/main.tsx (86%) delete mode 100644 runtime/react/playground.html rename runtime/react/{src/page => playground}/App.tsx (88%) create mode 100644 runtime/react/playground/index.html create mode 100644 runtime/react/playground/main.tsx delete mode 100644 runtime/react/scripts/build.js delete mode 100644 runtime/react/scripts/dev.js delete mode 100644 runtime/react/scripts/units.js delete mode 100644 runtime/react/src/page/App.css delete mode 100644 runtime/react/src/playground/App.css delete mode 100644 runtime/react/src/playground/main.tsx delete mode 100644 runtime/react/src/vite-env.d.ts create mode 100644 runtime/react/tmagic.config.ts delete mode 100644 runtime/react/vite.config.ts delete mode 100644 runtime/scripts/generateEntry.js delete mode 100644 runtime/vue2/.env.admin create mode 100644 runtime/vue2/build.vite.config.ts create mode 100644 runtime/vue2/dev.vite.config.ts delete mode 100644 runtime/vue2/page.html rename runtime/vue2/{src => }/page/App.vue (67%) create mode 100644 runtime/vue2/page/index.html rename runtime/vue2/{src => }/page/main.ts (80%) rename runtime/vue2/{src => page}/shims-vue.d.ts (100%) rename runtime/vue2/{src => page}/utils/index.ts (100%) rename runtime/vue2/{src => page}/utils/request.ts (100%) delete mode 100644 runtime/vue2/playground.html rename runtime/vue2/{src => }/playground/App.vue (100%) create mode 100644 runtime/vue2/playground/index.html rename runtime/vue2/{src => }/playground/main.ts (79%) create mode 100644 runtime/vue2/playground/shims-vue.d.ts delete mode 100644 runtime/vue2/scripts/build.js delete mode 100644 runtime/vue2/scripts/dev.js delete mode 100644 runtime/vue2/scripts/units.js delete mode 100644 runtime/vue2/src/index.d.ts delete mode 100644 runtime/vue2/src/vite-env.d.ts create mode 100644 runtime/vue2/tmagic.config.ts delete mode 100644 runtime/vue2/vite.config.ts diff --git a/package.json b/package.json index 0370d929..f8dcee42 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "packageManager": "pnpm@7.1.9", "scripts": { "bootstrap": "pnpm i && pnpm build", - "clean:top": "rimraf */**/dist */dist coverage dwt*", + "clean:top": "rimraf */**/dist */**/admin-dist */**/entry-dist */dist coverage dwt*", "clean:modules": "rimraf node_modules **/node_modules **/**/node_modules", "clean:all": "pnpm clean:top && pnpm clean:modules", "lint": "eslint . --ext .js,.vue,.ts,.tsx", diff --git a/packages/ui-vue2/src/button/Button.vue b/packages/ui-vue2/src/button/Button.vue index da289ec8..f8d7f5b5 100644 --- a/packages/ui-vue2/src/button/Button.vue +++ b/packages/ui-vue2/src/button/Button.vue @@ -6,7 +6,7 @@ - - diff --git a/runtime/react/src/playground/App.tsx b/runtime/react/page/App.tsx similarity index 98% rename from runtime/react/src/playground/App.tsx rename to runtime/react/page/App.tsx index c6595553..3e548850 100644 --- a/runtime/react/src/playground/App.tsx +++ b/runtime/react/page/App.tsx @@ -22,8 +22,6 @@ import Core from '@tmagic/core'; import type { Page } from '@tmagic/schema'; import { AppContent } from '@tmagic/ui-react'; -import './App.css'; - function App() { const app = useContext(AppContent); diff --git a/runtime/react/page/index.html b/runtime/react/page/index.html new file mode 100644 index 00000000..3cf5314a --- /dev/null +++ b/runtime/react/page/index.html @@ -0,0 +1,31 @@ + + + + + + + React Page + + + +
+ + + diff --git a/runtime/react/src/page/main.tsx b/runtime/react/page/main.tsx similarity index 86% rename from runtime/react/src/page/main.tsx rename to runtime/react/page/main.tsx index 7a832240..99b7de51 100644 --- a/runtime/react/src/page/main.tsx +++ b/runtime/react/page/main.tsx @@ -24,7 +24,8 @@ import type { MApp } from '@tmagic/schema'; import { AppContent } from '@tmagic/ui-react'; import { getUrlParam } from '@tmagic/utils'; -import entry from '../comp-entry'; +import components from '../.tmagic/comp-entry'; +import plugins from '../.tmagic/plugin-entry'; import App from './App'; declare global { @@ -54,7 +55,10 @@ const app = new Core({ curPage: getUrlParam('page'), }); -Object.keys(entry.components).forEach((type: string) => app.registerComponent(type, entry.components[type])); +Object.keys(components).forEach((type: string) => app.registerComponent(type, components[type])); +Object.values(plugins).forEach((plugin: any) => { + plugin.install(app); +}); ReactDOM.render( diff --git a/runtime/react/playground.html b/runtime/react/playground.html deleted file mode 100644 index ab96e629..00000000 --- a/runtime/react/playground.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - React Playground - - - - -
- - - - \ No newline at end of file diff --git a/runtime/react/src/page/App.tsx b/runtime/react/playground/App.tsx similarity index 88% rename from runtime/react/src/page/App.tsx rename to runtime/react/playground/App.tsx index c6595553..bcbd1431 100644 --- a/runtime/react/src/page/App.tsx +++ b/runtime/react/playground/App.tsx @@ -19,11 +19,9 @@ import React, { useContext } from 'react'; import Core from '@tmagic/core'; -import type { Page } from '@tmagic/schema'; +import type { MPage } from '@tmagic/schema'; import { AppContent } from '@tmagic/ui-react'; -import './App.css'; - function App() { const app = useContext(AppContent); @@ -33,7 +31,7 @@ function App() { const MagicUiPage = app.resolveComponent('page'); - return ; + return ; } export default App; diff --git a/runtime/react/playground/index.html b/runtime/react/playground/index.html new file mode 100644 index 00000000..e3b3b78e --- /dev/null +++ b/runtime/react/playground/index.html @@ -0,0 +1,46 @@ + + + + + + + React Playground + + + + +
+ + + + \ No newline at end of file diff --git a/runtime/react/playground/main.tsx b/runtime/react/playground/main.tsx new file mode 100644 index 00000000..57340902 --- /dev/null +++ b/runtime/react/playground/main.tsx @@ -0,0 +1,121 @@ +/* + * Tencent is pleased to support the open source community by making TMagicEditor available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import React from 'react'; +import ReactDOM from 'react-dom'; + +import Core from '@tmagic/core'; +import type { MApp } from '@tmagic/schema'; +import type { RemoveData, SortEventData, UpdateData } from '@tmagic/stage'; +import { AppContent } from '@tmagic/ui-react'; + +import components from '../.tmagic/comp-entry'; +import plugins from '../.tmagic/plugin-entry'; + +import App from './App'; + +const app = new Core({ + config: {}, + platform: 'editor', +}); + +let curPageId = ''; + +const updateConfig = (root: MApp) => { + app?.setConfig(root); + renderDom(); +}; + +const renderDom = () => { + ReactDOM.render( + + + + + , + document.getElementById('root'), + ); + + setTimeout(() => { + // @ts-ignore + window.magic.onPageElUpdate(document.querySelector('.magic-ui-page')); + }); +}; + +const operations = { + getApp() { + return app; + }, + + updateRootConfig(root: MApp) { + console.log('update root config', root); + app?.setConfig(root); + }, + + updatePageId(id: string) { + console.log('update page id', id); + curPageId = id; + app?.setPage(curPageId); + renderDom(); + }, + + getSnapElementQuerySelector() { + return '[class*=magic-ui][id]'; + }, + + select(id: string) { + console.log('select config', id); + const el = document.getElementById(id); + if (el) return el; + // 未在当前文档下找到目标元素，可能是还未渲染，等待渲染完成后再尝试获取 + return new Promise((resolve) => { + setTimeout(() => { + resolve(document.getElementById(id)); + }, 0); + }); + }, + + add({ root }: UpdateData) { + console.log('add config', root); + updateConfig(root); + }, + + update({ root }: UpdateData) { + console.log('update config', root); + updateConfig(root); + }, + + sortNode({ root }: SortEventData) { + console.log('sort config', root); + updateConfig(root); + }, + + remove({ root }: RemoveData) { + console.log('remove config', root); + updateConfig(root); + }, +}; + +Object.keys(components).forEach((type: string) => app.registerComponent(type, components[type])); + +Object.values(plugins).forEach((plugin: any) => { + plugin.install(app); +}); + +// @ts-ignore +window.magic?.onRuntimeReady(operations); diff --git a/runtime/react/scripts/build.js b/runtime/react/scripts/build.js deleted file mode 100644 index 683e3b3b..00000000 --- a/runtime/react/scripts/build.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const generateEntry = require('../../scripts/generateEntry'); -const units = require('./units'); - -generateEntry({ type: 'build', componentFileAffix: '.tsx', units, workingDir: __dirname }); diff --git a/runtime/react/scripts/dev.js b/runtime/react/scripts/dev.js deleted file mode 100644 index c52d23b6..00000000 --- a/runtime/react/scripts/dev.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const generateEntry = require('../../scripts/generateEntry'); -const units = require('./units'); - -generateEntry({ type: 'dev', componentFileAffix: '.tsx', units, workingDir: __dirname }); diff --git a/runtime/react/scripts/units.js b/runtime/react/scripts/units.js deleted file mode 100644 index 116d1cf7..00000000 --- a/runtime/react/scripts/units.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const path = require('path'); - -const units = { - ui: path.join(__dirname, '../../../packages/ui-react/src/index.ts'), -}; - -module.exports = units; diff --git a/runtime/react/src/page/App.css b/runtime/react/src/page/App.css deleted file mode 100644 index f321b3dc..00000000 --- a/runtime/react/src/page/App.css +++ /dev/null @@ -1,16 +0,0 @@ -html, -body, -#root { - width: 100%; - height: 100%; -} - -#root { - position: relative; - overflow: auto; -} - -#root::-webkit-scrollbar { - width: 0 !important; - display: none; -} diff --git a/runtime/react/src/playground/App.css b/runtime/react/src/playground/App.css deleted file mode 100644 index 027b5be7..00000000 --- a/runtime/react/src/playground/App.css +++ /dev/null @@ -1,23 +0,0 @@ -html, -body, -#app { - width: 100%; - height: 100%; -} - -#app { - position: relative; - overflow: auto; -} - -::-webkit-scrollbar { - width: 0; -} - -.magic-ui-container { - background-color: rgba(136, 136, 136, 0.5); -} - -.action-area { - background-color: rgba(51, 153, 255, 0.5) !important; -} \ No newline at end of file diff --git a/runtime/react/src/playground/main.tsx b/runtime/react/src/playground/main.tsx deleted file mode 100644 index d0abf6ca..00000000 --- a/runtime/react/src/playground/main.tsx +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import React from 'react'; -import ReactDOM from 'react-dom'; - -import Core from '@tmagic/core'; -import type { MApp } from '@tmagic/schema'; -import type { RemoveData, SortEventData, UpdateData } from '@tmagic/stage'; -import { AppContent } from '@tmagic/ui-react'; -import { getUrlParam } from '@tmagic/utils'; - -import App from './App'; - -import('../comp-entry').then(() => { - const { components } = window.magicPresetComponents; - - const app = new Core({ - config: {}, - curPage: getUrlParam('page'), - }); - - let curPageId = ''; - - const updateConfig = (root: MApp) => { - app?.setConfig(root); - renderDom(); - }; - - const renderDom = () => { - ReactDOM.render( - - - - - , - document.getElementById('root'), - ); - - setTimeout(() => { - // @ts-ignore - window.magic.onPageElUpdate(document.querySelector('.magic-ui-page')); - }); - }; - - const operations = { - getApp() { - return app; - }, - - updateRootConfig(root: MApp) { - console.log('update root config', root); - app?.setConfig(root); - }, - - updatePageId(id: string) { - console.log('update page id', id); - curPageId = id; - app?.setPage(curPageId); - renderDom(); - }, - - getSnapElementQuerySelector() { - return '[class*=magic-ui][id]'; - }, - - select(id: string) { - console.log('select config', id); - const el = document.getElementById(id); - if (el) return el; - // 未在当前文档下找到目标元素，可能是还未渲染，等待渲染完成后再尝试获取 - return new Promise((resolve) => { - setTimeout(() => { - resolve(document.getElementById(id)); - }, 0); - }); - }, - - add({ root }: UpdateData) { - console.log('add config', root); - updateConfig(root); - }, - - update({ root }: UpdateData) { - console.log('update config', root); - updateConfig(root); - }, - - sortNode({ root }: SortEventData) { - console.log('sort config', root); - updateConfig(root); - }, - - remove({ root }: RemoveData) { - console.log('remove config', root); - updateConfig(root); - }, - }; - - Object.keys(components).forEach((type: string) => app.registerComponent(type, components[type])); - - // @ts-ignore - window.magic?.onRuntimeReady(operations); -}); diff --git a/runtime/react/src/vite-env.d.ts b/runtime/react/src/vite-env.d.ts deleted file mode 100644 index 11f02fe2..00000000 --- a/runtime/react/src/vite-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/runtime/react/tmagic.config.ts b/runtime/react/tmagic.config.ts new file mode 100644 index 00000000..42edd20a --- /dev/null +++ b/runtime/react/tmagic.config.ts @@ -0,0 +1,8 @@ +import path from 'path'; + +import { defineConfig } from '@tmagic/cli'; + +export default defineConfig({ + packages: [path.join(__dirname, '../../packages/ui-react')], + componentFileAffix: '.tsx', +}); diff --git a/runtime/react/tsconfig.json b/runtime/react/tsconfig.json index 1e3030e9..43e3e99f 100644 --- a/runtime/react/tsconfig.json +++ b/runtime/react/tsconfig.json @@ -20,5 +20,5 @@ "@tmagic/*": ["../packages/*"], }, }, - "include": ["./src"] + "include": ["./page", "./playground"] } diff --git a/runtime/react/vite.config.ts b/runtime/react/vite.config.ts deleted file mode 100644 index 5c50a3a2..00000000 --- a/runtime/react/vite.config.ts +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import path from 'path'; - -import { defineConfig, loadEnv } from 'vite'; -import reactRefresh from '@vitejs/plugin-react-refresh'; - -export default defineConfig(({ command, mode }) => { - const { WATCH_INCLUDE = '', BASE, OUT_DIR } = loadEnv(mode, process.cwd(), ''); - const libInput = { - config: './src/config-entry.ts', - value: './src/value-entry.ts', - event: './src/event-entry.ts', - }; - - const htmlInput = { - page: './page.html', - playground: './playground.html', - }; - - const devInput = mode === 'lib' ? libInput : htmlInput; - - const buildConfig = { - outDir: OUT_DIR || 'dist', - - sourcemap: true, - - cssCodeSplit: false, - - rollupOptions: { - input: - command === 'build' && mode !== 'lib' - ? { - ...htmlInput, - ...libInput, - } - : devInput, - output: { - entryFileNames: 'assets/[name].js', - }, - }, - }; - - if (mode === 'lib') { - return { - build: { - ...buildConfig, - watch: { - include: WATCH_INCLUDE.split(','), - }, - }, - }; - } - - return { - base: BASE || '/tmagic-editor/playground/runtime/react', - - plugins: [reactRefresh()], - - resolve: { - alias: [ - { find: /^react$/, replacement: path.join(__dirname, 'node_modules/react/index.js') }, - { find: /^react-dom$/, replacement: path.join(__dirname, 'node_modules/react-dom/index.js') }, - { find: /^@tmagic\/ui-react/, replacement: path.join(__dirname, '../../packages/ui-react/src/index.ts') }, - { find: /^@tmagic\/utils/, replacement: path.join(__dirname, '../../packages/utils/src/index.ts') }, - { find: /^@tmagic\/core/, replacement: path.join(__dirname, '../../packages/core/src/index.ts') }, - { find: /^@tmagic\/schema/, replacement: path.join(__dirname, '../../packages/schema/src/index.ts') }, - ], - }, - - publicDir: command === 'serve' ? 'dist' : 'public', - - server: { - host: '0.0.0.0', - }, - - build: buildConfig, - }; -}); diff --git a/runtime/scripts/generateEntry.js b/runtime/scripts/generateEntry.js deleted file mode 100644 index 5f921b37..00000000 --- a/runtime/scripts/generateEntry.js +++ /dev/null @@ -1,430 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const { execSync } = require('child_process'); -const { exit } = require('process'); -const fs = require('fs'); -const path = require('path'); - -const { parse, prettyPrint, types } = require('recast'); -const n = types.namedTypes; - -const pluginList = {}; -let cwd = __dirname; -const pageRoot = () => path.resolve(cwd, '..'); -const entryPath = () => path.resolve(pageRoot(), './src'); -const defineTypes = { - component: 'component', - config: 'config', - value: 'value', - event: 'event', -}; - -const makeCamelCase = function (name) { - if (typeof name !== 'string') { - return ''; - } - return name.replace(/-(\w)/g, ($0, $1) => $1.toUpperCase()); -}; - -const parseEntry = function ({ ast, package, indexPath }) { - if (!ast.program) { - console.log(`${package} 入口文件不合法`); - return exit(1); - } - - const tokens = getASTTokenByTraverse({ ast, indexPath }); - let { config, value, event } = tokens; - const { importComponentSource, importComponentToken } = tokens; - - if (!config) { - console.log(`${package} ${defineTypes.config} 文件声明不合法`); - return exit(1); - } - if (!value) { - console.log(`${package} ${defineTypes.value} 文件声明不合法`); - return exit(1); - } - if (!event) { - // event 非必须，不需要 exit - console.log(`${package} ${defineTypes.event} 文件声明缺失`); - } - - const findIndex = importComponentToken.indexOf(exportDefaultToken); - let component = ''; - if (findIndex > -1) { - component = path.resolve(path.dirname(indexPath), importComponentSource[findIndex]); - } - - if (!component) { - console.log(`${package} ${defineTypes.component} 文件声明不合法`); - return exit(1); - } - - const reg = /^.*[/\\]node_modules[/\\](.*)/; - [, config] = config.match(reg) || [, config]; - [, value] = value.match(reg) || [, value]; - [, component] = component.match(reg) || [, component]; - [, event] = event.match(reg) || [, event]; - - return { - config, - value, - component, - event, - }; -}; - -const getASTTokenByTraverse = ({ ast, indexPath }) => { - let config = ''; - let value = ''; - let event = ''; - const importComponentToken = []; - const importComponentSource = []; - - types.visit(ast, { - visitImportDeclaration(p) { - const { node } = p; - const { specifiers, source } = node; - - importComponentToken.push(specifiers[0].local.name); - importComponentSource.push(source.value); - - this.traverse(p); - }, - visitExportNamedDeclaration(p) { - const { node } = p; - const { specifiers, source } = node; - const name = specifiers[0].exported.name.toLowerCase(); - - if (name === defineTypes.value) { - value = path.resolve(path.dirname(indexPath), source.value); - } else if (name === defineTypes.config) { - config = path.resolve(path.dirname(indexPath), source.value); - } else if (name === defineTypes.event) { - event = path.resolve(path.dirname(indexPath), source.value); - } - - this.traverse(p); - }, - visitExportDefaultDeclaration(p) { - const { node } = p; - const { declaration } = node; - exportDefaultToken = declaration.name; - this.traverse(p); - }, - }); - - return { - config, - value, - event, - importComponentToken, - importComponentSource, - }; -}; - -const generateEntry = function ({ entries, type = 'build', componentFileAffix }) { - const commonArgs = { entries, componentFileAffix }; - - generateEntryFile({ entryFile: 'comp-entry.ts', type: defineTypes.component, ...commonArgs }); - if (type === 'build') { - generateEntryFile({ entryFile: 'config-entry.ts', type: defineTypes.config, ...commonArgs }); - generateEntryFile({ entryFile: 'value-entry.ts', type: defineTypes.value, ...commonArgs }); - generateEntryFile({ entryFile: 'event-entry.ts', type: defineTypes.event, ...commonArgs }); - } -}; - -const generateEntryFile = function ({ entries, entryFile, type, componentFileAffix }) { - const list = []; - const importDeclarations = []; - - entries.forEach((entry) => { - if (!entry.entry[type]) return; - - const name = makeCamelCase(entry.type); - importDeclarations.push( - `import ${name} from '${entry.entry[type]}${ - type === defineTypes.component && !entry.entry[type].includes(componentFileAffix) ? componentFileAffix : '' - }'`, - ); - list.push(`'${entry.type}': ${name}`); - }); - - const exportToken = `${type}s`; - const capitalToken = exportToken.charAt(0).toUpperCase() + exportToken.slice(1); - let jsString = ''; - let exportData = `window.magicPreset${capitalToken} = ${exportToken};`; - - if (type === defineTypes.component) { - const pList = []; - - Object.keys(pluginList).forEach((pluginType) => { - const name = makeCamelCase(pluginType); - importDeclarations.push(`import ${name} from '${pluginList[pluginType]}'`); - pList.push(`'${pluginType}': ${name}`); - }); - - exportData = `const plugins = {${pList.join(',')}}; - const entry = {${exportToken}, plugins}; - window.magicPreset${capitalToken} = entry; - export default entry;`; - - jsString += `${importDeclarations.join(';')} - const ${exportToken}: Record = { - ${list.join(',')} - } - ${exportData}`; - } else { - jsString += `${importDeclarations.join(';')} - (function(){ - const ${exportToken}: Record = { - ${list.join(',')} - } - ${exportData} - })()`; - } - - fs.writeFileSync( - path.resolve(entryPath(), entryFile), - // window下需要将路径中\转换成/ - prettyPrint(parse(jsString.replace(/\\/g, '/'), { parser: require('recast/parsers/typescript') }), { - tabWidth: 2, - trailingComma: true, - quote: 'single', - }).code, - { encoding: 'utf-8' }, - ); -}; - -const installPackage = function (package) { - try { - // window下需要将路径中\转换成/ - execSync(`node -e "require.resolve('${package.replace(/\\/g, '/')}')"`, { stdio: 'ignore' }); - } catch (e) { - execSync(`npm install ${package}`, { - stdio: 'inherit', - cwd: pageRoot(), - }); - } -}; - -const getIndexPath = function (entry) { - if (fs.lstatSync(entry).isFile()) { - return entry; - } - - if (fs.lstatSync(entry).isDirectory()) { - const files = fs.readdirSync(entry); - const [index] = files.filter((file) => file.split('.')[0] === 'index'); - - return path.resolve(entry, index); - } - - return entry; -}; - -const typeComponent = 1; -const typePlugin = 2; -const typeComponentPackage = 3; - -const getComponentPackageImports = function ({ result, properties, indexPath, importDeclarations }) { - result.type = typeComponentPackage; - result.imports = []; - - properties.forEach((property) => { - const [propertyMatch] = importDeclarations.filter((i) => { - const [specifier] = i.specifiers; - - if (n.ImportDefaultSpecifier.check(specifier) && specifier.local.name === property.value.name) { - return true; - } - - return false; - }); - - if (propertyMatch) { - result.imports.push({ - type: property.key.name, - name: propertyMatch.specifiers[0].local.name, - indexPath: getIndexPath(path.resolve(path.dirname(indexPath), propertyMatch.source.value)), - }); - } - }); - - return result; -}; - -const isPlugin = function (properties) { - const [match] = properties.filter((property) => property.key.name === 'install'); - - return !!match; -}; - -/** - * 1 判断是否组件&插件包 - * 2 判断是组件还是插件 - * 3 组件插件分开写入 comp-entry.ts - * @param {*} ast - * @param {String} indexPath - * @return {Object} { type: '', imports: [] } 返回传入组件的类型。如果是组件包，imports 中包含所有子组件的入口文件路径 - */ -const typeAssertion = function ({ ast, indexPath }) { - const result = { - type: '', - imports: [], - }; - const { importDeclarations, variableDeclarations, exportDefaultName, exportDefaultNode } = - getAssertionTokenByTraverse(ast); - - if (exportDefaultName) { - importDeclarations.every((node) => { - const [specifier] = node.specifiers; - - // 从 import 语句中找到 export default 的变量，认为是组件 - if (n.ImportDefaultSpecifier.check(specifier) && specifier.local.name === exportDefaultName) { - result.type = typeComponent; - return false; - } - - return true; - }); - - if (result.type) return result; - - variableDeclarations.every((node) => { - const [variable] = node.declarations; - - // 从声明变量语句中找到 export default 的变量，认为是组件包 - if ( - n.Identifier.check(variable.id) && - variable.id.name === exportDefaultName && - n.ObjectExpression.check(variable.init) - ) { - if (isPlugin(variable.init.properties)) { - result.type = typePlugin; - return false; - } - - // 从组件包声明中找到对应子组件入口文件 - getComponentPackageImports({ result, properties: variable.init.properties, indexPath, importDeclarations }); - } - - return true; - }); - } - - if (exportDefaultNode) { - if (isPlugin(exportDefaultNode.properties)) { - result.type = typePlugin; - } else { - getComponentPackageImports({ result, properties: variable.init.properties, indexPath, importDeclarations }); - } - } - - return result; -}; - -const getAssertionTokenByTraverse = (ast) => { - const importDeclarations = []; - const variableDeclarations = []; - let exportDefaultName = ''; - let exportDefaultNode = undefined; - - types.visit(ast, { - visitImportDeclaration(p) { - importDeclarations.push(p.node); - this.traverse(p); - }, - visitVariableDeclaration(p) { - variableDeclarations.push(p.node); - this.traverse(p); - }, - visitExportDefaultDeclaration(p) { - const { node } = p; - const { declaration } = node; - - // 导出的是变量名 - if (n.Identifier.check(declaration)) { - exportDefaultName = declaration.name; - } - - // 导出的是对象的字面量 - if (n.ObjectExpression.check(declaration)) { - exportDefaultNode = declaration; - } - - this.traverse(p); - }, - }); - - return { - importDeclarations, - variableDeclarations, - exportDefaultName, - exportDefaultNode, - }; -}; - -const start = function ({ type, componentFileAffix, units, workingDir }) { - cwd = workingDir; - const entries = []; - - Object.keys(units).forEach((componentType) => { - const package = units[componentType]; - - installPackage(package); - - const indexPath = require.resolve(package); - const indexCode = fs.readFileSync(indexPath, { encoding: 'utf-8', flag: 'r' }); - const ast = parse(indexCode, { parser: require('recast/parsers/typescript') }); - const result = typeAssertion({ ast, indexPath }); - - if (result.type === typeComponent) { - // 组件 - const entry = parseEntry({ ast, package, indexPath }); - entries.push({ type: componentType, entry }); - } else if (result.type === typePlugin) { - // 插件 - pluginList[componentType] = package; - } else if (result.type === typeComponentPackage) { - // 组件&插件包 - result.imports.forEach((i) => { - const affixReg = new RegExp(`${componentFileAffix}$`); - if (affixReg.test(i.indexPath)) { - entries.push({ type: i.type, entry: { component: i.indexPath } }); - return; - } - const indexCode = fs.readFileSync(i.indexPath, { encoding: 'utf-8', flag: 'r' }); - const ast = parse(indexCode); - if (typeAssertion({ ast, indexPath }).type === typePlugin) { - // 插件 - pluginList[i.type] = i.indexPath; - } else { - // 组件 - const entry = parseEntry({ ast, package: `${package} | ${i.name}`, indexPath: i.indexPath }); - entries.push({ type: i.type, entry }); - } - }); - } - }); - - generateEntry({ entries, type, componentFileAffix }); -}; - -module.exports = start; diff --git a/runtime/vue2/.env.admin b/runtime/vue2/.env.admin deleted file mode 100644 index db8e871a..00000000 --- a/runtime/vue2/.env.admin +++ /dev/null @@ -1,2 +0,0 @@ -BASE=/runtime -OUT_DIR=admin-dist diff --git a/runtime/vue2/.gitignore b/runtime/vue2/.gitignore index 3ca491ff..7ff2a31b 100644 --- a/runtime/vue2/.gitignore +++ b/runtime/vue2/.gitignore @@ -1,5 +1,3 @@ -comp-entry.ts -config-entry.ts -value-entry.ts -event-entry.ts +.tmagic admin-dist +entry-dist diff --git a/runtime/vue2/build.vite.config.ts b/runtime/vue2/build.vite.config.ts new file mode 100644 index 00000000..9e95f562 --- /dev/null +++ b/runtime/vue2/build.vite.config.ts @@ -0,0 +1,76 @@ +/* + * Tencent is pleased to support the open source community by making TMagicEditor available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import path from 'path'; + +import { defineConfig } from 'vite'; +import legacy from '@vitejs/plugin-legacy'; +import vue from '@vitejs/plugin-vue2'; +// @ts-ignore +import externalGlobals from 'rollup-plugin-external-globals'; + +export default defineConfig(({ mode }) => { + if (['value', 'config', 'event'].includes(mode)) { + const capitalToken = mode.charAt(0).toUpperCase() + mode.slice(1); + return { + build: { + cssCodeSplit: false, + sourcemap: true, + minify: false, + target: 'esnext', + outDir: `entry-dist/${mode}-entry`, + + lib: { + entry: `.tmagic/${mode}-entry.ts`, + name: `magicPreset${capitalToken}s`, + fileName: 'index', + formats: ['umd'], + }, + }, + }; + } + + if (['page', 'playground', 'page:admin', 'playground:admin'].includes(mode)) { + const [type, isAdmin] = mode.split(':'); + const base = isAdmin ? `/runtime/${type}/` : `/tmagic-editor/playground/runtime/vue2/${type}`; + const outDir = isAdmin + ? path.resolve(process.cwd(), `./admin-dist/${type}`) + : path.resolve(process.cwd(), `./dist/${type}`); + return { + plugins: [ + vue(), + legacy({ + targets: ['defaults', 'not IE 11'], + }), + externalGlobals({ vue: 'Vue' }, { exclude: [`./${type}/index.html`] }), + ], + + root: `./${type}/`, + + base, + + build: { + emptyOutDir: true, + sourcemap: true, + outDir, + }, + }; + } + + return {}; +}); diff --git a/runtime/vue2/dev.vite.config.ts b/runtime/vue2/dev.vite.config.ts new file mode 100644 index 00000000..0a214b58 --- /dev/null +++ b/runtime/vue2/dev.vite.config.ts @@ -0,0 +1,62 @@ +/* + * Tencent is pleased to support the open source community by making TMagicEditor available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import path from 'path'; + +import { defineConfig } from 'vite'; +import vue from '@vitejs/plugin-vue2'; + +export default defineConfig({ + plugins: [vue()], + + resolve: { + alias: [ + { find: /^vue$/, replacement: path.join(__dirname, 'node_modules/vue/dist/vue.esm.js') }, + { find: /^@tmagic\/utils/, replacement: path.join(__dirname, '../../packages/utils/src/index.ts') }, + { find: /^@tmagic\/core/, replacement: path.join(__dirname, '../../packages/core/src/index.ts') }, + { find: /^@tmagic\/schema/, replacement: path.join(__dirname, '../../packages/schema/src/index.ts') }, + ], + }, + + root: './', + + base: '/tmagic-editor/playground/runtime/vue2/', + + publicDir: 'entry-dist', + + server: { + host: '0.0.0.0', + port: 8078, + }, + + build: { + sourcemap: true, + + cssCodeSplit: false, + + rollupOptions: { + input: { + page: './page/index.html', + playground: './playground/index.html', + }, + output: { + entryFileNames: 'assets/[name].js', + }, + }, + }, +}); diff --git a/runtime/vue2/package.json b/runtime/vue2/package.json index 544265f1..92baec66 100644 --- a/runtime/vue2/package.json +++ b/runtime/vue2/package.json @@ -3,17 +3,27 @@ "version": "1.1.0-beta.5", "private": true, "scripts": { - "dev:vue2": "npm run entry && npm run build:lib & npm run dev:html", - "build": "npm run entry && vite build", - "build:admin": "npm run entry && vite build --mode admin", - "serve": "vite preview", - "entry": "node scripts/build.js", - "build:lib": "vite build --mode lib", - "dev:html": "vite --port 8078" + "dev:vue2": "npm run build:libs && vite --config dev.vite.config.ts", + "build": "npm run build:libs && npm run build:page && npm run build:playground", + "build:admin": "npm run build:libs && npm run build:page:admin && npm run build:playground:admin", + "build:page": "vite build --config build.vite.config.ts --mode page", + "build:playground": "vite build --config build.vite.config.ts --mode playground", + "build:page:admin": "vite build --config build.vite.config.ts --mode page:admin", + "build:playground:admin": "vite build --config build.vite.config.ts --mode playground:admin", + "build:libs": "tmagic entry && npm run build:config & npm run build:value & npm run build:event", + "build:config": "vite build --config build.vite.config.ts --mode config", + "build:value": "vite build --config build.vite.config.ts --mode value", + "build:event": "vite build --config build.vite.config.ts --mode event" }, "dependencies": { + "@tmagic/cli": "workspace:*", + "@tmagic/core": "1.1.0-beta.5", + "@tmagic/ui-vue2": "1.1.0-beta.5", "@tmagic/schema": "1.1.0-beta.5", "@tmagic/stage": "1.1.0-beta.5", + "@tmagic/utils": "1.1.0-beta.5", + "axios": "^0.25.0", + "terser": "^5.14.2", "vue": "^2.7.4" }, "devDependencies": { @@ -24,6 +34,7 @@ "rollup-plugin-external-globals": "^0.6.1", "sass": "^1.35.1", "vite": "^3.0.4", + "@vitejs/plugin-legacy": "^2.0.0", "@vitejs/plugin-vue2": "^1.1.2", "vue-template-compiler": "^2.7.4" } diff --git a/runtime/vue2/page.html b/runtime/vue2/page.html deleted file mode 100644 index d7bb827a..00000000 --- a/runtime/vue2/page.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Vue2 Page - - - -
- - - diff --git a/runtime/vue2/src/page/App.vue b/runtime/vue2/page/App.vue similarity index 67% rename from runtime/vue2/src/page/App.vue rename to runtime/vue2/page/App.vue index 012714e2..fc418847 100644 --- a/runtime/vue2/src/page/App.vue +++ b/runtime/vue2/page/App.vue @@ -20,22 +20,3 @@ export default defineComponent({ }, }); - - diff --git a/runtime/vue2/page/index.html b/runtime/vue2/page/index.html new file mode 100644 index 00000000..d84e3ebe --- /dev/null +++ b/runtime/vue2/page/index.html @@ -0,0 +1,31 @@ + + + + + + Vue2 Page + + + + +
+ + + diff --git a/runtime/vue2/src/page/main.ts b/runtime/vue2/page/main.ts similarity index 80% rename from runtime/vue2/src/page/main.ts rename to runtime/vue2/page/main.ts index 8c35aa59..ebdf0fd5 100644 --- a/runtime/vue2/src/page/main.ts +++ b/runtime/vue2/page/main.ts @@ -21,11 +21,12 @@ import Vue from 'vue'; import Core from '@tmagic/core'; import { getUrlParam } from '@tmagic/utils'; -import entry from '../comp-entry'; -import { getLocalConfig } from '../utils'; -import request from '../utils/request'; +import components from '../.tmagic/comp-entry'; +import plugins from '../.tmagic/plugin-entry'; +import request from './utils/request'; import AppComponent from './App.vue'; +import { getLocalConfig } from './utils'; Vue.use(request); @@ -34,13 +35,13 @@ const app = new Core({ curPage: getUrlParam('page'), }); -Object.keys(entry.components).forEach((type: string) => { - const component = entry.components[type]; +Object.keys(components).forEach((type: string) => { + const component = components[type]; Vue.component(component.name, component); app.registerComponent(type, component); }); -Object.values(entry.plugins).forEach((plugin: any) => { +Object.values(plugins).forEach((plugin: any) => { Vue.use(plugin); }); diff --git a/runtime/vue2/src/shims-vue.d.ts b/runtime/vue2/page/shims-vue.d.ts similarity index 100% rename from runtime/vue2/src/shims-vue.d.ts rename to runtime/vue2/page/shims-vue.d.ts diff --git a/runtime/vue2/src/utils/index.ts b/runtime/vue2/page/utils/index.ts similarity index 100% rename from runtime/vue2/src/utils/index.ts rename to runtime/vue2/page/utils/index.ts diff --git a/runtime/vue2/src/utils/request.ts b/runtime/vue2/page/utils/request.ts similarity index 100% rename from runtime/vue2/src/utils/request.ts rename to runtime/vue2/page/utils/request.ts diff --git a/runtime/vue2/playground.html b/runtime/vue2/playground.html deleted file mode 100644 index 118cada7..00000000 --- a/runtime/vue2/playground.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Vue2 Playground - - - - -
- - - - - - \ No newline at end of file diff --git a/runtime/vue2/src/playground/App.vue b/runtime/vue2/playground/App.vue similarity index 100% rename from runtime/vue2/src/playground/App.vue rename to runtime/vue2/playground/App.vue diff --git a/runtime/vue2/playground/index.html b/runtime/vue2/playground/index.html new file mode 100644 index 00000000..6cf1313a --- /dev/null +++ b/runtime/vue2/playground/index.html @@ -0,0 +1,48 @@ + + + + + + + Vue2 Playground + + + + +
+ + + + + + \ No newline at end of file diff --git a/runtime/vue2/src/playground/main.ts b/runtime/vue2/playground/main.ts similarity index 79% rename from runtime/vue2/src/playground/main.ts rename to runtime/vue2/playground/main.ts index 3647046e..c593c550 100644 --- a/runtime/vue2/src/playground/main.ts +++ b/runtime/vue2/playground/main.ts @@ -20,14 +20,12 @@ import Vue from 'vue'; import App from './App.vue'; -import('../comp-entry').then(() => { - const { components, plugins } = window.magicPresetComponents; - - Object.values(components).forEach((component: any) => { +Promise.all([import('../.tmagic/comp-entry'), import('../.tmagic/plugin-entry')]).then(([components, plugins]) => { + Object.values(components.default).forEach((component: any) => { Vue.component(component.name, component); }); - Object.values(plugins).forEach((plugin: any) => { + Object.values(plugins.default).forEach((plugin: any) => { Vue.use(plugin); }); diff --git a/runtime/vue2/playground/shims-vue.d.ts b/runtime/vue2/playground/shims-vue.d.ts new file mode 100644 index 00000000..30030494 --- /dev/null +++ b/runtime/vue2/playground/shims-vue.d.ts @@ -0,0 +1,6 @@ +declare module '*.vue' { + import { DefineComponent } from 'vue'; + + const component: DefineComponent<{}, {}, any>; + export default component; +} diff --git a/runtime/vue2/scripts/build.js b/runtime/vue2/scripts/build.js deleted file mode 100644 index fef3efc0..00000000 --- a/runtime/vue2/scripts/build.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const generateEntry = require('../../scripts/generateEntry'); -const units = require('./units'); - -generateEntry({ type: 'build', componentFileAffix: '.vue', units, workingDir: __dirname }); diff --git a/runtime/vue2/scripts/dev.js b/runtime/vue2/scripts/dev.js deleted file mode 100644 index a112736b..00000000 --- a/runtime/vue2/scripts/dev.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const generateEntry = require('../../scripts/generateEntry'); -const units = require('./units'); - -generateEntry({ type: 'dev', componentFileAffix: '.vue', units, workingDir: __dirname }); diff --git a/runtime/vue2/scripts/units.js b/runtime/vue2/scripts/units.js deleted file mode 100644 index f424b924..00000000 --- a/runtime/vue2/scripts/units.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const path = require('path'); - -const units = { - ui: path.join(__dirname, '../../../packages/ui-vue2/src/index.ts'), -}; - -module.exports = units; diff --git a/runtime/vue2/src/index.d.ts b/runtime/vue2/src/index.d.ts deleted file mode 100644 index 726d4cee..00000000 --- a/runtime/vue2/src/index.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import type { MApp } from '@tmagic/schema'; - -declare global { - interface Window { - magicDSL: MApp[]; - magicPresetComponents: any; - magicPresetConfigs: any; - magicPresetValues: any; - } -} diff --git a/runtime/vue2/src/vite-env.d.ts b/runtime/vue2/src/vite-env.d.ts deleted file mode 100644 index 11f02fe2..00000000 --- a/runtime/vue2/src/vite-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/runtime/vue2/tmagic.config.ts b/runtime/vue2/tmagic.config.ts new file mode 100644 index 00000000..c1701203 --- /dev/null +++ b/runtime/vue2/tmagic.config.ts @@ -0,0 +1,8 @@ +import path from 'path'; + +import { defineConfig } from '@tmagic/cli'; + +export default defineConfig({ + packages: [path.join(__dirname, '../../packages/ui-vue2')], + componentFileAffix: '.vue', +}); diff --git a/runtime/vue2/vite.config.ts b/runtime/vue2/vite.config.ts deleted file mode 100644 index b700f77e..00000000 --- a/runtime/vue2/vite.config.ts +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making TMagicEditor available. - * - * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import path from 'path'; - -import { defineConfig, loadEnv } from 'vite'; -import vue from '@vitejs/plugin-vue2'; -// @ts-ignore -import externalGlobals from 'rollup-plugin-external-globals'; - -export default defineConfig(({ command, mode }) => { - const { WATCH_INCLUDE = '', BASE, OUT_DIR } = loadEnv(mode, process.cwd(), ''); - const libInput = { - config: './src/config-entry.ts', - value: './src/value-entry.ts', - event: './src/event-entry.ts', - }; - - const htmlInput = { - page: './page.html', - playground: './playground.html', - }; - - const devInput = mode === 'lib' ? libInput : htmlInput; - - const buildConfig = { - outDir: OUT_DIR || 'dist', - - sourcemap: true, - - cssCodeSplit: false, - - rollupOptions: { - input: - command === 'build' && mode !== 'lib' - ? { - ...htmlInput, - ...libInput, - } - : devInput, - output: { - entryFileNames: 'assets/[name].js', - }, - }, - }; - - if (mode === 'lib') { - return { - build: { - ...buildConfig, - watch: { - include: WATCH_INCLUDE.split(','), - }, - }, - }; - } - - return { - base: BASE || '/tmagic-editor/playground/runtime/vue2', - - plugins: [vue(), externalGlobals({ vue: 'Vue' }, { exclude: ['page.html', 'playground.html'] })], - - resolve: { - alias: [ - { find: /^vue$/, replacement: path.join(__dirname, 'node_modules/vue/dist/vue.esm.js') }, - { find: /^@tmagic\/ui-vue2/, replacement: path.join(__dirname, '../../packages/ui-vue2/src/index.ts') }, - { find: /^@tmagic\/utils/, replacement: path.join(__dirname, '../../packages/utils/src/index.ts') }, - { find: /^@tmagic\/core/, replacement: path.join(__dirname, '../../packages/core/src/index.ts') }, - { find: /^@tmagic\/schema/, replacement: path.join(__dirname, '../../packages/schema/src/index.ts') }, - ], - }, - - publicDir: command === 'serve' ? 'dist' : 'public', - - server: { - host: '0.0.0.0', - }, - - build: buildConfig, - }; -}); diff --git a/runtime/vue3/package.json b/runtime/vue3/package.json index edbd32ec..68661c6b 100644 --- a/runtime/vue3/package.json +++ b/runtime/vue3/package.json @@ -4,8 +4,8 @@ "private": true, "scripts": { "dev": "npm run build:libs && vite --config dev.vite.config.ts", - "build": "npm run build:libs & npm run build:page && npm run build:playground", - "build:admin": "npm run build:libs & npm run build:page:admin && npm run build:playground:admin", + "build": "npm run build:libs && npm run build:page && npm run build:playground", + "build:admin": "npm run build:libs && npm run build:page:admin && npm run build:playground:admin", "build:page": "vite build --config build.vite.config.ts --mode page", "build:playground": "vite build --config build.vite.config.ts --mode playground", "build:page:admin": "vite build --config build.vite.config.ts --mode page:admin",