diff --git a/src/server/middleware.ts b/src/server/middleware.ts index 84c568d1..235f0729 100644 --- a/src/server/middleware.ts +++ b/src/server/middleware.ts @@ -31,8 +31,9 @@ export function setCacheControl( let caching: string; if ( - req.path.match(/\.(js|css|txt|manifest\.webmanifest)\/?$/) || - req.path.includes("/css/themelist") + process.env.NODE_ENV === "production" && + (req.path.match(/\.(js|css|txt|manifest\.webmanifest)\/?$/) || + req.path.includes("/css/themelist")) ) { // Static content gets cached publicly for a day caching = "public, max-age=86400"; diff --git a/src/shared/utils/app/is-auth-path.ts b/src/shared/utils/app/is-auth-path.ts index 0ec963a2..5a201ac4 100644 --- a/src/shared/utils/app/is-auth-path.ts +++ b/src/shared/utils/app/is-auth-path.ts @@ -1,5 +1,5 @@ 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 ); } diff --git a/webpack.config.js b/webpack.config.js index 9afdb526..0c9806dd 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ const banner = ` @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0 `; -function getBase(env) { +function getBase(env, mode) { return { output: { filename: "js/server.js", @@ -54,6 +54,7 @@ function getBase(env) { plugins: [ new webpack.DefinePlugin({ "process.env.COMMIT_HASH": `"${env.COMMIT_HASH}"`, + "process.env.NODE_ENV": `"${mode}"`, }), new MiniCssExtractPlugin({ filename: "styles/styles.css", @@ -69,7 +70,7 @@ function getBase(env) { } const createServerConfig = (env, mode) => { - const base = getBase(env); + const base = getBase(env, mode); const config = merge({}, base, { mode, entry: "./src/server/index.tsx", @@ -97,7 +98,7 @@ const createServerConfig = (env, mode) => { }; const createClientConfig = (env, mode) => { - const base = getBase(env); + const base = getBase(env, mode); const config = merge({}, base, { mode, entry: "./src/client/index.tsx",