@storybook/core-server 7.0.0-alpha.51 → 7.0.0-alpha.52

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -13,6 +13,7 @@ var _coreCommon = require("@storybook/core-common");
 var _nodeLogger = require("@storybook/node-logger");
 var _csfTools = require("@storybook/csf-tools");
 var _csf = require("@storybook/csf");
+var _docsMdx = require("@storybook/docs-mdx");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -231,18 +232,8 @@ class StoryIndexGenerator {
       }
       var normalizedPath = (0, _coreCommon.normalizeStoryPath)(relativePath);
       var importPath = (0, _slash.default)(normalizedPath);
-
-      // This `await require(...)` is a bit of a hack. It's necessary because
-      // `docs-mdx` depends on ESM code, which must be asynchronously imported
-      // to be used in CJS. Unfortunately, we cannot use `import()` here, because
-      // it will be transpiled down to `require()` by Babel. So instead, we require
-      // a CJS export from `@storybook/docs-mdx` that does the `async import` for us.
-
-      // eslint-disable-next-line global-require
-      var _await$require = await require('@storybook/docs-mdx'),
-        analyze = _await$require.analyze;
       var content = await _fsExtra.default.readFile(absolutePath, 'utf8');
-      var result = analyze(content);
+      var result = (0, _docsMdx.analyze)(content);
 
       // Templates are not indexed
       if (result.isTemplate) return false;
@@ -252,7 +243,7 @@ class StoryIndexGenerator {
 
       // Go through the cache and collect all of the cache entries that this docs file depends on.
       // We'll use this to make sure this docs cache entry is invalidated when any of its dependents
-      // are invalidated.
+      // are invalidated.f
       var dependencies = this.findDependencies(absoluteImports);
 
       // Also, if `result.of` is set, it means that we're using the `<Meta of={XStories} />` syntax,
@@ -287,7 +278,7 @@ class StoryIndexGenerator {
           return dep.entries[0].importPath;
         }),
         type: 'docs',
-        tags: [...(result.tags || []), 'docs'],
+        tags: [...(result.tags || []), 'docs', 'mdx'],
         standalone: true
       };
       return docsEntry;

package/dist/esm/utils/StoryIndexGenerator.js

@@ -16,6 +16,7 @@ import { normalizeStoryPath } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 import { getStorySortParameter, NoMetaError } from '@storybook/csf-tools';
 import { toId } from '@storybook/csf';
+import { analyze } from '@storybook/docs-mdx';
 
 /** A .mdx file will produce a "standalone" docs entry */
 
@@ -227,16 +228,6 @@ export class StoryIndexGenerator {
       }
       var normalizedPath = normalizeStoryPath(relativePath);
       var importPath = slash(normalizedPath);
-
-      // This `await require(...)` is a bit of a hack. It's necessary because
-      // `docs-mdx` depends on ESM code, which must be asynchronously imported
-      // to be used in CJS. Unfortunately, we cannot use `import()` here, because
-      // it will be transpiled down to `require()` by Babel. So instead, we require
-      // a CJS export from `@storybook/docs-mdx` that does the `async import` for us.
-
-      // eslint-disable-next-line global-require
-      var _await$require = await require('@storybook/docs-mdx'),
-        analyze = _await$require.analyze;
       var content = await fs.readFile(absolutePath, 'utf8');
       var result = analyze(content);
 
@@ -248,7 +239,7 @@ export class StoryIndexGenerator {
 
       // Go through the cache and collect all of the cache entries that this docs file depends on.
       // We'll use this to make sure this docs cache entry is invalidated when any of its dependents
-      // are invalidated.
+      // are invalidated.f
       var dependencies = this.findDependencies(absoluteImports);
 
       // Also, if `result.of` is set, it means that we're using the `<Meta of={XStories} />` syntax,
@@ -283,7 +274,7 @@ export class StoryIndexGenerator {
           return dep.entries[0].importPath;
         }),
         type: 'docs',
-        tags: [...(result.tags || []), 'docs'],
+        tags: [...(result.tags || []), 'docs', 'mdx'],
         standalone: true
       };
       return docsEntry;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "7.0.0-alpha.51",
+  "version": "7.0.0-alpha.52",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -35,17 +35,17 @@
   "dependencies": {
     "@aw-web-design/x-default-browser": "1.4.88",
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/builder-manager": "7.0.0-alpha.51",
-    "@storybook/core-client": "7.0.0-alpha.51",
-    "@storybook/core-common": "7.0.0-alpha.51",
-    "@storybook/core-events": "7.0.0-alpha.51",
+    "@storybook/builder-manager": "7.0.0-alpha.52",
+    "@storybook/core-client": "7.0.0-alpha.52",
+    "@storybook/core-common": "7.0.0-alpha.52",
+    "@storybook/core-events": "7.0.0-alpha.52",
     "@storybook/csf": "next",
-    "@storybook/csf-tools": "7.0.0-alpha.51",
-    "@storybook/docs-mdx": "0.0.1-canary.12433cf.0",
-    "@storybook/node-logger": "7.0.0-alpha.51",
-    "@storybook/store": "7.0.0-alpha.51",
-    "@storybook/telemetry": "7.0.0-alpha.51",
-    "@storybook/types": "7.0.0-alpha.51",
+    "@storybook/csf-tools": "7.0.0-alpha.52",
+    "@storybook/docs-mdx": "next",
+    "@storybook/node-logger": "7.0.0-alpha.52",
+    "@storybook/store": "7.0.0-alpha.52",
+    "@storybook/telemetry": "7.0.0-alpha.52",
+    "@storybook/types": "7.0.0-alpha.52",
     "@types/node": "^16.0.0 || ^18.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
@@ -77,7 +77,7 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "7.0.0-alpha.51",
+    "@storybook/builder-webpack5": "7.0.0-alpha.52",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4fec76c3f5135854d9834ebc1cf2f1f325696ded"
+  "gitHead": "d2494e3f51ce0f55bcb1ef693a6477c669fbe666"
 }