1
0
mirror of synced 2026-02-03 18:01:02 -05:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Brandon Bayer
e5ead166ac fixes 2020-10-06 11:54:14 -04:00
Brandon Bayer
2b07a8b119 add _ between session prefix and cookie name 2020-10-06 11:34:17 -04:00
3 changed files with 18 additions and 5 deletions

View File

@@ -3,7 +3,17 @@ import {join} from "path"
import {existsSync} from "fs"
import {PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_SERVER} from "next/constants"
export const getProjectRoot = () => {
return pkgDir.sync() || process.cwd()
}
export const getPackageJson = () => {
const projectRoot = getProjectRoot()
return require(join(projectRoot, "package.json"))
}
const configFiles = ["blitz.config.js", "next.config.js"]
/**
* @param {boolean | undefined} reload - reimport config files to reset global cache
*/
@@ -13,7 +23,7 @@ export const getConfig = (reload?: boolean): Record<string, unknown> => {
}
let blitzConfig = {}
const projectRoot = pkgDir.sync() || process.cwd()
const projectRoot = getProjectRoot()
for (const configFile of configFiles) {
if (existsSync(join(projectRoot, configFile))) {

View File

@@ -3,9 +3,7 @@ import {publicDataStore} from "./public-data-store"
import {useIsomorphicLayoutEffect} from "./utils/hooks"
import {readCookie} from "./utils/cookie"
const sessionPrefix = (process.env.SESSION_PREFIX ||
process.env.sessionPrefix ||
process.env.npm_package_name)!.replace(/[^a-zA-Z0-9-_]/g, "_")
const sessionPrefix = (process.env.SESSION_PREFIX || "").replace(/[^a-zA-Z0-9-_]/g, "_") + "_"
export const TOKEN_SEPARATOR = ";"
export const HANDLE_SEPARATOR = ":"

View File

@@ -1,6 +1,11 @@
import pkgDir from "pkg-dir"
import path from "path"
import fs from "fs"
import {getPackageJson} from "@blitzjs/config"
if (!process.env.SESSION_PREFIX) {
process.env.SESSION_PREFIX = getPackageJson().name
}
export function withBlitz(nextConfig: any) {
return (phase: string, nextOpts: any = {}) => {
@@ -15,7 +20,7 @@ export function withBlitz(nextConfig: any) {
...(normalizedConfig.experimental || {}),
},
env: {
sessionPrefix: process.env.SESSION_PREFIX || process.env.npm_package_name,
SESSION_PREFIX: process.env.SESSION_PREFIX,
...(normalizedConfig.env || {}),
},
webpack(config: any, options: Record<any, any>) {