diff --git a/packages/controller/js/canvas.js b/packages/controller/js/canvas.js index 67cc0ad7b..c73f81c94 100644 --- a/packages/controller/js/canvas.js +++ b/packages/controller/js/canvas.js @@ -11,7 +11,8 @@ */ import { PAGE_STATUS } from './constants' -import { useEditorInfo, useResource } from '@opentiny/tiny-engine-controller' +import useEditorInfo from '../src/useEditorInfo' +import useResource from '../src/useResource' export const getCanvasStatus = (data) => { // 写死ID 待删除 diff --git a/packages/controller/js/completion.js b/packages/controller/js/completion.js index 3705232a9..ddd113870 100644 --- a/packages/controller/js/completion.js +++ b/packages/controller/js/completion.js @@ -10,7 +10,8 @@ * */ -import { useCanvas, useResource } from '@opentiny/tiny-engine-controller' +import useCanvas from '../src/useCanvas' +import useResource from '../src/useResource' const keyWords = [ 'state', diff --git a/packages/controller/js/css.js b/packages/controller/js/css.js index 689e6893f..e00ea3b00 100644 --- a/packages/controller/js/css.js +++ b/packages/controller/js/css.js @@ -11,7 +11,7 @@ */ import * as cssTree from 'css-tree' -import { hyphenate } from '@opentiny/tiny-engine-controller/utils' +import { hyphenate } from '../utils' /** * 传入 css 字符串,得到以选择器为 Key,css 规则为 value 的 object diff --git a/packages/controller/js/http.js b/packages/controller/js/http.js index 66e0d4b8a..cef979b3b 100644 --- a/packages/controller/js/http.js +++ b/packages/controller/js/http.js @@ -11,7 +11,9 @@ */ import { useHttp } from '@opentiny/tiny-engine-http' -import { usePage, useCanvas, useNotify } from '@opentiny/tiny-engine-controller' +import usePage from '../src/usePage' +import useCanvas from '../src/useCanvas' +import useNotify from '../src/useNotify' import { isVsCodeEnv } from './environments' import { generateRouter, generatePage } from './vscodeGenerateFile' diff --git a/packages/controller/js/preview.js b/packages/controller/js/preview.js index 08d52273a..12840569f 100644 --- a/packages/controller/js/preview.js +++ b/packages/controller/js/preview.js @@ -12,7 +12,7 @@ import { constants } from '@opentiny/tiny-engine-utils' import { isDevelopEnv } from './environments' -import { useResource } from '@opentiny/tiny-engine-controller' +import useResource from '../src/useResource' // prefer old unicode hacks for backward compatibility const { COMPONENT_NAME } = constants diff --git a/packages/controller/package.json b/packages/controller/package.json index 464117f11..bce89efaf 100644 --- a/packages/controller/package.json +++ b/packages/controller/package.json @@ -15,7 +15,7 @@ ], "exports": { ".": "./dist/index.js", - "./js/*": "./js/*.js", + "./js/": "./js/", "./utils": "./dist/utils.js", "./adapter": "./dist/adapter.js" }, @@ -42,7 +42,8 @@ "@opentiny/vue-locale": "~3.10.0", "@opentiny/vue-renderless": "~3.10.0", "@vue/shared": "^3.3.4", - "css-tree": "^2.3.1" + "css-tree": "^2.3.1", + "prettier": "2.7.1" }, "devDependencies": { "@vitejs/plugin-vue": "^4.2.3", diff --git a/packages/controller/src/useBlock.js b/packages/controller/src/useBlock.js index 3a0ccaa6c..0aaaf71bb 100644 --- a/packages/controller/src/useBlock.js +++ b/packages/controller/src/useBlock.js @@ -15,10 +15,10 @@ import { hyphenate } from '@vue/shared' import { extend, copyArray } from '@opentiny/vue-renderless/common/object' import { format } from '@opentiny/vue-renderless/common/date' import { remove } from '@opentiny/vue-renderless/common/array' -import { getCanvasStatus } from '@opentiny/tiny-engine-controller/js/canvas' -import { ast2String, parseExpression } from '@opentiny/tiny-engine-controller/js/ast' -import { getCssObjectFromStyleStr } from '@opentiny/tiny-engine-controller/js/css' import { constants } from '@opentiny/tiny-engine-utils' +import { getCanvasStatus } from '../js/canvas' +import { ast2String, parseExpression } from '../js/ast' +import { getCssObjectFromStyleStr } from '../js/css' import useCanvas from './useCanvas' import useTranslate from './useTranslate' import useEditorInfo from './useEditorInfo' diff --git a/packages/controller/src/useResource.js b/packages/controller/src/useResource.js index 89fd3c92d..e8e462ad9 100644 --- a/packages/controller/src/useResource.js +++ b/packages/controller/src/useResource.js @@ -14,8 +14,8 @@ import { reactive } from 'vue' import { getGlobalConfig } from './globalConfig' import { useHttp } from '@opentiny/tiny-engine-http' import { utils, constants } from '@opentiny/tiny-engine-utils' -import { getCanvasStatus } from '@opentiny/tiny-engine-controller/js/canvas' import { meta as BuiltinComponentMaterials } from '@opentiny/tiny-engine-builtin-component' +import { getCanvasStatus } from '../js/canvas' import useApp from './useApp' import useCanvas from './useCanvas' import useTranslate from './useTranslate' diff --git a/packages/controller/src/useSaveLocal.js b/packages/controller/src/useSaveLocal.js index 43d5f7ba9..7bbc5fbb0 100644 --- a/packages/controller/src/useSaveLocal.js +++ b/packages/controller/src/useSaveLocal.js @@ -11,7 +11,7 @@ */ import { Modal } from '@opentiny/vue' -import { VITE_ORIGIN } from '@opentiny/tiny-engine-controller/js/environments' +import { VITE_ORIGIN } from '../js/environments' import useCanvas from './useCanvas' import { getGlobalConfig } from './globalConfig' diff --git a/packages/controller/src/useTranslate.js b/packages/controller/src/useTranslate.js index 3ffcb2de0..3df0e9442 100644 --- a/packages/controller/src/useTranslate.js +++ b/packages/controller/src/useTranslate.js @@ -13,11 +13,12 @@ import { reactive, ref } from 'vue' import { useHttp } from '@opentiny/tiny-engine-http' import { utils } from '@opentiny/tiny-engine-utils' -import { isVsCodeEnv } from '@opentiny/tiny-engine-controller/js/environments' +import { isVsCodeEnv } from '../js/environments' import { constants } from '@opentiny/tiny-engine-utils' -import { generateI18n } from '@opentiny/tiny-engine-controller/js/vscodeGenerateFile' +import { generateI18n } from '../js/vscodeGenerateFile' import useResource from './useResource' import { PROP_DATA_TYPE } from '../utils' +import useCanvas from './useCanvas' const { HOST_TYPE } = constants const state = reactive({ diff --git a/packages/controller/vite.config.js b/packages/controller/vite.config.js index 511a0efe6..bd77aefff 100644 --- a/packages/controller/vite.config.js +++ b/packages/controller/vite.config.js @@ -20,6 +20,9 @@ export default defineConfig({ plugins: [vue(), vueJsx()], publicDir: false, resolve: {}, + define: { + 'process.env': {} + }, build: { cssCodeSplit: false, lib: {