diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json index 6c96bb0a8..55a0469f5 100644 --- a/web/ui/package-lock.json +++ b/web/ui/package-lock.json @@ -2147,27 +2147,6 @@ "w3c-keyname": "^2.2.4" } }, - "node_modules/@craco/craco": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@craco/craco/-/craco-6.2.0.tgz", - "integrity": "sha512-kLc4GSdgR9D5JiZmSxtzbvBKcUFSJqMXImRjjYf5pacwiyAs3XfQwai7T+pExfLQNUnytgkL8jRFUJeYrkVr7g==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "lodash": "^4.17.15", - "semver": "^7.3.2", - "webpack-merge": "^4.2.2" - }, - "bin": { - "craco": "bin/craco.js" - }, - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "react-scripts": "^4.0.0" - } - }, "node_modules/@csstools/convert-colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz", @@ -27533,15 +27512,6 @@ "node": ">= 4.0.0" } }, - "node_modules/webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15" - } - }, "node_modules/webpack-sources": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", @@ -28691,7 +28661,6 @@ "tempusdominus-core": "^5.0.3" }, "devDependencies": { - "@craco/craco": "^6.2.0", "@testing-library/react-hooks": "^7.0.1", "@types/enzyme": "^3.10.9", "@types/flot": "0.0.32", @@ -30246,18 +30215,6 @@ "w3c-keyname": "^2.2.4" } }, - "@craco/craco": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@craco/craco/-/craco-6.2.0.tgz", - "integrity": "sha512-kLc4GSdgR9D5JiZmSxtzbvBKcUFSJqMXImRjjYf5pacwiyAs3XfQwai7T+pExfLQNUnytgkL8jRFUJeYrkVr7g==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "lodash": "^4.17.15", - "semver": "^7.3.2", - "webpack-merge": "^4.2.2" - } - }, "@csstools/convert-colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz", @@ -37906,7 +37863,6 @@ "@codemirror/search": "^0.18.2", "@codemirror/state": "^0.18.2", "@codemirror/view": "^0.18.3", - "@craco/craco": "^6.2.0", "@forevolve/bootstrap-dark": "^1.0.0", "@fortawesome/fontawesome-svg-core": "^1.2.14", "@fortawesome/free-solid-svg-icons": "^5.7.1", @@ -50774,15 +50730,6 @@ } } }, - "webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", - "dev": true, - "requires": { - "lodash": "^4.17.15" - } - }, "webpack-sources": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", diff --git a/web/ui/react-app/craco.config.js b/web/ui/react-app/craco.config.js deleted file mode 100644 index 99b5de1f0..000000000 --- a/web/ui/react-app/craco.config.js +++ /dev/null @@ -1,19 +0,0 @@ -const path = require('path'); -const { getLoader, loaderByName } = require('@craco/craco'); - -const packages = []; -packages.push(path.join(__dirname, '../module')); - -module.exports = { - webpack: { - configure: (webpackConfig, arg) => { - const { isFound, match } = getLoader(webpackConfig, loaderByName('babel-loader')); - if (isFound) { - const include = Array.isArray(match.loader.include) ? match.loader.include : [match.loader.include]; - - match.loader.include = include.concat(packages); - } - return webpackConfig; - }, - }, -}; diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json index 91e43341a..f8ec094ac 100644 --- a/web/ui/react-app/package.json +++ b/web/ui/react-app/package.json @@ -43,12 +43,12 @@ "tempusdominus-core": "^5.0.3" }, "scripts": { - "start": "craco start", - "build": "craco build", - "test": "craco test --runInBand --resetMocks=false", - "test:coverage": "craco test --runInBand --resetMocks=false --no-watch --coverage", - "test:debug": "craco --inspect-brk test --runInBand --no-cache", - "eject": "craco eject", + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test --runInBand --resetMocks=false", + "test:coverage": "react-scripts test --runInBand --resetMocks=false --no-watch --coverage", + "test:debug": "react-scripts --inspect-brk test --runInBand --no-cache", + "eject": "react-scripts eject", "lint:ci": "eslint --quiet \"src/**/*.{ts,tsx}\"", "lint": "eslint --fix \"src/**/*.{ts,tsx}\"" }, @@ -64,7 +64,6 @@ "not op_mini all" ], "devDependencies": { - "@craco/craco": "^6.2.0", "@testing-library/react-hooks": "^7.0.1", "@types/enzyme": "^3.10.9", "@types/flot": "0.0.32",