creevey 0.9.0-beta.7 → 0.9.0-beta.9

package/lib/cjs/client/addon/components/Tools.js

@@ -77,7 +77,7 @@ const Tools = _ref => {
   }
 
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_components.IconButton, {
-    href: "http://localhost:".concat(__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__, "/?").concat((0, _qs.stringify)({
+    href: "http://localhost:".concat(__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__ || 3000, "/?").concat((0, _qs.stringify)({
       testPath: (0, _helpers.getTestPath)(test)
     })),
     target: "_blank",

package/lib/cjs/client/addon/preset.js

@@ -3,24 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._managerWebpack = _managerWebpack;
 exports.config = config;
 exports.managerEntries = managerEntries;
 
-var _path = _interopRequireDefault(require("path"));
-
-var _shelljs = require("shelljs");
-
-var _webpack = require("webpack");
-
-var _helpers = require("../../server/storybook/helpers");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function config() {
   let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return [...entry, require.resolve('./decorator')];
@@ -29,34 +14,4 @@ function config() {
 function managerEntries() {
   let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return [...entry, require.resolve('./register')];
-}
-
-function _managerWebpack(config, options) {
-  var _options$presets$appl, _options$presets;
-
-  // TODO How to execute with non-webpack bundlers
-  if (options.configType == 'PRODUCTION' && options.skipExtract != true) {
-    const args = [];
-    if (options.creeveyPreExtract) args.push("--require \"".concat(options.creeveyPreExtract, "\""));
-    args.push(_path.default.join(__dirname, '../../cli'));
-    args.push("--extract \"".concat(options.outputDir, "\""));
-    if (options.creeveyConfigPath) args.push("--config \"".concat(options.creeveyConfigPath, "\""));
-    (0, _shelljs.exec)("node ".concat(args.join(' ')), {
-      async: true
-    });
-  }
-
-  return ((_options$presets$appl = (_options$presets = options.presets) === null || _options$presets === void 0 ? void 0 : _options$presets.apply('webpackInstance')) !== null && _options$presets$appl !== void 0 ? _options$presets$appl : Promise.resolve(undefined)).then(webpack => webpack !== null && webpack !== void 0 ? webpack : Promise.resolve("".concat((0, _helpers.resolveFromStorybookCoreServer)('webpack'))).then(s => _interopRequireWildcard(require(s)))).then(webpack => {
-    var _config$plugins, _options$creeveyPort;
-
-    const {
-      DefinePlugin = _webpack.DefinePlugin
-    } = webpack !== null && webpack !== void 0 ? webpack : {};
-    (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.push(new DefinePlugin({
-      __CREEVEY_SERVER_HOST__: options.creeveyHost,
-      __CREEVEY_SERVER_PORT__: (_options$creeveyPort = options.creeveyPort) !== null && _options$creeveyPort !== void 0 ? _options$creeveyPort : 3000,
-      __CREEVEY_CLIENT_PORT__: options.clientPort
-    }));
-    return config;
-  });
 }

package/lib/cjs/client/addon/preset.sb7.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.managerEntries = managerEntries;
+exports.previewAnnotations = void 0;
+
+const previewAnnotations = function () {
+  let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return [...entry, require.resolve('./preview')];
+};
+
+exports.previewAnnotations = previewAnnotations;
+
+function managerEntries() {
+  let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return [...entry, require.resolve('./register')];
+}

package/lib/cjs/client/addon/preview.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _withCreevey = require("./withCreevey");
+
+const preview = {
+  decorators: [(0, _withCreevey.withCreevey)()]
+};
+var _default = preview;
+exports.default = _default;

package/lib/cjs/server/selenium/browser.js

@@ -145,9 +145,11 @@ async function waitForStorybook(browser) {
         return callback(false);
       }, Events.SET_STORIES);
     } else {
-      wait = await browser.executeAsyncScript(function (callback) {
-        return callback(typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined');
-      });
+      wait = await browser.executeAsyncScript(function (SET_GLOBALS, callback) {
+        if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return callback(true);
+        if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_GLOBALS) == undefined) return callback(true);
+        return callback(false);
+      }, Events.SET_GLOBALS);
     }
 
     if (!wait) clearTimeout(initiateTimeout);

package/lib/cjs/server/testsFiles/register.js

@@ -37,8 +37,8 @@ async function register(config) {
       },
       modules: 'commonjs'
     }]],
-    plugins: [['@babel/plugin-transform-runtime'], ['babel-plugin-tsconfig-paths', {
+    plugins: [['@babel/plugin-transform-runtime'], ...(tsConfigPath ? [['babel-plugin-tsconfig-paths', {
       tsconfig: tsConfigPath
-    }]]
+    }]] : [])]
   })); // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
 }

package/lib/esm/client/addon/components/Tools.js

@@ -58,7 +58,7 @@ export const Tools = _ref => {
   }
 
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(IconButton, {
-    href: "http://localhost:".concat(__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__, "/?").concat(stringify({
+    href: "http://localhost:".concat(__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__ || 3000, "/?").concat(stringify({
       testPath: getTestPath(test)
     })),
     target: "_blank",

package/lib/esm/client/addon/preset.js

@@ -1,7 +1,3 @@
-import path from 'path';
-import { exec } from 'shelljs';
-import { DefinePlugin as FallbackDefinePlugin } from 'webpack';
-import { resolveFromStorybookCoreServer } from '../../server/storybook/helpers';
 export function config() {
   let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return [...entry, require.resolve('./decorator')];
@@ -9,33 +5,4 @@ export function config() {
 export function managerEntries() {
   let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return [...entry, require.resolve('./register')];
-}
-export function _managerWebpack(config, options) {
-  var _options$presets$appl, _options$presets;
-
-  // TODO How to execute with non-webpack bundlers
-  if (options.configType == 'PRODUCTION' && options.skipExtract != true) {
-    const args = [];
-    if (options.creeveyPreExtract) args.push("--require \"".concat(options.creeveyPreExtract, "\""));
-    args.push(path.join(__dirname, '../../cli'));
-    args.push("--extract \"".concat(options.outputDir, "\""));
-    if (options.creeveyConfigPath) args.push("--config \"".concat(options.creeveyConfigPath, "\""));
-    exec("node ".concat(args.join(' ')), {
-      async: true
-    });
-  }
-
-  return ((_options$presets$appl = (_options$presets = options.presets) === null || _options$presets === void 0 ? void 0 : _options$presets.apply('webpackInstance')) !== null && _options$presets$appl !== void 0 ? _options$presets$appl : Promise.resolve(undefined)).then(webpack => webpack !== null && webpack !== void 0 ? webpack : import(resolveFromStorybookCoreServer('webpack'))).then(webpack => {
-    var _config$plugins, _options$creeveyPort;
-
-    const {
-      DefinePlugin = FallbackDefinePlugin
-    } = webpack !== null && webpack !== void 0 ? webpack : {};
-    (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.push(new DefinePlugin({
-      __CREEVEY_SERVER_HOST__: options.creeveyHost,
-      __CREEVEY_SERVER_PORT__: (_options$creeveyPort = options.creeveyPort) !== null && _options$creeveyPort !== void 0 ? _options$creeveyPort : 3000,
-      __CREEVEY_CLIENT_PORT__: options.clientPort
-    }));
-    return config;
-  });
 }

package/lib/esm/client/addon/preset.sb7.js

@@ -0,0 +1,8 @@
+export const previewAnnotations = function () {
+  let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return [...entry, require.resolve('./preview')];
+};
+export function managerEntries() {
+  let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return [...entry, require.resolve('./register')];
+}

package/lib/esm/client/addon/preview.js

@@ -0,0 +1,5 @@
+import { withCreevey } from './withCreevey';
+const preview = {
+  decorators: [withCreevey()]
+};
+export default preview;

package/lib/esm/server/selenium/browser.js

@@ -117,9 +117,11 @@ async function waitForStorybook(browser) {
         return callback(false);
       }, Events.SET_STORIES);
     } else {
-      wait = await browser.executeAsyncScript(function (callback) {
-        return callback(typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined');
-      });
+      wait = await browser.executeAsyncScript(function (SET_GLOBALS, callback) {
+        if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return callback(true);
+        if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_GLOBALS) == undefined) return callback(true);
+        return callback(false);
+      }, Events.SET_GLOBALS);
     }
 
     if (!wait) clearTimeout(initiateTimeout);

package/lib/esm/server/testsFiles/register.js

@@ -24,8 +24,8 @@ export default async function register(config) {
       },
       modules: 'commonjs'
     }]],
-    plugins: [['@babel/plugin-transform-runtime'], ['babel-plugin-tsconfig-paths', {
+    plugins: [['@babel/plugin-transform-runtime'], ...(tsConfigPath ? [['babel-plugin-tsconfig-paths', {
       tsconfig: tsConfigPath
-    }]]
+    }]] : [])]
   })); // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
 }

package/lib/types/client/addon/preset.d.ts

@@ -1,23 +1,2 @@
-import { Configuration } from 'webpack';
 export declare function config(entry?: string[]): string[];
 export declare function managerEntries(entry?: string[]): string[];
-declare global {
-    const __CREEVEY_SERVER_HOST__: string;
-    const __CREEVEY_SERVER_PORT__: number;
-    const __CREEVEY_CLIENT_PORT__: number | null;
-}
-export interface CreeveyAddonOptions {
-    creeveyConfigPath?: string;
-    creeveyPreExtract?: string;
-    creeveyHost?: string;
-    creeveyPort?: number;
-    clientPort?: number;
-    configType: string;
-    configDir: string;
-    outputDir: string;
-    skipExtract?: boolean;
-    presets?: {
-        apply: <T>(preset: string) => Promise<T | undefined>;
-    };
-}
-export declare function _managerWebpack(config: Configuration, options: CreeveyAddonOptions): Promise<Configuration>;

package/lib/types/client/addon/preset.sb7.d.ts

@@ -0,0 +1,2 @@
+export declare const previewAnnotations: (entry?: never[]) => string[];
+export declare function managerEntries(entry?: string[]): string[];

package/lib/types/client/addon/preview.d.ts

@@ -0,0 +1,4 @@
+declare const preview: {
+    decorators: import("@storybook/addons").MakeDecoratorResult[];
+};
+export default preview;

package/package.json

@@ -13,7 +13,7 @@
     "addon",
     "test"
   ],
-  "version": "0.9.0-beta.7",
+  "version": "0.9.0-beta.9",
   "bin": {
     "creevey": "./lib/cjs/cli.js"
   },
@@ -29,6 +29,7 @@
     },
     "./preset": "./preset/index.js",
     "./preset/ie11": "./preset/ie11.js",
+    "./preset/sb7": "./preset/sb7.js",
     "./lib/esm/client/addon/decorator.js": "./lib/esm/client/addon/decorator.js"
   },
   "main": "lib/cjs/index.js",

package/preset/sb7.js

@@ -0,0 +1,5 @@
+/* eslint-disable node/no-missing-require, @typescript-eslint/no-unsafe-assignment */
+
+module.exports = {
+  ...require('../lib/cjs/client/addon/preset.sb7'),
+};

package/types/global.d.ts

@@ -0,0 +1,5 @@
+/* eslint-disable no-var */
+
+declare var __CREEVEY_SERVER_HOST__: string;
+declare var __CREEVEY_SERVER_PORT__: number;
+declare var __CREEVEY_CLIENT_PORT__: number | null;