From 6bd1815ec04f218d35e02ce4a905612f007199de Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 18 Jul 2024 23:36:25 +0200 Subject: [PATCH] Merge pull request #28650 from storybookjs/norbert/cpc-backwards-support-for-addon-kit CPC: Add the globals export for manager (cherry picked from commit 0c91f47ba1cb1be3c1a914c039f3a58218482ee7) --- code/core/package.json | 8 ++++++++ code/core/scripts/entries.ts | 1 + code/deprecated/manager/globals.js | 1 + code/deprecated/preview/globals.js | 1 + code/lib/cli/core/manager/globals.cjs | 1 + code/lib/cli/core/manager/globals.d.ts | 2 ++ code/lib/cli/core/manager/globals.js | 1 + code/lib/cli/package.json | 8 ++++++++ 8 files changed, 23 insertions(+) create mode 100644 code/deprecated/manager/globals.js create mode 100644 code/deprecated/preview/globals.js create mode 100644 code/lib/cli/core/manager/globals.cjs create mode 100644 code/lib/cli/core/manager/globals.d.ts create mode 100644 code/lib/cli/core/manager/globals.js diff --git a/code/core/package.json b/code/core/package.json index cc832dc7b873..ddb05823afdc 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -142,6 +142,11 @@ "import": "./dist/manager/globals-module-info.js", "require": "./dist/manager/globals-module-info.cjs" }, + "./manager/globals": { + "types": "./dist/manager/globals.d.ts", + "import": "./dist/manager/globals.js", + "require": "./dist/manager/globals.cjs" + }, "./preview/globals": { "types": "./dist/preview/globals.d.ts", "import": "./dist/preview/globals.js", @@ -229,6 +234,9 @@ "manager/globals-module-info": [ "./dist/manager/globals-module-info.d.ts" ], + "manager/globals": [ + "./dist/manager/globals.d.ts" + ], "preview/globals": [ "./dist/preview/globals.d.ts" ] diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts index 85297c1b0c56..d392fdbe07e4 100644 --- a/code/core/scripts/entries.ts +++ b/code/core/scripts/entries.ts @@ -39,6 +39,7 @@ export const getEntries = (cwd: string) => { define('src/docs-tools/index.ts', ['browser', 'node'], true), define('src/manager/globals-module-info.ts', ['node'], true), + define('src/manager/globals.ts', ['node'], true), define('src/preview/globals.ts', ['node'], true), ]; }; diff --git a/code/deprecated/manager/globals.js b/code/deprecated/manager/globals.js new file mode 100644 index 000000000000..d6ee8ec2d144 --- /dev/null +++ b/code/deprecated/manager/globals.js @@ -0,0 +1 @@ +module.exports = require('storybook/internal/manager/globals'); diff --git a/code/deprecated/preview/globals.js b/code/deprecated/preview/globals.js new file mode 100644 index 000000000000..91340ce6505b --- /dev/null +++ b/code/deprecated/preview/globals.js @@ -0,0 +1 @@ +module.exports = require('storybook/internal/preview/globals'); diff --git a/code/lib/cli/core/manager/globals.cjs b/code/lib/cli/core/manager/globals.cjs new file mode 100644 index 000000000000..3dc797bf4cd7 --- /dev/null +++ b/code/lib/cli/core/manager/globals.cjs @@ -0,0 +1 @@ +module.exports = require('@storybook/core/manager/globals'); diff --git a/code/lib/cli/core/manager/globals.d.ts b/code/lib/cli/core/manager/globals.d.ts new file mode 100644 index 000000000000..47746a38ada4 --- /dev/null +++ b/code/lib/cli/core/manager/globals.d.ts @@ -0,0 +1,2 @@ +export * from '@storybook/core/manager/globals'; +export type * from '@storybook/core/manager/globals'; diff --git a/code/lib/cli/core/manager/globals.js b/code/lib/cli/core/manager/globals.js new file mode 100644 index 000000000000..779828900cda --- /dev/null +++ b/code/lib/cli/core/manager/globals.js @@ -0,0 +1 @@ +export * from '@storybook/core/manager/globals'; diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 501178157d0d..19b44d23e564 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -167,6 +167,11 @@ "types": "./core/preview/globals.d.ts", "import": "./core/preview/globals.js", "require": "./core/preview/globals.cjs" + }, + "./internal/manager/globals": { + "types": "./core/manager/globals.d.ts", + "import": "./core/manager/globals.js", + "require": "./core/manager/globals.cjs" } }, "main": "dist/index.cjs", @@ -219,6 +224,9 @@ "internal/manager-errors": [ "./core/manager-errors.d.ts" ], + "internal/manager/globals": [ + "./core/manager/globals.d.ts" + ], "internal/manager/globals-module-info": [ "./core/manager/globals-module-info.d.ts" ],