From 8df5f050d7350a39c214c7012ba574e5a48f80b3 Mon Sep 17 00:00:00 2001 From: "mark.ck" Date: Sat, 7 Nov 2020 19:15:22 +0800 Subject: [PATCH 1/6] fix: typo of onResizeEnd and remove --- .gitignore | 1 + .../src/builtin-simulator/bem-tools/border-resizing.tsx | 2 +- packages/types/src/metadata.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2073a217c..82aab7a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ typings/ # codealike codealike.json +.node diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx index 118f0de63..c24934f42 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx @@ -178,7 +178,7 @@ export class BoxResizingInstance extends Component<{ typeof metaData.experimental.callbacks.onResizeEnd === 'function' ) { e.trigger = direction; - metaData.experimental.callbacks.onResizeStart(e, node); + metaData.experimental.callbacks.onResizeEnd(e, node); } const editor = globalContext.get(Editor); diff --git a/packages/types/src/metadata.ts b/packages/types/src/metadata.ts index d43495fe9..39d250135 100644 --- a/packages/types/src/metadata.ts +++ b/packages/types/src/metadata.ts @@ -30,7 +30,7 @@ export interface ComponentConfigure { nestingRule?: NestingRule; rootSelector?: string; - // copy,move,delete | * + // copy, move, remove | * disableBehaviors?: string[] | string; actions?: ComponentAction[]; } From a59ab462c4672d4ac8db85c1c5068bd7ecd1d2b0 Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Tue, 10 Nov 2020 19:59:02 +0800 Subject: [PATCH 2/6] v1.0.20-alpha.1 --- packages/datasource-engine/package.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/datasource-engine/package.json b/packages/datasource-engine/package.json index 9c3d3e08a..fd033e8b0 100644 --- a/packages/datasource-engine/package.json +++ b/packages/datasource-engine/package.json @@ -1,23 +1,22 @@ { "name": "@ali/lowcode-datasource-engine", - "version": "1.0.19", + "version": "1.0.20-alpha.1", "description": "DataSource Engine for lowcode", "main": "lib/index.js", "module": "es/index.js", - "typings": "dist/index.d.ts", "files": [ - "dist", "src", - "interpret*", - "runtime*", - "lib" + "lib", + "es" ], "scripts": { - "build": "rm -rf dist && tsc --outDir ./dist --module esnext", + "clean": "rm -rf es lib", + "build": "npm run clean && tsc && tsc --outDir ./lib --module commonjs ", "test": "ava", "prepublishOnly": "npm run build" }, "dependencies": { + "@ali/lowcode-datasource-types": "^1.0.1", "@ali/lowcode-types": "^1.0.17", "typescript": "^3.9.7" }, From bf7b7d1a38e25f22dfd278c141156a9e059328b4 Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Tue, 10 Nov 2020 20:48:37 +0800 Subject: [PATCH 3/6] feat: update datasource engine --- packages/datasource-engine/interpret.js | 2 +- packages/datasource-engine/package.json | 12 ++++++------ packages/datasource-engine/tsconfig.json | 6 +++--- .../.eslintignore | 0 .../.eslintrc.js | 0 .../.prettierrc.js | 0 .../CHANGELOG.md | 0 .../package.json | 0 .../src/data-source-handlers.ts | 0 .../src/data-source-interpret.ts | 0 .../src/data-source-runtime.ts | 0 .../src/data-source.ts | 0 .../src/index.ts | 0 .../src/value-type.ts | 0 .../tsconfig.json | 0 15 files changed, 10 insertions(+), 10 deletions(-) rename packages/{types-datasource => datasource-types}/.eslintignore (100%) rename packages/{types-datasource => datasource-types}/.eslintrc.js (100%) rename packages/{types-datasource => datasource-types}/.prettierrc.js (100%) rename packages/{types-datasource => datasource-types}/CHANGELOG.md (100%) rename packages/{types-datasource => datasource-types}/package.json (100%) rename packages/{types-datasource => datasource-types}/src/data-source-handlers.ts (100%) rename packages/{types-datasource => datasource-types}/src/data-source-interpret.ts (100%) rename packages/{types-datasource => datasource-types}/src/data-source-runtime.ts (100%) rename packages/{types-datasource => datasource-types}/src/data-source.ts (100%) rename packages/{types-datasource => datasource-types}/src/index.ts (100%) rename packages/{types-datasource => datasource-types}/src/value-type.ts (100%) rename packages/{types-datasource => datasource-types}/tsconfig.json (100%) diff --git a/packages/datasource-engine/interpret.js b/packages/datasource-engine/interpret.js index 42c42028e..2cc45ddc7 100644 --- a/packages/datasource-engine/interpret.js +++ b/packages/datasource-engine/interpret.js @@ -1 +1 @@ -module.exports = require('./dist/interpret'); +module.exports = require('./dist/interpret/index'); diff --git a/packages/datasource-engine/package.json b/packages/datasource-engine/package.json index fd033e8b0..ea93e8ed3 100644 --- a/packages/datasource-engine/package.json +++ b/packages/datasource-engine/package.json @@ -2,16 +2,16 @@ "name": "@ali/lowcode-datasource-engine", "version": "1.0.20-alpha.1", "description": "DataSource Engine for lowcode", - "main": "lib/index.js", - "module": "es/index.js", + "main": "dist/index.js", "files": [ + "dist", "src", - "lib", - "es" + "interpret*", + "runtime*" ], "scripts": { - "clean": "rm -rf es lib", - "build": "npm run clean && tsc && tsc --outDir ./lib --module commonjs ", + "clean": "rm -rf dist", + "build": "npm run clean && tsc ", "test": "ava", "prepublishOnly": "npm run build" }, diff --git a/packages/datasource-engine/tsconfig.json b/packages/datasource-engine/tsconfig.json index 4c30ce1c8..ef698791a 100644 --- a/packages/datasource-engine/tsconfig.json +++ b/packages/datasource-engine/tsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { /* Basic Options */ // "incremental": true, /* Enable incremental compilation */ - "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, - "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, - // "lib": [], /* Specify library files to be included in the compilation. */ + "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, + "module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, + "lib": ["ESNext", "DOM"] /* Specify library files to be included in the compilation. */, // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ "jsx": "preserve" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */, diff --git a/packages/types-datasource/.eslintignore b/packages/datasource-types/.eslintignore similarity index 100% rename from packages/types-datasource/.eslintignore rename to packages/datasource-types/.eslintignore diff --git a/packages/types-datasource/.eslintrc.js b/packages/datasource-types/.eslintrc.js similarity index 100% rename from packages/types-datasource/.eslintrc.js rename to packages/datasource-types/.eslintrc.js diff --git a/packages/types-datasource/.prettierrc.js b/packages/datasource-types/.prettierrc.js similarity index 100% rename from packages/types-datasource/.prettierrc.js rename to packages/datasource-types/.prettierrc.js diff --git a/packages/types-datasource/CHANGELOG.md b/packages/datasource-types/CHANGELOG.md similarity index 100% rename from packages/types-datasource/CHANGELOG.md rename to packages/datasource-types/CHANGELOG.md diff --git a/packages/types-datasource/package.json b/packages/datasource-types/package.json similarity index 100% rename from packages/types-datasource/package.json rename to packages/datasource-types/package.json diff --git a/packages/types-datasource/src/data-source-handlers.ts b/packages/datasource-types/src/data-source-handlers.ts similarity index 100% rename from packages/types-datasource/src/data-source-handlers.ts rename to packages/datasource-types/src/data-source-handlers.ts diff --git a/packages/types-datasource/src/data-source-interpret.ts b/packages/datasource-types/src/data-source-interpret.ts similarity index 100% rename from packages/types-datasource/src/data-source-interpret.ts rename to packages/datasource-types/src/data-source-interpret.ts diff --git a/packages/types-datasource/src/data-source-runtime.ts b/packages/datasource-types/src/data-source-runtime.ts similarity index 100% rename from packages/types-datasource/src/data-source-runtime.ts rename to packages/datasource-types/src/data-source-runtime.ts diff --git a/packages/types-datasource/src/data-source.ts b/packages/datasource-types/src/data-source.ts similarity index 100% rename from packages/types-datasource/src/data-source.ts rename to packages/datasource-types/src/data-source.ts diff --git a/packages/types-datasource/src/index.ts b/packages/datasource-types/src/index.ts similarity index 100% rename from packages/types-datasource/src/index.ts rename to packages/datasource-types/src/index.ts diff --git a/packages/types-datasource/src/value-type.ts b/packages/datasource-types/src/value-type.ts similarity index 100% rename from packages/types-datasource/src/value-type.ts rename to packages/datasource-types/src/value-type.ts diff --git a/packages/types-datasource/tsconfig.json b/packages/datasource-types/tsconfig.json similarity index 100% rename from packages/types-datasource/tsconfig.json rename to packages/datasource-types/tsconfig.json From 63785959668c313a15be9bea4911d7c3dc2053b2 Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Tue, 10 Nov 2020 21:00:03 +0800 Subject: [PATCH 4/6] fix: add package json typings --- packages/datasource-engine/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/datasource-engine/package.json b/packages/datasource-engine/package.json index ea93e8ed3..5d26af3b9 100644 --- a/packages/datasource-engine/package.json +++ b/packages/datasource-engine/package.json @@ -3,6 +3,7 @@ "version": "1.0.20-alpha.1", "description": "DataSource Engine for lowcode", "main": "dist/index.js", + "typings": "dist/index.d.ts", "files": [ "dist", "src", From 6d8b0297cf33995039980c9922c615c51f012025 Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Tue, 10 Nov 2020 21:00:39 +0800 Subject: [PATCH 5/6] v1.0.20-alpha.2 --- package.json | 3 ++- packages/datasource-engine/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3ca7e714d..25458fc6a 100644 --- a/package.json +++ b/package.json @@ -47,5 +47,6 @@ "tnpm": { "mode": "yarn", "lockfile": "enable" - } + }, + "version": "0.0.0" } diff --git a/packages/datasource-engine/package.json b/packages/datasource-engine/package.json index 5d26af3b9..e93f834ad 100644 --- a/packages/datasource-engine/package.json +++ b/packages/datasource-engine/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-datasource-engine", - "version": "1.0.20-alpha.1", + "version": "1.0.20-alpha.2", "description": "DataSource Engine for lowcode", "main": "dist/index.js", "typings": "dist/index.d.ts", From 8170523b1eec697dfb08eb58758d69e14a4e0eb3 Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Tue, 10 Nov 2020 21:02:11 +0800 Subject: [PATCH 6/6] fix: package json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 25458fc6a..3ca7e714d 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,5 @@ "tnpm": { "mode": "yarn", "lockfile": "enable" - }, - "version": "0.0.0" + } }