Skip to content

Commit 31a031c

Browse files
liujupingJackLian
liujuping
authored and
JackLian
committed
feat: removed Rax packages, discontinuing support for Rax
1 parent ba53d6c commit 31a031c

68 files changed

Lines changed: 36 additions & 2851 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/docs/guide/appendix/npms.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ sidebar_position: 3
1212
| @alilc/lowcode-engine | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/engine |
1313
| @alilc/lowcode-plugin-designer | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/plugin-designer |
1414
| @alilc/lowcode-plugin-outline-pane | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/plugin-outline-pane |
15-
| @alilc/lowcode-rax-renderer | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/rax-renderer |
16-
| @alilc/lowcode-rax-simulator-renderer | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/rax-simulator-renderer |
1715
| @alilc/lowcode-react-renderer | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/react-renderer |
1816
| @alilc/lowcode-react-simulator-renderer | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/react-simulator-renderer |
1917
| @alilc/lowcode-renderer-core | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | packages/renderer-core |

‎docs/docs/guide/appendix/repos.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ sidebar_position: 2
1515
5. ignitor
1616
6. plugin-designer
1717
7. plugin-outline-pane
18-
8. rax-renderer
19-
9. rax-simulator-renderer
20-
10. react-renderer
21-
11. react-simulator-renderer
22-
12. renderer-core
23-
13. types
24-
14. utils
25-
15. material-parser
26-
16. code-generator
18+
8. react-renderer
19+
9. react-simulator-renderer
20+
10. renderer-core
21+
11. types
22+
12. utils
23+
13. material-parser
24+
14. code-generator
2725

2826
## 2. 引擎官方扩展包
2927
包含了常用的设置器（setter）、跟 setter 绑定的插件等

‎docs/docs/guide/design/renderer.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ sidebar_position: 4
1111
## npm 包与仓库信息
1212

1313
- React 框架渲染 npm 包：@alilc/lowcode-react-renderer
14-
- Rax 框架渲染 npm 包：@alilc/lowcode-rax-renderer
1514
- 仓库：[https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) 下的
1615
- packages/renderer-core
1716
- packages/react-renderer

‎docs/docs/guide/expand/runtime/renderer.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ ReactDOM.render((
4040
), document.getElementById('root'));
4141
```
4242

43-
- rax-renderer：npm 包替换为 @alilc/lowcode-rax-renderer
4443
####
4544
### 项目使用示例
4645
> [设计器 demo](https://lowcode-engine.cn/demo/demo-general/index.html)

‎docs/docs/participate/index.md‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,7 @@ npm install && npm run setup
4747
[
4848
"https?://uipaas-assets.com/prod/npm/@alilc/lowcode-engine/(.*)/dist/css/react-simulator-renderer.css",
4949
"http://localhost:5555/css/ReactSimulatorRenderer.css"
50-
],
51-
[
52-
"https?://uipaas-assets.com/prod/npm/@alilc/lowcode-engine/(.*)/dist/js/rax-simulator-renderer.js",
53-
"http://localhost:5555/js/RaxSimulatorRenderer.js"
54-
],
55-
[
56-
"https?://uipaas-assets.com/prod/npm/@alilc/lowcode-engine/(.*)/dist/css/rax-simulator-renderer.css",
57-
"http://localhost:5555/css/RaxSimulatorRenderer.css"
58-
],
50+
]
5951
]
6052
}
6153
```

‎docs/docs/specs/lowcode-spec.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@ try {
499499
- 说明：组件即将从 DOM 中移除
500500
- componentDidCatch(error, info)
501501
- 说明：组件捕获到异常
502-
- Rax：目前没有使用生命周期，使用 hooks 替代生命周期；
503502

504503
该对象由一系列 key-value 组成，key 为生命周期方法名，value 为 JSFunction 的描述，详见下方示例：
505504

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"yarn": "^1.22.17",
5353
"rimraf": "^3.0.2",
5454
"@types/react-router": "5.1.18",
55-
"@alilc/build-plugin-lce": "^0.0.3",
55+
"@alilc/build-plugin-lce": "^0.0.4",
5656
"babel-jest": "^26.5.2",
5757
"@alilc/lowcode-test-mate": "^1.0.1"
5858
},

‎packages/designer/src/builtin-simulator/host.ts‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import {
3939
isDragAnyObject,
4040
isDragNodeObject,
4141
isLocationData,
42+
Logger,
4243
} from '@alilc/lowcode-utils';
4344
import {
4445
isShaken,
@@ -72,6 +73,8 @@ import { IScroller } from '../designer/scroller';
7273
import { isElementNode, isDOMNodeVisible } from '../utils/misc';
7374
import { debounce } from 'lodash';
7475

76+
const logger = new Logger({ level: 'warn', bizName: 'designer' });
77+
7578
export type LibraryItem = IPublicTypePackage & {
7679
package: string;
7780
library: string;
@@ -122,21 +125,6 @@ const defaultSimulatorUrl = (() => {
122125
return urls;
123126
})();
124127

125-
const defaultRaxSimulatorUrl = (() => {
126-
const publicPath = getPublicPath();
127-
let urls;
128-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
129-
const [_, prefix = '', dev] = /^(.+?)(\/js)?\/?$/.exec(publicPath) || [];
130-
if (dev) {
131-
urls = [`${prefix}/css/rax-simulator-renderer.css`, `${prefix}/js/rax-simulator-renderer.js`];
132-
} else if (process.env.NODE_ENV === 'production') {
133-
urls = [`${prefix}/rax-simulator-renderer.css`, `${prefix}/rax-simulator-renderer.js`];
134-
} else {
135-
urls = [`${prefix}/rax-simulator-renderer.css`, `${prefix}/rax-simulator-renderer.js`];
136-
}
137-
return urls;
138-
})();
139-
140128
const defaultEnvironment = [
141129
// https://g.alicdn.com/mylib/??react/16.11.0/umd/react.production.min.js,react-dom/16.8.6/umd/react-dom.production.min.js,prop-types/15.7.2/prop-types.min.js
142130
assetItem(
@@ -151,17 +139,6 @@ const defaultEnvironment = [
151139
),
152140
];
153141

154-
const defaultRaxEnvironment = [
155-
assetItem(
156-
AssetType.JSText,
157-
'window.Rax=parent.Rax;window.React=parent.React;window.ReactDOM=parent.ReactDOM;window.VisualEngineUtils=parent.VisualEngineUtils;window.VisualEngine=parent.VisualEngine',
158-
),
159-
assetItem(
160-
AssetType.JSText,
161-
'window.PropTypes=parent.PropTypes;React.PropTypes=parent.PropTypes; window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;',
162-
),
163-
];
164-
165142
export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProps> {
166143
readonly isSimulator = true;
167144

@@ -467,11 +444,15 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
467444

468445
const libraryAsset: AssetList = this.buildLibrary();
469446

447+
if (this.renderEnv === 'rax') {
448+
logger.error('After LowcodeEngine v1.3.0, Rax is no longer supported.');
449+
}
450+
470451
const vendors = [
471452
// required & use once
472453
assetBundle(
473454
this.get('environment') ||
474-
(this.renderEnv === 'rax' ? defaultRaxEnvironment : defaultEnvironment),
455+
defaultEnvironment,
475456
AssetLevel.Environment,
476457
),
477458
// required & use once
@@ -484,7 +465,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
484465
// required & use once
485466
assetBundle(
486467
this.get('simulatorUrl') ||
487-
(this.renderEnv === 'rax' ? defaultRaxSimulatorUrl : defaultSimulatorUrl),
468+
defaultSimulatorUrl,
488469
AssetLevel.Runtime,
489470
),
490471
];

‎packages/designer/src/designer/setting/setting-top-entry.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { IPublicTypeCustomView, IPublicModelEditor, IPublicModelSettingTopEntry } from '@alilc/lowcode-types';
1+
import { IPublicTypeCustomView, IPublicModelEditor, IPublicModelSettingTopEntry, IPublicApiSetters } from '@alilc/lowcode-types';
22
import { isCustomView } from '@alilc/lowcode-utils';
33
import { computed, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
44
import { ISettingEntry } from './setting-entry-type';
55
import { ISettingField, SettingField } from './setting-field';
66
import { INode } from '../../document';
77
import type { IComponentMeta } from '../../component-meta';
88
import { IDesigner } from '../designer';
9-
import { Setters } from '@alilc/lowcode-shell';
109

1110
function generateSessionId(nodes: INode[]) {
1211
return nodes
@@ -19,18 +18,18 @@ export interface ISettingTopEntry extends ISettingEntry, IPublicModelSettingTopE
1918
INode,
2019
ISettingField
2120
> {
22-
purge(): void;
23-
24-
items: Array<ISettingField | IPublicTypeCustomView>;
25-
2621
readonly top: ISettingTopEntry;
2722

2823
readonly parent: ISettingTopEntry;
2924

3025
readonly path: never[];
3126

27+
items: Array<ISettingField | IPublicTypeCustomView>;
28+
3229
componentMeta: IComponentMeta | null;
3330

31+
purge(): void;
32+
3433
getExtraPropValue(propName: string): void;
3534

3635
setExtraPropValue(propName: string, value: any): void;
@@ -92,7 +91,7 @@ export class SettingTopEntry implements ISettingTopEntry {
9291

9392
readonly designer: IDesigner | undefined;
9493

95-
readonly setters: Setters;
94+
readonly setters: IPublicApiSetters;
9695

9796
disposeFunctions: any[] = [];
9897

@@ -103,7 +102,7 @@ export class SettingTopEntry implements ISettingTopEntry {
103102
this.id = generateSessionId(nodes);
104103
this.first = nodes[0];
105104
this.designer = this.first.document?.designer;
106-
this.setters = editor.get('setters') as Setters;
105+
this.setters = editor.get('setters') as IPublicApiSetters;
107106

108107
// setups
109108
this.setupComponentMeta();

‎packages/editor-core/src/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const VALID_ENGINE_OPTIONS = {
4444
},
4545
renderEnv: {
4646
type: 'string',
47-
enum: ['react', 'rax', 'any string value'],
47+
enum: ['react', 'any string value'],
4848
default: 'react',
4949
description: '渲染器类型',
5050
},

0 commit comments

Comments
 (0)