@storybook/core-common 7.0.0-alpha.2 → 7.0.0-alpha.5

package/dist/cjs/presets.js

@@ -83,19 +83,21 @@ var resolveAddonName = function (configDir, name, options) {
   var r = name.startsWith('/') ? _safeResolve.safeResolve : _safeResolve.safeResolveFrom.bind(null, configDir);
   var resolved = r(name);
 
-  if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
-    return {
-      type: 'virtual',
-      name: name,
-      managerEntries: [resolved]
-    };
-  }
+  if (resolved) {
+    if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
+      return {
+        type: 'virtual',
+        name: name,
+        managerEntries: [resolved]
+      };
+    }
 
-  if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) {
-    return {
-      type: 'presets',
-      name: resolved
-    };
+    if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) {
+      return {
+        type: 'presets',
+        name: resolved
+      };
+    }
   }
 
   var path = name; // when user provides full path, we don't need to do anything!
@@ -139,10 +141,14 @@ var resolveAddonName = function (configDir, name, options) {
     } : {});
   }
 
-  return {
-    type: 'presets',
-    name: resolved
-  };
+  if (resolved) {
+    return {
+      type: 'presets',
+      name: resolved
+    };
+  }
+
+  return undefined;
 };
 
 exports.resolveAddonName = resolveAddonName;

package/dist/cjs/utils/findDistEsm.js

@@ -12,9 +12,15 @@ var _findUp = require("find-up");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var findDistEsm = function (cwd, relativePath) {
-  var packageDir = _path.default.dirname((0, _findUp.sync)('package.json', {
+  var nearestPackageJson = (0, _findUp.sync)('package.json', {
     cwd: cwd
-  }));
+  });
+
+  if (!nearestPackageJson) {
+    throw new Error(`Could not find package.json in: ${cwd}`);
+  }
+
+  var packageDir = _path.default.dirname(nearestPackageJson);
 
   return _path.default.join(packageDir, 'dist', 'esm', relativePath);
 };

package/dist/cjs/utils/get-storybook-info.js

@@ -75,7 +75,7 @@ var getFrameworkInfo = function (packageJson) {
       pkg = _ref2[0],
       version = _ref2[1];
 
-  var framework = viewLayers[pkg];
+  var framework = pkg ? viewLayers[pkg] : undefined;
 
   if (dep && devDep && dep[0] === devDep[0]) {
     logger.warn(`Found "${dep[0]}" in both "dependencies" and "devDependencies". This is probably a mistake.`);

package/dist/cjs/utils/load-custom-presets.js

@@ -21,7 +21,11 @@ function loadCustomPresets({
   var main = (0, _interpretRequire.serverRequire)(_path.default.resolve(configDir, 'main'));
 
   if (main) {
-    return [(0, _interpretRequire.serverResolve)(_path.default.resolve(configDir, 'main'))];
+    var resolved = (0, _interpretRequire.serverResolve)(_path.default.resolve(configDir, 'main'));
+
+    if (resolved) {
+      return [resolved];
+    }
   }
 
   return presets || [];

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

@@ -30,9 +30,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 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
+var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // TODO: remove - LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 
 var fixBadGlob = (0, _utilDeprecate.default)(function (match) {
+  // @ts-ignore this will get removed later anyway
   return match.input.replace(match[1], `@${match[1]}`);
 }, (0, _tsDedent.default)`
     You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs

package/dist/cjs/utils/paths.js

@@ -16,16 +16,24 @@ var getProjectRoot = function () {
   var result;
 
   try {
-    result = result || _path.default.join(_findUp.default.sync('.git', {
+    var found = _findUp.default.sync('.git', {
       type: 'directory'
-    }), '..');
+    });
+
+    if (found) {
+      result = result || _path.default.join(found, '..');
+    }
   } catch (e) {//
   }
 
   try {
-    result = result || _path.default.join(_findUp.default.sync('.svn', {
+    var _found = _findUp.default.sync('.svn', {
       type: 'directory'
-    }), '..');
+    });
+
+    if (_found) {
+      result = result || _path.default.join(_found, '..');
+    }
   } catch (e) {//
   }
 

package/dist/esm/presets.js

@@ -66,19 +66,21 @@ export var resolveAddonName = function (configDir, name, options) {
   var r = name.startsWith('/') ? safeResolve : safeResolveFrom.bind(null, configDir);
   var resolved = r(name);
 
-  if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
-    return {
-      type: 'virtual',
-      name: name,
-      managerEntries: [resolved]
-    };
-  }
+  if (resolved) {
+    if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
+      return {
+        type: 'virtual',
+        name: name,
+        managerEntries: [resolved]
+      };
+    }
 
-  if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) {
-    return {
-      type: 'presets',
-      name: resolved
-    };
+    if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) {
+      return {
+        type: 'presets',
+        name: resolved
+      };
+    }
   }
 
   var path = name; // when user provides full path, we don't need to do anything!
@@ -122,10 +124,14 @@ export var resolveAddonName = function (configDir, name, options) {
     } : {});
   }
 
-  return {
-    type: 'presets',
-    name: resolved
-  };
+  if (resolved) {
+    return {
+      type: 'presets',
+      name: resolved
+    };
+  }
+
+  return undefined;
 };
 
 var map = function ({

package/dist/esm/utils/findDistEsm.js

@@ -1,8 +1,14 @@
 import path from 'path';
 import { sync as findUpSync } from 'find-up';
 export var findDistEsm = function (cwd, relativePath) {
-  var packageDir = path.dirname(findUpSync('package.json', {
+  var nearestPackageJson = findUpSync('package.json', {
     cwd: cwd
-  }));
+  });
+
+  if (!nearestPackageJson) {
+    throw new Error(`Could not find package.json in: ${cwd}`);
+  }
+
+  var packageDir = path.dirname(nearestPackageJson);
   return path.join(packageDir, 'dist', 'esm', relativePath);
 };

package/dist/esm/utils/get-storybook-info.js

@@ -63,7 +63,7 @@ var getFrameworkInfo = function (packageJson) {
       pkg = _ref2[0],
       version = _ref2[1];
 
-  var framework = viewLayers[pkg];
+  var framework = pkg ? viewLayers[pkg] : undefined;
 
   if (dep && devDep && dep[0] === devDep[0]) {
     logger.warn(`Found "${dep[0]}" in both "dependencies" and "devDependencies". This is probably a mistake.`);

package/dist/esm/utils/load-custom-presets.js

@@ -9,7 +9,11 @@ export function loadCustomPresets({
   var main = serverRequire(path.resolve(configDir, 'main'));
 
   if (main) {
-    return [serverResolve(path.resolve(configDir, 'main'))];
+    var resolved = serverResolve(path.resolve(configDir, 'main'));
+
+    if (resolved) {
+      return [resolved];
+    }
   }
 
   return presets || [];

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

@@ -13,9 +13,10 @@ import slash from 'slash';
 import { normalizeStoryPath } from './paths';
 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
+var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // TODO: remove - LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 
 var fixBadGlob = deprecate(function (match) {
+  // @ts-ignore this will get removed later anyway
   return match.input.replace(match[1], `@${match[1]}`);
 }, dedent`
     You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs

package/dist/esm/utils/paths.js

@@ -4,16 +4,24 @@ export var getProjectRoot = function () {
   var result;
 
   try {
-    result = result || path.join(findUp.sync('.git', {
+    var found = findUp.sync('.git', {
       type: 'directory'
-    }), '..');
+    });
+
+    if (found) {
+      result = result || path.join(found, '..');
+    }
   } catch (e) {//
   }
 
   try {
-    result = result || path.join(findUp.sync('.svn', {
+    var _found = findUp.sync('.svn', {
       type: 'directory'
-    }), '..');
+    });
+
+    if (_found) {
+      result = result || path.join(_found, '..');
+    }
   } catch (e) {//
   }
 

package/dist/types/presets.d.ts

@@ -30,7 +30,7 @@ interface ResolvedAddonVirtual {
         options?: any;
     })[];
 }
-export declare const resolveAddonName: (configDir: string, name: string, options: any) => ResolvedAddonPreset | ResolvedAddonVirtual;
+export declare const resolveAddonName: (configDir: string, name: string, options: any) => ResolvedAddonPreset | ResolvedAddonVirtual | undefined;
 export declare function loadPreset(input: PresetConfig, level: number, storybookOptions: InterPresetOptions): LoadedPreset[];
 declare type InterPresetOptions = Omit<CLIOptions & LoadOptions & BuilderOptions, 'frameworkPresets'>;
 export declare function getPresets(presets: PresetConfig[], storybookOptions: InterPresetOptions): Presets;

package/dist/types/utils/get-storybook-configuration.d.ts

@@ -1 +1 @@
-export declare function getStorybookConfiguration(storybookScript: string, shortName: string, longName: string): string;
+export declare function getStorybookConfiguration(storybookScript: string, shortName: string, longName: string): string | null;

package/dist/types/utils/interpret-files.d.ts

@@ -1,6 +1,6 @@
 export declare const boost: Set<string>;
-export declare function getInterpretedFile(pathToFile: string): string;
+export declare function getInterpretedFile(pathToFile: string): string | undefined;
 export declare function getInterpretedFileWithExt(pathToFile: string): {
     path: string;
     ext: string;
-};
+} | undefined;

package/dist/types/utils/load-manager-or-addons-file.d.ts

@@ -1,3 +1,3 @@
 export declare function loadManagerOrAddonsFile({ configDir }: {
     configDir: string;
-}): string;
+}): string | undefined;

package/dist/types/utils/load-preview-or-config-file.d.ts

@@ -1,3 +1,3 @@
 export declare function loadPreviewOrConfigFile({ configDir }: {
     configDir: string;
-}): string;
+}): string | undefined;

package/dist/types/utils/safeResolve.d.ts

@@ -1,2 +1,2 @@
-export declare const safeResolveFrom: (path: string, file: string) => string;
-export declare const safeResolve: (file: string) => string;
+export declare const safeResolveFrom: (path: string, file: string) => string | undefined;
+export declare const safeResolve: (file: string) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-alpha.5",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -55,7 +55,7 @@
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.1",
-    "@storybook/node-logger": "7.0.0-alpha.2",
+    "@storybook/node-logger": "7.0.0-alpha.5",
     "@storybook/semver": "^7.3.2",
     "@types/babel__core": "^7.0.0",
     "@types/express": "^4.7.0",
@@ -103,5 +103,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44920e2b6bd51981bac5124743c29fb9f5517e44"
+  "gitHead": "3dd46982823b34d9f37be917b6247631081feff7"
 }