From f2c7f462da26b5169a58b60c59d12727622a8cfc Mon Sep 17 00:00:00 2001 From: kangwei Date: Mon, 30 Mar 2020 20:55:39 +0800 Subject: [PATCH] merge --- packages/designer/package.json | 4 ---- packages/editor-skeleton/package.json | 4 ---- packages/plugin-components-pane/package.json | 4 ---- packages/plugin-event-bind-dialog/package.json | 4 ---- packages/plugin-outline-pane/package.json | 4 ---- packages/plugin-sample-logo/package.json | 4 ---- packages/plugin-sample-preview/package.json | 5 ----- packages/plugin-sample-save/package.json | 4 ---- packages/plugin-settings-pane/package.json | 4 ---- packages/plugin-undo-redo/package.json | 5 ----- packages/setters/package.json | 4 ---- 11 files changed, 46 deletions(-) diff --git a/packages/designer/package.json b/packages/designer/package.json index 49ad7d2d9..b034835dd 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-designer", -<<<<<<< HEAD "version": "0.8.4", -======= - "version": "0.8.2", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index 7f9c28ab5..8b07d8209 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-editor-skeleton", -<<<<<<< HEAD "version": "0.8.4", -======= - "version": "0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json index 4da3f27e7..e59b704dd 100644 --- a/packages/plugin-components-pane/package.json +++ b/packages/plugin-components-pane/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-plugin-components-pane", -<<<<<<< HEAD "version": "0.8.3", -======= - "version": "0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "alibaba lowcode editor component-list plugin", "files": [ "es/", diff --git a/packages/plugin-event-bind-dialog/package.json b/packages/plugin-event-bind-dialog/package.json index d96f6c201..030fc73f9 100644 --- a/packages/plugin-event-bind-dialog/package.json +++ b/packages/plugin-event-bind-dialog/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-plugin-event-bind-dialog", -<<<<<<< HEAD "version": "0.8.4", -======= - "version": "0.8.2", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "alibaba lowcode editor event bind dialog plugin", "files": [ "es", diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 59f876fce..383fa2684 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-plugin-outline-pane", -<<<<<<< HEAD "version": "0.8.4", -======= - "version": "0.8.2", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "Outline pane for Ali lowCode engine", "files": [ "es", diff --git a/packages/plugin-sample-logo/package.json b/packages/plugin-sample-logo/package.json index 014ff41e6..95cfc81a9 100644 --- a/packages/plugin-sample-logo/package.json +++ b/packages/plugin-sample-logo/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-logo", -<<<<<<< HEAD "version": "0.8.3", -======= - "version": "0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "alibaba lowcode editor logo plugin", "files": [ "es/", diff --git a/packages/plugin-sample-preview/package.json b/packages/plugin-sample-preview/package.json index 92a06bdf8..76f20af2b 100644 --- a/packages/plugin-sample-preview/package.json +++ b/packages/plugin-sample-preview/package.json @@ -18,13 +18,8 @@ "editor" ], "dependencies": { -<<<<<<< HEAD "@ali/lowcode-designer": "^0.8.4", "@ali/lowcode-editor-core": "^0.8.4", -======= - "@ali/lowcode-designer": "^0.8.2", - "@ali/lowcode-editor-core": "^0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "@alifd/next": "^1.x", "react": "^16.8.1" }, diff --git a/packages/plugin-sample-save/package.json b/packages/plugin-sample-save/package.json index 7409068f2..e42b30c16 100644 --- a/packages/plugin-sample-save/package.json +++ b/packages/plugin-sample-save/package.json @@ -19,11 +19,7 @@ ], "author": "xiayang.xy", "dependencies": { -<<<<<<< HEAD "@ali/lowcode-editor-core": "^0.8.4", -======= - "@ali/lowcode-editor-core": "^0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "@alifd/next": "^1.x", "react": "^16.8.1" }, diff --git a/packages/plugin-settings-pane/package.json b/packages/plugin-settings-pane/package.json index 1b75ea001..e9ab40f04 100644 --- a/packages/plugin-settings-pane/package.json +++ b/packages/plugin-settings-pane/package.json @@ -1,10 +1,6 @@ { "name": "@ali/lowcode-plugin-settings-pane", -<<<<<<< HEAD "version": "0.8.5", -======= - "version": "0.8.3", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "description": "Settings pane for Ali lowCode engine", "files": [ "es", diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json index 889cf8b5e..d2483a5a7 100644 --- a/packages/plugin-undo-redo/package.json +++ b/packages/plugin-undo-redo/package.json @@ -19,13 +19,8 @@ ], "author": "xiayang.xy", "dependencies": { -<<<<<<< HEAD "@ali/lowcode-editor-core": "^0.8.4", "@ali/lowcode-editor-skeleton": "^0.8.4", -======= - "@ali/lowcode-editor-core": "^0.8.1", - "@ali/lowcode-editor-skeleton": "^0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/setters/package.json b/packages/setters/package.json index ff4bd707f..b4fc0a077 100644 --- a/packages/setters/package.json +++ b/packages/setters/package.json @@ -22,11 +22,7 @@ "@ali/iceluna-comp-react-node": "^1.0.5", "@ali/iceluna-sdk": "^1.0.5-beta.24", "@ali/lc-style-setter": "^0.0.1", -<<<<<<< HEAD "@ali/lowcode-globals": "^0.8.3", -======= - "@ali/lowcode-globals": "^0.8.1", ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc "@alifd/next": "^1.19.16", "acorn": "^6.4.1", "classnames": "^2.2.6",