diff --git a/package.json b/package.json index 611ac5aa1..233a414a4 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "release": "pnpm deploy-docs && changeset publish", "version": "changeset version && pnpm install --lockfile-only" }, - "packageManager": "pnpm@8.4.0", "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": "pnpm@8.6.12", "skuSkipPostInstall": true, "skuSkipConfigure": true, "skuSkipValidatePeerDeps": true diff --git a/packages/sku/CHANGELOG.md b/packages/sku/CHANGELOG.md index d7b863f77..4d23277ea 100644 --- a/packages/sku/CHANGELOG.md +++ b/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 diff --git a/packages/sku/config/storybook/build/main.js b/packages/sku/config/storybook/build/main.js index edf07ff25..5686f9864 100644 --- a/packages/sku/config/storybook/build/main.js +++ b/packages/sku/config/storybook/build/main.js @@ -1 +1 @@ -export { default } from '../config'; +module.exports = require('../config'); diff --git a/packages/sku/config/storybook/config.js b/packages/sku/config/storybook/config.js index 643030e39..c060dc4e4 100644 --- a/packages/sku/config/storybook/config.js +++ b/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)')), diff --git a/packages/sku/config/storybook/start/main.js b/packages/sku/config/storybook/start/main.js index edf07ff25..5686f9864 100644 --- a/packages/sku/config/storybook/start/main.js +++ b/packages/sku/config/storybook/start/main.js @@ -1 +1 @@ -export { default } from '../config'; +module.exports = require('../config'); diff --git a/packages/sku/package.json b/packages/sku/package.json index dd65619bc..d7c9bc193 100644 --- a/packages/sku/package.json +++ b/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": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b4d5eb94..50df8bca5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + importers: .: @@ -946,10 +950,10 @@ importers: version: 6.0.1 webpack: specifier: ^5.52.0 - version: 5.88.0(esbuild@0.17.16)(webpack-cli@5.0.1) + version: 5.88.0(webpack-cli@5.0.1) webpack-cli: specifier: ^5.0.0 - version: 5.0.1(webpack-bundle-analyzer@4.8.0)(webpack-dev-server@4.11.1)(webpack@5.88.0) + version: 5.0.1(webpack-dev-server@4.11.1)(webpack@5.88.0) webpack-dev-server: specifier: 4.11.1 version: 4.11.1(debug@4.3.4)(webpack-cli@5.0.1)(webpack@5.88.0) @@ -6079,7 +6083,7 @@ packages: debug: 4.3.4(supports-color@8.1.1) es-module-lexer: 0.9.3 virtual-resource-loader: 1.0.1 - webpack: 5.88.0(esbuild@0.17.16)(webpack-cli@5.0.1) + webpack: 5.88.0(webpack-cli@5.0.1) transitivePeerDependencies: - supports-color dev: false @@ -6936,6 +6940,7 @@ packages: /bplist-parser@0.1.1: resolution: {integrity: sha512-2AEM0FXy8ZxVLBuqX0hqt1gDwcnz2zygEkQ6zaD5Wko/sB9paUNwlpawrFtKeHUAQUOzjVy9AO4oeonqIHKA9Q==} + requiresBuild: true dependencies: big-integer: 1.6.51 dev: false @@ -10023,7 +10028,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.88.0(esbuild@0.17.16)(webpack-cli@5.0.1) + webpack: 5.88.0(webpack-cli@5.0.1) /htmlparser2@3.10.1: resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==} @@ -11798,7 +11803,7 @@ packages: webpack: ^5.0.0 dependencies: schema-utils: 4.0.0 - webpack: 5.88.0(esbuild@0.17.16)(webpack-cli@5.0.1) + webpack: 5.88.0(webpack-cli@5.0.1) /minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} @@ -13029,6 +13034,7 @@ packages: /prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} + requiresBuild: true dev: false optional: true @@ -13778,6 +13784,7 @@ packages: /sax@1.2.4: resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} + requiresBuild: true dev: false optional: true @@ -14501,6 +14508,29 @@ packages: terser: 5.18.1 webpack: 5.88.0(esbuild@0.17.16)(webpack-cli@5.0.1) + /terser-webpack-plugin@5.3.9(webpack@5.88.0): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.18 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.18.1 + webpack: 5.88.0(webpack-cli@5.0.1) + /terser@5.18.1: resolution: {integrity: sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==} engines: {node: '>=10'} @@ -14914,6 +14944,7 @@ packages: /untildify@2.1.0: resolution: {integrity: sha512-sJjbDp2GodvkB0FZZcn7k6afVisqX5BZD7Yq3xp4nN2O15BBK0cLm3Vwn2vQaF7UDS0UUsrQMkkplmDI5fskig==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: os-homedir: 1.0.2 dev: false @@ -15238,6 +15269,39 @@ packages: webpack-dev-server: 4.11.1(debug@4.3.4)(webpack-cli@5.0.1)(webpack@5.88.0) webpack-merge: 5.8.0 + /webpack-cli@5.0.1(webpack-dev-server@4.11.1)(webpack@5.88.0): + resolution: {integrity: sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==} + engines: {node: '>=14.15.0'} + hasBin: true + peerDependencies: + '@webpack-cli/generators': '*' + webpack: 5.x.x + webpack-bundle-analyzer: '*' + webpack-dev-server: '*' + peerDependenciesMeta: + '@webpack-cli/generators': + optional: true + webpack-bundle-analyzer: + optional: true + webpack-dev-server: + optional: true + dependencies: + '@discoveryjs/json-ext': 0.5.7 + '@webpack-cli/configtest': 2.0.1(webpack-cli@5.0.1)(webpack@5.88.0) + '@webpack-cli/info': 2.0.1(webpack-cli@5.0.1)(webpack@5.88.0) + '@webpack-cli/serve': 2.0.1(webpack-cli@5.0.1)(webpack-dev-server@4.11.1)(webpack@5.88.0) + colorette: 2.0.19 + commander: 9.5.0 + cross-spawn: 7.0.3 + envinfo: 7.8.1 + fastest-levenshtein: 1.0.16 + import-local: 3.1.0 + interpret: 3.1.1 + rechoir: 0.8.0 + webpack: 5.88.0(webpack-cli@5.0.1) + webpack-dev-server: 4.11.1(debug@4.3.4)(webpack-cli@5.0.1)(webpack@5.88.0) + webpack-merge: 5.8.0 + /webpack-dev-middleware@5.3.3(webpack@5.88.0): resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} @@ -15371,6 +15435,46 @@ packages: - esbuild - uglify-js + /webpack@5.88.0(webpack-cli@5.0.1): + resolution: {integrity: sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.4 + '@types/estree': 1.0.1 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.9.0 + acorn-import-assertions: 1.9.0(acorn@8.9.0) + browserslist: 4.21.9 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.3.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(webpack@5.88.0) + watchpack: 2.4.0 + webpack-cli: 5.0.1(webpack-dev-server@4.11.1)(webpack@5.88.0) + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'}