From 66e2bf630f9c3516c84fc3189ff7e64293f03b10 Mon Sep 17 00:00:00 2001
From: Nemanja Glumac <31325167+nemanjaglumac@users.noreply.github.com>
Date: Thu, 12 Oct 2023 08:40:06 +0200
Subject: [PATCH] Revert "Clean up yarn scripts" (#34588)
This commit reverts b19add2.
---
package.json | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/package.json b/package.json
index 9840fc91200..ba30ef6d8cc 100644
--- a/package.json
+++ b/package.json
@@ -288,7 +288,7 @@
"json5": "2.2.2"
},
"scripts": {
- "concurrently": "concurrently --kill-others -p name",
+ "concurrently": "yarn && concurrently --kill-others -p name",
"dev": "yarn && yarn clean:cljs && concurrently -n 'backend,frontend,cljs,static-viz' -c 'blue,green,yellow,magenta,red' 'clojure -M:run' 'yarn build-hot:js-wait' 'yarn build-hot:cljs' 'yarn build-static-viz:watch-wait'",
"dev-ee": "yarn && yarn clean:cljs && concurrently -n 'backend,frontend,cljs,static-viz' -c 'blue,green,yellow,magenta,red' 'clojure -M:run:ee' 'MB_EDITION=ee yarn build-hot:js-wait' 'MB_EDITION=ee yarn build-hot:cljs' 'yarn build-static-viz:watch-wait'",
"type-check": "yarn clean:cljs && yarn build:cljs && yarn type-check-pure",
@@ -297,9 +297,9 @@
"lint": "yarn lint-eslint && yarn lint-prettier && yarn lint-docs-links && yarn lint-yaml && yarn type-check",
"lint-eslint": "yarn build:cljs && yarn lint-eslint-pure",
"lint-eslint-pure": "eslint --ext .js,.jsx,.ts,.tsx --rulesdir frontend/lint/eslint-rules --max-warnings 0 --report-unused-disable-directives enterprise/frontend/src frontend/src frontend/test e2e/test",
- "lint-prettier": "yarn lint-prettier-pure",
+ "lint-prettier": "yarn && yarn lint-prettier-pure",
"lint-prettier-pure": "prettier '{enterprise/,}frontend/**/*.{js,jsx,ts,tsx,css}' --check",
- "lint-docs-links": "./bin/verify-doc-links",
+ "lint-docs-links": "yarn && ./bin/verify-doc-links",
"lint-yaml": "yamllint **/*.{yaml,yml} --ignore=node_modules/**/*.{yaml,yml}",
"test": "yarn test-unit && yarn test-timezones && yarn test-cypress",
"test-debug": "yarn build:cljs && node --inspect-brk node_modules/.bin/jest --runInBand --detectOpenHandles",
@@ -308,30 +308,30 @@
"test-unit-watch": "yarn test-unit --watch",
"test-unit-watch:cljs": "yarn concurrently -n 'cljs,tests' 'yarn build-watch:cljs' 'yarn test-unit-keep-cljs --watch'",
"test-timezones-unit": "yarn build:cljs && jest --silent --maxWorkers=2 --config jest.tz.unit.conf.json",
- "test-timezones": "./frontend/test/__runner__/run_timezone_tests",
- "build:js": "NODE_OPTIONS=--max-old-space-size=8196 webpack --bail",
- "build-watch:js": "NODE_OPTIONS=--max-old-space-size=8196 webpack --watch",
- "build-hot:js": "NODE_OPTIONS=--max-old-space-size=8196 WEBPACK_BUNDLE=hot webpack serve --host 0.0.0.0",
+ "test-timezones": "yarn && ./frontend/test/__runner__/run_timezone_tests",
+ "build:js": "yarn && NODE_OPTIONS=--max-old-space-size=8196 webpack --bail",
+ "build-watch:js": "yarn && NODE_OPTIONS=--max-old-space-size=8196 webpack --watch",
+ "build-hot:js": "yarn && NODE_OPTIONS=--max-old-space-size=8196 WEBPACK_BUNDLE=hot webpack serve --host 0.0.0.0",
"build-hot:js-wait": "yarn wait:cljs; yarn build-hot:js",
- "build-release:js": "WEBPACK_BUNDLE=production NODE_OPTIONS=--max-old-space-size=8196 webpack --bail",
- "build-release:cljs": "yarn clean-release:cljs && shadow-cljs release app",
- "build:cljs": "yarn build-pure:cljs",
+ "build-release:js": "yarn && WEBPACK_BUNDLE=production NODE_OPTIONS=--max-old-space-size=8196 webpack --bail",
+ "build-release:cljs": "yarn && yarn clean-release:cljs && shadow-cljs release app",
+ "build:cljs": "yarn && yarn build-pure:cljs",
"build-pure:cljs": "yarn clean-dev:cljs && shadow-cljs compile app",
- "build-watch:cljs": "shadow-cljs watch app",
- "build-hot:cljs": "shadow-cljs watch app",
+ "build-watch:cljs": "yarn && shadow-cljs watch app",
+ "build-hot:cljs": "yarn && shadow-cljs watch app",
"wait:cljs": "echo Waiting for first CLJS build; until [ -f target/cljs_dev/cljs.core.js ]; do sleep 1; done; echo CLJS build done",
- "cljs-server-start": "shadow-cljs start",
- "cljs-server-stop": "shadow-cljs stop",
- "cljs-server-restart": "shadow-cljs restart",
- "cljs-nrepl": "shadow-cljs node-repl -d cider/cider-nrepl:0.30.0 -d cider/piggieback:0.5.3 -d refactor-nrepl/refactor-nrepl:3.6.0",
- "test-cljs": "shadow-cljs compile test && node target/node-tests.js",
+ "cljs-server-start": "yarn && shadow-cljs start",
+ "cljs-server-stop": "yarn && shadow-cljs stop",
+ "cljs-server-restart": "yarn && shadow-cljs restart",
+ "cljs-nrepl": "yarn && shadow-cljs node-repl -d cider/cider-nrepl:0.30.0 -d cider/piggieback:0.5.3 -d refactor-nrepl/refactor-nrepl:3.6.0",
+ "test-cljs": "yarn && shadow-cljs compile test && node target/node-tests.js",
"build": "yarn build:cljs && yarn build:js",
"build-watch": "yarn concurrently -n 'cljs,js' 'yarn build-watch:cljs' 'yarn build-watch:js'",
"build-hot": "rm -f target/cljs_dev/cljs.core.js && yarn concurrently -n 'cljs,js' -c 'yellow,green' 'yarn build-hot:cljs' 'yarn build-hot:js-wait'",
"build-release": "yarn build-release:cljs && yarn build-release:js",
- "build-stats": "webpack --json > stats.json",
- "build-shared": "webpack --config webpack.shared.config.js",
- "build-static-viz": "yarn build-release:cljs && WEBPACK_BUNDLE=production webpack --config webpack.static-viz.config.js",
+ "build-stats": "yarn && webpack --json > stats.json",
+ "build-shared": "yarn && webpack --config webpack.shared.config.js",
+ "build-static-viz": "yarn && yarn build-release:cljs && WEBPACK_BUNDLE=production webpack --config webpack.static-viz.config.js",
"build-static-viz:watch": "webpack --config webpack.static-viz.config.js --watch",
"build-static-viz:watch-wait": "yarn wait:cljs; yarn build-static-viz:watch",
"precommit": "lint-staged",
@@ -349,7 +349,7 @@
"test-qa-dbs:up": "docker-compose -f ./e2e/test/scenarios/docker-compose.yml up -d",
"test-qa-dbs:down": "docker-compose -f ./e2e/test/scenarios/docker-compose.yml down",
"validate-e2e-filenames": "node e2e/validate-e2e-test-files.js",
- "clean:cljs": "yarn clean-dev:cljs && yarn clean-release:cljs",
+ "clean:cljs": "yarn && yarn clean-dev:cljs && yarn clean-release:cljs",
"clean-dev:cljs": "rm -rf target/cljs_dev/*",
"clean-release:cljs": "rm -rf target/cljs_release/*",
"clean-cypress-artifacts": "rm -R -f cypress/",
--
GitLab