sku 15.1.0 → 15.2.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # sku
 
+## 15.2.0
+
+### Minor Changes
+
+- `start-ssr`: `--list-urls, -l` flag is available for SSR apps ([#1435](https://github.com/seek-oss/sku/pull/1435))
+
+### Patch Changes
+
+- Fix incorrect devServerMiddleware validation logic ([#1437](https://github.com/seek-oss/sku/pull/1437))
+
 ## 15.1.0
 
 ### Minor Changes

package/dist/context/createSkuContext.d.ts

@@ -102,7 +102,7 @@ export declare const createSkuContext: ({ configPath, port: portArg, strictPort,
     };
     paths: {
         appSkuConfigPath: string;
-        devServerMiddleware: string;
+        devServerMiddleware: string | undefined;
         src: string[];
         compilePackages: string[];
         clientEntry: string;
@@ -147,7 +147,6 @@ export declare const createSkuContext: ({ configPath, port: portArg, strictPort,
     initialPath: string;
     transformOutputPath: (input: import("../types/types.d.ts").TransformOutputPathFunctionParams) => string;
     sites: import("../types/types.d.ts").SkuSiteObject[];
-    useDevServerMiddleware: boolean;
     skipPackageCompatibilityCompilation: string[];
     externalizeNodeModules: boolean;
     defaultClientEntry: string;

package/dist/context/createSkuContext.js

@@ -108,13 +108,12 @@ export const createSkuContext = ({ configPath, port: portArg, strictPort, }) =>
         : `${skuConfig.publicPath}/`;
     const devServerMiddleware = skuConfig.devServerMiddleware &&
         getPathFromCwd(skuConfig.devServerMiddleware);
-    const useDevServerMiddleware = Boolean(devServerMiddleware) || existsSync(devServerMiddleware);
-    if (devServerMiddleware && !useDevServerMiddleware) {
+    if (devServerMiddleware && !existsSync(devServerMiddleware)) {
         throw new Error(`${devServerMiddleware} does not exist. Please create the file or remove 'devServerMiddleware' from your sku config.`);
     }
     const paths = {
         appSkuConfigPath: appSkuConfigPath,
-        devServerMiddleware: devServerMiddleware,
+        devServerMiddleware,
         src: skuConfig.srcPaths.map(getPathFromCwd),
         compilePackages: [...defaultCompilePackages, ...skuConfig.compilePackages],
         clientEntry: getPathFromCwd(skuConfig.clientEntry),
@@ -191,7 +190,6 @@ export const createSkuContext = ({ configPath, port: portArg, strictPort, }) =>
         initialPath,
         transformOutputPath: skuConfig.transformOutputPath,
         sites,
-        useDevServerMiddleware,
         skipPackageCompatibilityCompilation,
         externalizeNodeModules,
         defaultClientEntry,

package/dist/program/commands/serve/serve.action.js

@@ -14,7 +14,7 @@ import createServer from '../../../utils/createServer.js';
 import { getRouteWithLanguage, getValidLanguagesForRoute, } from '../../../utils/language-utils.js';
 import { configureProject, validatePeerDeps, } from '../../../utils/configure.js';
 export const serveAction = async ({ site: preferredSite, environment: environmentOption, skuContext, }) => {
-    const { port, paths, initialPath, routes, sites, useDevServerMiddleware, httpsDevServer, hosts, languages, } = skuContext;
+    const { port, paths, initialPath, routes, sites, httpsDevServer, hosts, languages, } = skuContext;
     await configureProject(skuContext);
     validatePeerDeps(skuContext);
     provider.count('serve');
@@ -50,7 +50,7 @@ export const serveAction = async ({ site: preferredSite, environment: environmen
         skuContext,
     });
     const app = express();
-    if (useDevServerMiddleware) {
+    if (paths.devServerMiddleware) {
         const devServerMiddleware = (await import(paths.devServerMiddleware))
             .default;
         if (devServerMiddleware && typeof devServerMiddleware === 'function') {

package/dist/program/commands/start/webpack-start-handler.js

@@ -17,7 +17,7 @@ const localhost = '0.0.0.0';
 const hot = process.env.SKU_HOT !== 'false';
 export const webpackStartHandler = async ({ stats: statsOption, environment: environmentOption, skuContext, }) => {
     process.env.NODE_ENV = 'development';
-    const { port, initialPath, paths, routes, httpsDevServer, useDevServerMiddleware, sites, hosts, } = skuContext;
+    const { port, initialPath, paths, routes, httpsDevServer, sites, hosts } = skuContext;
     const environment = resolveEnvironment({
         environment: environmentOption,
         skuContext,
@@ -53,7 +53,7 @@ export const webpackStartHandler = async ({ stats: statsOption, environment: env
     });
     const appHosts = getAppHosts(skuContext);
     let devServerMiddleware = null;
-    if (useDevServerMiddleware) {
+    if (paths.devServerMiddleware) {
         devServerMiddleware = (await import(paths.devServerMiddleware)).default;
     }
     const devServerConfig = {

package/dist/program/commands/start-ssr/start-ssr.command.js

@@ -1,8 +1,10 @@
 import { Command } from 'commander';
 import { statsOption } from '../../options/stats.option.js';
+import { listUrlsOption } from '../../options/list-urls.js';
 export const startSsrCommand = new Command('start-ssr')
     .description('Start the sku development server for a server-rendered application.')
     .addOption(statsOption)
+    .addOption(listUrlsOption)
     .action(async (options) => {
     const { startSsrAction } = await import('./start-ssr.action.js');
     await startSsrAction(options);

package/dist/program/commands/start-ssr/webpack-start-ssr-handler.js

@@ -14,7 +14,7 @@ import { openBrowser } from '../../../openBrowser.js';
 import createServerManager from '../../../services/serverManager.js';
 import { watchVocabCompile } from '../../../services/vocab/runVocab.js';
 import { configureProject, validatePeerDeps, } from '../../../utils/configure.js';
-import { requireFromCwd } from '@sku-lib/utils';
+import { printUrls, requireFromCwd } from '@sku-lib/utils';
 const log = debug('sku:start-ssr');
 const hot = process.env.SKU_HOT !== 'false';
 const pluginName = 'sku-start-ssr';
@@ -71,7 +71,11 @@ export const webpackStartSsrHandler = async ({ stats: statsOption, skuContext, }
     const webpackDevServerUrl = `${proto}://${appHosts?.[0]}:${clientPort}`;
     console.log();
     console.log(chalk.blue(`Starting the webpack dev server on ${chalk.underline(webpackDevServerUrl)}`));
-    console.log(chalk.blue(`Starting the SSR development server on ${chalk.underline(serverUrl)}`));
+    printUrls(skuContext.listUrls ? appHosts : [appHosts[0]], {
+        https: httpsDevServer,
+        initialPath,
+        port: serverPort,
+    });
     console.log();
     const onServerDone = once((err, stats) => {
         if (err) {

package/dist/services/vite/plugins/middlewarePlugin.js

@@ -17,7 +17,7 @@ export const middlewarePlugin = (skuContext) => ({
         }
         // We need to start loading the devMiddleware before Vite's middleware runs.
         // Trying to lazy load it after Vite's middleware causes the Vite 404 middleware to take over the requests because this hook is run async.
-        if (skuContext.useDevServerMiddleware) {
+        if (skuContext.paths.devServerMiddleware) {
             log('Using dev server middleware at %s', skuContext.paths.devServerMiddleware);
             const devServerMiddleware = (await import(skuContext.paths.devServerMiddleware)).default;
             if (devServerMiddleware && typeof devServerMiddleware === 'function') {

package/dist/services/webpack/config/webpack.config.ssr.js

@@ -24,7 +24,7 @@ import { resolvePolyfills } from '../../../utils/resolvePolyfills.js';
 const require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const makeWebpackConfig = ({ clientPort, serverPort, isDevServer = false, hot = false, isStartScript = false, stats, skuContext, }) => {
-    const { paths, webpackDecorator, polyfills, supportedBrowsers, displayNamesProd, cspEnabled, cspExtraScriptSrcHosts, httpsDevServer, useDevServerMiddleware, rootResolution, skipPackageCompatibilityCompilation, externalizeNodeModules, sourceMapsProd, } = skuContext;
+    const { paths, webpackDecorator, polyfills, supportedBrowsers, displayNamesProd, cspEnabled, cspExtraScriptSrcHosts, httpsDevServer, rootResolution, skipPackageCompatibilityCompilation, externalizeNodeModules, sourceMapsProd, } = skuContext;
     const isProductionBuild = process.env.NODE_ENV === 'production';
     const webpackMode = isProductionBuild ? 'production' : 'development';
     const vocabOptions = getVocabConfig(skuContext);
@@ -226,7 +226,7 @@ const makeWebpackConfig = ({ clientPort, serverPort, isDevServer = false, hot =
                         extraHosts: cspExtraScriptSrcHosts,
                     }),
                     __SKU_DEV_MIDDLEWARE_PATH__: JSON.stringify(isDevServer ? paths.devServerMiddleware : false),
-                    __SKU_DEV_MIDDLEWARE_ENABLED__: JSON.stringify(isDevServer ? useDevServerMiddleware : false),
+                    __SKU_DEV_MIDDLEWARE_ENABLED__: JSON.stringify(isDevServer ? Boolean(paths.devServerMiddleware) : false),
                     __SKU_DEV_HTTPS__: JSON.stringify(isDevServer ? httpsDevServer : false),
                 }),
                 new SkuWebpackPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sku",
-  "version": "15.1.0",
+  "version": "15.2.0",
   "description": "Front-end development toolkit, powered by Webpack, Babel, Vanilla Extract and Jest",
   "types": "./dist/index.d.ts",
   "bin": {