mirror of
https://github.com/aleleba/create-react-ssr.git
synced 2025-07-14 16:48:30 -06:00
PR-536602: updating packages and fixing vendors.css error.
This commit is contained in:
@ -8,7 +8,7 @@ const OtherComponent = () => (
|
||||
<header className="App-header">
|
||||
<img src={logo} className="App-logo" alt="logo" />
|
||||
<p>
|
||||
Edit src/frontend/OtherComponent.jsx and save to reload.
|
||||
Edit <code>src/frontend/OtherComponent.jsx</code> and save to reload.
|
||||
</p>
|
||||
<Link className="App-link" to="/">Initial Component</Link>
|
||||
</header>
|
||||
|
@ -1,13 +0,0 @@
|
||||
import fs from 'fs';
|
||||
|
||||
const getHashManifest = () => {
|
||||
try {
|
||||
const baseUrl = __dirname.replace(/\/server(.*)/,'');
|
||||
const fullURL = `${baseUrl}/assets/manifest-hash.json` ;
|
||||
return JSON.parse(fs.readFileSync(fullURL).toString());
|
||||
}catch(err){
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
|
||||
export default getHashManifest;
|
@ -20,7 +20,7 @@ import { Provider } from 'react-redux';
|
||||
import setStore from '../frontend/setStore';
|
||||
import initialState from '../frontend/reducers/initialState';
|
||||
//Get Hashes
|
||||
import getHashManifest from './getHashManifest';
|
||||
import { getHashManifest, haveVendorsCss } from './utilsServer';
|
||||
//App
|
||||
import App from '../frontend/components/App';
|
||||
|
||||
@ -67,8 +67,8 @@ if(env === 'development'){
|
||||
}
|
||||
|
||||
const setResponse = (html, preloadedState, manifest) => {
|
||||
const mainStyles = manifest ? manifest['frontend.css'] : 'assets/main/app.css';
|
||||
const vendorStyles = manifest ? manifest['vendors.css'] : '/assets/vendors/app.css';
|
||||
const mainStyles = manifest ? manifest['frontend.css'] : 'assets/main.css';
|
||||
const vendorStyles = manifest ? manifest['vendors.css'] : 'assets/vendors.css';
|
||||
const mainBuild = manifest ? manifest['frontend.js'] : 'assets/app.js';
|
||||
const vendorBuild = manifest ? manifest['vendors.js'] : 'assets/vendor.js';
|
||||
const manifestJson = manifest ? `<link rel="manifest" href="${manifest['manifest.json']}">` : '';
|
||||
@ -84,7 +84,7 @@ const setResponse = (html, preloadedState, manifest) => {
|
||||
<meta name="theme-color" content="#000000">
|
||||
${manifestJson}
|
||||
<link href="${mainStyles}" rel="stylesheet" type="text/css"></link>
|
||||
<link href="${vendorStyles}" rel="stylesheet" type="text/css"></link>
|
||||
${haveVendorsCss() ? `<link href="${vendorStyles}" rel="stylesheet" type="text/css"></link>` : ''}
|
||||
<title>App</title>
|
||||
</head>
|
||||
<body>
|
||||
|
23
src/server/utilsServer.ts
Normal file
23
src/server/utilsServer.ts
Normal file
@ -0,0 +1,23 @@
|
||||
import fs from 'fs';
|
||||
|
||||
export const getHashManifest = () => {
|
||||
try {
|
||||
const baseUrl = __dirname.replace(/\/server(.*)/,'');
|
||||
const fullURL = `${baseUrl}/assets/manifest-hash.json` ;
|
||||
return JSON.parse(fs.readFileSync(fullURL).toString());
|
||||
}catch(err){
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
|
||||
export const haveVendorsCss = () => {
|
||||
try {
|
||||
const baseUrl = __dirname.replace(/\/server(.*)/,'');
|
||||
const fullURL = `${baseUrl}/assets/vendors.css` ;
|
||||
fs.readFileSync(fullURL).toString();
|
||||
return true
|
||||
}catch(err){
|
||||
// console.error(err);
|
||||
return false
|
||||
}
|
||||
};
|
Reference in New Issue
Block a user