From 4ccfa46dea790de58e5924179e22d7a49b438d1c Mon Sep 17 00:00:00 2001 From: kangwei Date: Mon, 30 Mar 2020 17:09:19 +0800 Subject: [PATCH] chore: cloud build test 17 --- .gitignore | 1 + README.md | 3 ++- deploy-space/html/index.html | 6 ++--- deploy-space/html/preview.html | 5 ++-- deploy-space/package.json | 9 ++++--- deploy-space/tsconfig.json | 2 ++ package.json | 7 ++---- packages/demo/package.json | 3 ++- packages/globals/package.json | 24 +++++++++---------- .../plugin-event-bind-dialog/package.json | 2 +- scripts/addowner.sh | 1 + scripts/deploy.sh | 8 +++---- scripts/setup.sh | 3 ++- 13 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 scripts/addowner.sh diff --git a/.gitignore b/.gitignore index 72b3f8225..d919991a0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ packages/*/dist/ package-lock.json yarn.lock deploy-space/packages +deploy-space/.env # IDE diff --git a/README.md b/README.md index 7b563a190..3007afc49 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,12 @@ #### 跑起来： - `npm run setup` +- `npm start` #### 开发提交： - `git add ` -- `npm run commit` +- `npm run commit` # 在根目录 ## 发布 diff --git a/deploy-space/html/index.html b/deploy-space/html/index.html index b3eeefd68..450c984b7 100644 --- a/deploy-space/html/index.html +++ b/deploy-space/html/index.html @@ -4,7 +4,7 @@ - LowCodeEngine DEMO + LowCodeEngine Editor DEMO @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + diff --git a/deploy-space/html/preview.html b/deploy-space/html/preview.html index c8f2cfdcb..5da2c42ba 100644 --- a/deploy-space/html/preview.html +++ b/deploy-space/html/preview.html @@ -4,7 +4,7 @@ - LowCodeEngine DEMO + LowCodeEngine Preview DEMO @@ -13,9 +13,10 @@ + -
+ diff --git a/deploy-space/package.json b/deploy-space/package.json index 661c105a7..37698f1dc 100644 --- a/deploy-space/package.json +++ b/deploy-space/package.json @@ -1,9 +1,5 @@ { "private": true, - "dependencies": { - "tslib": "^1.9.3", - "typescript": "^3.2.2" - }, "workspaces": { "packages": [ "packages/*" @@ -13,5 +9,8 @@ "**/@alife/theme-lowcode-*" ] }, - "engines" : { "node" : "^10" } + "dependencies": { + "tslib": "^1.11.1", + "typescript": "^3.8.3" + } } diff --git a/deploy-space/tsconfig.json b/deploy-space/tsconfig.json index 8a7d7ca15..005c63fad 100644 --- a/deploy-space/tsconfig.json +++ b/deploy-space/tsconfig.json @@ -6,6 +6,8 @@ "target": "esnext", // Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. "module": "esnext", + // Search under node_modules for non-relative imports. + "moduleResolution": "node", // Process & infer types from .js files. "allowJs": true, // Report errors in .js files. diff --git a/package.json b/package.json index 8b8d1a51b..62438b2ea 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ ] }, "scripts": { - "build": "lerna run build", + "build": "lerna run build --stream", "clean": "rm -rf ./packages/*/lib ./packages/*/es ./packages/*/dist ./packages/*/build", "commit": "git-cz", "pub": "lerna publish", "setup": "./scripts/setup.sh", "start": "./scripts/start.sh", - "test": "lerna run test", + "test": "lerna run test --stream", "test:snapshot": "lerna run test:snapshot" }, "lint-staged": { @@ -45,8 +45,5 @@ "ts-node": "^7.0.1", "tslib": "^1.9.3", "typescript": "^3.2.2" - }, - "engines": { - "node": "^10" } } diff --git a/packages/demo/package.json b/packages/demo/package.json index 0b5e31cb8..da204da97 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -18,7 +18,8 @@ "@ali/lowcode-plugin-zh-en": "^0.8.0", "@ali/lowcode-plugin-sample-logo": "^0.8.0", "@ali/lowcode-plugin-sample-preview": "^0.8.0", - "@ali/lowcode-runtime": "^0.8.0", + "@ali/lowcode-plugin-event-bind-dialog": "^0.8.0", + "@ali/lowcode-runtime": "^0.0.3", "@ali/lowcode-react-renderer": "^0.8.0", "@alife/theme-lowcode-dark": "^0.1.0", "@alife/theme-lowcode-light": "^0.1.0", diff --git a/packages/globals/package.json b/packages/globals/package.json index ee79abf6c..22877a235 100644 --- a/packages/globals/package.json +++ b/packages/globals/package.json @@ -2,6 +2,7 @@ "name": "@ali/lowcode-globals", "version": "0.8.0", "description": "Globals api for Ali lowCode engine", + "license": "MIT", "main": "lib/index.js", "module": "es/index.js", "files": [ @@ -14,6 +15,16 @@ "test": "ava", "test:snapshot": "ava --update-snapshots" }, + "ava": { + "compileEnhancements": false, + "extensions": [ + "ts" + ], + "require": [ + "ts-node/register" + ], + "snapshotDir": "test/fixtures/__snapshots__" + }, "dependencies": { "@alifd/next": "^1.19.16", "@recore/obx": "^1.0.8", @@ -23,26 +34,15 @@ "react-dom": "^16.7.0" }, "devDependencies": { + "@alib/build-scripts": "^0.1.18", "@types/classnames": "^2.2.7", "@types/node": "^13.7.1", "@types/react": "^16", "@types/react-dom": "^16", - "@alib/build-scripts": "^0.1.18", "build-plugin-component": "^0.2.11", "build-plugin-fusion": "^0.1.0", "build-plugin-moment-locales": "^0.1.0" }, - "ava": { - "compileEnhancements": false, - "snapshotDir": "test/fixtures/__snapshots__", - "extensions": [ - "ts" - ], - "require": [ - "ts-node/register" - ] - }, - "license": "MIT", "publishConfig": { "registry": "https://registry.npm.alibaba-inc.com" } diff --git a/packages/plugin-event-bind-dialog/package.json b/packages/plugin-event-bind-dialog/package.json index 104196740..e8eba3d64 100644 --- a/packages/plugin-event-bind-dialog/package.json +++ b/packages/plugin-event-bind-dialog/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-event-bind-dialog", - "version": "0.8.0", + "version": "0.8.1", "description": "alibaba lowcode editor event bind dialog plugin", "files": [ "es", diff --git a/scripts/addowner.sh b/scripts/addowner.sh new file mode 100644 index 000000000..4d9440604 --- /dev/null +++ b/scripts/addowner.sh @@ -0,0 +1 @@ +todo \ No newline at end of file diff --git a/scripts/deploy.sh b/scripts/deploy.sh index a10109817..94eae5349 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -7,9 +7,9 @@ echo "Deploy ${PWD} -> ${BUILD_DEST} ..." cd deploy-space # basic environment preparing -tnpm install yarn lerna --install-node=10 -mv node_modules env -export PATH=$WORK_DIR/deploy-space/env/.bin:$PATH +tnpm install @ali/tyarn lerna --install-node=10 +mv node_modules .env +export PATH=$WORK_DIR/deploy-space/.env/.bin:$PATH echo "" echo "Use node version:" @@ -17,7 +17,7 @@ node -v echo "" # set source -yarn config set registry https://registry.npm.alibaba-inc.com +# yarn config set registry https://registry.npm.alibaba-inc.com # work mkdir packages diff --git a/scripts/setup.sh b/scripts/setup.sh index e012d9b8d..7aced60d2 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash +tnpm i -g lerna @ali/tyarn + rm -rf node_modules package-lock.json yarn.lock lerna clean -y find ./packages -type f -name "package-lock.json" -exec rm -f {} \; -yarn install --registry=http://registry.npm.alibaba-inc.com lerna bootstrap