Skip to content

Commit

Permalink
Merge pull request #1426 from guardian/cross-spawn-vuln
Browse files Browse the repository at this point in the history
Cross spawn vuln fix
  • Loading branch information
rBangay authored Dec 11, 2024
2 parents 0d67bfe + 61891d5 commit 195c083
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 1,249 deletions.
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint-staged --concurrent false && yarn type-check && yarn bundle-check-client-if-changed
21 changes: 8 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"cypress:start": "RUNNING_IN_CYPRESS=true nodemon --inspect ./dist/server",
"type-check": "tsc --skipLibCheck",
"lint": "eslint 'client/**' 'server/**' 'shared/**'",
"bundle": "copy-node-modules . ./dist && yarn webpack --config webpack.production.js",
"bundle": "yarn webpack --config webpack.production.js",
"bundle-dev": "yarn bundle-dev-server && yarn bundle-dev-client",
"bundle-dev-server": "webpack --config webpack.dev.server.js",
"bundle-dev-server-cypress": "CYPRESS=SKIP_IDAPI webpack --config webpack.dev.server.js",
Expand All @@ -28,17 +28,13 @@
"cypress:e2e:open": "cypress open --config '{\"e2e\":{\"specPattern\":\"cypress/tests/e2e/**/*.cy.{js,jsx,ts,tsx}\"}}' --e2e --browser chrome",
"cypress:e2e:run": "cypress run --config '{\"e2e\":{\"specPattern\":\"cypress/tests/e2e/**/*.cy.{js,jsx,ts,tsx}\"}}' --e2e --browser chrome",
"cypress:e2e:server": "yarn bundle-dev-server && (yarn bundle-dev-server -w & yarn cypress:start & yarn serve-dev-cypress)",
"chromatic": "chromatic"
"chromatic": "chromatic",
"prepare": "husky install"
},
"lint-staged": {
"*.{js,jsx,ts,tsx,css,md,json}": "prettier --write",
"{client,server,shared}/**": "eslint --fix"
},
"husky": {
"hooks": {
"pre-commit": "yarn lint-staged --concurrent false && yarn type-check && yarn bundle-check-client-if-changed"
}
},
"main": "./dist/server",
"browserslist": [
">0.25%",
Expand Down Expand Up @@ -111,16 +107,15 @@
"babel-plugin-lodash": "3.3.4",
"babel-plugin-source-map-support": "2.1.1",
"chromatic": "6.4.1",
"copy-node-modules": "1.1.1",
"copy-webpack-plugin": "9.1.0",
"core-js": "3.19.1",
"cypress": "13.2.0",
"cypress": "^13.16.1",
"cypress-plugin-stripe-elements": "1.0.2",
"eslint": "8.49.0",
"eslint-plugin-jest": "27.0.4",
"eslint-plugin-react": "7.30.0",
"git-revision-webpack-plugin": "3.0.6",
"husky": "1.3.1",
"husky": "^8.0.0",
"jest": "29.7.0",
"jest-fetch-mock": "3.0.3",
"lint-staged": "15.2.7",
Expand Down Expand Up @@ -150,7 +145,7 @@
"@emotion/react": "11.11.1",
"@guardian/ab-core": "2.0.0",
"@guardian/ab-react": "2.0.1",
"@guardian/commercial": "21.0.3",
"@guardian/commercial": "23.7.4",
"@guardian/libs": "16.1.0",
"@guardian/source": "1.0.2",
"@guardian/source-development-kitchen": "1.0.0",
Expand Down Expand Up @@ -183,15 +178,15 @@
"react-router-dom": "6.2.2",
"regenerator-runtime": "0.13.9",
"source-map-support": "0.5.21",
"stylis-pxtorem": "0.0.2",
"tslib": "2.6.2",
"ua-parser-js": "1.0.34",
"winston": "3.2.1",
"yup": "0.28.5",
"zod": "3.22.4"
},
"resolutions": {
"http-proxy-middleware": "^2.0.7"
"http-proxy-middleware": "^2.0.7",
"cross-spawn": "^7.0.5"
},
"license": "UNLICENSED",
"msw": {
Expand Down
23 changes: 0 additions & 23 deletions types/stylis-pxtorem.d.ts

This file was deleted.

Loading

0 comments on commit 195c083

Please sign in to comment.