track next branch

storybookjs · Aug 16, 2021 · ccd8f3a · ccd8f3a
1 parent 8c13500
commit ccd8f3a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/lib/core-common/src/types.ts b/lib/core-common/src/types.ts
@@ -276,6 +276,10 @@ export interface StorybookConfig {
    * Controls how Storybook handles TypeScript files.
    */
   typescript?: Partial<TypescriptOptions>;
+  /**
+   * Modify or return a custom Babel config.
+   */
+  babel?: (config: TransformOptions) => TransformOptions | Promise<TransformOptions>;
   /**
    * Modify or return a custom Webpack config.
    */

diff --git a/lib/core-server/package.json b/lib/core-server/package.json
@@ -40,13 +40,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "@babel/core": "^7.0.0",
     "@storybook/builder-webpack4": "6.4.0-alpha.30",
     "@storybook/core-client": "6.4.0-alpha.30",
     "@storybook/core-common": "6.4.0-alpha.30",
     "@storybook/csf-tools": "6.4.0-alpha.30",
     "@storybook/manager-webpack4": "6.4.0-alpha.30",
     "@storybook/node-logger": "6.4.0-alpha.30",
     "@storybook/semver": "^7.3.2",
+    "@types/babel__core": "^7",
     "@types/node": "^14.0.10",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",

diff --git a/lib/core-server/src/presets/babel-cache-preset.ts b/lib/core-server/src/presets/babel-cache-preset.ts
@@ -1,7 +1,7 @@
 import { resolvePathInStorybookCache } from '@storybook/core-common';
+import { TransformOptions } from '@babel/core';
 
-// FIXME: babelConfig is maybe a TransformOptions?
-const extend = (babelConfig: any) => ({
+const extend = (babelConfig: TransformOptions) => ({
   // This is a feature of `babel-loader` for webpack (not Babel itself).
   // It enables a cache directory for faster-rebuilds
   cacheDirectory: resolvePathInStorybookCache('babel'),

diff --git a/yarn.lock b/yarn.lock
@@ -585,7 +585,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.15.0, @babel/core@npm:^7.14.6":
+"@babel/core@npm:7.15.0, @babel/core@npm:^7.0.0, @babel/core@npm:^7.14.6":
   version: 7.15.0
   resolution: "@babel/core@npm:7.15.0"
   dependencies:
@@ -7990,6 +7990,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/core-server@workspace:lib/core-server"
   dependencies:
+    "@babel/core": ^7.0.0
     "@storybook/builder-webpack4": 6.4.0-alpha.30
     "@storybook/builder-webpack5": 6.4.0-alpha.30
     "@storybook/core-client": 6.4.0-alpha.30
@@ -7998,6 +7999,7 @@ __metadata:
     "@storybook/manager-webpack4": 6.4.0-alpha.30
     "@storybook/node-logger": 6.4.0-alpha.30
     "@storybook/semver": ^7.3.2
+    "@types/babel__core": ^7
     "@types/compression": ^1.7.0
     "@types/ip": ^1.1.0
     "@types/node": ^14.0.10
@@ -9452,6 +9454,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/babel__core@npm:^7":
+  version: 7.1.15
+  resolution: "@types/babel__core@npm:7.1.15"
+  dependencies:
+    "@babel/parser": ^7.1.0
+    "@babel/types": ^7.0.0
+    "@types/babel__generator": "*"
+    "@types/babel__template": "*"
+    "@types/babel__traverse": "*"
+  checksum: 4c7f4d6fa112ea0f795ed3d8260b0f41d6887757fc1f0720485b962d65ba4e6a98dd131133ea78278527c5eba8de02702c2d99f73946938a9876f66e8e934785
+  languageName: node
+  linkType: hard
+
 "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.0, @types/babel__core@npm:^7.1.7":
   version: 7.1.12
   resolution: "@types/babel__core@npm:7.1.12"