@zengenti/contensis-react-base 4.0.1-beta.0 → 4.0.1-beta.10

package/cjs/build.js

@@ -0,0 +1,219 @@
+#!/usr/bin/env node
+'use strict';
+
+var cac = require('cac');
+var child_process = require('child_process');
+var path = require('path');
+var fs = require('fs');
+var dotenv = require('dotenv');
+var nodemon = require('nodemon');
+var webpack = require('webpack');
+var WebpackDevServer = require('webpack-dev-server');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var path__default = /*#__PURE__*/_interopDefault(path);
+var fs__default = /*#__PURE__*/_interopDefault(fs);
+var dotenv__default = /*#__PURE__*/_interopDefault(dotenv);
+var nodemon__default = /*#__PURE__*/_interopDefault(nodemon);
+var webpack__default = /*#__PURE__*/_interopDefault(webpack);
+var WebpackDevServer__default = /*#__PURE__*/_interopDefault(WebpackDevServer);
+
+const projectRoot = process.cwd();
+const DEVSERVER_RUNTIME_GLOBALS = path__default.default.resolve(__dirname, 'dev-server-globals.js');
+function runDev(args) {
+  const configPath = args.config;
+  const devHost = args.devHost || 'localhost';
+  const devPort = args.devPort || '3000';
+  const devListen = args.devListen || '0.0.0.0';
+  const openBrowser = args.open !== false;
+
+  // --inspect-brk takes precedence over --inspect.
+  // A bare flag (no port value) resolves to true in cac — treat that as the default port.
+  const resolveInspectPort = val => val === true || val === undefined ? '9229' : String(val);
+  const inspectNodeArg = args.inspectBrk !== undefined ? `--inspect-brk=${resolveInspectPort(args.inspectBrk)}` : `--inspect=${resolveInspectPort(args.inspect)}`;
+
+  // Validate --config option
+  if (!configPath) {
+    console.error('[crb] ❌ Error: --config option is required');
+    console.log('Usage: crb dev --config <path-to-webpack-config> [--dev-host <host>] [--dev-port <port>] [--dev-listen <host>] [--inspect[=port]] [--inspect-brk[=port]]');
+    process.exit(1);
+  }
+  console.info('[crb] 🚀 Starting SSR dev server pipeline');
+  const resolvedConfigPath = path__default.default.resolve(projectRoot, configPath);
+
+  // Check config file exists
+  if (!fs__default.default.existsSync(resolvedConfigPath)) {
+    console.error(`[crb] ❌ Error: Config file not found: ${resolvedConfigPath}`);
+    process.exit(1);
+  }
+
+  // Set default host and port
+  process.env.DEV_HOST = devHost;
+  process.env.DEV_PORT = devPort;
+
+  // Load .env file
+  const envFilePath = path__default.default.resolve(projectRoot, args.envFile || '.env');
+  try {
+    dotenv__default.default.config({
+      path: envFilePath
+    });
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    console.error(`[crb] ❌ Error: Failed to load env file (${envFilePath}): ${msg}`);
+    process.exit(1);
+  }
+
+  // Validate required environment variables
+  const REQUIRED_ENV = ['ALIAS', 'PROJECT', 'ACCESS_TOKEN'];
+  const missingEnv = REQUIRED_ENV.filter(k => !process.env[k] || !process.env[k].trim());
+  if (missingEnv.length) {
+    console.error(`[crb] ❌ Error: Cannot start dev server. Missing required env vars: ${missingEnv.join(', ')}. ` + `Set them in a .env file at the project root or export them in your shell.`);
+    process.exit(1);
+  }
+
+  // Load project webpack config
+  let webpackConfig;
+  try {
+    webpackConfig = require(resolvedConfigPath);
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    console.error(`[crb] ❌ Error: Failed to load webpack config: ${msg}`);
+    process.exit(1);
+  }
+
+  // Validate webpack config is an array (dual-target mode)
+  if (!Array.isArray(webpackConfig)) {
+    console.error(`[crb] ❌ Error: webpack config must be an array [clientConfig, serverConfig]. ` + `The config appears to be a single object (CSR/ANALYZE mode). ` + `Use the unified webpack.config.js for SSR dev mode.`);
+    process.exit(1);
+  }
+  const [clientConfig, serverConfig] = webpackConfig;
+
+  // State flags for orchestration
+  let clientReady = false;
+  let serverReady = false;
+  let nodemonStarted = false;
+  let browserOpened = false;
+
+  // Nodemon reference for cleanup
+  let nodemonInstance = null;
+
+  // Dev server options
+  const devServerOptions = {
+    host: devListen,
+    port: parseInt(devPort, 10),
+    headers: {
+      'Access-Control-Allow-Origin': '*'
+    },
+    hot: true,
+    historyApiFallback: true,
+    devMiddleware: {
+      index: 'index_csr.html',
+      writeToDisk: true
+    }
+    // TODO: Add proxy config from bundle-info.js (DEVSERVER_PROXIES)
+    // to proxy API calls and reverse proxy paths to CMS/IIS
+  };
+
+  // Create dual webpack compilers (single config each → single Compiler, not MultiCompiler)
+  const clientCompiler = webpack__default.default(clientConfig);
+  const nodeServerCompiler = webpack__default.default(serverConfig);
+
+  // Start nodemon when both compilers are ready
+  function startNodemon() {
+    if (nodemonStarted) return;
+    nodemonStarted = true;
+    console.info('[crb] 🎯 Starting nodemon...');
+    nodemonInstance = nodemon__default.default({
+      script: 'dist/server-dev.js',
+      ext: 'js json',
+      watch: ['dist/server-dev.js'],
+      nodeArgs: [inspectNodeArg, '-r', DEVSERVER_RUNTIME_GLOBALS]
+    }).on('start', () => {
+      console.info('[nodemon] started. Now starting local web server at port 3001, with hot-reload enabled.');
+      if (openBrowser && !browserOpened) {
+        browserOpened = true;
+        try {
+          const cmd = process.platform === 'win32' ? 'start' : process.platform === 'darwin' ? 'open' : 'xdg-open';
+          child_process.execSync(`${cmd} http://${process.env.DEV_HOST}:3001/`, {
+            windowsHide: true
+          });
+        } catch {
+          console.info(`Please open http://${process.env.DEV_HOST}:3001/ in your browser`);
+        }
+      }
+    }).on('crash', () => {
+      console.error('[nodemon] crashed');
+    });
+  }
+
+  // Server afterEmit -> start nodemon when both compilers are ready
+  nodeServerCompiler.hooks.afterEmit.tap('serverAfterEmitPlugin', () => {
+    if (serverReady) return;
+    serverReady = true;
+    if (clientReady) {
+      startNodemon();
+    }
+  });
+
+  // Start server compiler watch immediately
+  console.info('[crb] 📦 Starting server compiler...');
+  nodeServerCompiler.watch({}, (err, stats) => {
+    if (err) {
+      return console.error(err);
+    }
+    const statString = stats.toString();
+    process.stdout.write(statString + '\n');
+  });
+
+  // Client afterEmit -> start nodemon if server is already ready
+  clientCompiler.hooks.afterEmit.tap('clientAfterEmitPlugin', () => {
+    if (clientReady) return;
+    clientReady = true;
+    if (serverReady) {
+      startNodemon();
+    }
+  });
+
+  // Start webpack dev server
+  const devServer = new WebpackDevServer__default.default(devServerOptions, clientCompiler);
+  devServer.startCallback(err => {
+    if (err) {
+      console.error('[webpack] devServer listening failed');
+      return console.error(err);
+    }
+    console.info(`[webpack] devServer listening on port ${devPort}`);
+  });
+
+  // Cleanup on SIGTERM/SIGINT
+  function cleanup() {
+    console.info('[crb] 🛑 Shutting down...');
+    if (nodemonInstance) {
+      nodemonInstance.emit('quit');
+    }
+    devServer.stopCallback(() => {
+      console.info('[webpack] devServer stopped');
+      clientCompiler.close(() => {
+        console.info('[webpack] client compiler closed');
+        nodeServerCompiler.close(() => {
+          console.info('[webpack] server compiler closed');
+          process.exit(0);
+        });
+      });
+    });
+  }
+  process.on('SIGTERM', cleanup);
+  process.on('SIGINT', cleanup);
+}
+
+const cli = cac.cac('crb');
+
+// Dev subcommand
+cli.command('dev', 'Start the SSR dev server pipeline').option('--config <path>', 'Path to webpack config file (required)').option('--env-file <path>', 'Path to .env file (default: .env)').option('--dev-host <host>', 'webpack publicPath / HMR host (default: localhost)').option('--dev-port <port>', 'webpack-dev-server listen port (default: 3000)').option('--dev-listen <host>', 'webpack-dev-server listen host (default: 0.0.0.0)').option('--open', 'Open the browser when the SSR server starts. Use --no-open to disable. (default: true)').option('--inspect [port]', 'Enable the V8 inspector on the SSR server. Optionally specify a port (default: 9229)').option('--inspect-brk [port]', 'Enable the V8 inspector and break before the script starts — useful for debugging server startup. Optionally specify a port (default: 9229). Takes precedence over --inspect.').action(runDev);
+cli.help();
+cli.parse();
+if (!cli.matchedCommand) {
+  cli.outputHelp();
+  process.exit(1);
+}
+//# sourceMappingURL=build.js.map

package/cjs/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sources":["../src/build/dev-server.ts","../src/build/cli.ts"],"sourcesContent":["import { execSync } from 'child_process';\nimport path from 'path';\nimport fs from 'fs';\nimport dotenv from 'dotenv';\n// @ts-ignore — nodemon has no type definitions\nimport nodemon from 'nodemon';\nimport webpack from 'webpack';\nimport WebpackDevServer from 'webpack-dev-server';\nconst projectRoot = process.cwd();\nconst DEVSERVER_RUNTIME_GLOBALS = path.resolve(__dirname, 'dev-server-globals.js');\n\ninterface DevOptions {\n  config?: string;\n  envFile?: string;\n  devHost?: string;\n  devPort?: string;\n  devListen?: string;\n  open?: boolean;\n  inspect?: boolean | string;\n  inspectBrk?: boolean | string;\n}\n\nexport function runDev(args: DevOptions): void {\n  const configPath = args.config;\n  const devHost = args.devHost || 'localhost';\n  const devPort = args.devPort || '3000';\n  const devListen = args.devListen || '0.0.0.0';\n  const openBrowser = args.open !== false;\n\n  // --inspect-brk takes precedence over --inspect.\n  // A bare flag (no port value) resolves to true in cac — treat that as the default port.\n  const resolveInspectPort = (val: boolean | string | undefined) =>\n    val === true || val === undefined ? '9229' : String(val);\n  const inspectNodeArg =\n    args.inspectBrk !== undefined\n      ? `--inspect-brk=${resolveInspectPort(args.inspectBrk)}`\n      : `--inspect=${resolveInspectPort(args.inspect)}`;\n\n  // Validate --config option\n  if (!configPath) {\n    console.error('[crb] ❌ Error: --config option is required');\n    console.log(\n      'Usage: crb dev --config <path-to-webpack-config> [--dev-host <host>] [--dev-port <port>] [--dev-listen <host>] [--inspect[=port]] [--inspect-brk[=port]]'\n    );\n    process.exit(1);\n  }\n\n  console.info('[crb] 🚀 Starting SSR dev server pipeline');\n\n  const resolvedConfigPath = path.resolve(projectRoot, configPath);\n\n  // Check config file exists\n  if (!fs.existsSync(resolvedConfigPath)) {\n    console.error(\n      `[crb] ❌ Error: Config file not found: ${resolvedConfigPath}`\n    );\n    process.exit(1);\n  }\n\n  // Set default host and port\n  process.env.DEV_HOST = devHost;\n  process.env.DEV_PORT = devPort;\n\n  // Load .env file\n  const envFilePath = path.resolve(projectRoot, args.envFile || '.env');\n  try {\n    dotenv.config({ path: envFilePath });\n  } catch (e: unknown) {\n    const msg = e instanceof Error ? e.message : String(e);\n    console.error(\n      `[crb] ❌ Error: Failed to load env file (${envFilePath}): ${msg}`\n    );\n    process.exit(1);\n  }\n\n  // Validate required environment variables\n  const REQUIRED_ENV: string[] = ['ALIAS', 'PROJECT', 'ACCESS_TOKEN'];\n  const missingEnv = REQUIRED_ENV.filter(\n    (k) => !process.env[k] || !process.env[k].trim()\n  );\n  if (missingEnv.length) {\n    console.error(\n      `[crb] ❌ Error: Cannot start dev server. Missing required env vars: ${missingEnv.join(', ')}. ` +\n        `Set them in a .env file at the project root or export them in your shell.`\n    );\n    process.exit(1);\n  }\n\n  // Load project webpack config\n  let webpackConfig: unknown;\n  try {\n    webpackConfig = require(resolvedConfigPath);\n  } catch (e: unknown) {\n    const msg = e instanceof Error ? e.message : String(e);\n    console.error(\n      `[crb] ❌ Error: Failed to load webpack config: ${msg}`\n    );\n    process.exit(1);\n  }\n\n  // Validate webpack config is an array (dual-target mode)\n  if (!Array.isArray(webpackConfig)) {\n    console.error(\n      `[crb] ❌ Error: webpack config must be an array [clientConfig, serverConfig]. ` +\n        `The config appears to be a single object (CSR/ANALYZE mode). ` +\n        `Use the unified webpack.config.js for SSR dev mode.`\n    );\n    process.exit(1);\n  }\n\n  const [clientConfig, serverConfig] = webpackConfig as [webpack.Configuration, webpack.Configuration];\n\n  // State flags for orchestration\n  let clientReady = false;\n  let serverReady = false;\n  let nodemonStarted = false;\n  let browserOpened = false;\n\n  // Nodemon reference for cleanup\n  let nodemonInstance: ReturnType<typeof nodemon> | null = null;\n\n  // Dev server options\n  const devServerOptions = {\n    host: devListen,\n    port: parseInt(devPort, 10),\n    headers: { 'Access-Control-Allow-Origin': '*' },\n    hot: true,\n    historyApiFallback: true,\n    devMiddleware: {\n      index: 'index_csr.html',\n      writeToDisk: true,\n    },\n    // TODO: Add proxy config from bundle-info.js (DEVSERVER_PROXIES)\n    // to proxy API calls and reverse proxy paths to CMS/IIS\n  };\n\n  // Create dual webpack compilers (single config each → single Compiler, not MultiCompiler)\n  const clientCompiler = webpack(clientConfig);\n  const nodeServerCompiler = webpack(serverConfig);\n\n  // Start nodemon when both compilers are ready\n  function startNodemon(): void {\n    if (nodemonStarted) return;\n    nodemonStarted = true;\n\n    console.info('[crb] 🎯 Starting nodemon...');\n    nodemonInstance = nodemon({\n      script: 'dist/server-dev.js',\n      ext: 'js json',\n      watch: ['dist/server-dev.js'],\n      nodeArgs: [\n        inspectNodeArg,\n        '-r',\n        DEVSERVER_RUNTIME_GLOBALS,\n      ],\n    })\n      .on('start', () => {\n        console.info(\n          '[nodemon] started. Now starting local web server at port 3001, with hot-reload enabled.'\n        );\n        if (openBrowser && !browserOpened) {\n          browserOpened = true;\n          try {\n            const cmd =\n              process.platform === 'win32'\n                ? 'start'\n                : process.platform === 'darwin'\n                  ? 'open'\n                  : 'xdg-open';\n            execSync(`${cmd} http://${process.env.DEV_HOST}:3001/`, {\n              windowsHide: true,\n            });\n          } catch {\n            console.info(\n              `Please open http://${process.env.DEV_HOST}:3001/ in your browser`\n            );\n          }\n        }\n      })\n      .on('crash', () => {\n        console.error('[nodemon] crashed');\n      });\n  }\n\n  // Server afterEmit -> start nodemon when both compilers are ready\n  nodeServerCompiler.hooks.afterEmit.tap('serverAfterEmitPlugin', () => {\n    if (serverReady) return;\n    serverReady = true;\n\n    if (clientReady) {\n      startNodemon();\n    }\n  });\n\n  // Start server compiler watch immediately\n  console.info('[crb] 📦 Starting server compiler...');\n  nodeServerCompiler.watch({}, (err, stats) => {\n    if (err) {\n      return console.error(err);\n    }\n    const statString = stats!.toString();\n    process.stdout.write(statString + '\\n');\n  });\n\n  // Client afterEmit -> start nodemon if server is already ready\n  clientCompiler.hooks.afterEmit.tap('clientAfterEmitPlugin', () => {\n    if (clientReady) return;\n    clientReady = true;\n\n    if (serverReady) {\n      startNodemon();\n    }\n  });\n\n  // Start webpack dev server\n  const devServer = new WebpackDevServer(devServerOptions, clientCompiler);\n\n  devServer.startCallback((err) => {\n    if (err) {\n      console.error('[webpack] devServer listening failed');\n      return console.error(err);\n    }\n    console.info(`[webpack] devServer listening on port ${devPort}`);\n  });\n\n  // Cleanup on SIGTERM/SIGINT\n  function cleanup(): void {\n    console.info('[crb] 🛑 Shutting down...');\n    if (nodemonInstance) {\n      nodemonInstance.emit('quit');\n    }\n    devServer.stopCallback(() => {\n      console.info('[webpack] devServer stopped');\n      clientCompiler.close(() => {\n        console.info('[webpack] client compiler closed');\n        nodeServerCompiler.close(() => {\n          console.info('[webpack] server compiler closed');\n          process.exit(0);\n        });\n      });\n    });\n  }\n\n  process.on('SIGTERM', cleanup);\n  process.on('SIGINT', cleanup);\n}\n","#!/usr/bin/env node\n\nimport { cac } from 'cac';\nimport { runDev } from './dev-server';\n\nconst cli = cac('crb');\n\n// Dev subcommand\ncli\n  .command('dev', 'Start the SSR dev server pipeline')\n  .option('--config <path>', 'Path to webpack config file (required)')\n  .option('--env-file <path>', 'Path to .env file (default: .env)')\n  .option(\n    '--dev-host <host>',\n    'webpack publicPath / HMR host (default: localhost)'\n  )\n  .option('--dev-port <port>', 'webpack-dev-server listen port (default: 3000)')\n  .option(\n    '--dev-listen <host>',\n    'webpack-dev-server listen host (default: 0.0.0.0)'\n  )\n  .option(\n    '--open',\n    'Open the browser when the SSR server starts. Use --no-open to disable. (default: true)'\n  )\n  .option(\n    '--inspect [port]',\n    'Enable the V8 inspector on the SSR server. Optionally specify a port (default: 9229)'\n  )\n  .option(\n    '--inspect-brk [port]',\n    'Enable the V8 inspector and break before the script starts — useful for debugging server startup. Optionally specify a port (default: 9229). Takes precedence over --inspect.'\n  )\n  .action(runDev);\n\ncli.help();\n\ncli.parse();\nif (!cli.matchedCommand) {\n  cli.outputHelp();\n  process.exit(1);\n}\n"],"names":["projectRoot","process","cwd","DEVSERVER_RUNTIME_GLOBALS","path","resolve","__dirname","runDev","args","configPath","config","devHost","devPort","devListen","openBrowser","open","resolveInspectPort","val","undefined","String","inspectNodeArg","inspectBrk","inspect","console","error","log","exit","info","resolvedConfigPath","fs","existsSync","env","DEV_HOST","DEV_PORT","envFilePath","envFile","dotenv","e","msg","Error","message","REQUIRED_ENV","missingEnv","filter","k","trim","length","join","webpackConfig","require","Array","isArray","clientConfig","serverConfig","clientReady","serverReady","nodemonStarted","browserOpened","nodemonInstance","devServerOptions","host","port","parseInt","headers","hot","historyApiFallback","devMiddleware","index","writeToDisk","clientCompiler","webpack","nodeServerCompiler","startNodemon","nodemon","script","ext","watch","nodeArgs","on","cmd","platform","execSync","windowsHide","hooks","afterEmit","tap","err","stats","statString","toString","stdout","write","devServer","WebpackDevServer","startCallback","cleanup","emit","stopCallback","close","cli","cac","command","option","action","help","parse","matchedCommand","outputHelp"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAQA,MAAMA,WAAW,GAAGC,OAAO,CAACC,GAAG,EAAE;AACjC,MAAMC,yBAAyB,GAAGC,qBAAI,CAACC,OAAO,CAACC,SAAS,EAAE,uBAAuB,CAAC;AAa3E,SAASC,MAAMA,CAACC,IAAgB,EAAQ;AAC7C,EAAA,MAAMC,UAAU,GAAGD,IAAI,CAACE,MAAM;AAC9B,EAAA,MAAMC,OAAO,GAAGH,IAAI,CAACG,OAAO,IAAI,WAAW;AAC3C,EAAA,MAAMC,OAAO,GAAGJ,IAAI,CAACI,OAAO,IAAI,MAAM;AACtC,EAAA,MAAMC,SAAS,GAAGL,IAAI,CAACK,SAAS,IAAI,SAAS;AAC7C,EAAA,MAAMC,WAAW,GAAGN,IAAI,CAACO,IAAI,KAAK,KAAK;;AAEvC;AACA;AACA,EAAA,MAAMC,kBAAkB,GAAIC,GAAiC,IAC3DA,GAAG,KAAK,IAAI,IAAIA,GAAG,KAAKC,SAAS,GAAG,MAAM,GAAGC,MAAM,CAACF,GAAG,CAAC;EAC1D,MAAMG,cAAc,GAClBZ,IAAI,CAACa,UAAU,KAAKH,SAAS,GACzB,CAAA,cAAA,EAAiBF,kBAAkB,CAACR,IAAI,CAACa,UAAU,CAAC,CAAA,CAAE,GACtD,CAAA,UAAA,EAAaL,kBAAkB,CAACR,IAAI,CAACc,OAAO,CAAC,CAAA,CAAE;;AAErD;EACA,IAAI,CAACb,UAAU,EAAE;AACfc,IAAAA,OAAO,CAACC,KAAK,CAAC,4CAA4C,CAAC;AAC3DD,IAAAA,OAAO,CAACE,GAAG,CACT,0JACF,CAAC;AACDxB,IAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,EAAA;AAEAH,EAAAA,OAAO,CAACI,IAAI,CAAC,2CAA2C,CAAC;EAEzD,MAAMC,kBAAkB,GAAGxB,qBAAI,CAACC,OAAO,CAACL,WAAW,EAAES,UAAU,CAAC;;AAEhE;AACA,EAAA,IAAI,CAACoB,mBAAE,CAACC,UAAU,CAACF,kBAAkB,CAAC,EAAE;AACtCL,IAAAA,OAAO,CAACC,KAAK,CACX,CAAA,sCAAA,EAAyCI,kBAAkB,EAC7D,CAAC;AACD3B,IAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,EAAA;;AAEA;AACAzB,EAAAA,OAAO,CAAC8B,GAAG,CAACC,QAAQ,GAAGrB,OAAO;AAC9BV,EAAAA,OAAO,CAAC8B,GAAG,CAACE,QAAQ,GAAGrB,OAAO;;AAE9B;AACA,EAAA,MAAMsB,WAAW,GAAG9B,qBAAI,CAACC,OAAO,CAACL,WAAW,EAAEQ,IAAI,CAAC2B,OAAO,IAAI,MAAM,CAAC;EACrE,IAAI;IACFC,uBAAM,CAAC1B,MAAM,CAAC;AAAEN,MAAAA,IAAI,EAAE8B;AAAY,KAAC,CAAC;EACtC,CAAC,CAAC,OAAOG,CAAU,EAAE;AACnB,IAAA,MAAMC,GAAG,GAAGD,CAAC,YAAYE,KAAK,GAAGF,CAAC,CAACG,OAAO,GAAGrB,MAAM,CAACkB,CAAC,CAAC;IACtDd,OAAO,CAACC,KAAK,CACX,CAAA,wCAAA,EAA2CU,WAAW,CAAA,GAAA,EAAMI,GAAG,EACjE,CAAC;AACDrC,IAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,EAAA;;AAEA;EACA,MAAMe,YAAsB,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC;EACnE,MAAMC,UAAU,GAAGD,YAAY,CAACE,MAAM,CACnCC,CAAC,IAAK,CAAC3C,OAAO,CAAC8B,GAAG,CAACa,CAAC,CAAC,IAAI,CAAC3C,OAAO,CAAC8B,GAAG,CAACa,CAAC,CAAC,CAACC,IAAI,EAChD,CAAC;EACD,IAAIH,UAAU,CAACI,MAAM,EAAE;AACrBvB,IAAAA,OAAO,CAACC,KAAK,CACX,CAAA,mEAAA,EAAsEkB,UAAU,CAACK,IAAI,CAAC,IAAI,CAAC,CAAA,EAAA,CAAI,GAC7F,2EACJ,CAAC;AACD9C,IAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,EAAA;;AAEA;AACA,EAAA,IAAIsB,aAAsB;EAC1B,IAAI;AACFA,IAAAA,aAAa,GAAGC,OAAO,CAACrB,kBAAkB,CAAC;EAC7C,CAAC,CAAC,OAAOS,CAAU,EAAE;AACnB,IAAA,MAAMC,GAAG,GAAGD,CAAC,YAAYE,KAAK,GAAGF,CAAC,CAACG,OAAO,GAAGrB,MAAM,CAACkB,CAAC,CAAC;AACtDd,IAAAA,OAAO,CAACC,KAAK,CACX,CAAA,8CAAA,EAAiDc,GAAG,EACtD,CAAC;AACDrC,IAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,EAAA;;AAEA;AACA,EAAA,IAAI,CAACwB,KAAK,CAACC,OAAO,CAACH,aAAa,CAAC,EAAE;IACjCzB,OAAO,CAACC,KAAK,CACX,CAAA,6EAAA,CAA+E,GAC7E,CAAA,6DAAA,CAA+D,GAC/D,qDACJ,CAAC;AACDvB,IAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,EAAA;AAEA,EAAA,MAAM,CAAC0B,YAAY,EAAEC,YAAY,CAAC,GAAGL,aAA+D;;AAEpG;EACA,IAAIM,WAAW,GAAG,KAAK;EACvB,IAAIC,WAAW,GAAG,KAAK;EACvB,IAAIC,cAAc,GAAG,KAAK;EAC1B,IAAIC,aAAa,GAAG,KAAK;;AAEzB;EACA,IAAIC,eAAkD,GAAG,IAAI;;AAE7D;AACA,EAAA,MAAMC,gBAAgB,GAAG;AACvBC,IAAAA,IAAI,EAAE/C,SAAS;AACfgD,IAAAA,IAAI,EAAEC,QAAQ,CAAClD,OAAO,EAAE,EAAE,CAAC;AAC3BmD,IAAAA,OAAO,EAAE;AAAE,MAAA,6BAA6B,EAAE;KAAK;AAC/CC,IAAAA,GAAG,EAAE,IAAI;AACTC,IAAAA,kBAAkB,EAAE,IAAI;AACxBC,IAAAA,aAAa,EAAE;AACbC,MAAAA,KAAK,EAAE,gBAAgB;AACvBC,MAAAA,WAAW,EAAE;AACf;AACA;AACA;GACD;;AAED;AACA,EAAA,MAAMC,cAAc,GAAGC,wBAAO,CAAClB,YAAY,CAAC;AAC5C,EAAA,MAAMmB,kBAAkB,GAAGD,wBAAO,CAACjB,YAAY,CAAC;;AAEhD;EACA,SAASmB,YAAYA,GAAS;AAC5B,IAAA,IAAIhB,cAAc,EAAE;AACpBA,IAAAA,cAAc,GAAG,IAAI;AAErBjC,IAAAA,OAAO,CAACI,IAAI,CAAC,8BAA8B,CAAC;IAC5C+B,eAAe,GAAGe,wBAAO,CAAC;AACxBC,MAAAA,MAAM,EAAE,oBAAoB;AAC5BC,MAAAA,GAAG,EAAE,SAAS;MACdC,KAAK,EAAE,CAAC,oBAAoB,CAAC;AAC7BC,MAAAA,QAAQ,EAAE,CACRzD,cAAc,EACd,IAAI,EACJjB,yBAAyB;AAE7B,KAAC,CAAC,CACC2E,EAAE,CAAC,OAAO,EAAE,MAAM;AACjBvD,MAAAA,OAAO,CAACI,IAAI,CACV,yFACF,CAAC;AACD,MAAA,IAAIb,WAAW,IAAI,CAAC2C,aAAa,EAAE;AACjCA,QAAAA,aAAa,GAAG,IAAI;QACpB,IAAI;AACF,UAAA,MAAMsB,GAAG,GACP9E,OAAO,CAAC+E,QAAQ,KAAK,OAAO,GACxB,OAAO,GACP/E,OAAO,CAAC+E,QAAQ,KAAK,QAAQ,GAC3B,MAAM,GACN,UAAU;UAClBC,sBAAQ,CAAC,CAAA,EAAGF,GAAG,CAAA,QAAA,EAAW9E,OAAO,CAAC8B,GAAG,CAACC,QAAQ,CAAA,MAAA,CAAQ,EAAE;AACtDkD,YAAAA,WAAW,EAAE;AACf,WAAC,CAAC;AACJ,QAAA,CAAC,CAAC,MAAM;UACN3D,OAAO,CAACI,IAAI,CACV,CAAA,mBAAA,EAAsB1B,OAAO,CAAC8B,GAAG,CAACC,QAAQ,CAAA,sBAAA,CAC5C,CAAC;AACH,QAAA;AACF,MAAA;AACF,IAAA,CAAC,CAAC,CACD8C,EAAE,CAAC,OAAO,EAAE,MAAM;AACjBvD,MAAAA,OAAO,CAACC,KAAK,CAAC,mBAAmB,CAAC;AACpC,IAAA,CAAC,CAAC;AACN,EAAA;;AAEA;EACA+C,kBAAkB,CAACY,KAAK,CAACC,SAAS,CAACC,GAAG,CAAC,uBAAuB,EAAE,MAAM;AACpE,IAAA,IAAI9B,WAAW,EAAE;AACjBA,IAAAA,WAAW,GAAG,IAAI;AAElB,IAAA,IAAID,WAAW,EAAE;AACfkB,MAAAA,YAAY,EAAE;AAChB,IAAA;AACF,EAAA,CAAC,CAAC;;AAEF;AACAjD,EAAAA,OAAO,CAACI,IAAI,CAAC,sCAAsC,CAAC;EACpD4C,kBAAkB,CAACK,KAAK,CAAC,EAAE,EAAE,CAACU,GAAG,EAAEC,KAAK,KAAK;AAC3C,IAAA,IAAID,GAAG,EAAE;AACP,MAAA,OAAO/D,OAAO,CAACC,KAAK,CAAC8D,GAAG,CAAC;AAC3B,IAAA;AACA,IAAA,MAAME,UAAU,GAAGD,KAAK,CAAEE,QAAQ,EAAE;IACpCxF,OAAO,CAACyF,MAAM,CAACC,KAAK,CAACH,UAAU,GAAG,IAAI,CAAC;AACzC,EAAA,CAAC,CAAC;;AAEF;EACAnB,cAAc,CAACc,KAAK,CAACC,SAAS,CAACC,GAAG,CAAC,uBAAuB,EAAE,MAAM;AAChE,IAAA,IAAI/B,WAAW,EAAE;AACjBA,IAAAA,WAAW,GAAG,IAAI;AAElB,IAAA,IAAIC,WAAW,EAAE;AACfiB,MAAAA,YAAY,EAAE;AAChB,IAAA;AACF,EAAA,CAAC,CAAC;;AAEF;EACA,MAAMoB,SAAS,GAAG,IAAIC,iCAAgB,CAAClC,gBAAgB,EAAEU,cAAc,CAAC;AAExEuB,EAAAA,SAAS,CAACE,aAAa,CAAER,GAAG,IAAK;AAC/B,IAAA,IAAIA,GAAG,EAAE;AACP/D,MAAAA,OAAO,CAACC,KAAK,CAAC,sCAAsC,CAAC;AACrD,MAAA,OAAOD,OAAO,CAACC,KAAK,CAAC8D,GAAG,CAAC;AAC3B,IAAA;AACA/D,IAAAA,OAAO,CAACI,IAAI,CAAC,CAAA,sCAAA,EAAyCf,OAAO,EAAE,CAAC;AAClE,EAAA,CAAC,CAAC;;AAEF;EACA,SAASmF,OAAOA,GAAS;AACvBxE,IAAAA,OAAO,CAACI,IAAI,CAAC,2BAA2B,CAAC;AACzC,IAAA,IAAI+B,eAAe,EAAE;AACnBA,MAAAA,eAAe,CAACsC,IAAI,CAAC,MAAM,CAAC;AAC9B,IAAA;IACAJ,SAAS,CAACK,YAAY,CAAC,MAAM;AAC3B1E,MAAAA,OAAO,CAACI,IAAI,CAAC,6BAA6B,CAAC;MAC3C0C,cAAc,CAAC6B,KAAK,CAAC,MAAM;AACzB3E,QAAAA,OAAO,CAACI,IAAI,CAAC,kCAAkC,CAAC;QAChD4C,kBAAkB,CAAC2B,KAAK,CAAC,MAAM;AAC7B3E,UAAAA,OAAO,CAACI,IAAI,CAAC,kCAAkC,CAAC;AAChD1B,UAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB,QAAA,CAAC,CAAC;AACJ,MAAA,CAAC,CAAC;AACJ,IAAA,CAAC,CAAC;AACJ,EAAA;AAEAzB,EAAAA,OAAO,CAAC6E,EAAE,CAAC,SAAS,EAAEiB,OAAO,CAAC;AAC9B9F,EAAAA,OAAO,CAAC6E,EAAE,CAAC,QAAQ,EAAEiB,OAAO,CAAC;AAC/B;;AChPA,MAAMI,GAAG,GAAGC,OAAG,CAAC,KAAK,CAAC;;AAEtB;AACAD,GAAG,CACAE,OAAO,CAAC,KAAK,EAAE,mCAAmC,CAAC,CACnDC,MAAM,CAAC,iBAAiB,EAAE,wCAAwC,CAAC,CACnEA,MAAM,CAAC,mBAAmB,EAAE,mCAAmC,CAAC,CAChEA,MAAM,CACL,mBAAmB,EACnB,oDACF,CAAC,CACAA,MAAM,CAAC,mBAAmB,EAAE,gDAAgD,CAAC,CAC7EA,MAAM,CACL,qBAAqB,EACrB,mDACF,CAAC,CACAA,MAAM,CACL,QAAQ,EACR,wFACF,CAAC,CACAA,MAAM,CACL,kBAAkB,EAClB,sFACF,CAAC,CACAA,MAAM,CACL,sBAAsB,EACtB,+KACF,CAAC,CACAC,MAAM,CAAChG,MAAM,CAAC;AAEjB4F,GAAG,CAACK,IAAI,EAAE;AAEVL,GAAG,CAACM,KAAK,EAAE;AACX,IAAI,CAACN,GAAG,CAACO,cAAc,EAAE;EACvBP,GAAG,CAACQ,UAAU,EAAE;AAChB1G,EAAAA,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC;AACjB;;"}

package/cjs/client.js

@@ -11,38 +11,38 @@ var component = require('@loadable/component');
 var queryString = require('query-string');
 var reactCookie = require('react-cookie');
 var reactHelmetAsync = require('react-helmet-async');
-var App = require('./App-Bg1MzW4V.js');
+var App = require('./App-95IjaQXT.js');
 var slice = require('./slice-5xJMH24n.js');
-var version = require('./version-rFG9Y6_B.js');
-var version$1 = require('./version-yjHMrfVz.js');
-var store = require('./store-B7SJs5Hf.js');
-var selectors = require('./selectors-BrxJ8-F8.js');
-var ContensisDeliveryApi = require('./ContensisDeliveryApi-MfcvdfDR.js');
-var SSRContext = require('./SSRContext-tMufQDHY.js');
+var version = require('./version-CaRCM9vq.js');
+var version$1 = require('./version-AE19NqSo.js');
+var store = require('./store-Ccwrx5Do.js');
+var selectors = require('./selectors-BnaBk5xL.js');
+var ContensisDeliveryApi = require('./ContensisDeliveryApi-vsHVQ_Ci.js');
+var SSRContext = require('./SSRContext-WPN0QwEg.js');
 require('history');
 require('@redux-saga/core/effects');
 require('loglevel');
 require('await-to-js');
 require('redux-saga');
 require('contensis-delivery-api');
-require('./VersionInfo-zFPsvS8q.js');
+require('./VersionInfo-BygZuA9D.js');
 require('./_commonjsHelpers-BJu3ubxk.js');
 require('jsonpath-mapper');
 require('styled-components');
 require('./selectors-DAQR0uZa.js');
-require('./ChangePassword.container-C4Du3Wb1.js');
-require('./matchGroups-dqONU-vY.js');
+require('./ChangePassword.container-CVwXfQjB.js');
+require('./matchGroups-D8QZEd1p.js');
 require('./CookieConstants-DfPiWCRZ.js');
 require('./CookieHelper.class-Det3qfdU.js');
 require('./ToJs-BsWqWjdm.js');
-require('./sagas-BCy9u6zA.js');
+require('./sagas-BG31QdkC.js');
 require('reselect');
-require('./util-eOjxDjxF.js');
+require('./util-LE7KTRCU.js');
 require('contensis-core-api');
 require('deepmerge');
 require('immer');
 require('deep-equal');
-require('./RouteLoader-DJeM8cym.js');
+require('./RouteLoader-NjuQ0VMn.js');
 require('@reduxjs/toolkit');
 require('redux');
 require('redux-thunk');

package/cjs/contensis-react-base.js

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var ContensisDeliveryApi = require('./ContensisDeliveryApi-MfcvdfDR.js');
+var ContensisDeliveryApi = require('./ContensisDeliveryApi-vsHVQ_Ci.js');
 var contensisDeliveryApi = require('contensis-delivery-api');
 var React = require('react');
 var reactRedux = require('react-redux');
 var slice = require('./slice-5xJMH24n.js');
 var mapJson = require('jsonpath-mapper');
-var sagas = require('./sagas-BCy9u6zA.js');
+var sagas = require('./sagas-BG31QdkC.js');
 require('reselect');
 require('immer');
 require('deep-equal');
@@ -20,7 +20,7 @@ require('isomorphic-fetch');
 var express = require('express');
 var http = require('http');
 var httpProxy = require('http-proxy');
-var App = require('./App-Bg1MzW4V.js');
+var App = require('./App-95IjaQXT.js');
 var fs = require('fs');
 var path = require('path');
 var appRootPath = require('app-root-path');
@@ -33,10 +33,10 @@ var lodash = require('lodash');
 var lodashClean = require('lodash-clean');
 var CookieHelper_class = require('./CookieHelper.class-Det3qfdU.js');
 var cookiesMiddleware = require('universal-cookie-express');
-var store = require('./store-B7SJs5Hf.js');
-var version = require('./version-yjHMrfVz.js');
-var selectors = require('./selectors-BrxJ8-F8.js');
-var RouteLoader = require('./RouteLoader-DJeM8cym.js');
+var store = require('./store-Ccwrx5Do.js');
+var version = require('./version-AE19NqSo.js');
+var selectors = require('./selectors-BnaBk5xL.js');
+var RouteLoader = require('./RouteLoader-NjuQ0VMn.js');
 var stream = require('stream');
 var server$2 = require('@loadable/server');
 var chalk = require('chalk');
@@ -44,21 +44,21 @@ var minifyCssString = require('minify-css-string');
 var reactCookie = require('react-cookie');
 var reactHelmetAsync = require('react-helmet-async');
 var server$3 = require('react-router-dom/server');
-var SSRContext = require('./SSRContext-tMufQDHY.js');
-require('./VersionInfo-zFPsvS8q.js');
+var SSRContext = require('./SSRContext-WPN0QwEg.js');
+require('./VersionInfo-BygZuA9D.js');
 require('./CookieConstants-DfPiWCRZ.js');
 require('@reduxjs/toolkit');
 require('loglevel');
 require('@redux-saga/core/effects');
-require('./version-rFG9Y6_B.js');
-require('./util-eOjxDjxF.js');
+require('./version-CaRCM9vq.js');
+require('./util-LE7KTRCU.js');
 require('./selectors-DAQR0uZa.js');
 require('./_commonjsHelpers-BJu3ubxk.js');
 require('history');
 require('await-to-js');
 require('redux-saga');
-require('./ChangePassword.container-C4Du3Wb1.js');
-require('./matchGroups-dqONU-vY.js');
+require('./ChangePassword.container-CVwXfQjB.js');
+require('./matchGroups-D8QZEd1p.js');
 require('./ToJs-BsWqWjdm.js');
 require('redux');
 require('redux-thunk');
@@ -1143,7 +1143,7 @@ const addStandardHeaders = (state, response, packagejson, groups) => {
     try {
       const routingSurrogateKeys = selectors.selectSurrogateKeys(state);
       const apiCalls = selectors.selectSsrApiCalls(state);
-      const anyApiError = !!apiCalls.find(([status]) => status >= 400);
+      const anyApiError = !!apiCalls.find(call => call.statusCode >= 400);
 
       // Check length of surrogate keys and prevent potential header overflow errors in prod
       // Check for any error set in the page response
@@ -1316,7 +1316,10 @@ const webApp = (app, ReactApp, config) => {
   let isRenderingJsxToString = config.renderToString || false;
   const bundleData = getBundleData(config, staticRoutePath);
   const attributes = stringifyAttributes(scripts.attributes);
-  scripts.startup = scripts.startup || startupScriptFilename;
+  scripts.startup =
+  // We don't need the startup script with SSR in development
+  // as globals are baked into the client-side development bundles
+  process.env.NODE_ENV === 'development' ? undefined : scripts.startup || startupScriptFilename;
   let responseHandler = handleResponse;
   if (typeof handleResponses === 'function') {
     responseHandler = handleResponses;
@@ -1469,7 +1472,7 @@ const webApp = (app, ReactApp, config) => {
 
     // Render the JSX server side and send response as per access method options
     if (!accessMethod.DYNAMIC) {
-      store$1.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
+      store$1.runSaga(App.rootSaga(withSagas)).toPromise().then(async () => {
         var _selectCurrentSearch;
         const reduxState = store$1.getState();
         let clonedState = lodashClean.buildCleaner({
@@ -1549,6 +1552,13 @@ const webApp = (app, ReactApp, config) => {
         let title = helmet.title.toString().includes('><') ? helmetAsync.title.toString() : helmet.title.toString();
         const metadata = helmetAsync.meta.toString().concat(helmetAsync.base.toString()).concat(helmetAsync.priority.toString()).concat(helmetAsync.link.toString()).concat(helmetAsync.script.toString()).concat(helmetAsync.noscript.toString()).concat(helmet.meta.toString()).concat(helmet.base.toString()).concat(helmet.link.toString()).concat(helmet.script.toString()).concat(helmet.noscript.toString());
         try {
+          var _config$styles, _loadableExtractor$mo, _loadableExtractor$mo2;
+          // Getting style tags generated by "CSS Modules" because they will be
+          // available to loadable stats if we have built parts of the app with CSS
+          // plugins that are not within styled-components
+          // Render inline styles for CSS Modules if configured
+          const cssModuleStyles = (_config$styles = config.styles) !== null && _config$styles !== void 0 && _config$styles.inline ? await (loadableExtractor === null || loadableExtractor === void 0 || (_loadableExtractor$mo = loadableExtractor.modern) === null || _loadableExtractor$mo === void 0 ? void 0 : _loadableExtractor$mo.getInlineStyleTags()) : loadableExtractor === null || loadableExtractor === void 0 || (_loadableExtractor$mo2 = loadableExtractor.modern) === null || _loadableExtractor$mo2 === void 0 ? void 0 : _loadableExtractor$mo2.getStyleTags();
+
           /**
            * Loads all page assets into the provided templateHTML
            *
@@ -1559,7 +1569,6 @@ const webApp = (app, ReactApp, config) => {
            * if the context has requested a redirect
            * */
           const getContextHtml = (isFinal = false, styleTags, renderedJsxMarkup) => {
-            var _loadableExtractor$mo;
             if (context.url) {
               response.redirect(context.statusCode || 302, context.url);
               return '';
@@ -1574,18 +1583,13 @@ const webApp = (app, ReactApp, config) => {
             // Set response.status from React StaticRouter
             if (typeof context.statusCode === 'number') response.status(context.statusCode);
             const bundleTags = isFinal ? getBundleTags(loadableExtractor, scripts, staticRoutePath) : '';
-
-            // Getting style tags generated by "CSS Modules" because they will be
-            // available to loadable stats if we have built parts of the app with CSS
-            // plugins that are not within styled-components
-            const styles = loadableExtractor === null || loadableExtractor === void 0 || (_loadableExtractor$mo = loadableExtractor.modern) === null || _loadableExtractor$mo === void 0 ? void 0 : _loadableExtractor$mo.getStyleTags();
             const html = replaceHtml({
               bundleTags,
               html: renderedJsxMarkup,
               htmlAttributes,
               metadata,
               state: serialisedReduxData,
-              styleTags: `${styleTags || ''}${styles || ''}`,
+              styleTags: `${styleTags || ''}${cssModuleStyles || ''}`,
               title,
               templateHTML,
               templateHTMLFragment,