diff --git a/client/package-lock.json b/client/package-lock.json index 41628b275..d56f1f602 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -103,6 +103,7 @@ "browserslist": "^4.22.2", "browserslist-to-esbuild": "^2.1.1", "craco-less": "^3.0.1", + "cross-env": "^7.0.3", "cypress": "^13.6.2", "eslint-plugin-cypress": "^2.15.1", "memfs": "^4.6.0", @@ -6843,6 +6844,24 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", diff --git a/client/package.json b/client/package.json index 16cd46a89..d780f0d69 100644 --- a/client/package.json +++ b/client/package.json @@ -93,10 +93,10 @@ "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "vite", - "build": "VITE_APP_GIT_SHA=`git rev-parse --short HEAD` vite build", + "build": "cross-env-shell VITE_APP_GIT_SHA=\\\"`git rev-parse --short HEAD`\\\" vite build", "build:test": "env-cmd -f .env.test npm run build", "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'", - "buildcra": "VITE_APP_GIT_SHA=`git rev-parse --short HEAD` vite build", + "buildcra": "cross-env-shell VITE_APP_GIT_SHA=\\\"`git rev-parse --short HEAD`\\\" vite build", "test": "cypress open", "eject": "react-scripts eject", "madge": "madge --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ." @@ -135,6 +135,7 @@ "browserslist": "^4.22.2", "browserslist-to-esbuild": "^2.1.1", "craco-less": "^3.0.1", + "cross-env": "^7.0.3", "cypress": "^13.6.2", "eslint-plugin-cypress": "^2.15.1", "memfs": "^4.6.0", diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index b021fcc85..0064f3536 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -387,7 +387,11 @@ export function Manage({conflict, bodyshop}) { }} >