Merge pull request #47 from ice-lab/fix-eslint-scripts

fix: eslint scripts
ice-lab · Nov 25, 2020 · 8acf0f7 · 8acf0f7
2 parents 4341b05 + 5d7b1a7
commit 8acf0f7
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ coverage/
 build
 .tmp/
 npmrc
+.history
diff --git 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
@@ -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 ./",
+    "eslint: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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",

diff --git 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"

diff --git 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": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,4 @@ coverage/ @@
     build
     .tmp/
     npmrc
+    .history