Skip to content

Commit 64204b2

Browse files
authored
Merge pull request #102 from smswithoutborders/staging
Staging
2 parents 2c8429c + a8d68b8 commit 64204b2

3 files changed

Lines changed: 616 additions & 87 deletions

File tree

craco.config.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module.exports = {
2+
webpack: {
3+
configure: (webpackConfig) => {
4+
return webpackConfig;
5+
},
6+
},
7+
devServer: (devServerConfig, { env, paths, proxy, allowedHost }) => {
8+
// Create a new config object based on the old one
9+
const newConfig = {
10+
...devServerConfig,
11+
};
12+
13+
// Remove deprecated options that are not compatible with webpack-dev-server v5
14+
delete newConfig.onBeforeSetupMiddleware;
15+
delete newConfig.onAfterSetupMiddleware;
16+
delete newConfig.https;
17+
18+
// Handle https option - it should be moved to server.type and server.options
19+
if (devServerConfig.https) {
20+
if (typeof devServerConfig.https === 'boolean' && devServerConfig.https) {
21+
newConfig.server = 'https';
22+
} else if (typeof devServerConfig.https === 'object') {
23+
newConfig.server = {
24+
type: 'https',
25+
options: devServerConfig.https,
26+
};
27+
}
28+
} else {
29+
newConfig.server = 'http';
30+
}
31+
32+
newConfig.setupMiddlewares = (middlewares, devServer) => {
33+
if (!devServer) {
34+
throw new Error('webpack-dev-server is not defined');
35+
}
36+
37+
return middlewares;
38+
};
39+
40+
return newConfig;
41+
},
42+
};

package.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"web-vitals": "^2.1.0"
4444
},
4545
"scripts": {
46-
"start": "react-scripts start",
47-
"build": "react-scripts build",
48-
"test": "react-scripts test",
46+
"start": "craco start",
47+
"build": "craco build",
48+
"test": "craco test",
4949
"eject": "react-scripts eject",
5050
"analyze": "source-map-explorer 'build/static/js/*.js'"
5151
},
@@ -63,6 +63,8 @@
6363
},
6464
"devDependencies": {
6565
"@babel/plugin-proposal-private-property-in-object": "^7.0.0",
66+
"@craco/craco": "^7.1.0",
67+
"baseline-browser-mapping": "^2.9.8",
6668
"source-map-explorer": "^2.5.3",
6769
"source-map-loader": "^5.0.0",
6870
"webpack": "^5.94.0",
@@ -71,9 +73,11 @@
7173
"resolutions": {
7274
"nth-check": "^2.1.1",
7375
"glob": "^11.0.0",
74-
"webpack-dev-server": "^4.15.2",
76+
"webpack-dev-server": "^5.2.2",
7577
"postcss": "^8.4.49",
76-
"js-yaml": "^4.1.0"
78+
"js-yaml": "^4.1.1",
79+
"mdast-util-to-hast": "^13.2.1",
80+
"node-forge": "^1.3.2"
7781
},
7882
"packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c"
7983
}

0 commit comments

Comments
 (0)