sku 11.2.3 → 11.2.7

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # sku
 
+## 11.2.7
+
+### Patch Changes
+
+- Support static rendering for routes using ':language' ([#670](https://github.com/seek-oss/sku/pull/670))
+
+## 11.2.6
+
+### Patch Changes
+
+- Add "extends" to languages type definition ([#668](https://github.com/seek-oss/sku/pull/668))
+
+## 11.2.5
+
+### Patch Changes
+
+- Fix missing import for resolve modules ([#666](https://github.com/seek-oss/sku/pull/666))
+
+## 11.2.4
+
+### Patch Changes
+
+- Ensure compile packages within nested node_modules are transformed in jest ([#664](https://github.com/seek-oss/sku/pull/664))
+
+- Include `@babel/runtime` in render builds to ensure it is importable ([#664](https://github.com/seek-oss/sku/pull/664))
+
 ## 11.2.3
 
 ### Patch Changes

package/config/jest/jestConfig.js

@@ -1,7 +1,9 @@
 const escapeRegex = require('escape-string-regexp');
 const { paths } = require('../../context');
 const slash = '[/\\\\]'; // Cross-platform path delimiter regex
-const compilePackagesRegex = paths.compilePackages.map(escapeRegex).join('|');
+const compilePackagesRegex = paths.compilePackages
+  .map((pkg) => `.*${escapeRegex(pkg)}`)
+  .join('|');
 
 module.exports = {
   testEnvironment: 'jsdom',

package/config/webpack/resolveModules.js

@@ -0,0 +1,19 @@
+const path = require('path');
+
+const modules = ['node_modules'];
+
+try {
+  const skuPath = require.resolve('sku/package.json');
+
+  // If the project is using pnpm then we add the sku node_modules directory
+  // to the modules array. This allows dependecies of sku to be importable
+  // as part of the build process. This is specifically useful for
+  // @babel/plugin-transform-runtime as it inject imports to @babel/runtime.
+  if (skuPath.includes('.pnpm')) {
+    modules.push(path.join(skuPath, '../..'));
+  }
+} catch (e) {
+  // Ignore errors as if sku isn't resolvable then we don't need to apply the pnpm fix
+}
+
+module.exports = modules;

package/config/webpack/webpack.config.js

@@ -24,6 +24,7 @@ const { getVocabConfig } = require('../vocab/vocab');
 const statsConfig = require('./statsConfig');
 const getSourceMapSetting = require('./sourceMaps');
 const getCacheSettings = require('./cache');
+const modules = require('./resolveModules');
 
 const {
   paths,
@@ -161,6 +162,7 @@ const makeWebpackConfig = ({
       },
       resolve: {
         alias: { __sku_alias__clientEntry: paths.clientEntry },
+        modules,
       },
       module: {
         rules: [
@@ -274,6 +276,9 @@ const makeWebpackConfig = ({
               allowlist: [
                 'classnames', // Workaround for https://github.com/JedWatson/classnames/issues/240
 
+                // Include '@babel/runtime' in render builds to workaround ESM imports in html-render-webpack-plugin
+                /@babel\/runtime/,
+
                 // webpack-node-externals compares the `import` or `require` expression to this list,
                 // not the package name, so we map each packageName to a pattern. This ensures it
                 // matches when importing a file within a package e.g. import { Text } from 'seek-style-guide/react'.
@@ -298,6 +303,7 @@ const makeWebpackConfig = ({
       },
       resolve: {
         alias: { __sku_alias__renderEntry: paths.renderEntry },
+        modules,
       },
       module: {
         rules: [

package/config/webpack/webpack.config.ssr.js

@@ -35,6 +35,7 @@ const { getVocabConfig } = require('../vocab/vocab');
 const statsConfig = require('./statsConfig');
 const getSourceMapSetting = require('./sourceMaps');
 const getCacheSettings = require('./cache');
+const modules = require('./resolveModules');
 
 const makeWebpackConfig = ({
   clientPort,
@@ -123,6 +124,9 @@ const makeWebpackConfig = ({
         },
         emitOnErrors: isProductionBuild,
       },
+      resolve: {
+        modules,
+      },
       module: {
         rules: [
           ...(isDevServer
@@ -244,6 +248,7 @@ const makeWebpackConfig = ({
         alias: {
           __sku_alias__serverEntry: paths.serverEntry,
         },
+        modules,
       },
       target: 'node',
       node: {

package/context/configSchema.js

@@ -9,7 +9,11 @@ const languagesToCompile = {
     { type: 'string' },
     {
       type: 'object',
-      props: { name: { type: 'string', extends: { type: 'string' } } },
+      strict: true,
+      props: {
+        name: { type: 'string' },
+        extends: { type: 'string', optional: true },
+      },
     },
   ],
 };

package/lib/language-utils.js

@@ -88,7 +88,7 @@ function getLanguageFromRoute(req, route) {
 }
 
 function getRouteWithLanguage(routePath, language) {
-  return routePath.replace(/\$language/g, language);
+  return routePath.replace(/(\$|\:)language/g, language);
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sku",
-  "version": "11.2.3",
+  "version": "11.2.7",
   "description": "Front-end development toolkit, powered by Webpack, Babel, CSS Modules, Less and Jest",
   "main": "index.js",
   "bin": {

package/sku-types.d.ts

@@ -192,7 +192,7 @@ export interface SkuConfig {
    *
    * @link https://seek-oss.github.io/sku/#/./docs/configuration?id=languages
    */
-  languages?: Array<string | { name: string }>;
+  languages?: Array<string | { name: string; extends?: string }>;
 
   /**
    * **Only for libraries**