breaking off some changes for another PR

apache · Jan 20, 2024 · e83cffa · e83cffa
1 parent 6787fa2
commit e83cffa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/superset-frontend/js_build.sh b/superset-frontend/js_build.sh
@@ -21,6 +21,5 @@ npm --version
 node --version
 time npm ci
 time npm run lint
-time npm run check
 time npm run cover  # this also runs the tests, so no need to 'npm run test'
 time npm run build
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -37,7 +37,7 @@
     "src/setup/*"
   ],
   "scripts": {
-    "_lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,tsx",
+    "_lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,tsx .",
     "_prettier": "prettier './({src,spec,cypress-base,plugins,packages,.storybook}/**/*{.js,.jsx,.ts,.tsx,.css,.less,.scss,.sass}|package.json)'",
     "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production BABEL_ENV=\"${BABEL_ENV:=production}\" webpack --mode=production --color",
     "build-dev": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=development webpack --mode=development --color",
@@ -51,9 +51,8 @@
     "dev": "webpack --mode=development --color --watch",
     "dev-server": "cross-env NODE_ENV=development BABEL_ENV=development node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --mode=development",
     "format": "npm run _prettier -- --write",
-    "lint": "npm run _lint -- .",
-    "lint-fix": "npm run _lint . -- --fix",
-    "lint-file": "npm run _lint",
+    "lint": "npm run _lint && npm run type",
+    "lint-fix": "npm run _lint -- --fix && npm run type",
     "plugins:build": "node ./scripts/build.js",
     "plugins:build-assets": "node ./scripts/copyAssets.js",
     "plugins:build-storybook": "cd packages/superset-ui-demo && npm run build-storybook",

diff --git a/superset-frontend/scripts/build.js b/superset-frontend/scripts/build.js
@@ -107,7 +107,6 @@ let scope = getPackages(glob);
 
 if (shouldLint) {
   run(`npm run lint --fix {packages,plugins}/${scope}/{src,test}`);
-  run(`npm run type`);
 }
 
 if (shouldCleanup) {