aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Quist <partouf@gmail.com>2022-01-01 14:13:53 +0000
committerGitHub <noreply@github.com>2022-01-01 14:13:53 +0000
commit500c57437ee397f4c65de2d72165ddd5e176ea8b (patch)
tree30619aef0d963f7c07ccaa624394b7dbe5817b29
parentd489044f9614658b1dacd021d495a416693acef9 (diff)
parenta9f1aba1082f2542401370ec6d1531740108c5be (diff)
downloadcompiler-explorer-gh-1497.tar.gz
compiler-explorer-gh-1497.zip
Merge a9f1aba1082f2542401370ec6d1531740108c5be into d489044f9614658b1dacd021d495a416693acef9gh-1497
-rwxr-xr-x.husky/pre-commit1
-rw-r--r--Makefile3
-rw-r--r--package.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/.husky/pre-commit b/.husky/pre-commit
index a74898dcd..2b796a876 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,5 +1,6 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
+make prereqs
npx lint-staged
npm run test
diff --git a/Makefile b/Makefile
index b61ab4048..9c9ad5a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,7 @@ prereqs: node_modules
NODE_MODULES=.npm-updated
$(NODE_MODULES): package.json | node-installed
- $(NPM) install --only=prod $(NPM_FLAGS)
- $(NPM) install --only=dev $(NPM_FLAGS)
+ $(NPM) install $(NPM_FLAGS)
@rm -rf node_modules/.cache/esm/*
@touch $@
diff --git a/package.json b/package.json
index 4d7eed9d2..95187ec2b 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
"tree-kill": "^1.2.2",
"triple-beam": "^1.3.0",
"tslib": "^2.3.1",
+ "ts-node": "^10.4.0",
"underscore": "^1.13.2",
"url-join": "^4.0.1",
"vis": "4.20.1",
@@ -132,7 +133,6 @@
"supervisor": "^0.12.0",
"terser-webpack-plugin": "^5.3.0",
"ts-loader": "^9.2.6",
- "ts-node": "^10.4.0",
"typescript": "^4.5.4",
"url-loader": "^4.1.1",
"webpack": "^5.65.0",