@storybook/core-common 6.4.0-beta.26 → 6.4.0-beta.27

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeStories = exports.normalizeStoriesEntry = void 0;
+exports.normalizeStories = exports.normalizeStoriesEntry = exports.getDirectoryFromWorkingDir = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -54,6 +54,26 @@ var isDirectory = function (configDir, entry) {
   }
 };
 
+var getDirectoryFromWorkingDir = function ({
+  configDir: configDir,
+  workingDir: workingDir,
+  directory: directory
+}) {
+  var directoryFromConfig = _path.default.resolve(configDir, directory);
+
+  var directoryFromWorking = _path.default.relative(workingDir, directoryFromConfig); // relative('/foo', '/foo/src') => 'src'
+  // but we want `./src` to match importPaths
+
+
+  if (!directoryFromWorking.startsWith('.')) {
+    directoryFromWorking = `.${_path.default.sep}${directoryFromWorking}`;
+  }
+
+  return directoryFromWorking;
+};
+
+exports.getDirectoryFromWorkingDir = getDirectoryFromWorkingDir;
+
 var normalizeStoriesEntry = function (entry, {
   configDir: configDir,
   workingDir: workingDir
@@ -105,17 +125,11 @@ var normalizeStoriesEntry = function (entry, {
 
   var _specifierWithoutMatc = specifierWithoutMatcher,
       directoryRelativeToConfig = _specifierWithoutMatc.directory;
-
-  var absoluteDirectory = _path.default.resolve(configDir, directoryRelativeToConfig);
-
-  var directory = (0, _slash.default)(_path.default.relative(workingDir, absoluteDirectory)); // relative('/foo', '/foo/src') => 'src'
-  // but we want `./src` to match importPaths
-
-  if (!directory.startsWith('.')) {
-    directory = `./${directory}`;
-  }
-
-  directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
+  var directory = (0, _slash.default)(getDirectoryFromWorkingDir({
+    configDir: configDir,
+    workingDir: workingDir,
+    directory: directoryRelativeToConfig
+  })).replace(/\/$/, ''); // Now make the importFn matcher.
 
   var importPathMatcher = (0, _globToRegexp.globToRegexp)(`${directory}/${files}`);
   return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {

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

@@ -38,6 +38,21 @@ var isDirectory = function (configDir, entry) {
   }
 };
 
+export var getDirectoryFromWorkingDir = function ({
+  configDir: configDir,
+  workingDir: workingDir,
+  directory: directory
+}) {
+  var directoryFromConfig = path.resolve(configDir, directory);
+  var directoryFromWorking = path.relative(workingDir, directoryFromConfig); // relative('/foo', '/foo/src') => 'src'
+  // but we want `./src` to match importPaths
+
+  if (!directoryFromWorking.startsWith('.')) {
+    directoryFromWorking = `.${path.sep}${directoryFromWorking}`;
+  }
+
+  return directoryFromWorking;
+};
 export var normalizeStoriesEntry = function (entry, {
   configDir: configDir,
   workingDir: workingDir
@@ -89,15 +104,11 @@ export var normalizeStoriesEntry = function (entry, {
 
   var _specifierWithoutMatc = specifierWithoutMatcher,
       directoryRelativeToConfig = _specifierWithoutMatc.directory;
-  var absoluteDirectory = path.resolve(configDir, directoryRelativeToConfig);
-  var directory = slash(path.relative(workingDir, absoluteDirectory)); // relative('/foo', '/foo/src') => 'src'
-  // but we want `./src` to match importPaths
-
-  if (!directory.startsWith('.')) {
-    directory = `./${directory}`;
-  }
-
-  directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
+  var directory = slash(getDirectoryFromWorkingDir({
+    configDir: configDir,
+    workingDir: workingDir,
+    directory: directoryRelativeToConfig
+  })).replace(/\/$/, ''); // Now make the importFn matcher.
 
   var importPathMatcher = globToRegexp(`${directory}/${files}`);
   return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {

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

@@ -38,6 +38,21 @@ var isDirectory = function (configDir, entry) {
   }
 };
 
+export var getDirectoryFromWorkingDir = function ({
+  configDir: configDir,
+  workingDir: workingDir,
+  directory: directory
+}) {
+  var directoryFromConfig = path.resolve(configDir, directory);
+  var directoryFromWorking = path.relative(workingDir, directoryFromConfig); // relative('/foo', '/foo/src') => 'src'
+  // but we want `./src` to match importPaths
+
+  if (!directoryFromWorking.startsWith('.')) {
+    directoryFromWorking = `.${path.sep}${directoryFromWorking}`;
+  }
+
+  return directoryFromWorking;
+};
 export var normalizeStoriesEntry = function (entry, {
   configDir: configDir,
   workingDir: workingDir
@@ -89,15 +104,11 @@ export var normalizeStoriesEntry = function (entry, {
 
   var _specifierWithoutMatc = specifierWithoutMatcher,
       directoryRelativeToConfig = _specifierWithoutMatc.directory;
-  var absoluteDirectory = path.resolve(configDir, directoryRelativeToConfig);
-  var directory = slash(path.relative(workingDir, absoluteDirectory)); // relative('/foo', '/foo/src') => 'src'
-  // but we want `./src` to match importPaths
-
-  if (!directory.startsWith('.')) {
-    directory = `./${directory}`;
-  }
-
-  directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
+  var directory = slash(getDirectoryFromWorkingDir({
+    configDir: configDir,
+    workingDir: workingDir,
+    directory: directoryRelativeToConfig
+  })).replace(/\/$/, ''); // Now make the importFn matcher.
 
   var importPathMatcher = globToRegexp(`${directory}/${files}`);
   return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {

package/dist/ts3.4/types.d.ts

@@ -24,6 +24,10 @@ export interface CoreConfig {
     disableWebpackDefaults?: boolean;
     channelOptions?: Partial<TelejsonOptions>;
 }
+interface DirectoryMapping {
+    from: string;
+    to: string;
+}
 export interface Presets {
     apply(extension: 'typescript', config: TypescriptConfig, args?: Options): Promise<TypescriptConfig>;
     apply(extension: 'babel', config: {}, args: any): Promise<TransformOptions>;
@@ -105,6 +109,9 @@ export interface CLIOptions {
     previewUrl?: string;
     forceBuildPreview?: boolean;
     host?: string;
+    /**
+     * @deprecated Use 'staticDirs' Storybook Configuration option instead
+     */
     staticDir?: string[];
     configDir?: string;
     https?: boolean;
@@ -225,6 +232,8 @@ export declare type Entry = string;
 declare type StorybookRefs = Record<string, {
     title: string;
     url: string;
+} | {
+    disable: boolean;
 }>;
 /**
  * The interface for Storybook configuration in `main.ts` files.
@@ -237,6 +246,12 @@ export interface StorybookConfig {
      */
     addons?: Preset[];
     core?: CoreConfig;
+    /**
+     * Sets a list of directories of static files to be loaded by Storybook server
+     *
+     * @example `['./public']` or `[{from: './public', 'to': '/assets'}]`
+     */
+    staticDirs?: (DirectoryMapping | string)[];
     logLevel?: string;
     features?: {
         /**

package/dist/ts3.4/utils/normalize-stories.d.ts

@@ -1,4 +1,7 @@
 import { StoriesEntry, NormalizedStoriesSpecifier } from '../types';
+export declare const getDirectoryFromWorkingDir: ({ configDir, workingDir, directory, }: NormalizeOptions & {
+    directory: string;
+}) => string;
 export declare const normalizeStoriesEntry: (entry: StoriesEntry, { configDir, workingDir }: NormalizeOptions) => NormalizedStoriesSpecifier;
 interface NormalizeOptions {
     configDir: string;

package/dist/ts3.9/types.d.ts

@@ -24,6 +24,10 @@ export interface CoreConfig {
     disableWebpackDefaults?: boolean;
     channelOptions?: Partial<TelejsonOptions>;
 }
+interface DirectoryMapping {
+    from: string;
+    to: string;
+}
 export interface Presets {
     apply(extension: 'typescript', config: TypescriptConfig, args?: Options): Promise<TypescriptConfig>;
     apply(extension: 'babel', config: {}, args: any): Promise<TransformOptions>;
@@ -101,6 +105,9 @@ export interface CLIOptions {
     previewUrl?: string;
     forceBuildPreview?: boolean;
     host?: string;
+    /**
+     * @deprecated Use 'staticDirs' Storybook Configuration option instead
+     */
     staticDir?: string[];
     configDir?: string;
     https?: boolean;
@@ -221,6 +228,8 @@ export declare type Entry = string;
 declare type StorybookRefs = Record<string, {
     title: string;
     url: string;
+} | {
+    disable: boolean;
 }>;
 /**
  * The interface for Storybook configuration in `main.ts` files.
@@ -233,6 +242,12 @@ export interface StorybookConfig {
      */
     addons?: Preset[];
     core?: CoreConfig;
+    /**
+     * Sets a list of directories of static files to be loaded by Storybook server
+     *
+     * @example `['./public']` or `[{from: './public', 'to': '/assets'}]`
+     */
+    staticDirs?: (DirectoryMapping | string)[];
     logLevel?: string;
     features?: {
         /**

package/dist/ts3.9/utils/normalize-stories.d.ts

@@ -1,4 +1,7 @@
 import type { StoriesEntry, NormalizedStoriesSpecifier } from '../types';
+export declare const getDirectoryFromWorkingDir: ({ configDir, workingDir, directory, }: NormalizeOptions & {
+    directory: string;
+}) => string;
 export declare const normalizeStoriesEntry: (entry: StoriesEntry, { configDir, workingDir }: NormalizeOptions) => NormalizedStoriesSpecifier;
 interface NormalizeOptions {
     configDir: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "6.4.0-beta.26",
+  "version": "6.4.0-beta.27",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -61,7 +61,7 @@
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.1",
-    "@storybook/node-logger": "6.4.0-beta.26",
+    "@storybook/node-logger": "6.4.0-beta.27",
     "@storybook/semver": "^7.3.2",
     "@types/node": "^14.0.10",
     "@types/pretty-hrtime": "^1.0.0",
@@ -110,6 +110,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ddc43c3b4cf4ae8463a2e284b290e5014e33780e",
+  "gitHead": "b73d9e79cf41328a21eb5f8c1490f450abaf4142",
   "sbmodern": "dist/modern/index.js"
 }