From 0c1ba98756a124a8bb2b808cc353f4e7debe4867 Mon Sep 17 00:00:00 2001 From: "liuxiong.lx" Date: Wed, 18 Nov 2020 15:35:10 +0800 Subject: [PATCH 1/7] fix: eslint scripts --- packages/template-rax-api/package.json | 2 +- .../template-rax-api/template/component/package.json.ejs | 4 ++-- packages/template-rax-js/package.json | 2 +- packages/template-rax-js/template/component/package.json.ejs | 4 ++-- packages/template-rax-miniapp-plugin/package.json | 2 +- .../template/component/package.json.ejs | 4 ++-- packages/template-rax/package.json | 2 +- packages/template-rax/template/component/package.json.ejs | 4 ++-- packages/template-rax/template/scaffold/package.json.ejs | 4 ++-- packages/template-react-deep/package.json | 2 +- .../template-react-deep/template/component/package.json.ejs | 5 +++-- packages/template-react-ts/package.json | 2 +- .../template-react-ts/template/component/package.json.ejs | 5 +++-- .../template-react-ts/template/scaffold/package.json.ejs | 5 +++-- packages/template-react/package.json | 2 +- packages/template-react/template/component/package.json.ejs | 4 ++-- packages/template-react/template/scaffold/package.json.ejs | 3 ++- 17 files changed, 30 insertions(+), 26 deletions(-) diff --git a/packages/template-rax-api/package.json b/packages/template-rax-api/package.json index 5a9bcb5..4fcadbf 100644 --- a/packages/template-rax-api/package.json +++ b/packages/template-rax-api/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/template-rax-api", - "version": "0.2.0", + "version": "0.2.1", "description": "Rax API 模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-rax-api/template/component/package.json.ejs b/packages/template-rax-api/template/component/package.json.ejs index 4b91ec6..8977e17 100644 --- a/packages/template-rax-api/template/component/package.json.ejs +++ b/packages/template-rax-api/template/component/package.json.ejs @@ -20,8 +20,8 @@ "scripts": { "start": "build-scripts start", "build": "build-scripts build", - "lint": "eslint --ext .js,.jsx,.ts,.tsx ./", - "lint-fix": "eslint --fix ./src/**/*.*", + "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", + "eslin:fix": "npm run eslint -- --fix", "prepublishOnly": "npm run build" }, "devDependencies": { diff --git a/packages/template-rax-js/package.json b/packages/template-rax-js/package.json index bfc6677..42c720d 100644 --- a/packages/template-rax-js/package.json +++ b/packages/template-rax-js/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/template-rax-js", - "version": "0.2.1", + "version": "0.2.2", "description": "Rax 物料模板(JS)", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-rax-js/template/component/package.json.ejs b/packages/template-rax-js/template/component/package.json.ejs index a2d5cf5..842a958 100644 --- a/packages/template-rax-js/template/component/package.json.ejs +++ b/packages/template-rax-js/template/component/package.json.ejs @@ -25,8 +25,8 @@ "start": "build-scripts start", "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", - "eslint-fix": "npm run eslint -- --fix", - "stylelint": "stylelint ./**/*.css", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'", "lint": "npm run eslint && npm run stylelint", "prepublishOnly": "npm run build" }, diff --git a/packages/template-rax-miniapp-plugin/package.json b/packages/template-rax-miniapp-plugin/package.json index 724a3cc..be4a163 100644 --- a/packages/template-rax-miniapp-plugin/package.json +++ b/packages/template-rax-miniapp-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/template-rax-miniapp-plugin", - "version": "0.2.1", + "version": "0.2.2", "description": "Rax 小程序插件模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-rax-miniapp-plugin/template/component/package.json.ejs b/packages/template-rax-miniapp-plugin/template/component/package.json.ejs index eea943f..fa2479b 100644 --- a/packages/template-rax-miniapp-plugin/template/component/package.json.ejs +++ b/packages/template-rax-miniapp-plugin/template/component/package.json.ejs @@ -21,8 +21,8 @@ "start": "build-scripts start", "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", - "eslint-fix": "npm run eslint -- --fix", - "stylelint": "stylelint ./**/*.css", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'", "lint": "npm run eslint && npm run stylelint", "prepublishOnly": "npm run build" }, diff --git a/packages/template-rax/package.json b/packages/template-rax/package.json index 104f4ad..b910d42 100644 --- a/packages/template-rax/package.json +++ b/packages/template-rax/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/template-rax", - "version": "0.4.2", + "version": "0.4.3", "description": "Rax 物料模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-rax/template/component/package.json.ejs b/packages/template-rax/template/component/package.json.ejs index a23f61f..c93a1be 100644 --- a/packages/template-rax/template/component/package.json.ejs +++ b/packages/template-rax/template/component/package.json.ejs @@ -25,8 +25,8 @@ "start": "build-scripts start", "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", - "eslint-fix": "npm run eslint -- --fix", - "stylelint": "stylelint ./**/*.css", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'", "lint": "npm run eslint && npm run stylelint", "prepublishOnly": "npm run build" }, diff --git a/packages/template-rax/template/scaffold/package.json.ejs b/packages/template-rax/template/scaffold/package.json.ejs index d15c070..be51b90 100644 --- a/packages/template-rax/template/scaffold/package.json.ejs +++ b/packages/template-rax/template/scaffold/package.json.ejs @@ -20,7 +20,8 @@ "start": "rax-app start", "build": "rax-app build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", - "stylelint": "stylelint ./**/*.css", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'", "lint": "npm run eslint && npm run stylelint", "screenshot": "screenshot -l -u /build/web/index.html -s root", "prepublishOnly": "npm run build && npm run screenshot" @@ -37,7 +38,6 @@ "rax-app": "^3.0.0", "@iceworks/spec": "^1.0.0", "@types/rax": "^1.0.0", - "babel-eslint": "^10.0.3", "eslint": "^6.8.0", "stylelint": "^13.7.2" }, diff --git a/packages/template-react-deep/package.json b/packages/template-react-deep/package.json index ceaa57a..e534d12 100755 --- a/packages/template-react-deep/package.json +++ b/packages/template-react-deep/package.json @@ -1,6 +1,6 @@ { "name": "@alifd/deep-template", - "version": "1.3.1", + "version": "1.3.2", "description": "deep 模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-react-deep/template/component/package.json.ejs b/packages/template-react-deep/template/component/package.json.ejs index 01238d4..9aae275 100755 --- a/packages/template-react-deep/template/component/package.json.ejs +++ b/packages/template-react-deep/template/component/package.json.ejs @@ -14,8 +14,9 @@ "start": "build-scripts start", "build": "build-scripts build", "prepublishOnly": "npm run build", - "eslint": "eslint --ext .js,.jsx ./", - "stylelint": "stylelint ./**/*.scss", + "eslint": "eslint --cache --ext .js,.jsx ./", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'" "lint": "npm run eslint && npm run stylelint" }, "license": "MIT", diff --git a/packages/template-react-ts/package.json b/packages/template-react-ts/package.json index 831a80b..5538698 100644 --- a/packages/template-react-ts/package.json +++ b/packages/template-react-ts/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/ice-react-ts-material-template", - "version": "0.6.2", + "version": "0.6.3", "description": "自定义物料源的初始模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-react-ts/template/component/package.json.ejs b/packages/template-react-ts/template/component/package.json.ejs index 060f3b1..689431a 100644 --- a/packages/template-react-ts/template/component/package.json.ejs +++ b/packages/template-react-ts/template/component/package.json.ejs @@ -16,8 +16,9 @@ "build": "build-scripts build", "test": "build-scripts test", "prepublishOnly": "npm run build", - "eslint": "eslint --ext .ts,.tsx ./", - "stylelint": "stylelint ./**/*.scss", + "eslint": "eslint --cache --ext .js,.jsx ./", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'" "lint": "npm run eslint && npm run stylelint" }, "keywords": [ diff --git a/packages/template-react-ts/template/scaffold/package.json.ejs b/packages/template-react-ts/template/scaffold/package.json.ejs index 728a44b..7237788 100644 --- a/packages/template-react-ts/template/scaffold/package.json.ejs +++ b/packages/template-react-ts/template/scaffold/package.json.ejs @@ -26,9 +26,10 @@ "build": "icejs build", "screenshot": "../../node_modules/.bin/screenshot -l", "prepublishOnly": "npm run build && npm run screenshot", - "lint": "npm run eslint && npm run stylelint", "eslint": "eslint --cache --ext .js,.jsx ./", - "stylelint": "stylelint ./**/*.scss" + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'" + "lint": "npm run eslint && npm run stylelint" }, "dependencies": { "@alifd/next": "^1.19.4", diff --git a/packages/template-react/package.json b/packages/template-react/package.json index b392c96..134dbab 100644 --- a/packages/template-react/package.json +++ b/packages/template-react/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/ice-react-material-template", - "version": "0.6.3", + "version": "0.6.4", "description": "自定义物料源的初始模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/template-react/template/component/package.json.ejs b/packages/template-react/template/component/package.json.ejs index ed2708e..5c30325 100644 --- a/packages/template-react/template/component/package.json.ejs +++ b/packages/template-react/template/component/package.json.ejs @@ -17,8 +17,8 @@ "test": "build-scripts test", "prepublishOnly": "npm run build", "eslint": "eslint --cache --ext .js,.jsx ./", - "eslint-fix": "npm run eslint -- --fix", - "stylelint": "stylelint ./**/*.scss", + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'" "lint": "npm run eslint && npm run stylelint" }, "keywords": [ diff --git a/packages/template-react/template/scaffold/package.json.ejs b/packages/template-react/template/scaffold/package.json.ejs index b49eb7b..a194fea 100644 --- a/packages/template-react/template/scaffold/package.json.ejs +++ b/packages/template-react/template/scaffold/package.json.ejs @@ -28,7 +28,8 @@ "prepublishOnly": "npm run build && npm run screenshot", "lint": "npm run eslint && npm run stylelint", "eslint": "eslint --cache --ext .js,.jsx ./", - "stylelint": "stylelint ./**/*.scss" + "eslint:fix": "npm run eslint -- --fix", + "stylelint": "stylelint '**/*.{css,scss,less}'" }, "dependencies": { "@alifd/next": "^1.19.4", From 186b03cb44927712bd84b372cafd5d36a3f0957b Mon Sep 17 00:00:00 2001 From: "liuxiong.lx" Date: Wed, 25 Nov 2020 12:36:43 +0800 Subject: [PATCH 2/7] fix: stylelint cmd --- packages/template-rax-js/template/component/package.json.ejs | 2 +- .../template/component/package.json.ejs | 2 +- packages/template-rax/template/component/package.json.ejs | 2 +- packages/template-rax/template/scaffold/package.json.ejs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/template-rax-js/template/component/package.json.ejs b/packages/template-rax-js/template/component/package.json.ejs index 842a958..6e6c13c 100644 --- a/packages/template-rax-js/template/component/package.json.ejs +++ b/packages/template-rax-js/template/component/package.json.ejs @@ -26,7 +26,7 @@ "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'", + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint", "prepublishOnly": "npm run build" }, diff --git a/packages/template-rax-miniapp-plugin/template/component/package.json.ejs b/packages/template-rax-miniapp-plugin/template/component/package.json.ejs index fa2479b..d8bece0 100644 --- a/packages/template-rax-miniapp-plugin/template/component/package.json.ejs +++ b/packages/template-rax-miniapp-plugin/template/component/package.json.ejs @@ -22,7 +22,7 @@ "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'", + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint", "prepublishOnly": "npm run build" }, diff --git a/packages/template-rax/template/component/package.json.ejs b/packages/template-rax/template/component/package.json.ejs index c93a1be..f018e43 100644 --- a/packages/template-rax/template/component/package.json.ejs +++ b/packages/template-rax/template/component/package.json.ejs @@ -26,7 +26,7 @@ "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'", + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint", "prepublishOnly": "npm run build" }, diff --git a/packages/template-rax/template/scaffold/package.json.ejs b/packages/template-rax/template/scaffold/package.json.ejs index be51b90..27518d2 100644 --- a/packages/template-rax/template/scaffold/package.json.ejs +++ b/packages/template-rax/template/scaffold/package.json.ejs @@ -21,7 +21,7 @@ "build": "rax-app build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'", + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint", "screenshot": "screenshot -l -u /build/web/index.html -s root", "prepublishOnly": "npm run build && npm run screenshot" From e29ce7ea858ebdd9cf6ecc58f0b9585441d56386 Mon Sep 17 00:00:00 2001 From: "liuxiong.lx" Date: Wed, 25 Nov 2020 12:37:18 +0800 Subject: [PATCH 3/7] chore: .history --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f32957e..9b46437 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ coverage/ build .tmp/ npmrc +.history From e519109ce94a8badaea447bb23e979f3b7c6cc6c Mon Sep 17 00:00:00 2001 From: "liuxiong.lx" Date: Wed, 25 Nov 2020 13:30:00 +0800 Subject: [PATCH 4/7] fix: stylelint scripts --- .../template-react-deep/template/component/package.json.ejs | 2 +- packages/template-react-ts/template/component/package.json.ejs | 2 +- packages/template-react-ts/template/scaffold/package.json.ejs | 2 +- packages/template-react/template/component/package.json.ejs | 2 +- packages/template-react/template/scaffold/package.json.ejs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/template-react-deep/template/component/package.json.ejs b/packages/template-react-deep/template/component/package.json.ejs index 9aae275..872777c 100755 --- a/packages/template-react-deep/template/component/package.json.ejs +++ b/packages/template-react-deep/template/component/package.json.ejs @@ -16,7 +16,7 @@ "prepublishOnly": "npm run build", "eslint": "eslint --cache --ext .js,.jsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'" + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint" }, "license": "MIT", diff --git a/packages/template-react-ts/template/component/package.json.ejs b/packages/template-react-ts/template/component/package.json.ejs index 689431a..99aefd4 100644 --- a/packages/template-react-ts/template/component/package.json.ejs +++ b/packages/template-react-ts/template/component/package.json.ejs @@ -18,7 +18,7 @@ "prepublishOnly": "npm run build", "eslint": "eslint --cache --ext .js,.jsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'" + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint" }, "keywords": [ diff --git a/packages/template-react-ts/template/scaffold/package.json.ejs b/packages/template-react-ts/template/scaffold/package.json.ejs index 7237788..74f8220 100644 --- a/packages/template-react-ts/template/scaffold/package.json.ejs +++ b/packages/template-react-ts/template/scaffold/package.json.ejs @@ -28,7 +28,7 @@ "prepublishOnly": "npm run build && npm run screenshot", "eslint": "eslint --cache --ext .js,.jsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'" + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint" }, "dependencies": { diff --git a/packages/template-react/template/component/package.json.ejs b/packages/template-react/template/component/package.json.ejs index 5c30325..69bb381 100644 --- a/packages/template-react/template/component/package.json.ejs +++ b/packages/template-react/template/component/package.json.ejs @@ -18,7 +18,7 @@ "prepublishOnly": "npm run build", "eslint": "eslint --cache --ext .js,.jsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'" + "stylelint": "stylelint \"**/*.{css,scss,less}\"", "lint": "npm run eslint && npm run stylelint" }, "keywords": [ diff --git a/packages/template-react/template/scaffold/package.json.ejs b/packages/template-react/template/scaffold/package.json.ejs index a194fea..12ff4ad 100644 --- a/packages/template-react/template/scaffold/package.json.ejs +++ b/packages/template-react/template/scaffold/package.json.ejs @@ -29,7 +29,7 @@ "lint": "npm run eslint && npm run stylelint", "eslint": "eslint --cache --ext .js,.jsx ./", "eslint:fix": "npm run eslint -- --fix", - "stylelint": "stylelint '**/*.{css,scss,less}'" + "stylelint": "stylelint \"**/*.{css,scss,less}\"" }, "dependencies": { "@alifd/next": "^1.19.4", From cb3ea99665e792552fb5dcf18138ed7c4d453c06 Mon Sep 17 00:00:00 2001 From: hetech Date: Wed, 25 Nov 2020 13:33:02 +0800 Subject: [PATCH 5/7] fix: update vue template screenshot script (#46) --- packages/template-vue/template/block/package.json.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/template-vue/template/block/package.json.ejs b/packages/template-vue/template/block/package.json.ejs index 4a963e1..2d47fbe 100644 --- a/packages/template-vue/template/block/package.json.ejs +++ b/packages/template-vue/template/block/package.json.ejs @@ -18,7 +18,7 @@ "start": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "screenshot": "screenshot -l mountNode", + "screenshot": "screenshot -l -s mountNode", "prepublishOnly": "npm run build && npm run screenshot" }, "dependencies": { From eac6824cc0fdd9098991917e7467c227ef683fdb Mon Sep 17 00:00:00 2001 From: "liuxiong.lx" Date: Wed, 25 Nov 2020 13:33:48 +0800 Subject: [PATCH 6/7] chore: version --- packages/template-vue/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/template-vue/package.json b/packages/template-vue/package.json index fcc4d87..d8d830c 100644 --- a/packages/template-vue/package.json +++ b/packages/template-vue/package.json @@ -1,6 +1,6 @@ { "name": "@icedesign/ice-vue-material-template", - "version": "0.3.2", + "version": "0.3.3", "description": "自定义物料源的初始模板", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" From 5d7b1a776c6e8c9ff98e0ad84c091f7eef5cc1e5 Mon Sep 17 00:00:00 2001 From: "liuxiong.lx" Date: Wed, 25 Nov 2020 15:04:04 +0800 Subject: [PATCH 7/7] fix: typo error --- packages/template-rax-api/template/component/package.json.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/template-rax-api/template/component/package.json.ejs b/packages/template-rax-api/template/component/package.json.ejs index 8977e17..5f10e4f 100644 --- a/packages/template-rax-api/template/component/package.json.ejs +++ b/packages/template-rax-api/template/component/package.json.ejs @@ -21,7 +21,7 @@ "start": "build-scripts start", "build": "build-scripts build", "eslint": "eslint --ext .js,.jsx,.ts,.tsx ./", - "eslin:fix": "npm run eslint -- --fix", + "eslint:fix": "npm run eslint -- --fix", "prepublishOnly": "npm run build" }, "devDependencies": {