Skip to content

Commit

Permalink
fix/build issues (#538)
Browse files Browse the repository at this point in the history
* fix: fix some build issue

1. fix cycle dependency between utils and entry
2. change vite-plusin-generate-comments to
   tiny-engine-vite-plugin-meta-comments
3. delete duplicate dependency inside design-core

* fix: change directory desc
  • Loading branch information
chilingling authored Jun 4, 2024
1 parent e8c4ba1 commit efd411c
Show file tree
Hide file tree
Showing 103 changed files with 104 additions and 109 deletions.
2 changes: 1 addition & 1 deletion designer-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"@vitejs/plugin-vue": "^5.0.4",
"vite": "^5.2.7",
"@opentiny/tiny-engine-cli": "workspace:^",
"@opentiny/vite-plugin-generate-comments": "workspace:^"
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:^"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@opentiny/vite-plugin-generate-comments",
"name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
"version": "1.0.0",
"description": "",
"type": "module",
Expand All @@ -22,6 +22,18 @@
"@vue/compiler-sfc": "^3.4.21"
},
"keywords": [],
"author": "",
"license": "ISC"
"publishConfig": {
"access": "public"
},
"repository": {
"type": "git",
"url": "https://github.com/opentiny/tiny-engine",
"directory": "packages/build/vite-plugin-meta-comments"
},
"bugs": {
"url": "https://github.com/opentiny/tiny-engine/issues"
},
"author": "OpenTiny Team",
"license": "MIT",
"homepage": "https://opentiny.design/tiny-engine"
}
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/canvas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@vueuse/core": "^9.6.0"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"rollup-plugin-terser": "^7.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import { terser } from 'rollup-plugin-terser'
import generateComments from '@opentiny/vite-plugin-generate-comments'
import generateComments from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"vue-draggable-next": "2.1.0"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/common/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComments from '@opentiny/vite-plugin-generate-comments'
import generateComments from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"prettier": "2.7.1"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"glob": "^10.3.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/controller/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import { glob } from 'glob'
import { fileURLToPath } from 'node:url'
import generateComments from '@opentiny/vite-plugin-generate-comments'
import generateComments from '@opentiny/tiny-engine-vite-plugin-meta-comments'

const jsEntries = glob.sync('./js/**/*.js').map((file) => {
return [file.slice(0, file.length - path.extname(file).length), fileURLToPath(new URL(file, import.meta.url))]
Expand Down
4 changes: 1 addition & 3 deletions packages/design-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@babel/parser": "~7.23.2",
"@babel/traverse": "~7.23.2",
"@opentiny/tiny-engine-layout": "workspace:~",
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@opentiny/tiny-engine-entry": "workspace:*",
"@opentiny/tiny-engine-canvas": "workspace:*",
"@opentiny/tiny-engine-common": "workspace:*",
Expand Down Expand Up @@ -110,11 +110,9 @@
"vue-i18n": "^9.9.0"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@babel/eslint-parser": "^7.21.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
"@opentiny/tiny-engine-i18n-host": "workspace:*",
"@types/node": "^18.0.0",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/design-core/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
import { importmapPlugin } from './scripts/externalDeps.js'
import visualizerCjs from 'rollup-plugin-visualizer'
import { fileURLToPath } from 'node:url'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'
import {
getBaseUrlFromCli,
copyBundleDeps,
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-cli/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"@vitejs/plugin-vue": "^5.0.4",
"vite": "^5.2.7",
"@opentiny/tiny-engine-cli": "workspace:^",
"@opentiny/vite-plugin-generate-comments": "workspace:^"
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:^"
}
}
2 changes: 1 addition & 1 deletion packages/http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"axios-mock-adapter": "^1.21.5"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/http/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"vue": "3.2.45"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^5.0.4",
"less": "^4.2.0",
"vite": "^5.1.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/block/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"pinyin-pro": "^3.13.0"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/block/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-http": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/bridge/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"monaco-editor": "0.33.0"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/data/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/help/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@opentiny/tiny-engine-http": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/help/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"vue-clipboard3": "^2.0.0"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/i18n/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/materials/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-http": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/materials/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-utils": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/page/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/robot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-http": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/robot/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-http": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/schema/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/script/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-utils": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/script/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/tree/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@opentiny/tiny-engine-utils": "workspace:*"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/tree/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"marked": "^4.0.17"
},
"devDependencies": {
"@opentiny/vite-plugin-generate-comments": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"vite": "^4.3.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/tutorial/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import generateComment from '@opentiny/vite-plugin-generate-comments'
import generateComment from '@opentiny/tiny-engine-vite-plugin-meta-comments'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down
Loading

0 comments on commit efd411c

Please sign in to comment.