@dr.pogodin/react-utils 1.47.0-alpha.1 → 1.47.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/build/development/client/getInj.js.map +1 -1
  2. package/build/development/client/index.js.map +1 -1
  3. package/build/development/client/init.js.map +1 -1
  4. package/build/development/index.js +3 -4
  5. package/build/development/index.js.map +1 -1
  6. package/build/development/server/server.js +11 -10
  7. package/build/development/server/server.js.map +1 -1
  8. package/build/development/shared/utils/config.js +5 -6
  9. package/build/development/shared/utils/config.js.map +1 -1
  10. package/build/development/shared/utils/splitComponent.js +18 -22
  11. package/build/development/shared/utils/splitComponent.js.map +1 -1
  12. package/build/production/client/getInj.js.map +1 -1
  13. package/build/production/client/index.js.map +1 -1
  14. package/build/production/client/init.js.map +1 -1
  15. package/build/production/index.js +2 -3
  16. package/build/production/index.js.map +1 -1
  17. package/build/production/server/server.js +2 -4
  18. package/build/production/server/server.js.map +1 -1
  19. package/build/production/shared/utils/config.js +3 -5
  20. package/build/production/shared/utils/config.js.map +1 -1
  21. package/build/production/shared/utils/splitComponent.js +6 -17
  22. package/build/production/shared/utils/splitComponent.js.map +1 -1
  23. package/build/types-code/index.d.ts +2 -2
  24. package/build/web/client/getInj.js +9 -16
  25. package/build/web/client/getInj.js.map +1 -1
  26. package/build/web/client/index.js +14 -21
  27. package/build/web/client/index.js.map +1 -1
  28. package/build/web/client/init.js +2 -4
  29. package/build/web/client/init.js.map +1 -1
  30. package/build/web/index.js +2 -4
  31. package/build/web/index.js.map +1 -1
  32. package/build/web/server/server.js +10 -8
  33. package/build/web/server/server.js.map +1 -1
  34. package/build/web/shared/utils/config.js +4 -6
  35. package/build/web/shared/utils/config.js.map +1 -1
  36. package/build/web/shared/utils/splitComponent.js +17 -20
  37. package/build/web/shared/utils/splitComponent.js.map +1 -1
  38. package/config/jest/default.js +7 -2
  39. package/package.json +9 -8
  40. package/src/index.ts +3 -7
  41. package/src/server/server.ts +10 -10
  42. package/src/shared/utils/config.ts +5 -10
  43. package/src/shared/utils/splitComponent.tsx +17 -20
  44. package/node-entry.js +0 -15
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","names":["sep","pathToFileURL","cloneDeep","mapValues","pick","compression","cookieParser","csrf","express","favicon","helmet","loggerMiddleware","requestIp","v4","uuid","rendererFactory","CODES","ERRORS","getErrorForCode","newError","defaultCspSettings","directives","contentSecurityPolicy","getDefaultDirectives","array","filter","item","push","getDefaultCspSettings","factory","webpackConfig","options","rendererOps","renderer","publicPath","output","server","beforeExpressJsSetup","logger","httpsRedirect","use","req","res","next","schema","headers","url","host","originalUrl","redirect","crossOriginEmbedderPolicy","crossOriginOpenerPolicy","crossOriginResourcePolicy","noCsp","req2","nonce","cspNonce","cspSettings","cspSettingsHook","send","json","limit","urlencoded","extended","cookieSignatureSecret","mw","cookie","token","clientIp","FORMAT","stream","write","info","bind","get","static","path","setHeaders","set","devMode","global","location","href","process","cwd","webpack","require","webpackDevMiddleware","webpackHotMiddleware","compiler","serverSideRender","onExpressJsSetup","NOT_FOUND","dontAttachDefaultErrorHandler","beforeExpressJsError","error","headersSent","status","INTERNAL_SERVER_ERROR","serverSide","log","toString","message","env","NODE_ENV"],"sources":["../../../src/server/server.ts"],"sourcesContent":["/**\n * Creation of standard ExpressJS server for ReactJS apps.\n */\n\nimport { sep } from 'node:path';\nimport { pathToFileURL } from 'node:url';\n\nimport cloneDeep from 'lodash/cloneDeep';\nimport mapValues from 'lodash/mapValues';\nimport pick from 'lodash/pick';\n\nimport compression from 'compression';\nimport cookieParser from 'cookie-parser';\nimport csrf from '@dr.pogodin/csurf';\n\nimport express, {\n type Express,\n type NextFunction,\n type RequestHandler,\n type Request,\n type Response,\n} from 'express';\n\nimport favicon from 'serve-favicon';\nimport helmet, { type HelmetOptions } from 'helmet';\nimport loggerMiddleware from 'morgan';\nimport requestIp from 'request-ip';\nimport { v4 as uuid } from 'uuid';\n\nimport type { Compiler, Configuration } from 'webpack';\n\nimport rendererFactory, {\n type LoggerI,\n type OptionsT as RendererOptionsT,\n} from './renderer';\n\nimport {\n CODES,\n ERRORS,\n getErrorForCode,\n newError,\n} from './utils/errors';\n\nexport type CspOptionsT = Exclude<HelmetOptions['contentSecurityPolicy'], boolean | undefined>;\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\ninterface RequestT extends Request {\n cspNonce: string;\n nonce: string;\n}\n\n/**\n * Default Content Security Policy settings.\n * @ignore\n */\nconst defaultCspSettings = {\n directives: mapValues(\n helmet.contentSecurityPolicy.getDefaultDirectives(),\n\n // 'https:' options (automatic re-write of insecure URLs to secure ones)\n // is removed to facilitate local development with HTTP server. In cloud\n // deployments we assume Apache or Nginx server in front of out app takes\n // care about such re-writes.\n (array) => (array as string[]).filter((item: string) => item !== 'https:'),\n ),\n};\ndefaultCspSettings.directives['frame-src'] = [\n \"'self'\",\n\n // YouTube domain is whitelisted to allow <YouTubeVideo> component to work\n // out of box.\n 'https://*.youtube.com',\n];\n\n{\n const directives = defaultCspSettings.directives['script-src'];\n if (directives) directives.push(\"'unsafe-eval'\");\n else defaultCspSettings.directives['script-src'] = [\"'unsafe-eval'\"];\n}\n\n// No need for automatic re-writes via Content Security Policy settings:\n// the forefront Apache or Nginx server is supposed to take care of this\n// in production cloud deployments.\ndelete defaultCspSettings.directives['upgrade-insecure-requests'];\n\n/**\n * @category Utilities\n * @func server/getDefaultCspSettings\n * @global\n * @desc\n * ```js\n * import { server } from '@dr.pogodin/react-utils';\n * const { getDefaultCspSettings } from '@dr.pogodin/react-utils';\n * ```\n * @return {{\n * directives: object\n * }} A deep copy of default CSP settings object used by `react-utils`,\n * with the exception of `nonce-xxx` clause in `script-src` directive,\n * which is added dynamically for each request.\n */\nexport function getDefaultCspSettings(): {\n directives: Record<string, string[]>;\n} {\n return cloneDeep(defaultCspSettings);\n}\n\nexport type ServerT = Express & {\n logger: LoggerI;\n};\n\nexport type OptionsT = RendererOptionsT & {\n beforeExpressJsError?:\n (server: ServerT) => boolean | Promise<boolean>;\n\n beforeExpressJsSetup?: (server: ServerT) => Promise<void> | void;\n cookieSignatureSecret?: string;\n cspSettingsHook?: (\n defaultOptions: CspOptionsT,\n req: Request,\n ) => CspOptionsT;\n devMode?: boolean;\n httpsRedirect?: boolean;\n onExpressJsSetup?: (server: ServerT) => Promise<void> | void;\n};\n\nexport default async function factory(\n webpackConfig: Configuration,\n options: OptionsT,\n): Promise<ServerT> {\n const rendererOps: RendererOptionsT = pick(options, [\n 'Application',\n 'beforeRender',\n 'favicon',\n 'logger',\n 'maxSsrRounds',\n 'noCsp',\n 'ssrTimeout',\n 'staticCacheController',\n 'staticCacheSize',\n ]);\n const renderer = rendererFactory(webpackConfig, rendererOps);\n const { publicPath } = webpackConfig.output!;\n\n const server = express() as ServerT;\n\n if (options.beforeExpressJsSetup) {\n await options.beforeExpressJsSetup(server);\n }\n\n if (options.logger) server.logger = options.logger;\n\n if (options.httpsRedirect) {\n server.use((req, res, next) => {\n const schema = req.headers['x-forwarded-proto'];\n if (schema === 'http') {\n let url = `https://${req.headers.host}`;\n if (req.originalUrl !== '/') url += req.originalUrl;\n res.redirect(url);\n return;\n }\n next();\n });\n }\n\n server.use(compression());\n server.use(\n helmet({\n contentSecurityPolicy: false,\n crossOriginEmbedderPolicy: false,\n crossOriginOpenerPolicy: false,\n crossOriginResourcePolicy: false,\n }),\n );\n\n if (!options.noCsp) {\n server.use(\n (req: Request, res: Response, next: NextFunction) => {\n const req2 = req as RequestT;\n\n req2.nonce = uuid();\n\n // TODO: This is deprecated, but it is kept for now for backward\n // compatibility. Should be removed sometime later.\n req2.cspNonce = req2.nonce;\n\n // The deep clone is necessary here to ensure that default value can't be\n // mutated during request processing.\n let cspSettings: CspOptionsT = cloneDeep(defaultCspSettings);\n (cspSettings.directives?.['script-src'] as string[]).push(`'nonce-${req2.nonce}'`);\n if (options.cspSettingsHook) {\n cspSettings = options.cspSettingsHook(cspSettings, req);\n }\n helmet.contentSecurityPolicy(cspSettings)(req, res, next);\n },\n );\n }\n\n if (options.favicon) {\n server.use(favicon(options.favicon));\n }\n\n server.use('/robots.txt', (req, res) => {\n res.send('User-agent: *\\nDisallow:');\n });\n\n server.use(express.json({ limit: '300kb' }));\n server.use(express.urlencoded({ extended: false }));\n server.use(cookieParser(options.cookieSignatureSecret));\n server.use(requestIp.mw());\n\n server.use(csrf({ cookie: true }));\n\n loggerMiddleware.token(\n 'ip',\n (req: Request & { clientIp: string }) => req.clientIp,\n );\n const FORMAT = ':ip > :status :method :url :response-time ms :res[content-length] :referrer :user-agent';\n server.use(loggerMiddleware(FORMAT, {\n stream: {\n // TODO: This implies the logger is always set. Is it on a higher level?\n // then mark it as always present.\n write: options.logger!.info.bind(options.logger),\n },\n }));\n\n // Note: no matter the \"public path\", we want the service worker, if any,\n // to be served from the root, to have all web app pages in its scope.\n // Thus, this setup to serve it. Probably, need some more configuration\n // for special cases, but this will do for now.\n server.get('/__service-worker.js', express.static(\n webpackConfig.output?.path ?? '',\n {\n setHeaders: (res) => res.set('Cache-Control', 'no-cache'),\n },\n ));\n\n /* Setup of Hot Module Reloading for development environment.\n * These dependencies are not used, nor installed for production use,\n * hence we should violate some import-related lint rules. */\n /* eslint-disable import/no-extraneous-dependencies */\n if (options.devMode) {\n // This is a workaround for SASS bug:\n // https://github.com/dart-lang/sdk/issues/27979\n // which manifests itself sometimes when webpack dev middleware is used\n // (in dev mode), and app modules are imported in some unfortunate ways.\n // TODO: Double-check, what is going on here.\n // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n if (!global.location) {\n global.location = {\n href: `${pathToFileURL(process.cwd()).href}${sep}`,\n } as Location;\n }\n\n /* eslint-disable @typescript-eslint/no-require-imports */\n const webpack = require('webpack') as (ops: Configuration) => Compiler;\n\n // TODO: Figure out the exact type for options, don't wanna waste time on it\n // right now.\n const webpackDevMiddleware = require('webpack-dev-middleware') as\n (c: Compiler, ops: unknown) => RequestHandler;\n\n const webpackHotMiddleware = require('webpack-hot-middleware') as\n (c: Compiler) => RequestHandler;\n\n const compiler = webpack(webpackConfig);\n server.use(webpackDevMiddleware(compiler, {\n publicPath,\n serverSideRender: true,\n }));\n server.use(webpackHotMiddleware(compiler));\n }\n /* eslint-enable import/no-extraneous-dependencies */\n\n server.use(publicPath as string, express.static(webpackConfig.output!.path!));\n\n if (options.onExpressJsSetup) {\n await options.onExpressJsSetup(server);\n }\n server.use(renderer);\n\n /* Detects 404 errors, and forwards them to the error handler. */\n server.use((req, res, next) => {\n next(newError(ERRORS.NOT_FOUND, CODES.NOT_FOUND));\n });\n\n let dontAttachDefaultErrorHandler;\n if (options.beforeExpressJsError) {\n dontAttachDefaultErrorHandler = await options.beforeExpressJsError(server);\n }\n\n /* Error handler. */\n if (!dontAttachDefaultErrorHandler) {\n // TODO: Do we need this error handler at all? It actually seems to do\n // what the default ExpressJS error handler does anyway, see:\n // https://expressjs.com/en/guide/error-handling.html\n //\n // TODO: It is better to move the default error handler definition\n // to a stand-alone function at top-level, but the use of options.logger\n // prevents to do it without some extra refactoring. Should be done sometime\n // though.\n server.use((\n error: Error & {\n status?: number;\n },\n req: Request,\n res: Response,\n next: NextFunction,\n ) => {\n // TODO: This is needed to correctly handled any errors thrown after\n // sending initial response to the client.\n if (res.headersSent) {\n next(error);\n return;\n }\n\n const status = error.status ?? CODES.INTERNAL_SERVER_ERROR;\n const serverSide = status >= (CODES.INTERNAL_SERVER_ERROR as number);\n\n // Log server-side errors always, client-side at debug level only.\n options.logger!.log(serverSide ? 'error' : 'debug', error.toString());\n\n let message = error.message || getErrorForCode(status);\n if (serverSide && process.env.NODE_ENV === 'production') {\n message = ERRORS.INTERNAL_SERVER_ERROR;\n }\n\n res.status(status).send(message);\n });\n }\n\n return server;\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"server.js","names":["sep","pathToFileURL","cloneDeep","mapValues","pick","compression","cookieParser","csrf","express","favicon","helmet","loggerMiddleware","requestIp","v4","uuid","rendererFactory","CODES","ERRORS","getErrorForCode","newError","defaultCspSettings","directives","contentSecurityPolicy","getDefaultDirectives","array","filter","item","push","getDefaultCspSettings","factory","webpackConfig","options","rendererOps","renderer","publicPath","output","server","beforeExpressJsSetup","logger","httpsRedirect","use","req","res","next","schema","headers","url","host","originalUrl","redirect","crossOriginEmbedderPolicy","crossOriginOpenerPolicy","crossOriginResourcePolicy","noCsp","req2","nonce","cspNonce","cspSettings","cspSettingsHook","send","json","limit","urlencoded","extended","cookieSignatureSecret","mw","cookie","token","clientIp","FORMAT","stream","write","info","bind","get","static","path","setHeaders","set","devMode","global","location","href","process","cwd","webpack","default","webpackDevMiddleware","webpackHotMiddleware","compiler","Error","serverSideRender","onExpressJsSetup","NOT_FOUND","dontAttachDefaultErrorHandler","beforeExpressJsError","error","headersSent","status","INTERNAL_SERVER_ERROR","serverSide","log","toString","message","env","NODE_ENV"],"sources":["../../../src/server/server.ts"],"sourcesContent":["/**\n * Creation of standard ExpressJS server for ReactJS apps.\n */\n\nimport { sep } from 'node:path';\nimport { pathToFileURL } from 'node:url';\n\nimport cloneDeep from 'lodash/cloneDeep';\nimport mapValues from 'lodash/mapValues';\nimport pick from 'lodash/pick';\n\nimport compression from 'compression';\nimport cookieParser from 'cookie-parser';\nimport csrf from '@dr.pogodin/csurf';\n\nimport express, {\n type Express,\n type NextFunction,\n type Request,\n type Response,\n} from 'express';\n\nimport favicon from 'serve-favicon';\nimport helmet, { type HelmetOptions } from 'helmet';\nimport loggerMiddleware from 'morgan';\nimport requestIp from 'request-ip';\nimport { v4 as uuid } from 'uuid';\n\nimport type { Configuration } from 'webpack';\n\nimport rendererFactory, {\n type LoggerI,\n type OptionsT as RendererOptionsT,\n} from './renderer';\n\nimport {\n CODES,\n ERRORS,\n getErrorForCode,\n newError,\n} from './utils/errors';\n\nexport type CspOptionsT = Exclude<HelmetOptions['contentSecurityPolicy'], boolean | undefined>;\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\ninterface RequestT extends Request {\n cspNonce: string;\n nonce: string;\n}\n\n/**\n * Default Content Security Policy settings.\n * @ignore\n */\nconst defaultCspSettings = {\n directives: mapValues(\n helmet.contentSecurityPolicy.getDefaultDirectives(),\n\n // 'https:' options (automatic re-write of insecure URLs to secure ones)\n // is removed to facilitate local development with HTTP server. In cloud\n // deployments we assume Apache or Nginx server in front of out app takes\n // care about such re-writes.\n (array) => (array as string[]).filter((item: string) => item !== 'https:'),\n ),\n};\ndefaultCspSettings.directives['frame-src'] = [\n \"'self'\",\n\n // YouTube domain is whitelisted to allow <YouTubeVideo> component to work\n // out of box.\n 'https://*.youtube.com',\n];\n\n{\n const directives = defaultCspSettings.directives['script-src'];\n if (directives) directives.push(\"'unsafe-eval'\");\n else defaultCspSettings.directives['script-src'] = [\"'unsafe-eval'\"];\n}\n\n// No need for automatic re-writes via Content Security Policy settings:\n// the forefront Apache or Nginx server is supposed to take care of this\n// in production cloud deployments.\ndelete defaultCspSettings.directives['upgrade-insecure-requests'];\n\n/**\n * @category Utilities\n * @func server/getDefaultCspSettings\n * @global\n * @desc\n * ```js\n * import { server } from '@dr.pogodin/react-utils';\n * const { getDefaultCspSettings } from '@dr.pogodin/react-utils';\n * ```\n * @return {{\n * directives: object\n * }} A deep copy of default CSP settings object used by `react-utils`,\n * with the exception of `nonce-xxx` clause in `script-src` directive,\n * which is added dynamically for each request.\n */\nexport function getDefaultCspSettings(): {\n directives: Record<string, string[]>;\n} {\n return cloneDeep(defaultCspSettings);\n}\n\nexport type ServerT = Express & {\n logger: LoggerI;\n};\n\nexport type OptionsT = RendererOptionsT & {\n beforeExpressJsError?:\n (server: ServerT) => boolean | Promise<boolean>;\n\n beforeExpressJsSetup?: (server: ServerT) => Promise<void> | void;\n cookieSignatureSecret?: string;\n cspSettingsHook?: (\n defaultOptions: CspOptionsT,\n req: Request,\n ) => CspOptionsT;\n devMode?: boolean;\n httpsRedirect?: boolean;\n onExpressJsSetup?: (server: ServerT) => Promise<void> | void;\n};\n\nexport default async function factory(\n webpackConfig: Configuration,\n options: OptionsT,\n): Promise<ServerT> {\n const rendererOps: RendererOptionsT = pick(options, [\n 'Application',\n 'beforeRender',\n 'favicon',\n 'logger',\n 'maxSsrRounds',\n 'noCsp',\n 'ssrTimeout',\n 'staticCacheController',\n 'staticCacheSize',\n ]);\n const renderer = rendererFactory(webpackConfig, rendererOps);\n const { publicPath } = webpackConfig.output!;\n\n const server = express() as ServerT;\n\n if (options.beforeExpressJsSetup) {\n await options.beforeExpressJsSetup(server);\n }\n\n if (options.logger) server.logger = options.logger;\n\n if (options.httpsRedirect) {\n server.use((req, res, next) => {\n const schema = req.headers['x-forwarded-proto'];\n if (schema === 'http') {\n let url = `https://${req.headers.host}`;\n if (req.originalUrl !== '/') url += req.originalUrl;\n res.redirect(url);\n return;\n }\n next();\n });\n }\n\n server.use(compression());\n server.use(\n helmet({\n contentSecurityPolicy: false,\n crossOriginEmbedderPolicy: false,\n crossOriginOpenerPolicy: false,\n crossOriginResourcePolicy: false,\n }),\n );\n\n if (!options.noCsp) {\n server.use(\n (req: Request, res: Response, next: NextFunction) => {\n const req2 = req as RequestT;\n\n req2.nonce = uuid();\n\n // TODO: This is deprecated, but it is kept for now for backward\n // compatibility. Should be removed sometime later.\n req2.cspNonce = req2.nonce;\n\n // The deep clone is necessary here to ensure that default value can't be\n // mutated during request processing.\n let cspSettings: CspOptionsT = cloneDeep(defaultCspSettings);\n (cspSettings.directives?.['script-src'] as string[]).push(`'nonce-${req2.nonce}'`);\n if (options.cspSettingsHook) {\n cspSettings = options.cspSettingsHook(cspSettings, req);\n }\n helmet.contentSecurityPolicy(cspSettings)(req, res, next);\n },\n );\n }\n\n if (options.favicon) {\n server.use(favicon(options.favicon));\n }\n\n server.use('/robots.txt', (req, res) => {\n res.send('User-agent: *\\nDisallow:');\n });\n\n server.use(express.json({ limit: '300kb' }));\n server.use(express.urlencoded({ extended: false }));\n server.use(cookieParser(options.cookieSignatureSecret));\n server.use(requestIp.mw());\n\n server.use(csrf({ cookie: true }));\n\n loggerMiddleware.token(\n 'ip',\n (req: Request & { clientIp: string }) => req.clientIp,\n );\n const FORMAT = ':ip > :status :method :url :response-time ms :res[content-length] :referrer :user-agent';\n server.use(loggerMiddleware(FORMAT, {\n stream: {\n // TODO: This implies the logger is always set. Is it on a higher level?\n // then mark it as always present.\n write: options.logger!.info.bind(options.logger),\n },\n }));\n\n // Note: no matter the \"public path\", we want the service worker, if any,\n // to be served from the root, to have all web app pages in its scope.\n // Thus, this setup to serve it. Probably, need some more configuration\n // for special cases, but this will do for now.\n server.get('/__service-worker.js', express.static(\n webpackConfig.output?.path ?? '',\n {\n setHeaders: (res) => res.set('Cache-Control', 'no-cache'),\n },\n ));\n\n /* Setup of Hot Module Reloading for development environment.\n * These dependencies are not used, nor installed for production use,\n * hence we should violate some import-related lint rules. */\n /* eslint-disable import/no-extraneous-dependencies */\n if (options.devMode) {\n // This is a workaround for SASS bug:\n // https://github.com/dart-lang/sdk/issues/27979\n // which manifests itself sometimes when webpack dev middleware is used\n // (in dev mode), and app modules are imported in some unfortunate ways.\n // TODO: Double-check, what is going on here.\n // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n if (!global.location) {\n global.location = {\n href: `${pathToFileURL(process.cwd()).href}${sep}`,\n } as Location;\n }\n\n const { webpack } = await import(/* webpackChunkName: \"server-side-code\" */ 'webpack');\n\n const { default: webpackDevMiddleware } = await import(\n /* webpackChunkName: \"server-side-code\" */ 'webpack-dev-middleware'\n );\n\n const { default: webpackHotMiddleware } = await import(\n /* webpackChunkName: \"server-side-code\" */ 'webpack-hot-middleware'\n );\n\n const compiler = webpack(webpackConfig);\n if (!compiler) throw Error('Internal error');\n\n server.use(webpackDevMiddleware(compiler, {\n publicPath,\n serverSideRender: true,\n }));\n server.use(webpackHotMiddleware(compiler));\n }\n /* eslint-enable import/no-extraneous-dependencies */\n\n server.use(publicPath as string, express.static(webpackConfig.output!.path!));\n\n if (options.onExpressJsSetup) {\n await options.onExpressJsSetup(server);\n }\n server.use(renderer);\n\n /* Detects 404 errors, and forwards them to the error handler. */\n server.use((req, res, next) => {\n next(newError(ERRORS.NOT_FOUND, CODES.NOT_FOUND));\n });\n\n let dontAttachDefaultErrorHandler;\n if (options.beforeExpressJsError) {\n dontAttachDefaultErrorHandler = await options.beforeExpressJsError(server);\n }\n\n /* Error handler. */\n if (!dontAttachDefaultErrorHandler) {\n // TODO: Do we need this error handler at all? It actually seems to do\n // what the default ExpressJS error handler does anyway, see:\n // https://expressjs.com/en/guide/error-handling.html\n //\n // TODO: It is better to move the default error handler definition\n // to a stand-alone function at top-level, but the use of options.logger\n // prevents to do it without some extra refactoring. Should be done sometime\n // though.\n server.use((\n error: Error & {\n status?: number;\n },\n req: Request,\n res: Response,\n next: NextFunction,\n ) => {\n // TODO: This is needed to correctly handled any errors thrown after\n // sending initial response to the client.\n if (res.headersSent) {\n next(error);\n return;\n }\n\n const status = error.status ?? CODES.INTERNAL_SERVER_ERROR;\n const serverSide = status >= (CODES.INTERNAL_SERVER_ERROR as number);\n\n // Log server-side errors always, client-side at debug level only.\n options.logger!.log(serverSide ? 'error' : 'debug', error.toString());\n\n let message = error.message || getErrorForCode(status);\n if (serverSide && process.env.NODE_ENV === 'production') {\n message = ERRORS.INTERNAL_SERVER_ERROR;\n }\n\n res.status(status).send(message);\n });\n }\n\n return server;\n}\n"],"mappings":"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","ignoreList":[]}
@@ -1,21 +1,19 @@
1
1
  /* global document */
2
2
 
3
+ import { parse } from 'cookie';
4
+ import clientGetInj from "../../client/getInj";
3
5
  import { IS_CLIENT_SIDE } from "./isomorphy/environment-check";
4
6
  import { requireWeak } from "./webpack";
5
7
 
6
8
  // TODO: The internal type casting is somewhat messed up here,
7
9
  // to be corrected later.
8
- const config = (IS_CLIENT_SIDE
9
- // eslint-disable-next-line @typescript-eslint/no-require-imports
10
- ? require("../../client/getInj").default().CONFIG : requireWeak('config')) ?? {};
10
+ const config = (IS_CLIENT_SIDE ? clientGetInj().CONFIG : requireWeak('config')) ?? {};
11
11
 
12
12
  // The safeguard for "document" is necessary because in non-Node environments,
13
13
  // like React Native, IS_CLIENT_SIDE is "true", however "document" and a bunch
14
14
  // of other browser-world features are not available.
15
15
  if (IS_CLIENT_SIDE && typeof document !== 'undefined') {
16
- // eslint-disable-next-line @typescript-eslint/no-require-imports
17
- const cookie = require('cookie');
18
- config.CSRF = cookie.parse(document.cookie).csrfToken;
16
+ config.CSRF = parse(document.cookie).csrfToken;
19
17
  }
20
18
  export default config;
21
19
  //# sourceMappingURL=config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","names":["IS_CLIENT_SIDE","requireWeak","config","require","default","CONFIG","document","cookie","CSRF","parse","csrfToken"],"sources":["../../../../src/shared/utils/config.ts"],"sourcesContent":["/* global document */\n\nimport type CookieM from 'cookie';\n\nimport { IS_CLIENT_SIDE } from './isomorphy/environment-check';\nimport { requireWeak } from './webpack';\n\n// TODO: The internal type casting is somewhat messed up here,\n// to be corrected later.\nconst config: Record<string, unknown> = (\n IS_CLIENT_SIDE\n // eslint-disable-next-line @typescript-eslint/no-require-imports\n ? (require('client/getInj') as {\n default: () => Record<string, unknown>;\n }).default().CONFIG\n : requireWeak('config')\n) as (Record<string, unknown> | undefined) ?? ({} as Record<string, unknown>);\n\n// The safeguard for \"document\" is necessary because in non-Node environments,\n// like React Native, IS_CLIENT_SIDE is \"true\", however \"document\" and a bunch\n// of other browser-world features are not available.\nif (IS_CLIENT_SIDE && typeof document !== 'undefined') {\n // eslint-disable-next-line @typescript-eslint/no-require-imports\n const cookie = require('cookie') as typeof CookieM;\n config.CSRF = cookie.parse(document.cookie).csrfToken;\n}\n\nexport default config;\n"],"mappings":"AAAA;;AAIA,SAASA,cAAc;AACvB,SAASC,WAAW;;AAEpB;AACA;AACA,MAAMC,MAA+B,GAAG,CACtCF;AACE;AAAA,EACGG,OAAO,sBAAgB,CAAC,CAExBC,OAAO,CAAC,CAAC,CAACC,MAAM,GACjBJ,WAAW,CAAC,QAAQ,CAAC,KACoB,CAAC,CAA6B;;AAE7E;AACA;AACA;AACA,IAAID,cAAc,IAAI,OAAOM,QAAQ,KAAK,WAAW,EAAE;EACrD;EACA,MAAMC,MAAM,GAAGJ,OAAO,CAAC,QAAQ,CAAmB;EAClDD,MAAM,CAACM,IAAI,GAAGD,MAAM,CAACE,KAAK,CAACH,QAAQ,CAACC,MAAM,CAAC,CAACG,SAAS;AACvD;AAEA,eAAeR,MAAM","ignoreList":[]}
1
+ {"version":3,"file":"config.js","names":["parse","clientGetInj","IS_CLIENT_SIDE","requireWeak","config","CONFIG","document","CSRF","cookie","csrfToken"],"sources":["../../../../src/shared/utils/config.ts"],"sourcesContent":["/* global document */\n\nimport { parse } from 'cookie';\n\nimport clientGetInj from '../../client/getInj';\n\nimport { IS_CLIENT_SIDE } from './isomorphy/environment-check';\nimport { requireWeak } from './webpack';\n\n// TODO: The internal type casting is somewhat messed up here,\n// to be corrected later.\nconst config: Record<string, unknown> = (\n IS_CLIENT_SIDE ? clientGetInj().CONFIG : requireWeak('config')\n) as (Record<string, unknown> | undefined) ?? ({} as Record<string, unknown>);\n\n// The safeguard for \"document\" is necessary because in non-Node environments,\n// like React Native, IS_CLIENT_SIDE is \"true\", however \"document\" and a bunch\n// of other browser-world features are not available.\nif (IS_CLIENT_SIDE && typeof document !== 'undefined') {\n config.CSRF = parse(document.cookie).csrfToken;\n}\n\nexport default config;\n"],"mappings":"AAAA;;AAEA,SAASA,KAAK,QAAQ,QAAQ;AAE9B,OAAOC,YAAY;AAEnB,SAASC,cAAc;AACvB,SAASC,WAAW;;AAEpB;AACA;AACA,MAAMC,MAA+B,GAAG,CACtCF,cAAc,GAAGD,YAAY,CAAC,CAAC,CAACI,MAAM,GAAGF,WAAW,CAAC,QAAQ,CAAC,KACjB,CAAC,CAA6B;;AAE7E;AACA;AACA;AACA,IAAID,cAAc,IAAI,OAAOI,QAAQ,KAAK,WAAW,EAAE;EACrDF,MAAM,CAACG,IAAI,GAAGP,KAAK,CAACM,QAAQ,CAACE,MAAM,CAAC,CAACC,SAAS;AAChD;AAEA,eAAeL,MAAM","ignoreList":[]}
@@ -4,24 +4,15 @@ import { Suspense, lazy, useInsertionEffect } from 'react';
4
4
  import { Barrier } from '@dr.pogodin/js-utils';
5
5
  import { getSsrContext } from "./globalState";
6
6
  import { IS_CLIENT_SIDE, IS_SERVER_SIDE, getBuildInfo } from "./isomorphy";
7
-
8
- // Note: At the client side we can get chunk groups immediately when loading
9
- // the module; at the server-side we only can get them within React render flow.
10
- // Thus, we set and use the following variable at the client-side, and then when
11
- // needed on the server side, we'll fetch it differently.
12
7
  import { jsx as _jsx } from "react/jsx-runtime";
13
- let clientChunkGroups;
14
- if (IS_CLIENT_SIDE) {
15
- // TODO: Rewrite to avoid these overrides of ESLint rules.
16
- /* eslint-disable @typescript-eslint/no-unsafe-assignment,
17
- @typescript-eslint/no-require-imports,
18
- @typescript-eslint/no-unsafe-call,
19
- @typescript-eslint/no-unsafe-member-access */
20
- clientChunkGroups = require("../../client/getInj").default().CHUNK_GROUPS ?? {};
21
- /* eslint-enable @typescript-eslint/no-unsafe-assignment,
22
- @typescript-eslint/no-require-imports,
23
- @typescript-eslint/no-unsafe-call,
24
- @typescript-eslint/no-unsafe-member-access */
8
+ function getClientChunkGroups() {
9
+ if (!IS_CLIENT_SIDE) return undefined;
10
+ return (async () => {
11
+ const {
12
+ default: getInj
13
+ } = await import(/* webpackChunkName: "react-utils-client-side-code" */"../../client/getInj");
14
+ return getInj().CHUNK_GROUPS ?? {};
15
+ })();
25
16
  }
26
17
  const refCounts = {};
27
18
  function getPublicPath() {
@@ -151,14 +142,18 @@ export default function splitComponent({
151
142
  getComponent,
152
143
  placeholder
153
144
  }) {
154
- // On the client side we can check right away if the chunk name is known.
155
- if (IS_CLIENT_SIDE) assertChunkName(chunkName, clientChunkGroups);
156
-
157
145
  // The correct usage of splitComponent() assumes a single call per chunk.
158
146
  if (usedChunkNames.has(chunkName)) {
159
147
  throw Error(`Repeated splitComponent() call for the chunk "${chunkName}"`);
160
148
  } else usedChunkNames.add(chunkName);
161
149
  const LazyComponent = /*#__PURE__*/lazy(async () => {
150
+ const clientChunkGroups = await getClientChunkGroups();
151
+
152
+ // On the client side we can check right away if the chunk name is known.
153
+ if (IS_CLIENT_SIDE) {
154
+ if (!clientChunkGroups) throw Error('Internal error');
155
+ assertChunkName(chunkName, clientChunkGroups);
156
+ }
162
157
  const resolved = await getComponent();
163
158
  const Component = 'default' in resolved ? resolved.default : resolved;
164
159
 
@@ -166,6 +161,7 @@ export default function splitComponent({
166
161
  // the component (the lazy load function is executed by React one at
167
162
  // the frist mount).
168
163
  if (IS_CLIENT_SIDE) {
164
+ if (!clientChunkGroups) throw Error('Internal error');
169
165
  await bookStyleSheets(chunkName, clientChunkGroups, false);
170
166
  }
171
167
  const Wrapper = ({
@@ -187,6 +183,7 @@ export default function splitComponent({
187
183
  // This takes care about stylesheets management every time an instance of
188
184
  // this component is mounted / unmounted.
189
185
  useInsertionEffect(() => {
186
+ if (!clientChunkGroups) throw Error('Internal error');
190
187
  void bookStyleSheets(chunkName, clientChunkGroups, true);
191
188
  return () => {
192
189
  freeStyleSheets(chunkName, clientChunkGroups);
@@ -1 +1 @@
1
- {"version":3,"file":"splitComponent.js","names":["Suspense","lazy","useInsertionEffect","Barrier","getSsrContext","IS_CLIENT_SIDE","IS_SERVER_SIDE","getBuildInfo","jsx","_jsx","clientChunkGroups","require","default","CHUNK_GROUPS","refCounts","getPublicPath","publicPath","bookStyleSheet","name","loadedSheets","refCount","res","path","fullPath","document","location","origin","has","link","querySelector","createElement","setAttribute","head","appendChild","addEventListener","Error","resolve","current","getLoadedStyleSheets","Set","styleSheets","href","add","assertChunkName","chunkName","chunkGroups","bookStyleSheets","promises","assets","Promise","asset","endsWith","promise","push","length","allSettled","then","freeStyleSheets","pathRefCount","remove","usedChunkNames","splitComponent","getComponent","placeholder","LazyComponent","resolved","Component","Wrapper","children","ref","rest","chunks","includes","CodeSplit","fallback"],"sources":["../../../../src/shared/utils/splitComponent.tsx"],"sourcesContent":["/* global document */\n\nimport {\n type ComponentType,\n type FunctionComponent,\n type ReactNode,\n type RefObject,\n Suspense,\n lazy,\n useInsertionEffect,\n} from 'react';\n\nimport { Barrier } from '@dr.pogodin/js-utils';\n\nimport { type ChunkGroupsT, getSsrContext } from './globalState';\n\nimport {\n IS_CLIENT_SIDE,\n IS_SERVER_SIDE,\n getBuildInfo,\n} from './isomorphy';\n\n// Note: At the client side we can get chunk groups immediately when loading\n// the module; at the server-side we only can get them within React render flow.\n// Thus, we set and use the following variable at the client-side, and then when\n// needed on the server side, we'll fetch it differently.\nlet clientChunkGroups: ChunkGroupsT;\n\nif (IS_CLIENT_SIDE) {\n // TODO: Rewrite to avoid these overrides of ESLint rules.\n /* eslint-disable @typescript-eslint/no-unsafe-assignment,\n @typescript-eslint/no-require-imports,\n @typescript-eslint/no-unsafe-call,\n @typescript-eslint/no-unsafe-member-access */\n clientChunkGroups = require('client/getInj').default().CHUNK_GROUPS ?? {};\n /* eslint-enable @typescript-eslint/no-unsafe-assignment,\n @typescript-eslint/no-require-imports,\n @typescript-eslint/no-unsafe-call,\n @typescript-eslint/no-unsafe-member-access */\n}\n\nconst refCounts: Record<string, number> = {};\n\nfunction getPublicPath() {\n return getBuildInfo().publicPath;\n}\n\n/**\n * Client-side only! Ensures the specified CSS stylesheet is loaded into\n * the document; loads if it is missing; and does simple reference counting\n * to facilitate future clean-up.\n * @param name\n * @param loadedSheets\n * @param refCount\n * @return\n */\nfunction bookStyleSheet(\n name: string,\n loadedSheets: Set<string>,\n refCount: boolean,\n): Promise<void> | undefined {\n let res: Barrier<void> | undefined;\n const path = `${getPublicPath()}/${name}`;\n const fullPath = `${document.location.origin}${path}`;\n\n if (!loadedSheets.has(fullPath)) {\n let link = document.querySelector(`link[href=\"${path}\"]`);\n\n if (!link) {\n link = document.createElement('link');\n link.setAttribute('rel', 'stylesheet');\n link.setAttribute('href', path);\n document.head.appendChild(link);\n }\n\n res = new Barrier<void>();\n link.addEventListener('load', () => {\n if (!res) throw Error('Internal error');\n void res.resolve();\n });\n link.addEventListener('error', () => {\n if (!res) throw Error('Internal error');\n void res.resolve();\n });\n }\n\n if (refCount) {\n const current = refCounts[path] ?? 0;\n refCounts[path] = 1 + current;\n }\n\n return res;\n}\n\n/**\n * Generates the set of URLs for currently loaded, linked stylesheets.\n * @return\n */\nfunction getLoadedStyleSheets(): Set<string> {\n const res = new Set<string>();\n const { styleSheets } = document;\n for (const { href } of styleSheets) {\n if (href) res.add(href);\n }\n return res;\n}\n\nfunction assertChunkName(\n chunkName: string,\n chunkGroups: ChunkGroupsT,\n) {\n if (chunkGroups[chunkName]) return;\n throw Error(`Unknown chunk name \"${chunkName}\"`);\n}\n\n/**\n * Client-side only! Ensures all CSS stylesheets required for the specified\n * code chunk are loaded into the document; loads the missing ones; and does\n * simple reference counting to facilitate future clean-up.\n * @param chunkName Chunk name.\n * @param refCount\n * @return Resolves once all pending stylesheets, necessary for\n * the chunk, are either loaded, or failed to load.\n */\nexport async function bookStyleSheets(\n chunkName: string,\n chunkGroups: ChunkGroupsT,\n refCount: boolean,\n): Promise<void> {\n const promises = [];\n const assets = chunkGroups[chunkName];\n if (!assets) return Promise.resolve();\n\n const loadedSheets = getLoadedStyleSheets();\n\n for (const asset of assets) {\n if (asset.endsWith('.css')) {\n const promise = bookStyleSheet(asset, loadedSheets, refCount);\n if (promise) promises.push(promise);\n }\n }\n\n return promises.length\n ? Promise.allSettled(promises).then()\n : Promise.resolve();\n}\n\n/**\n * Client-side only! Frees from the document all CSS stylesheets that are\n * required by the specified chunk, and have reference counter equal to one\n * (for chunks with larger reference counter values, it just decrements\n * the reference counter).\n * @param {string} chunkName\n */\nexport function freeStyleSheets(\n chunkName: string,\n chunkGroups: ChunkGroupsT,\n): void {\n const assets = chunkGroups[chunkName];\n if (!assets) return;\n\n for (const asset of assets) {\n if (asset.endsWith('.css')) {\n const path = `${getPublicPath()}/${asset}`;\n\n const pathRefCount = refCounts[path];\n if (pathRefCount) {\n if (pathRefCount <= 1) {\n document.head.querySelector(`link[href=\"${path}\"]`)!.remove();\n delete refCounts[path];\n } else refCounts[path] = pathRefCount - 1;\n }\n }\n }\n}\n\n// Holds the set of chunk names already used for splitComponent() calls.\nconst usedChunkNames = new Set();\n\ntype ComponentOrModule<PropsT> = ComponentType<PropsT> | {\n default: ComponentType<PropsT>;\n};\n\n/**\n * Given an async component retrieval function `getComponent()` it creates\n * a special \"code split\" component, which uses <Suspense> to asynchronously\n * load on demand the code required by `getComponent()`.\n * @param options\n * @param options.chunkName\n * @param {function} options.getComponent\n * @param {React.Element} [options.placeholder]\n * @return {React.ElementType}\n */\nexport default function splitComponent<\n ComponentPropsT extends { children?: ReactNode; ref?: RefObject<unknown> },\n>({\n chunkName,\n getComponent,\n placeholder,\n}: {\n chunkName: string;\n getComponent: () => Promise<ComponentOrModule<ComponentPropsT>>;\n placeholder?: ReactNode;\n}): FunctionComponent<ComponentPropsT> {\n // On the client side we can check right away if the chunk name is known.\n if (IS_CLIENT_SIDE) assertChunkName(chunkName, clientChunkGroups);\n\n // The correct usage of splitComponent() assumes a single call per chunk.\n if (usedChunkNames.has(chunkName)) {\n throw Error(`Repeated splitComponent() call for the chunk \"${chunkName}\"`);\n } else usedChunkNames.add(chunkName);\n\n const LazyComponent = lazy(async () => {\n const resolved = await getComponent();\n const Component = 'default' in resolved ? resolved.default : resolved;\n\n // This pre-loads necessary stylesheets prior to the first mount of\n // the component (the lazy load function is executed by React one at\n // the frist mount).\n if (IS_CLIENT_SIDE) {\n await bookStyleSheets(chunkName, clientChunkGroups, false);\n }\n\n const Wrapper: FunctionComponent<ComponentPropsT> = ({\n children,\n ref,\n ...rest\n }) => {\n // On the server side we'll assert the chunk name here,\n // and also push it to the SSR chunks array.\n if (IS_SERVER_SIDE) {\n const { chunkGroups, chunks } = getSsrContext()!;\n assertChunkName(chunkName, chunkGroups);\n if (!chunks.includes(chunkName)) chunks.push(chunkName);\n }\n\n // This takes care about stylesheets management every time an instance of\n // this component is mounted / unmounted.\n useInsertionEffect(() => {\n void bookStyleSheets(chunkName, clientChunkGroups, true);\n return () => {\n freeStyleSheets(chunkName, clientChunkGroups);\n };\n }, []);\n\n return (\n <Component\n // eslint-disable-next-line react/jsx-props-no-spreading\n {...(rest as unknown as ComponentPropsT)}\n ref={ref}\n >\n {children}\n </Component>\n );\n };\n\n return { default: Wrapper };\n });\n\n const CodeSplit: React.FunctionComponent<ComponentPropsT> = ({\n children,\n ...rest\n }: ComponentPropsT) => (\n <Suspense fallback={placeholder}>\n <LazyComponent\n // eslint-disable-next-line react/jsx-props-no-spreading\n {...rest as Parameters<typeof LazyComponent>[0]}\n >\n {children}\n </LazyComponent>\n </Suspense>\n );\n\n return CodeSplit;\n}\n"],"mappings":"AAAA;;AAEA,SAKEA,QAAQ,EACRC,IAAI,EACJC,kBAAkB,QACb,OAAO;AAEd,SAASC,OAAO,QAAQ,sBAAsB;AAE9C,SAA4BC,aAAa;AAEzC,SACEC,cAAc,EACdC,cAAc,EACdC,YAAY;;AAGd;AACA;AACA;AACA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AACA,IAAIC,iBAA+B;AAEnC,IAAIL,cAAc,EAAE;EAClB;EACA;AACF;AACA;AACA;EACEK,iBAAiB,GAAGC,OAAO,sBAAgB,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,IAAI,CAAC,CAAC;EACzE;AACF;AACA;AACA;AACA;AAEA,MAAMC,SAAiC,GAAG,CAAC,CAAC;AAE5C,SAASC,aAAaA,CAAA,EAAG;EACvB,OAAOR,YAAY,CAAC,CAAC,CAACS,UAAU;AAClC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,cAAcA,CACrBC,IAAY,EACZC,YAAyB,EACzBC,QAAiB,EACU;EAC3B,IAAIC,GAA8B;EAClC,MAAMC,IAAI,GAAG,GAAGP,aAAa,CAAC,CAAC,IAAIG,IAAI,EAAE;EACzC,MAAMK,QAAQ,GAAG,GAAGC,QAAQ,CAACC,QAAQ,CAACC,MAAM,GAAGJ,IAAI,EAAE;EAErD,IAAI,CAACH,YAAY,CAACQ,GAAG,CAACJ,QAAQ,CAAC,EAAE;IAC/B,IAAIK,IAAI,GAAGJ,QAAQ,CAACK,aAAa,CAAC,cAAcP,IAAI,IAAI,CAAC;IAEzD,IAAI,CAACM,IAAI,EAAE;MACTA,IAAI,GAAGJ,QAAQ,CAACM,aAAa,CAAC,MAAM,CAAC;MACrCF,IAAI,CAACG,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC;MACtCH,IAAI,CAACG,YAAY,CAAC,MAAM,EAAET,IAAI,CAAC;MAC/BE,QAAQ,CAACQ,IAAI,CAACC,WAAW,CAACL,IAAI,CAAC;IACjC;IAEAP,GAAG,GAAG,IAAIlB,OAAO,CAAO,CAAC;IACzByB,IAAI,CAACM,gBAAgB,CAAC,MAAM,EAAE,MAAM;MAClC,IAAI,CAACb,GAAG,EAAE,MAAMc,KAAK,CAAC,gBAAgB,CAAC;MACvC,KAAKd,GAAG,CAACe,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;IACFR,IAAI,CAACM,gBAAgB,CAAC,OAAO,EAAE,MAAM;MACnC,IAAI,CAACb,GAAG,EAAE,MAAMc,KAAK,CAAC,gBAAgB,CAAC;MACvC,KAAKd,GAAG,CAACe,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;EACJ;EAEA,IAAIhB,QAAQ,EAAE;IACZ,MAAMiB,OAAO,GAAGvB,SAAS,CAACQ,IAAI,CAAC,IAAI,CAAC;IACpCR,SAAS,CAACQ,IAAI,CAAC,GAAG,CAAC,GAAGe,OAAO;EAC/B;EAEA,OAAOhB,GAAG;AACZ;;AAEA;AACA;AACA;AACA;AACA,SAASiB,oBAAoBA,CAAA,EAAgB;EAC3C,MAAMjB,GAAG,GAAG,IAAIkB,GAAG,CAAS,CAAC;EAC7B,MAAM;IAAEC;EAAY,CAAC,GAAGhB,QAAQ;EAChC,KAAK,MAAM;IAAEiB;EAAK,CAAC,IAAID,WAAW,EAAE;IAClC,IAAIC,IAAI,EAAEpB,GAAG,CAACqB,GAAG,CAACD,IAAI,CAAC;EACzB;EACA,OAAOpB,GAAG;AACZ;AAEA,SAASsB,eAAeA,CACtBC,SAAiB,EACjBC,WAAyB,EACzB;EACA,IAAIA,WAAW,CAACD,SAAS,CAAC,EAAE;EAC5B,MAAMT,KAAK,CAAC,uBAAuBS,SAAS,GAAG,CAAC;AAClD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeE,eAAeA,CACnCF,SAAiB,EACjBC,WAAyB,EACzBzB,QAAiB,EACF;EACf,MAAM2B,QAAQ,GAAG,EAAE;EACnB,MAAMC,MAAM,GAAGH,WAAW,CAACD,SAAS,CAAC;EACrC,IAAI,CAACI,MAAM,EAAE,OAAOC,OAAO,CAACb,OAAO,CAAC,CAAC;EAErC,MAAMjB,YAAY,GAAGmB,oBAAoB,CAAC,CAAC;EAE3C,KAAK,MAAMY,KAAK,IAAIF,MAAM,EAAE;IAC1B,IAAIE,KAAK,CAACC,QAAQ,CAAC,MAAM,CAAC,EAAE;MAC1B,MAAMC,OAAO,GAAGnC,cAAc,CAACiC,KAAK,EAAE/B,YAAY,EAAEC,QAAQ,CAAC;MAC7D,IAAIgC,OAAO,EAAEL,QAAQ,CAACM,IAAI,CAACD,OAAO,CAAC;IACrC;EACF;EAEA,OAAOL,QAAQ,CAACO,MAAM,GAClBL,OAAO,CAACM,UAAU,CAACR,QAAQ,CAAC,CAACS,IAAI,CAAC,CAAC,GACnCP,OAAO,CAACb,OAAO,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASqB,eAAeA,CAC7Bb,SAAiB,EACjBC,WAAyB,EACnB;EACN,MAAMG,MAAM,GAAGH,WAAW,CAACD,SAAS,CAAC;EACrC,IAAI,CAACI,MAAM,EAAE;EAEb,KAAK,MAAME,KAAK,IAAIF,MAAM,EAAE;IAC1B,IAAIE,KAAK,CAACC,QAAQ,CAAC,MAAM,CAAC,EAAE;MAC1B,MAAM7B,IAAI,GAAG,GAAGP,aAAa,CAAC,CAAC,IAAImC,KAAK,EAAE;MAE1C,MAAMQ,YAAY,GAAG5C,SAAS,CAACQ,IAAI,CAAC;MACpC,IAAIoC,YAAY,EAAE;QAChB,IAAIA,YAAY,IAAI,CAAC,EAAE;UACrBlC,QAAQ,CAACQ,IAAI,CAACH,aAAa,CAAC,cAAcP,IAAI,IAAI,CAAC,CAAEqC,MAAM,CAAC,CAAC;UAC7D,OAAO7C,SAAS,CAACQ,IAAI,CAAC;QACxB,CAAC,MAAMR,SAAS,CAACQ,IAAI,CAAC,GAAGoC,YAAY,GAAG,CAAC;MAC3C;IACF;EACF;AACF;;AAEA;AACA,MAAME,cAAc,GAAG,IAAIrB,GAAG,CAAC,CAAC;AAMhC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASsB,cAAcA,CAEpC;EACAjB,SAAS;EACTkB,YAAY;EACZC;AAKF,CAAC,EAAsC;EACrC;EACA,IAAI1D,cAAc,EAAEsC,eAAe,CAACC,SAAS,EAAElC,iBAAiB,CAAC;;EAEjE;EACA,IAAIkD,cAAc,CAACjC,GAAG,CAACiB,SAAS,CAAC,EAAE;IACjC,MAAMT,KAAK,CAAC,iDAAiDS,SAAS,GAAG,CAAC;EAC5E,CAAC,MAAMgB,cAAc,CAAClB,GAAG,CAACE,SAAS,CAAC;EAEpC,MAAMoB,aAAa,gBAAG/D,IAAI,CAAC,YAAY;IACrC,MAAMgE,QAAQ,GAAG,MAAMH,YAAY,CAAC,CAAC;IACrC,MAAMI,SAAS,GAAG,SAAS,IAAID,QAAQ,GAAGA,QAAQ,CAACrD,OAAO,GAAGqD,QAAQ;;IAErE;IACA;IACA;IACA,IAAI5D,cAAc,EAAE;MAClB,MAAMyC,eAAe,CAACF,SAAS,EAAElC,iBAAiB,EAAE,KAAK,CAAC;IAC5D;IAEA,MAAMyD,OAA2C,GAAGA,CAAC;MACnDC,QAAQ;MACRC,GAAG;MACH,GAAGC;IACL,CAAC,KAAK;MACJ;MACA;MACA,IAAIhE,cAAc,EAAE;QAClB,MAAM;UAAEuC,WAAW;UAAE0B;QAAO,CAAC,GAAGnE,aAAa,CAAC,CAAE;QAChDuC,eAAe,CAACC,SAAS,EAAEC,WAAW,CAAC;QACvC,IAAI,CAAC0B,MAAM,CAACC,QAAQ,CAAC5B,SAAS,CAAC,EAAE2B,MAAM,CAAClB,IAAI,CAACT,SAAS,CAAC;MACzD;;MAEA;MACA;MACA1C,kBAAkB,CAAC,MAAM;QACvB,KAAK4C,eAAe,CAACF,SAAS,EAAElC,iBAAiB,EAAE,IAAI,CAAC;QACxD,OAAO,MAAM;UACX+C,eAAe,CAACb,SAAS,EAAElC,iBAAiB,CAAC;QAC/C,CAAC;MACH,CAAC,EAAE,EAAE,CAAC;MAEN,oBACED,IAAA,CAACyD;MACC;MAAA;QAAA,GACKI,IAAI;QACTD,GAAG,EAAEA,GAAI;QAAAD,QAAA,EAERA;MAAQ,CACA,CAAC;IAEhB,CAAC;IAED,OAAO;MAAExD,OAAO,EAAEuD;IAAQ,CAAC;EAC7B,CAAC,CAAC;EAEF,MAAMM,SAAmD,GAAGA,CAAC;IAC3DL,QAAQ;IACR,GAAGE;EACY,CAAC,kBAChB7D,IAAA,CAACT,QAAQ;IAAC0E,QAAQ,EAAEX,WAAY;IAAAK,QAAA,eAC9B3D,IAAA,CAACuD;IACC;IAAA;MAAA,GACIM,IAAI;MAAAF,QAAA,EAEPA;IAAQ,CACI;EAAC,CACR,CACX;EAED,OAAOK,SAAS;AAClB","ignoreList":[]}
1
+ {"version":3,"file":"splitComponent.js","names":["Suspense","lazy","useInsertionEffect","Barrier","getSsrContext","IS_CLIENT_SIDE","IS_SERVER_SIDE","getBuildInfo","jsx","_jsx","getClientChunkGroups","undefined","default","getInj","CHUNK_GROUPS","refCounts","getPublicPath","publicPath","bookStyleSheet","name","loadedSheets","refCount","res","path","fullPath","document","location","origin","has","link","querySelector","createElement","setAttribute","head","appendChild","addEventListener","Error","resolve","current","getLoadedStyleSheets","Set","styleSheets","href","add","assertChunkName","chunkName","chunkGroups","bookStyleSheets","promises","assets","Promise","asset","endsWith","promise","push","length","allSettled","then","freeStyleSheets","pathRefCount","remove","usedChunkNames","splitComponent","getComponent","placeholder","LazyComponent","clientChunkGroups","resolved","Component","Wrapper","children","ref","rest","chunks","includes","CodeSplit","fallback"],"sources":["../../../../src/shared/utils/splitComponent.tsx"],"sourcesContent":["/* global document */\n\nimport {\n type ComponentType,\n type FunctionComponent,\n type ReactNode,\n type RefObject,\n Suspense,\n lazy,\n useInsertionEffect,\n} from 'react';\n\nimport { Barrier } from '@dr.pogodin/js-utils';\n\nimport { type ChunkGroupsT, getSsrContext } from './globalState';\n\nimport {\n IS_CLIENT_SIDE,\n IS_SERVER_SIDE,\n getBuildInfo,\n} from './isomorphy';\n\nfunction getClientChunkGroups(): Promise<ChunkGroupsT> | undefined {\n if (!IS_CLIENT_SIDE) return undefined;\n\n return (async () => {\n const { default: getInj } = await import(/* webpackChunkName: \"react-utils-client-side-code\" */ '../../client/getInj');\n return getInj().CHUNK_GROUPS ?? {};\n })();\n}\n\nconst refCounts: Record<string, number> = {};\n\nfunction getPublicPath() {\n return getBuildInfo().publicPath;\n}\n\n/**\n * Client-side only! Ensures the specified CSS stylesheet is loaded into\n * the document; loads if it is missing; and does simple reference counting\n * to facilitate future clean-up.\n * @param name\n * @param loadedSheets\n * @param refCount\n * @return\n */\nfunction bookStyleSheet(\n name: string,\n loadedSheets: Set<string>,\n refCount: boolean,\n): Promise<void> | undefined {\n let res: Barrier<void> | undefined;\n const path = `${getPublicPath()}/${name}`;\n const fullPath = `${document.location.origin}${path}`;\n\n if (!loadedSheets.has(fullPath)) {\n let link = document.querySelector(`link[href=\"${path}\"]`);\n\n if (!link) {\n link = document.createElement('link');\n link.setAttribute('rel', 'stylesheet');\n link.setAttribute('href', path);\n document.head.appendChild(link);\n }\n\n res = new Barrier<void>();\n link.addEventListener('load', () => {\n if (!res) throw Error('Internal error');\n void res.resolve();\n });\n link.addEventListener('error', () => {\n if (!res) throw Error('Internal error');\n void res.resolve();\n });\n }\n\n if (refCount) {\n const current = refCounts[path] ?? 0;\n refCounts[path] = 1 + current;\n }\n\n return res;\n}\n\n/**\n * Generates the set of URLs for currently loaded, linked stylesheets.\n * @return\n */\nfunction getLoadedStyleSheets(): Set<string> {\n const res = new Set<string>();\n const { styleSheets } = document;\n for (const { href } of styleSheets) {\n if (href) res.add(href);\n }\n return res;\n}\n\nfunction assertChunkName(\n chunkName: string,\n chunkGroups: ChunkGroupsT,\n) {\n if (chunkGroups[chunkName]) return;\n throw Error(`Unknown chunk name \"${chunkName}\"`);\n}\n\n/**\n * Client-side only! Ensures all CSS stylesheets required for the specified\n * code chunk are loaded into the document; loads the missing ones; and does\n * simple reference counting to facilitate future clean-up.\n * @param chunkName Chunk name.\n * @param refCount\n * @return Resolves once all pending stylesheets, necessary for\n * the chunk, are either loaded, or failed to load.\n */\nexport async function bookStyleSheets(\n chunkName: string,\n chunkGroups: ChunkGroupsT,\n refCount: boolean,\n): Promise<void> {\n const promises = [];\n const assets = chunkGroups[chunkName];\n if (!assets) return Promise.resolve();\n\n const loadedSheets = getLoadedStyleSheets();\n\n for (const asset of assets) {\n if (asset.endsWith('.css')) {\n const promise = bookStyleSheet(asset, loadedSheets, refCount);\n if (promise) promises.push(promise);\n }\n }\n\n return promises.length\n ? Promise.allSettled(promises).then()\n : Promise.resolve();\n}\n\n/**\n * Client-side only! Frees from the document all CSS stylesheets that are\n * required by the specified chunk, and have reference counter equal to one\n * (for chunks with larger reference counter values, it just decrements\n * the reference counter).\n * @param {string} chunkName\n */\nexport function freeStyleSheets(\n chunkName: string,\n chunkGroups: ChunkGroupsT,\n): void {\n const assets = chunkGroups[chunkName];\n if (!assets) return;\n\n for (const asset of assets) {\n if (asset.endsWith('.css')) {\n const path = `${getPublicPath()}/${asset}`;\n\n const pathRefCount = refCounts[path];\n if (pathRefCount) {\n if (pathRefCount <= 1) {\n document.head.querySelector(`link[href=\"${path}\"]`)!.remove();\n delete refCounts[path];\n } else refCounts[path] = pathRefCount - 1;\n }\n }\n }\n}\n\n// Holds the set of chunk names already used for splitComponent() calls.\nconst usedChunkNames = new Set();\n\ntype ComponentOrModule<PropsT> = ComponentType<PropsT> | {\n default: ComponentType<PropsT>;\n};\n\n/**\n * Given an async component retrieval function `getComponent()` it creates\n * a special \"code split\" component, which uses <Suspense> to asynchronously\n * load on demand the code required by `getComponent()`.\n * @param options\n * @param options.chunkName\n * @param {function} options.getComponent\n * @param {React.Element} [options.placeholder]\n * @return {React.ElementType}\n */\nexport default function splitComponent<\n ComponentPropsT extends { children?: ReactNode; ref?: RefObject<unknown> },\n>({\n chunkName,\n getComponent,\n placeholder,\n}: {\n chunkName: string;\n getComponent: () => Promise<ComponentOrModule<ComponentPropsT>>;\n placeholder?: ReactNode;\n}): FunctionComponent<ComponentPropsT> {\n // The correct usage of splitComponent() assumes a single call per chunk.\n if (usedChunkNames.has(chunkName)) {\n throw Error(`Repeated splitComponent() call for the chunk \"${chunkName}\"`);\n } else usedChunkNames.add(chunkName);\n\n const LazyComponent = lazy(async () => {\n const clientChunkGroups = await getClientChunkGroups();\n\n // On the client side we can check right away if the chunk name is known.\n if (IS_CLIENT_SIDE) {\n if (!clientChunkGroups) throw Error('Internal error');\n assertChunkName(chunkName, clientChunkGroups);\n }\n\n const resolved = await getComponent();\n const Component = 'default' in resolved ? resolved.default : resolved;\n\n // This pre-loads necessary stylesheets prior to the first mount of\n // the component (the lazy load function is executed by React one at\n // the frist mount).\n if (IS_CLIENT_SIDE) {\n if (!clientChunkGroups) throw Error('Internal error');\n await bookStyleSheets(chunkName, clientChunkGroups, false);\n }\n\n const Wrapper: FunctionComponent<ComponentPropsT> = ({\n children,\n ref,\n ...rest\n }) => {\n // On the server side we'll assert the chunk name here,\n // and also push it to the SSR chunks array.\n if (IS_SERVER_SIDE) {\n const { chunkGroups, chunks } = getSsrContext()!;\n assertChunkName(chunkName, chunkGroups);\n if (!chunks.includes(chunkName)) chunks.push(chunkName);\n }\n\n // This takes care about stylesheets management every time an instance of\n // this component is mounted / unmounted.\n useInsertionEffect(() => {\n if (!clientChunkGroups) throw Error('Internal error');\n void bookStyleSheets(chunkName, clientChunkGroups, true);\n return () => {\n freeStyleSheets(chunkName, clientChunkGroups);\n };\n }, []);\n\n return (\n <Component\n // eslint-disable-next-line react/jsx-props-no-spreading\n {...(rest as unknown as ComponentPropsT)}\n ref={ref}\n >\n {children}\n </Component>\n );\n };\n\n return { default: Wrapper };\n });\n\n const CodeSplit: React.FunctionComponent<ComponentPropsT> = ({\n children,\n ...rest\n }: ComponentPropsT) => (\n <Suspense fallback={placeholder}>\n <LazyComponent\n // eslint-disable-next-line react/jsx-props-no-spreading\n {...rest as Parameters<typeof LazyComponent>[0]}\n >\n {children}\n </LazyComponent>\n </Suspense>\n );\n\n return CodeSplit;\n}\n"],"mappings":"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","ignoreList":[]}
@@ -5,6 +5,12 @@ const path = require('node:path');
5
5
 
6
6
  const globalLibDir = path.resolve(process.execPath, '../../lib/node_modules');
7
7
 
8
+ const modulesToTransform = [
9
+ '@dr.pogodin/react-global-state',
10
+ '@dr.pogodin/react-utils',
11
+ 'uuid',
12
+ ];
13
+
8
14
  module.exports = {
9
15
  collectCoverage: true,
10
16
  collectCoverageFrom: [
@@ -36,7 +42,6 @@ module.exports = {
36
42
  '\\.((j|t)sx?|svg)$': 'babel-jest',
37
43
  },
38
44
  transformIgnorePatterns: [
39
- '/node_modules/(?!@dr.pogodin/react-utils|uuid)',
45
+ `/node_modules/(?!${modulesToTransform.join('|')})`,
40
46
  ],
41
-
42
47
  };
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.47.0-alpha.1",
2
+ "version": "1.47.0-alpha.2",
3
3
  "bin": {
4
4
  "react-utils-build": "bin/build.js",
5
5
  "react-utils-setup": "bin/setup.js"
@@ -12,7 +12,7 @@
12
12
  "@dr.pogodin/babel-plugin-react-css-modules": "^6.13.8",
13
13
  "@dr.pogodin/csurf": "^1.16.6",
14
14
  "@dr.pogodin/js-utils": "^0.1.4",
15
- "@dr.pogodin/react-global-state": "^0.20.1",
15
+ "@dr.pogodin/react-global-state": "^0.21.0",
16
16
  "@dr.pogodin/react-helmet": "^3.0.4",
17
17
  "@dr.pogodin/react-themes": "^1.9.3",
18
18
  "@jest/environment": "^30.2.0",
@@ -23,7 +23,7 @@
23
23
  "cookie": "^1.0.2",
24
24
  "cookie-parser": "^1.4.7",
25
25
  "cross-env": "^10.1.0",
26
- "dayjs": "^1.11.18",
26
+ "dayjs": "^1.11.19",
27
27
  "express": "^5.1.0",
28
28
  "helmet": "^8.1.0",
29
29
  "http-status-codes": "^2.3.0",
@@ -36,7 +36,7 @@
36
36
  "react-dom": "^19.2.0",
37
37
  "react-router": "^7.9.5",
38
38
  "request-ip": "^3.3.0",
39
- "rimraf": "^6.0.0",
39
+ "rimraf": "^6.1.0",
40
40
  "serialize-javascript": "^7.0.0",
41
41
  "serve-favicon": "^2.5.1",
42
42
  "source-map-support": "^0.5.21",
@@ -102,7 +102,7 @@
102
102
  "react-refresh": "^0.18.0",
103
103
  "regenerator-runtime": "^0.14.1",
104
104
  "resolve-url-loader": "^5.0.0",
105
- "sass": "^1.93.2",
105
+ "sass": "^1.93.3",
106
106
  "sass-loader": "^16.0.6",
107
107
  "sitemap": "^8.0.2",
108
108
  "source-map-loader": "^5.0.0",
@@ -125,7 +125,7 @@
125
125
  "node": ">=20",
126
126
  "npm": ">=10"
127
127
  },
128
- "main": "./node-entry.js",
128
+ "main": "./build/production/index.js",
129
129
  "source": "./src/index.ts",
130
130
  "types": "./build/types-code/index.d.ts",
131
131
  "exports": {
@@ -133,10 +133,11 @@
133
133
  "browser": "./build/web/index.js",
134
134
  "node": {
135
135
  "webpack": "./build/web/index.js",
136
- "default": "./node-entry.js"
136
+ "development": "./build/development/index.js",
137
+ "default": "./build/production/index.js"
137
138
  },
138
139
  "react-native": {
139
- "default": "./node-entry.js",
140
+ "default": "./build/production/index.js",
140
141
  "types": "./build/types-code/index.d.ts"
141
142
  }
142
143
  },
package/src/index.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import 'styles/global.scss';
2
2
 
3
- import { webpack } from 'utils';
3
+ import clientModule from './client';
4
+ import { webpack } from './shared/utils';
4
5
 
5
- import type * as ClientM from './client';
6
6
  import type * as ServerFactoryM from './server';
7
7
 
8
8
  // It is a safeguard against multiple instances / versions of the library
@@ -21,11 +21,7 @@ dirname = dirname.slice(5, dirname.lastIndexOf('/'));
21
21
 
22
22
  const server = webpack.requireWeak<typeof ServerFactoryM>('./server', dirname);
23
23
 
24
- const client = server
25
- ? undefined
26
-
27
- // eslint-disable-next-line @typescript-eslint/no-require-imports
28
- : (require('./client') as typeof ClientM).default;
24
+ const client = server ? undefined : clientModule;
29
25
 
30
26
  export {
31
27
  type AsyncCollectionT,
@@ -16,7 +16,6 @@ import csrf from '@dr.pogodin/csurf';
16
16
  import express, {
17
17
  type Express,
18
18
  type NextFunction,
19
- type RequestHandler,
20
19
  type Request,
21
20
  type Response,
22
21
  } from 'express';
@@ -27,7 +26,7 @@ import loggerMiddleware from 'morgan';
27
26
  import requestIp from 'request-ip';
28
27
  import { v4 as uuid } from 'uuid';
29
28
 
30
- import type { Compiler, Configuration } from 'webpack';
29
+ import type { Configuration } from 'webpack';
31
30
 
32
31
  import rendererFactory, {
33
32
  type LoggerI,
@@ -251,18 +250,19 @@ export default async function factory(
251
250
  } as Location;
252
251
  }
253
252
 
254
- /* eslint-disable @typescript-eslint/no-require-imports */
255
- const webpack = require('webpack') as (ops: Configuration) => Compiler;
253
+ const { webpack } = await import(/* webpackChunkName: "server-side-code" */ 'webpack');
256
254
 
257
- // TODO: Figure out the exact type for options, don't wanna waste time on it
258
- // right now.
259
- const webpackDevMiddleware = require('webpack-dev-middleware') as
260
- (c: Compiler, ops: unknown) => RequestHandler;
255
+ const { default: webpackDevMiddleware } = await import(
256
+ /* webpackChunkName: "server-side-code" */ 'webpack-dev-middleware'
257
+ );
261
258
 
262
- const webpackHotMiddleware = require('webpack-hot-middleware') as
263
- (c: Compiler) => RequestHandler;
259
+ const { default: webpackHotMiddleware } = await import(
260
+ /* webpackChunkName: "server-side-code" */ 'webpack-hot-middleware'
261
+ );
264
262
 
265
263
  const compiler = webpack(webpackConfig);
264
+ if (!compiler) throw Error('Internal error');
265
+
266
266
  server.use(webpackDevMiddleware(compiler, {
267
267
  publicPath,
268
268
  serverSideRender: true,
@@ -1,6 +1,8 @@
1
1
  /* global document */
2
2
 
3
- import type CookieM from 'cookie';
3
+ import { parse } from 'cookie';
4
+
5
+ import clientGetInj from '../../client/getInj';
4
6
 
5
7
  import { IS_CLIENT_SIDE } from './isomorphy/environment-check';
6
8
  import { requireWeak } from './webpack';
@@ -8,21 +10,14 @@ import { requireWeak } from './webpack';
8
10
  // TODO: The internal type casting is somewhat messed up here,
9
11
  // to be corrected later.
10
12
  const config: Record<string, unknown> = (
11
- IS_CLIENT_SIDE
12
- // eslint-disable-next-line @typescript-eslint/no-require-imports
13
- ? (require('client/getInj') as {
14
- default: () => Record<string, unknown>;
15
- }).default().CONFIG
16
- : requireWeak('config')
13
+ IS_CLIENT_SIDE ? clientGetInj().CONFIG : requireWeak('config')
17
14
  ) as (Record<string, unknown> | undefined) ?? ({} as Record<string, unknown>);
18
15
 
19
16
  // The safeguard for "document" is necessary because in non-Node environments,
20
17
  // like React Native, IS_CLIENT_SIDE is "true", however "document" and a bunch
21
18
  // of other browser-world features are not available.
22
19
  if (IS_CLIENT_SIDE && typeof document !== 'undefined') {
23
- // eslint-disable-next-line @typescript-eslint/no-require-imports
24
- const cookie = require('cookie') as typeof CookieM;
25
- config.CSRF = cookie.parse(document.cookie).csrfToken;
20
+ config.CSRF = parse(document.cookie).csrfToken;
26
21
  }
27
22
 
28
23
  export default config;
@@ -20,23 +20,13 @@ import {
20
20
  getBuildInfo,
21
21
  } from './isomorphy';
22
22
 
23
- // Note: At the client side we can get chunk groups immediately when loading
24
- // the module; at the server-side we only can get them within React render flow.
25
- // Thus, we set and use the following variable at the client-side, and then when
26
- // needed on the server side, we'll fetch it differently.
27
- let clientChunkGroups: ChunkGroupsT;
28
-
29
- if (IS_CLIENT_SIDE) {
30
- // TODO: Rewrite to avoid these overrides of ESLint rules.
31
- /* eslint-disable @typescript-eslint/no-unsafe-assignment,
32
- @typescript-eslint/no-require-imports,
33
- @typescript-eslint/no-unsafe-call,
34
- @typescript-eslint/no-unsafe-member-access */
35
- clientChunkGroups = require('client/getInj').default().CHUNK_GROUPS ?? {};
36
- /* eslint-enable @typescript-eslint/no-unsafe-assignment,
37
- @typescript-eslint/no-require-imports,
38
- @typescript-eslint/no-unsafe-call,
39
- @typescript-eslint/no-unsafe-member-access */
23
+ function getClientChunkGroups(): Promise<ChunkGroupsT> | undefined {
24
+ if (!IS_CLIENT_SIDE) return undefined;
25
+
26
+ return (async () => {
27
+ const { default: getInj } = await import(/* webpackChunkName: "react-utils-client-side-code" */ '../../client/getInj');
28
+ return getInj().CHUNK_GROUPS ?? {};
29
+ })();
40
30
  }
41
31
 
42
32
  const refCounts: Record<string, number> = {};
@@ -202,15 +192,20 @@ export default function splitComponent<
202
192
  getComponent: () => Promise<ComponentOrModule<ComponentPropsT>>;
203
193
  placeholder?: ReactNode;
204
194
  }): FunctionComponent<ComponentPropsT> {
205
- // On the client side we can check right away if the chunk name is known.
206
- if (IS_CLIENT_SIDE) assertChunkName(chunkName, clientChunkGroups);
207
-
208
195
  // The correct usage of splitComponent() assumes a single call per chunk.
209
196
  if (usedChunkNames.has(chunkName)) {
210
197
  throw Error(`Repeated splitComponent() call for the chunk "${chunkName}"`);
211
198
  } else usedChunkNames.add(chunkName);
212
199
 
213
200
  const LazyComponent = lazy(async () => {
201
+ const clientChunkGroups = await getClientChunkGroups();
202
+
203
+ // On the client side we can check right away if the chunk name is known.
204
+ if (IS_CLIENT_SIDE) {
205
+ if (!clientChunkGroups) throw Error('Internal error');
206
+ assertChunkName(chunkName, clientChunkGroups);
207
+ }
208
+
214
209
  const resolved = await getComponent();
215
210
  const Component = 'default' in resolved ? resolved.default : resolved;
216
211
 
@@ -218,6 +213,7 @@ export default function splitComponent<
218
213
  // the component (the lazy load function is executed by React one at
219
214
  // the frist mount).
220
215
  if (IS_CLIENT_SIDE) {
216
+ if (!clientChunkGroups) throw Error('Internal error');
221
217
  await bookStyleSheets(chunkName, clientChunkGroups, false);
222
218
  }
223
219
 
@@ -237,6 +233,7 @@ export default function splitComponent<
237
233
  // This takes care about stylesheets management every time an instance of
238
234
  // this component is mounted / unmounted.
239
235
  useInsertionEffect(() => {
236
+ if (!clientChunkGroups) throw Error('Internal error');
240
237
  void bookStyleSheets(chunkName, clientChunkGroups, true);
241
238
  return () => {
242
239
  freeStyleSheets(chunkName, clientChunkGroups);
package/node-entry.js DELETED
@@ -1,15 +0,0 @@
1
- // TODO: We should re-visit, if this can be simplified / optimized?
2
- /* global global, module, process, require */
3
-
4
- // This permits to load the library in react-native, or other environment that
5
- // does not have __dirname global. It probably breaks a few node-specific lib
6
- // pieces, but that does not seem to prevent more relevant parts from working.
7
- if (typeof __dirname === 'undefined') {
8
- global.__dirname = ''; // eslint-disable-line no-underscore-dangle
9
- }
10
-
11
- // Again, for react-native, and maybe some other environments, we need
12
- // to have no dynamic requires below (i.e. can't do require(`./build/${env}`)).
13
- // eslint-disable-next-line import/no-commonjs
14
- module.exports = process.env.NODE_ENV === 'production'
15
- ? require('./build/production') : require('./build/development');