Merge pull request #1711 from LemmyNet/cache-dev

Fix some issues
This commit is contained in:
SleeplessOne1917 2023-06-29 19:26:40 -04:00 committed by GitHub
commit b6415f828e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions

View file

@ -31,8 +31,9 @@ export function setCacheControl(
let caching: string; let caching: string;
if ( if (
req.path.match(/\.(js|css|txt|manifest\.webmanifest)\/?$/) || process.env.NODE_ENV === "production" &&
req.path.includes("/css/themelist") (req.path.match(/\.(js|css|txt|manifest\.webmanifest)\/?$/) ||
req.path.includes("/css/themelist"))
) { ) {
// Static content gets cached publicly for a day // Static content gets cached publicly for a day
caching = "public, max-age=86400"; caching = "public, max-age=86400";

View file

@ -1,5 +1,5 @@
export default function isAuthPath(pathname: string) { export default function isAuthPath(pathname: string) {
return /create_.*|inbox|settings|admin|reports|registration_applications/g.test( return /^\/create_.*|inbox|settings|admin|reports|registration_applications/g.test(
pathname pathname
); );
} }

View file

@ -14,7 +14,7 @@ const banner = `
@license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0 @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0
`; `;
function getBase(env) { function getBase(env, mode) {
return { return {
output: { output: {
filename: "js/server.js", filename: "js/server.js",
@ -54,6 +54,7 @@ function getBase(env) {
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
"process.env.COMMIT_HASH": `"${env.COMMIT_HASH}"`, "process.env.COMMIT_HASH": `"${env.COMMIT_HASH}"`,
"process.env.NODE_ENV": `"${mode}"`,
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: "styles/styles.css", filename: "styles/styles.css",
@ -69,7 +70,7 @@ function getBase(env) {
} }
const createServerConfig = (env, mode) => { const createServerConfig = (env, mode) => {
const base = getBase(env); const base = getBase(env, mode);
const config = merge({}, base, { const config = merge({}, base, {
mode, mode,
entry: "./src/server/index.tsx", entry: "./src/server/index.tsx",
@ -97,7 +98,7 @@ const createServerConfig = (env, mode) => {
}; };
const createClientConfig = (env, mode) => { const createClientConfig = (env, mode) => {
const base = getBase(env); const base = getBase(env, mode);
const config = merge({}, base, { const config = merge({}, base, {
mode, mode,
entry: "./src/client/index.tsx", entry: "./src/client/index.tsx",