PR-753737: Se saca el proyecto al directorio Raíz y se actualizan dependencias.
9
.gitignore
vendored
@ -1,9 +1,6 @@
|
|||||||
#node_modules ignore
|
#node_modules ignore
|
||||||
client/node_modules
|
node_modules
|
||||||
server/node_modules
|
|
||||||
#.envs
|
#.envs
|
||||||
client/.env
|
.env
|
||||||
server/.env
|
|
||||||
#builds
|
#builds
|
||||||
client/build
|
build
|
||||||
server/build
|
|
@ -1,8 +1,6 @@
|
|||||||
const config = {
|
const config = {
|
||||||
env: process.env.ENV ? process.env.ENV : 'production',
|
env: process.env.ENV ? process.env.ENV : 'production',
|
||||||
port: process.env.PORT ? process.env.PORT : 80,
|
port: process.env.PORT ? process.env.PORT : 80,
|
||||||
// portDev: process.env.PORT_DEV ? process.env.PORT_DEV : 3000,
|
|
||||||
// portReloadDev: process.env.PORT_RELOAD_DEV,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = { config: config };
|
module.exports = { config: config };
|
0
client/custom.d.ts → custom.d.ts
vendored
7086
client/package-lock.json → package-lock.json
generated
@ -67,7 +67,7 @@
|
|||||||
"@types/jest": "^27.4.1",
|
"@types/jest": "^27.4.1",
|
||||||
"@types/node": "^17.0.25",
|
"@types/node": "^17.0.25",
|
||||||
"@types/react": "^18.0.5",
|
"@types/react": "^18.0.5",
|
||||||
"@types/react-dom": "^18.0.1",
|
"@types/react-dom": "^18.0.0",
|
||||||
"@types/webpack-hot-middleware": "^2.25.6",
|
"@types/webpack-hot-middleware": "^2.25.6",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.20.0",
|
"@typescript-eslint/eslint-plugin": "^5.20.0",
|
||||||
"@typescript-eslint/parser": "^5.20.0",
|
"@typescript-eslint/parser": "^5.20.0",
|
||||||
@ -83,10 +83,11 @@
|
|||||||
"eslint-webpack-plugin": "^3.1.1",
|
"eslint-webpack-plugin": "^3.1.1",
|
||||||
"file-loader": "^6.2.0",
|
"file-loader": "^6.2.0",
|
||||||
"identity-obj-proxy": "^3.0.0",
|
"identity-obj-proxy": "^3.0.0",
|
||||||
"jest": "^27.5.1",
|
"jest": "^28.0.2",
|
||||||
|
"jest-environment-jsdom": "^28.0.2",
|
||||||
"jest-fetch-mock": "^3.0.3",
|
"jest-fetch-mock": "^3.0.3",
|
||||||
"mini-css-extract-plugin": "^2.6.0",
|
"mini-css-extract-plugin": "^2.6.0",
|
||||||
"react-refresh": "^0.12.0",
|
"react-refresh": "^0.13.0",
|
||||||
"redux-devtools-extension": "^2.13.9",
|
"redux-devtools-extension": "^2.13.9",
|
||||||
"sass": "^1.50.0",
|
"sass": "^1.50.0",
|
||||||
"sass-loader": "^12.6.0",
|
"sass-loader": "^12.6.0",
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
@ -2,8 +2,8 @@ import fs from 'fs';
|
|||||||
|
|
||||||
const getHashManifest = () => {
|
const getHashManifest = () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = __dirname.replace(/\/client(.*)/,'');
|
const baseUrl = __dirname.replace(/\/server(.*)/,'');
|
||||||
const fullURL = `${baseUrl}/client/build/assets/manifest-hash.json` ;
|
const fullURL = `${baseUrl}/assets/manifest-hash.json` ;
|
||||||
return JSON.parse(fs.readFileSync(fullURL));
|
return JSON.parse(fs.readFileSync(fullURL));
|
||||||
}catch(err){
|
}catch(err){
|
||||||
console.error(err);
|
console.error(err);
|
@ -44,8 +44,8 @@ if(env === 'development'){
|
|||||||
heartbeat: 1000,
|
heartbeat: 1000,
|
||||||
}));
|
}));
|
||||||
}else{
|
}else{
|
||||||
const baseUrl = __dirname.replace(/\/client(.*)/,'');
|
const baseUrl = __dirname.replace(/\/server(.*)/,'');
|
||||||
const fullURL = `${baseUrl}/client/build` ;
|
const fullURL = `${baseUrl}` ;
|
||||||
app
|
app
|
||||||
.use((req, res, next) => {
|
.use((req, res, next) => {
|
||||||
if(!req.hashManifest) req.hashManifest = getHashManifest();
|
if(!req.hashManifest) req.hashManifest = getHashManifest();
|