diff --git a/Dockerfile b/Dockerfile index 69bb3fa..d16175b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN npm run build # Build client code RUN cd ./client \ - && npm install --production \ + && npm install \ && npm run build \ && cd .. \ && mv ./client/build/* ./public diff --git a/Dockerfile.arm b/Dockerfile.arm index 97dffde..5b3067d 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -17,7 +17,7 @@ RUN npm run build # Build client code RUN cd ./client \ - && npm install --production \ + && npm install \ && npm run build \ && cd .. \ && mv ./client/build/* ./public diff --git a/client/package-lock.json b/client/package-lock.json index eb016b0..256e2ac 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2363,8 +2363,7 @@ "@types/history": { "version": "4.7.9", "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.9.tgz", - "integrity": "sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ==", - "dev": true + "integrity": "sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ==" }, "@types/html-minifier-terser": { "version": "5.1.2", @@ -2486,17 +2485,15 @@ "version": "5.1.16", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.16.tgz", "integrity": "sha512-8d7nR/fNSqlTFGHti0R3F9WwIertOaaA1UEB8/jr5l5mDMOs4CidEgvvYMw4ivqrBK+vtVLxyTj2P+Pr/dtgzg==", - "dev": true, "requires": { "@types/history": "*", "@types/react": "*" } }, "@types/react-router-dom": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.9.tgz", - "integrity": "sha512-Go0vxZSigXTyXx8xPkGiBrrc3YbBs82KE14WENMLS6TSUKcRFSmYVbL19zFOnNFqJhqrPqEs2h5eUpJhSRrwZw==", - "dev": true, + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.0.tgz", + "integrity": "sha512-svUzpEpKDwK8nmfV2vpZNSsiijFNKY8+gUqGqvGGOVrXvX58k1JIJubZa5igkwacbq/0umphO5SsQn/BQsnKpw==", "requires": { "@types/history": "*", "@types/react": "*", diff --git a/client/package.json b/client/package.json index 6d2c159..2b0b096 100644 --- a/client/package.json +++ b/client/package.json @@ -13,6 +13,7 @@ "@types/node": "^12.20.25", "@types/react": "^17.0.21", "@types/react-dom": "^17.0.9", + "@types/react-router-dom": "^5.3.0", "axios": "^0.21.4", "dayjs": "^1.10.7", "react": "^17.0.2", @@ -47,8 +48,6 @@ "last 1 safari version" ] }, - "devDependencies": { - "@types/react-router-dom": "^5.1.9" - }, + "devDependencies": {}, "proxy": "http://localhost:5000" } diff --git a/package.json b/package.json index 3d7f32b..ead2fb6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "init:client": "npm install --prefix=client", "init:server": "npm install", - "init": "npm-run-all -n init:**", + "init": "npm i && cd client && npm i", "dev:client": "npm start --prefix=client", "dev:server": "nodemon", "dev": "npm-run-all -n --parallel dev:**",