@storybook/core-common 6.4.0-beta.21 → 6.4.0-beta.25

package/dist/cjs/utils/glob-to-regexp.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.globToRegex = globToRegex;
+exports.globToRegexp = globToRegexp;
 
-var _micromatch = require("micromatch");
+var _picomatch = require("picomatch");
 
-function globToRegex(glob) {
-  var regex = (0, _micromatch.makeRe)(glob, {
+function globToRegexp(glob) {
+  var regex = (0, _picomatch.makeRe)(glob, {
     fastpaths: false,
     noglobstar: false,
     bash: false

package/dist/cjs/utils/normalize-stories.js

@@ -13,7 +13,7 @@ var _utilDeprecate = _interopRequireDefault(require("util-deprecate"));
 
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
-var _micromatch = require("micromatch");
+var _picomatch = require("picomatch");
 
 var _slash = _interopRequireDefault(require("slash"));
 
@@ -77,7 +77,7 @@ var normalizeStoriesEntry = function (entry, {
       }
     } else {
       var fixedEntry = detectBadGlob(entry);
-      var globResult = (0, _micromatch.scan)(fixedEntry);
+      var globResult = (0, _picomatch.scan)(fixedEntry);
 
       var _directory = globResult.isGlob ? globResult.prefix + globResult.base : _path.default.dirname(fixedEntry);
 
@@ -117,7 +117,7 @@ var normalizeStoriesEntry = function (entry, {
 
   directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
 
-  var importPathMatcher = (0, _globToRegexp.globToRegex)(`${directory}/${files}`);
+  var importPathMatcher = (0, _globToRegexp.globToRegexp)(`${directory}/${files}`);
   return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {
     directory: directory,
     importPathMatcher: importPathMatcher

package/dist/cjs/utils/to-importFn.js

@@ -3,22 +3,35 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.webpackIncludeRegexp = webpackIncludeRegexp;
 exports.toImportFnPart = toImportFnPart;
 exports.toImportFn = toImportFn;
 
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
+var _globToRegexp = require("./glob-to-regexp");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function toImportFnPart(specifier) {
+function webpackIncludeRegexp(specifier) {
   var directory = specifier.directory,
-      importPathMatcher = specifier.importPathMatcher; // It appears webpack passes *something* similar to the absolute path to the file
+      files = specifier.files; // It appears webpack passes *something* similar to the absolute path to the file
   // on disk (prefixed with something unknown) to the matcher.
-  // We don't want to include the absolute path in our bundle, so we will just pull the
-  // '^' and any leading '.' off the regexp and match on that.
+  // We don't want to include the absolute path in our bundle, so we will just pull any leading
+  // `./` or `../` off our directory and match on that.
   // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
+  // NOTE: directory is "slashed" so will contain only `/` (no `\`), even on windows
 
-  var webpackIncludeRegex = new RegExp(importPathMatcher.source.replace(/^\^\\\.*/, ''));
+  var directoryWithoutLeadingDots = directory.replace(/^(\.+\/)+/, '/');
+  var webpackIncludeGlob = ['.', '..'].includes(directory) ? files : `${directoryWithoutLeadingDots}/${files}`;
+  var webpackIncludeRegexpWithCaret = (0, _globToRegexp.globToRegexp)(webpackIncludeGlob); // picomatch is creating an exact match, but we are only matching the end of the filename
+
+  return new RegExp(webpackIncludeRegexpWithCaret.source.replace(/^\^/, ''));
+}
+
+function toImportFnPart(specifier) {
+  var directory = specifier.directory,
+      importPathMatcher = specifier.importPathMatcher;
   return (0, _tsDedent.default)`
       async (path) => {
         if (!${importPathMatcher}.exec(path)) {
@@ -27,7 +40,8 @@ function toImportFnPart(specifier) {
 
         const pathRemainder = path.substring(${directory.length + 1});
         return import(
-          /* webpackInclude: ${webpackIncludeRegex} */
+          /* webpackChunkName: "[request]" */
+          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
           '${directory}/' + pathRemainder
         );
       }

package/dist/cjs/utils/to-require-context.js

@@ -12,7 +12,7 @@ var toRequireContext = function (specifier) {
       files = specifier.files; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
   // For `require.context()` we want the same thing, relative to directory
 
-  var match = (0, _globToRegexp.globToRegex)(`./${files}`);
+  var match = (0, _globToRegexp.globToRegexp)(`./${files}`);
   return {
     path: directory,
     recursive: !!files.match(/^\*{1,2}\//),

package/dist/esm/utils/glob-to-regexp.js

@@ -1,5 +1,5 @@
-import { makeRe } from 'micromatch';
-export function globToRegex(glob) {
+import { makeRe } from 'picomatch';
+export function globToRegexp(glob) {
   var regex = makeRe(glob, {
     fastpaths: false,
     noglobstar: false,

package/dist/esm/utils/normalize-stories.js

@@ -8,9 +8,9 @@ import fs from 'fs';
 import path from 'path';
 import deprecate from 'util-deprecate';
 import dedent from 'ts-dedent';
-import { scan } from 'micromatch';
+import { scan } from 'picomatch';
 import slash from 'slash';
-import { globToRegex } from './glob-to-regexp';
+import { globToRegexp } from './glob-to-regexp';
 var DEFAULT_TITLE_PREFIX = '';
 var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 
@@ -99,7 +99,7 @@ export var normalizeStoriesEntry = function (entry, {
 
   directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
 
-  var importPathMatcher = globToRegex(`${directory}/${files}`);
+  var importPathMatcher = globToRegexp(`${directory}/${files}`);
   return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {
     directory: directory,
     importPathMatcher: importPathMatcher

package/dist/esm/utils/to-importFn.js

@@ -1,13 +1,23 @@
 import dedent from 'ts-dedent';
-export function toImportFnPart(specifier) {
+import { globToRegexp } from './glob-to-regexp';
+export function webpackIncludeRegexp(specifier) {
   var directory = specifier.directory,
-      importPathMatcher = specifier.importPathMatcher; // It appears webpack passes *something* similar to the absolute path to the file
+      files = specifier.files; // It appears webpack passes *something* similar to the absolute path to the file
   // on disk (prefixed with something unknown) to the matcher.
-  // We don't want to include the absolute path in our bundle, so we will just pull the
-  // '^' and any leading '.' off the regexp and match on that.
+  // We don't want to include the absolute path in our bundle, so we will just pull any leading
+  // `./` or `../` off our directory and match on that.
   // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
+  // NOTE: directory is "slashed" so will contain only `/` (no `\`), even on windows
+
+  var directoryWithoutLeadingDots = directory.replace(/^(\.+\/)+/, '/');
+  var webpackIncludeGlob = ['.', '..'].includes(directory) ? files : `${directoryWithoutLeadingDots}/${files}`;
+  var webpackIncludeRegexpWithCaret = globToRegexp(webpackIncludeGlob); // picomatch is creating an exact match, but we are only matching the end of the filename
 
-  var webpackIncludeRegex = new RegExp(importPathMatcher.source.replace(/^\^\\\.*/, ''));
+  return new RegExp(webpackIncludeRegexpWithCaret.source.replace(/^\^/, ''));
+}
+export function toImportFnPart(specifier) {
+  var directory = specifier.directory,
+      importPathMatcher = specifier.importPathMatcher;
   return dedent`
       async (path) => {
         if (!${importPathMatcher}.exec(path)) {
@@ -16,7 +26,8 @@ export function toImportFnPart(specifier) {
 
         const pathRemainder = path.substring(${directory.length + 1});
         return import(
-          /* webpackInclude: ${webpackIncludeRegex} */
+          /* webpackChunkName: "[request]" */
+          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
           '${directory}/' + pathRemainder
         );
       }

package/dist/esm/utils/to-require-context.js

@@ -1,10 +1,10 @@
-import { globToRegex } from './glob-to-regexp';
+import { globToRegexp } from './glob-to-regexp';
 export var toRequireContext = function (specifier) {
   var directory = specifier.directory,
       files = specifier.files; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
   // For `require.context()` we want the same thing, relative to directory
 
-  var match = globToRegex(`./${files}`);
+  var match = globToRegexp(`./${files}`);
   return {
     path: directory,
     recursive: !!files.match(/^\*{1,2}\//),

package/dist/modern/utils/glob-to-regexp.js

@@ -1,5 +1,5 @@
-import { makeRe } from 'micromatch';
-export function globToRegex(glob) {
+import { makeRe } from 'picomatch';
+export function globToRegexp(glob) {
   var regex = makeRe(glob, {
     fastpaths: false,
     noglobstar: false,

package/dist/modern/utils/normalize-stories.js

@@ -8,9 +8,9 @@ import fs from 'fs';
 import path from 'path';
 import deprecate from 'util-deprecate';
 import dedent from 'ts-dedent';
-import { scan } from 'micromatch';
+import { scan } from 'picomatch';
 import slash from 'slash';
-import { globToRegex } from './glob-to-regexp';
+import { globToRegexp } from './glob-to-regexp';
 var DEFAULT_TITLE_PREFIX = '';
 var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 
@@ -99,7 +99,7 @@ export var normalizeStoriesEntry = function (entry, {
 
   directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
 
-  var importPathMatcher = globToRegex(`${directory}/${files}`);
+  var importPathMatcher = globToRegexp(`${directory}/${files}`);
   return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {
     directory: directory,
     importPathMatcher: importPathMatcher

package/dist/modern/utils/to-importFn.js

@@ -1,13 +1,23 @@
 import dedent from 'ts-dedent';
-export function toImportFnPart(specifier) {
+import { globToRegexp } from './glob-to-regexp';
+export function webpackIncludeRegexp(specifier) {
   var directory = specifier.directory,
-      importPathMatcher = specifier.importPathMatcher; // It appears webpack passes *something* similar to the absolute path to the file
+      files = specifier.files; // It appears webpack passes *something* similar to the absolute path to the file
   // on disk (prefixed with something unknown) to the matcher.
-  // We don't want to include the absolute path in our bundle, so we will just pull the
-  // '^' and any leading '.' off the regexp and match on that.
+  // We don't want to include the absolute path in our bundle, so we will just pull any leading
+  // `./` or `../` off our directory and match on that.
   // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
+  // NOTE: directory is "slashed" so will contain only `/` (no `\`), even on windows
+
+  var directoryWithoutLeadingDots = directory.replace(/^(\.+\/)+/, '/');
+  var webpackIncludeGlob = ['.', '..'].includes(directory) ? files : `${directoryWithoutLeadingDots}/${files}`;
+  var webpackIncludeRegexpWithCaret = globToRegexp(webpackIncludeGlob); // picomatch is creating an exact match, but we are only matching the end of the filename
 
-  var webpackIncludeRegex = new RegExp(importPathMatcher.source.replace(/^\^\\\.*/, ''));
+  return new RegExp(webpackIncludeRegexpWithCaret.source.replace(/^\^/, ''));
+}
+export function toImportFnPart(specifier) {
+  var directory = specifier.directory,
+      importPathMatcher = specifier.importPathMatcher;
   return dedent`
       async (path) => {
         if (!${importPathMatcher}.exec(path)) {
@@ -16,7 +26,8 @@ export function toImportFnPart(specifier) {
 
         const pathRemainder = path.substring(${directory.length + 1});
         return import(
-          /* webpackInclude: ${webpackIncludeRegex} */
+          /* webpackChunkName: "[request]" */
+          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
           '${directory}/' + pathRemainder
         );
       }

package/dist/modern/utils/to-require-context.js

@@ -1,10 +1,10 @@
-import { globToRegex } from './glob-to-regexp';
+import { globToRegexp } from './glob-to-regexp';
 export var toRequireContext = function (specifier) {
   var directory = specifier.directory,
       files = specifier.files; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
   // For `require.context()` we want the same thing, relative to directory
 
-  var match = globToRegex(`./${files}`);
+  var match = globToRegexp(`./${files}`);
   return {
     path: directory,
     recursive: !!files.match(/^\*{1,2}\//),

package/dist/ts3.4/utils/glob-to-regexp.d.ts

@@ -1 +1 @@
-export declare function globToRegex(glob: string): RegExp;
+export declare function globToRegexp(glob: string): RegExp;

package/dist/ts3.4/utils/to-importFn.d.ts

@@ -1,3 +1,4 @@
 import { NormalizedStoriesSpecifier } from '../types';
+export declare function webpackIncludeRegexp(specifier: NormalizedStoriesSpecifier): RegExp;
 export declare function toImportFnPart(specifier: NormalizedStoriesSpecifier): string;
 export declare function toImportFn(stories: NormalizedStoriesSpecifier[]): string;

package/dist/ts3.9/utils/glob-to-regexp.d.ts

@@ -1 +1 @@
-export declare function globToRegex(glob: string): RegExp;
+export declare function globToRegexp(glob: string): RegExp;

package/dist/ts3.9/utils/to-importFn.d.ts

@@ -1,3 +1,4 @@
 import type { NormalizedStoriesSpecifier } from '../types';
+export declare function webpackIncludeRegexp(specifier: NormalizedStoriesSpecifier): RegExp;
 export declare function toImportFnPart(specifier: NormalizedStoriesSpecifier): string;
 export declare function toImportFn(stories: NormalizedStoriesSpecifier[]): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "6.4.0-beta.21",
+  "version": "6.4.0-beta.25",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -61,9 +61,8 @@
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.1",
-    "@storybook/node-logger": "6.4.0-beta.21",
+    "@storybook/node-logger": "6.4.0-beta.25",
     "@storybook/semver": "^7.3.2",
-    "@types/micromatch": "^4.0.1",
     "@types/node": "^14.0.10",
     "@types/pretty-hrtime": "^1.0.0",
     "babel-loader": "^8.0.0",
@@ -81,7 +80,7 @@
     "interpret": "^2.2.0",
     "json5": "^2.1.3",
     "lazy-universal-dotenv": "^3.0.1",
-    "micromatch": "^4.0.2",
+    "picomatch": "^2.3.0",
     "pkg-dir": "^5.0.0",
     "pretty-hrtime": "^1.0.3",
     "resolve-from": "^5.0.0",
@@ -96,6 +95,7 @@
     "@types/compression": "^1.7.0",
     "@types/interpret": "^1.1.1",
     "@types/mock-fs": "^4.13.0",
+    "@types/picomatch": "^2.3.0",
     "mock-fs": "^4.13.0"
   },
   "peerDependencies": {
@@ -110,6 +110,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb83ef6aefb6791324e2c70567bdc128cef09d92",
+  "gitHead": "5bf101067e5b9387ce092301bea6ab4ee432f777",
   "sbmodern": "dist/modern/index.js"
 }