@storybook/core-server 6.4.9 → 6.5.0-alpha.4

package/dist/cjs/build-dev.js

@@ -131,11 +131,11 @@ async function buildDevStandalone(options) {
   if (options.smokeTest) {
     // @ts-ignore
     var managerWarnings = managerStats && managerStats.toJson().warnings || [];
-    if (managerWarnings.length > 0) _nodeLogger.logger.warn(`manager: ${managerWarnings}`); // I'm a little reticent to import webpack types in this file :shrug:
+    if (managerWarnings.length > 0) _nodeLogger.logger.warn(`manager: ${JSON.stringify(managerWarnings, null, 2)}`); // I'm a little reticent to import webpack types in this file :shrug:
     // @ts-ignore
 
     var previewWarnings = previewStats && previewStats.toJson().warnings || [];
-    if (previewWarnings.length > 0) _nodeLogger.logger.warn(`preview: ${previewWarnings}`);
+    if (previewWarnings.length > 0) _nodeLogger.logger.warn(`preview: ${JSON.stringify(previewWarnings, null, 2)}`);
     process.exit(managerWarnings.length > 0 || previewWarnings.length > 0 && !options.ignorePreview ? 1 : 0);
     return;
   } // Get package name and capitalize it e.g. @storybook/react -> React

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -200,8 +200,7 @@ class StoryIndexGenerator {
   }
 
   invalidate(specifier, importPath, removed) {
-    var absolutePath = _path.default.resolve(this.options.workingDir, importPath);
-
+    var absolutePath = (0, _slash.default)(_path.default.resolve(this.options.workingDir, importPath));
     var pathToEntries = this.storyIndexEntries.get(specifier);
 
     if (removed) {

package/dist/cjs/utils/open-in-browser.js

@@ -5,22 +5,37 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.openInBrowser = openInBrowser;
 
+require("core-js/modules/es.promise.js");
+
 var _nodeLogger = require("@storybook/node-logger");
 
 var _betterOpn = _interopRequireDefault(require("better-opn"));
 
+var _open = _interopRequireDefault(require("open"));
+
+var _xDefaultBrowser = _interopRequireDefault(require("x-default-browser"));
+
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// betterOpn alias used because also loading open
 function openInBrowser(address) {
-  try {
-    (0, _betterOpn.default)(address);
-  } catch (error) {
-    _nodeLogger.logger.error((0, _tsDedent.default)`
-      Could not open ${address} inside a browser. If you're running this command inside a
-      docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
-      browser by default.
-    `);
-  }
+  (0, _xDefaultBrowser.default)(async function (err, res) {
+    try {
+      if (res.isChrome || res.isChromium) {
+        // We use betterOpn for Chrome because it is better at handling which chrome tab
+        // or window the preview loads in.
+        (0, _betterOpn.default)(address);
+      } else {
+        await (0, _open.default)(address);
+      }
+    } catch (error) {
+      _nodeLogger.logger.error((0, _tsDedent.default)`
+        Could not open ${address} inside a browser. If you're running this command inside a
+        docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
+        browser by default.
+      `);
+    }
+  });
 }

package/dist/cjs/utils/watch-story-specifiers.js

@@ -79,11 +79,13 @@ function watchStorySpecifiers(specifiers, options, onInvalidate) {
         // (where the last bit depends on `files`).
         var dirGlob = _path.default.join(options.workingDir, importPath, '**', // files can be e.g. '**/foo/*/*.js' so we just want the last bit,
         // because the directoru could already be within the files part (e.g. './x/foo/bar')
-        _path.default.basename(specifier.files));
+        _path.default.basename(specifier.files)); // glob only supports forward slashes
 
-        var files = await (0, _globby.default)(dirGlob);
+
+        var files = await (0, _globby.default)(dirGlob.replace(/\\/g, '/'));
         files.forEach(function (filePath) {
-          var fileImportPath = toImportPath(_path.default.relative(options.workingDir, filePath));
+          var fileImportPath = toImportPath( // use posix path separators even on windows
+          _path.default.relative(options.workingDir, filePath).replace(/\\/g, '/'));
 
           if (specifier.importPathMatcher.exec(fileImportPath)) {
             onInvalidate(specifier, fileImportPath, removed);

package/dist/esm/build-dev.js

@@ -105,11 +105,11 @@ export async function buildDevStandalone(options) {
   if (options.smokeTest) {
     // @ts-ignore
     var managerWarnings = managerStats && managerStats.toJson().warnings || [];
-    if (managerWarnings.length > 0) logger.warn(`manager: ${managerWarnings}`); // I'm a little reticent to import webpack types in this file :shrug:
+    if (managerWarnings.length > 0) logger.warn(`manager: ${JSON.stringify(managerWarnings, null, 2)}`); // I'm a little reticent to import webpack types in this file :shrug:
     // @ts-ignore
 
     var previewWarnings = previewStats && previewStats.toJson().warnings || [];
-    if (previewWarnings.length > 0) logger.warn(`preview: ${previewWarnings}`);
+    if (previewWarnings.length > 0) logger.warn(`preview: ${JSON.stringify(previewWarnings, null, 2)}`);
     process.exit(managerWarnings.length > 0 || previewWarnings.length > 0 && !options.ignorePreview ? 1 : 0);
     return;
   } // Get package name and capitalize it e.g. @storybook/react -> React

package/dist/esm/utils/StoryIndexGenerator.js

@@ -175,7 +175,7 @@ export class StoryIndexGenerator {
   }
 
   invalidate(specifier, importPath, removed) {
-    var absolutePath = path.resolve(this.options.workingDir, importPath);
+    var absolutePath = slash(path.resolve(this.options.workingDir, importPath));
     var pathToEntries = this.storyIndexEntries.get(specifier);
 
     if (removed) {

package/dist/esm/utils/open-in-browser.js

@@ -1,14 +1,26 @@
+import "core-js/modules/es.promise.js";
 import { logger } from '@storybook/node-logger';
-import open from 'better-opn';
+import betterOpn from 'better-opn'; // betterOpn alias used because also loading open
+
+import open from 'open';
+import getDefaultBrowser from 'x-default-browser';
 import dedent from 'ts-dedent';
 export function openInBrowser(address) {
-  try {
-    open(address);
-  } catch (error) {
-    logger.error(dedent`
-      Could not open ${address} inside a browser. If you're running this command inside a
-      docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
-      browser by default.
-    `);
-  }
+  getDefaultBrowser(async function (err, res) {
+    try {
+      if (res.isChrome || res.isChromium) {
+        // We use betterOpn for Chrome because it is better at handling which chrome tab
+        // or window the preview loads in.
+        betterOpn(address);
+      } else {
+        await open(address);
+      }
+    } catch (error) {
+      logger.error(dedent`
+        Could not open ${address} inside a browser. If you're running this command inside a
+        docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
+        browser by default.
+      `);
+    }
+  });
 }

package/dist/esm/utils/watch-story-specifiers.js

@@ -65,10 +65,12 @@ export function watchStorySpecifiers(specifiers, options, onInvalidate) {
         // (where the last bit depends on `files`).
         var dirGlob = path.join(options.workingDir, importPath, '**', // files can be e.g. '**/foo/*/*.js' so we just want the last bit,
         // because the directoru could already be within the files part (e.g. './x/foo/bar')
-        path.basename(specifier.files));
-        var files = await glob(dirGlob);
+        path.basename(specifier.files)); // glob only supports forward slashes
+
+        var files = await glob(dirGlob.replace(/\\/g, '/'));
         files.forEach(function (filePath) {
-          var fileImportPath = toImportPath(path.relative(options.workingDir, filePath));
+          var fileImportPath = toImportPath( // use posix path separators even on windows
+          path.relative(options.workingDir, filePath).replace(/\\/g, '/'));
 
           if (specifier.importPathMatcher.exec(fileImportPath)) {
             onInvalidate(specifier, fileImportPath, removed);

package/dist/modern/build-dev.js

@@ -105,11 +105,11 @@ export async function buildDevStandalone(options) {
   if (options.smokeTest) {
     // @ts-ignore
     var managerWarnings = managerStats && managerStats.toJson().warnings || [];
-    if (managerWarnings.length > 0) logger.warn(`manager: ${managerWarnings}`); // I'm a little reticent to import webpack types in this file :shrug:
+    if (managerWarnings.length > 0) logger.warn(`manager: ${JSON.stringify(managerWarnings, null, 2)}`); // I'm a little reticent to import webpack types in this file :shrug:
     // @ts-ignore
 
     var previewWarnings = previewStats && previewStats.toJson().warnings || [];
-    if (previewWarnings.length > 0) logger.warn(`preview: ${previewWarnings}`);
+    if (previewWarnings.length > 0) logger.warn(`preview: ${JSON.stringify(previewWarnings, null, 2)}`);
     process.exit(managerWarnings.length > 0 || previewWarnings.length > 0 && !options.ignorePreview ? 1 : 0);
     return;
   } // Get package name and capitalize it e.g. @storybook/react -> React

package/dist/modern/utils/StoryIndexGenerator.js

@@ -175,7 +175,7 @@ export class StoryIndexGenerator {
   }
 
   invalidate(specifier, importPath, removed) {
-    var absolutePath = path.resolve(this.options.workingDir, importPath);
+    var absolutePath = slash(path.resolve(this.options.workingDir, importPath));
     var pathToEntries = this.storyIndexEntries.get(specifier);
 
     if (removed) {

package/dist/modern/utils/open-in-browser.js

@@ -1,14 +1,26 @@
+import "core-js/modules/es.promise.js";
 import { logger } from '@storybook/node-logger';
-import open from 'better-opn';
+import betterOpn from 'better-opn'; // betterOpn alias used because also loading open
+
+import open from 'open';
+import getDefaultBrowser from 'x-default-browser';
 import dedent from 'ts-dedent';
 export function openInBrowser(address) {
-  try {
-    open(address);
-  } catch (error) {
-    logger.error(dedent`
-      Could not open ${address} inside a browser. If you're running this command inside a
-      docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
-      browser by default.
-    `);
-  }
+  getDefaultBrowser(async function (err, res) {
+    try {
+      if (res.isChrome || res.isChromium) {
+        // We use betterOpn for Chrome because it is better at handling which chrome tab
+        // or window the preview loads in.
+        betterOpn(address);
+      } else {
+        await open(address);
+      }
+    } catch (error) {
+      logger.error(dedent`
+        Could not open ${address} inside a browser. If you're running this command inside a
+        docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
+        browser by default.
+      `);
+    }
+  });
 }

package/dist/modern/utils/watch-story-specifiers.js

@@ -65,10 +65,12 @@ export function watchStorySpecifiers(specifiers, options, onInvalidate) {
         // (where the last bit depends on `files`).
         var dirGlob = path.join(options.workingDir, importPath, '**', // files can be e.g. '**/foo/*/*.js' so we just want the last bit,
         // because the directoru could already be within the files part (e.g. './x/foo/bar')
-        path.basename(specifier.files));
-        var files = await glob(dirGlob);
+        path.basename(specifier.files)); // glob only supports forward slashes
+
+        var files = await glob(dirGlob.replace(/\\/g, '/'));
         files.forEach(function (filePath) {
-          var fileImportPath = toImportPath(path.relative(options.workingDir, filePath));
+          var fileImportPath = toImportPath( // use posix path separators even on windows
+          path.relative(options.workingDir, filePath).replace(/\\/g, '/'));
 
           if (specifier.importPathMatcher.exec(fileImportPath)) {
             onInvalidate(specifier, fileImportPath, removed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "6.4.9",
+  "version": "6.5.0-alpha.4",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -41,17 +41,17 @@
   },
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/builder-webpack4": "6.4.9",
-    "@storybook/core-client": "6.4.9",
-    "@storybook/core-common": "6.4.9",
-    "@storybook/core-events": "6.4.9",
+    "@storybook/builder-webpack4": "6.5.0-alpha.4",
+    "@storybook/core-client": "6.5.0-alpha.4",
+    "@storybook/core-common": "6.5.0-alpha.4",
+    "@storybook/core-events": "6.5.0-alpha.4",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/csf-tools": "6.4.9",
-    "@storybook/manager-webpack4": "6.4.9",
-    "@storybook/node-logger": "6.4.9",
+    "@storybook/csf-tools": "6.5.0-alpha.4",
+    "@storybook/manager-webpack4": "6.5.0-alpha.4",
+    "@storybook/node-logger": "6.5.0-alpha.4",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "6.4.9",
-    "@types/node": "^14.0.10",
+    "@storybook/store": "6.5.0-alpha.4",
+    "@types/node": "^14.0.10 || ^16.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
     "@types/webpack": "^4.41.26",
@@ -71,6 +71,7 @@
     "ip": "^1.1.5",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.1",
+    "open": "^8.4.0",
     "pretty-hrtime": "^1.0.3",
     "prompts": "^2.4.0",
     "regenerator-runtime": "^0.13.7",
@@ -81,10 +82,11 @@
     "util-deprecate": "^1.0.2",
     "watchpack": "^2.2.0",
     "webpack": "4",
-    "ws": "^8.2.3"
+    "ws": "^8.2.3",
+    "x-default-browser": "^0.4.0"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "6.4.9",
+    "@storybook/builder-webpack5": "6.5.0-alpha.4",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -92,8 +94,8 @@
     "jest-specific-snapshot": "^4.0.0"
   },
   "peerDependencies": {
-    "@storybook/builder-webpack5": "6.4.9",
-    "@storybook/manager-webpack5": "6.4.9",
+    "@storybook/builder-webpack5": "6.5.0-alpha.4",
+    "@storybook/manager-webpack5": "6.5.0-alpha.4",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
@@ -111,6 +113,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7d354c89322080b241454eff2cd3adf9c11306cd",
+  "gitHead": "9a73995d6a5cfa36c5a5ce60cb33259ff40e2fe6",
   "sbmodern": "dist/modern/index.js"
 }

package/typings.d.ts

@@ -6,6 +6,8 @@ declare module 'pnp-webpack-plugin';
 declare module '@storybook/theming/paths';
 declare module '@storybook/ui/paths';
 declare module 'better-opn';
+declare module 'open';
+declare module 'x-default-browser';
 declare module '@storybook/ui';
 declare module '@discoveryjs/json-ext';
 declare module 'watchpack';