From f0c3b1f2e55f099757816cacd595a1eaa8b3b2fc Mon Sep 17 00:00:00 2001 From: JackLian Date: Thu, 22 Dec 2022 16:13:57 +0800 Subject: [PATCH] chore: merge from develop --- docs/docs/faq/faq011.md | 3 +++ docs/package.json | 2 +- .../src/components/settings/main.ts | 2 +- packages/engine/build.plugin.js | 19 ++++++++++++++++++ packages/engine/src/engine-core.ts | 2 +- packages/ignitor/build.plugin.js | 20 +++++++++++++++++++ packages/rax-renderer/src/renderer/block.tsx | 3 +-- .../rax-renderer/src/renderer/component.tsx | 1 - .../rax-simulator-renderer/build.plugin.js | 19 ++++++++++++++++++ .../react-simulator-renderer/build.plugin.js | 19 ++++++++++++++++++ packages/workspace/src/base-context.ts | 2 +- 11 files changed, 85 insertions(+), 7 deletions(-) diff --git a/docs/docs/faq/faq011.md b/docs/docs/faq/faq011.md index 3c6bf1d2d..f61d9830f 100644 --- a/docs/docs/faq/faq011.md +++ b/docs/docs/faq/faq011.md @@ -5,6 +5,7 @@ tags: [FAQ] --- ## 简单场景 可以利用 props.__designMode + ![image.png](https://img.alicdn.com/imgextra/i3/O1CN01btr66024FOEldBOr2_!!6000000007361-2-tps-1616-440.png) 设计态中，__designMode 值为 "design" @@ -13,10 +14,12 @@ tags: [FAQ] ## 复杂场景 在资产包里定义 editUrls + ![image.png](https://img.alicdn.com/imgextra/i1/O1CN01odal6P27Rhjn8NoJ6_!!6000000007794-2-tps-1590-538.png) ### editUrls 在 lowcode/xx/ 下新建一个 view.tsx + ![image.png](https://img.alicdn.com/imgextra/i3/O1CN01q0Bbn91Lrig7d0alA_!!6000000001353-2-tps-598-154.png) 再执行 diff --git a/docs/package.json b/docs/package.json index d28f9e7cf..b5a6669fe 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-engine-docs", - "version": "1.0.9", + "version": "1.0.10", "description": "低代码引擎版本化文档", "license": "MIT", "files": [ diff --git a/packages/editor-skeleton/src/components/settings/main.ts b/packages/editor-skeleton/src/components/settings/main.ts index 64b0dbef0..6cc672c90 100644 --- a/packages/editor-skeleton/src/components/settings/main.ts +++ b/packages/editor-skeleton/src/components/settings/main.ts @@ -13,7 +13,7 @@ export class SettingsMain { private _sessionId = ''; - @obx.ref private _settings?: SettingTopEntry | null = null; + @obx.ref private _settings?: SettingTopEntry; @computed get length(): number | undefined { return this._settings?.nodes.length; diff --git a/packages/engine/build.plugin.js b/packages/engine/build.plugin.js index 5c4ab7bfb..cb0368d88 100644 --- a/packages/engine/build.plugin.js +++ b/packages/engine/build.plugin.js @@ -25,6 +25,25 @@ const releaseVersion = getVersion(); module.exports = ({ context, onGetWebpackConfig }) => { onGetWebpackConfig((config) => { + ['jsx', 'tsx'].forEach((rule) => { + config.module + .rule(rule) + .exclude.clear() + .add(/node_modules(?!(.+_component_demo|.+build-plugin-component))/) + .end() + .use('babel-loader') + .tap((options) => { + const { plugins = [] } = options; + console.log('plugins', plugins); + return { + ...options, + plugins: [ + ...plugins, + ['@babel/plugin-proposal-class-properties', { loose: true }], + ], + }; + }); + }); config.resolve .plugin('tsconfigpaths') .use(TsconfigPathsPlugin, [{ diff --git a/packages/engine/src/engine-core.ts b/packages/engine/src/engine-core.ts index 9913caa39..2d51e8cb7 100644 --- a/packages/engine/src/engine-core.ts +++ b/packages/engine/src/engine-core.ts @@ -172,7 +172,7 @@ export async function init( // 注册一批内置插件 await plugins.register(OutlinePlugin); await plugins.register(componentMetaParser(designer)); - await plugins.register(setterRegistry); + await plugins.register(setterRegistry, {}, { autoInit: true }); await plugins.register(defaultPanelRegistry(editor, designer)); await plugins.register(builtinHotkey); diff --git a/packages/ignitor/build.plugin.js b/packages/ignitor/build.plugin.js index ffa1d4957..308432796 100644 --- a/packages/ignitor/build.plugin.js +++ b/packages/ignitor/build.plugin.js @@ -6,6 +6,26 @@ const { version } = lernaConfig; module.exports = ({ context, onGetWebpackConfig }) => { onGetWebpackConfig((config) => { + ['jsx', 'tsx'].forEach((rule) => { + config.module + .rule(rule) + .exclude.clear() + .add(/node_modules(?!(.+_component_demo|.+build-plugin-component))/) + .end() + .use('babel-loader') + .tap((options) => { + const { plugins = [] } = options; + console.log('plugins', plugins); + return { + ...options, + plugins: [ + ...plugins, + ['@babel/plugin-proposal-class-properties', { loose: true }], + ], + }; + }); + }); + config.resolve.plugin('tsconfigpaths').use(TsconfigPathsPlugin, [ { configFile: './tsconfig.json', diff --git a/packages/rax-renderer/src/renderer/block.tsx b/packages/rax-renderer/src/renderer/block.tsx index b7e075ea5..8fa4a2731 100644 --- a/packages/rax-renderer/src/renderer/block.tsx +++ b/packages/rax-renderer/src/renderer/block.tsx @@ -22,5 +22,4 @@ const raxBlockRendererFactory: () => any = () => { } }; }; - -export default raxBlockRendererFactory; \ No newline at end of file +export default raxBlockRendererFactory; diff --git a/packages/rax-renderer/src/renderer/component.tsx b/packages/rax-renderer/src/renderer/component.tsx index 99575e1d5..9943b3c2f 100644 --- a/packages/rax-renderer/src/renderer/component.tsx +++ b/packages/rax-renderer/src/renderer/component.tsx @@ -34,5 +34,4 @@ const raxComponentRendererFactory: () => any = () => { } }; }; - export default raxComponentRendererFactory; diff --git a/packages/rax-simulator-renderer/build.plugin.js b/packages/rax-simulator-renderer/build.plugin.js index d613f1f56..1c8604e63 100644 --- a/packages/rax-simulator-renderer/build.plugin.js +++ b/packages/rax-simulator-renderer/build.plugin.js @@ -1,5 +1,24 @@ module.exports = ({ onGetWebpackConfig }) => { onGetWebpackConfig((config) => { + ['jsx', 'tsx'].forEach((rule) => { + config.module + .rule(rule) + .exclude.clear() + .add(/node_modules(?!(.+_component_demo|.+build-plugin-component))/) + .end() + .use('babel-loader') + .tap((options) => { + const { plugins = [] } = options; + console.log('plugins', plugins); + return { + ...options, + plugins: [ + ...plugins, + ['@babel/plugin-proposal-class-properties', { loose: true }], + ], + }; + }); + }); config.performance.hints(false); }); }; diff --git a/packages/react-simulator-renderer/build.plugin.js b/packages/react-simulator-renderer/build.plugin.js index d613f1f56..1c8604e63 100644 --- a/packages/react-simulator-renderer/build.plugin.js +++ b/packages/react-simulator-renderer/build.plugin.js @@ -1,5 +1,24 @@ module.exports = ({ onGetWebpackConfig }) => { onGetWebpackConfig((config) => { + ['jsx', 'tsx'].forEach((rule) => { + config.module + .rule(rule) + .exclude.clear() + .add(/node_modules(?!(.+_component_demo|.+build-plugin-component))/) + .end() + .use('babel-loader') + .tap((options) => { + const { plugins = [] } = options; + console.log('plugins', plugins); + return { + ...options, + plugins: [ + ...plugins, + ['@babel/plugin-proposal-class-properties', { loose: true }], + ], + }; + }); + }); config.performance.hints(false); }); }; diff --git a/packages/workspace/src/base-context.ts b/packages/workspace/src/base-context.ts index 12151b5c1..daf97f35e 100644 --- a/packages/workspace/src/base-context.ts +++ b/packages/workspace/src/base-context.ts @@ -133,7 +133,7 @@ export class BasicContext { // 注册一批内置插件 this.registerInnerPlugins = async function registerPlugins() { await plugins.register(componentMetaParser(designer)); - await plugins.register(setterRegistry); + await plugins.register(setterRegistry, {}, { autoInit: true }); await plugins.register(defaultPanelRegistry(editor, designer)); await plugins.register(builtinHotkey); };