Merge branch 'master' into increase-timeout

package.json

@@ -15,7 +15,6 @@
     "release": "pnpm deploy-docs && changeset publish",
     "version": "changeset version && pnpm install --lockfile-only"
   },
-  "packageManager": "[email protected]",
   "lint-staged": {
     "+(package.json|pnpm-lock.yaml)": [
       "pnpm run check"
@@ -64,8 +63,10 @@
     "ts-jest": "^29.1.1"
   },
   "volta": {
-    "node": "18.16.0"
+    "node": "18.16.0",
+    "pnpm": "8.6.12"
   },
+  "packageManager": "[email protected]",
   "skuSkipPostInstall": true,
   "skuSkipConfigure": true,
   "skuSkipValidatePeerDeps": true

packages/sku/CHANGELOG.md

@@ -1,5 +1,13 @@
 # sku
 
+## 12.3.3
+
+### Patch Changes
+
+- Revert storybook config to CJS ([#873](https://github.com/seek-oss/sku/pull/873))
+
+  Fixes a bug where newer storybook versions (>=7.1.0) could not load sku's storybook config
+
 ## 12.3.2
 
 ### Patch Changes

packages/sku/config/storybook/build/main.js

@@ -1 +1 @@
-export { default } from '../config';
+module.exports = require('../config');

packages/sku/config/storybook/config.js

@@ -1,12 +1,13 @@
-import fs from 'fs';
-import path from 'path';
-import { createRequire } from 'module';
-import { paths, storybookAddons, storybookStoryStore } from '../../context';
-
-const require = createRequire(import.meta.url);
+const fs = require('fs');
+const path = require('path');
+const {
+  paths,
+  storybookAddons,
+  storybookStoryStore,
+} = require('../../context');
 
 /** @type {import("@storybook/react-webpack5").StorybookConfig} */
-export default {
+module.exports = {
   stories: paths.src
     .filter((srcPath) => fs.statSync(srcPath).isDirectory())
     .map((srcPath) => path.join(srcPath, '**/*.stories.@(js|ts|tsx)')),

packages/sku/config/storybook/start/main.js

@@ -1 +1 @@
-export { default } from '../config';
+module.exports = require('../config');

packages/sku/package.json

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