sku 12.3.2 → 12.4.0

package/scripts/storybook.js

@@ -1,25 +1,22 @@
-const path = require('path');
-const { argv } = require('../config/args');
+const { argv, config } = require('../config/args');
 const gracefulSpawn = require('../lib/gracefulSpawn');
 const { storybookPort } = require('../context');
 const startStorybookPath = require.resolve('@storybook/cli/bin/index');
-const configDir = path.resolve(__dirname, '../config/storybook/start');
 const { watchVocabCompile } = require('../lib/runVocab');
-const { setUpStorybookPreviewFile } = require('../lib/storybook');
+const { setUpStorybookConfigDirectory } = require('../lib/storybook');
 
 // Unshift args to allow pushing --ci as an arg during storybook-config tests
 argv.unshift('--quiet');
-argv.unshift('--config-dir', configDir);
 argv.unshift('--port', storybookPort);
 argv.unshift('dev');
 
 (async () => {
   await watchVocabCompile();
-  await setUpStorybookPreviewFile(configDir);
+  await setUpStorybookConfigDirectory();
 
   const storybookProcess = gracefulSpawn(startStorybookPath, argv, {
     stdio: 'inherit',
-    env: process.env,
+    env: { ...process.env, SKU_CONFIG: config },
   });
 
   storybookProcess.on('exit', (exitCode) => {

package/telemetry/provider.js

@@ -1,3 +1,4 @@
+const { getAddCommand } = require('../lib/packageManager');
 const banner = require('../lib/banner');
 
 function noop() {}
@@ -23,9 +24,14 @@ try {
     provider = realProvider;
   }
 } catch (e) {
+  const addCommand = getAddCommand({
+    deps: ['@seek/sku-telemetry'],
+    type: 'dev',
+  });
+
   banner('warning', '@seek/sku-telemetry not installed', [
     'To help us improve sku, please install our private telemetry package that gives us insights on usage, errors and performance.',
-    'yarn add --dev @seek/sku-telemetry',
+    addCommand,
     'Non SEEK based usage can disable this message with `SKU_TELEMETRY=false`',
   ]);
 }

package/config/storybook/build/main.js

@@ -1 +0,0 @@
-export { default } from '../config';

package/config/storybook/build/webpack.config.js

@@ -1,4 +0,0 @@
-const storybookWebpackConfig = require('../storybookWebpackConfig');
-
-module.exports = (storybookConfig) =>
-  storybookWebpackConfig(storybookConfig, { isDevServer: false });

package/config/storybook/config.js

@@ -1,44 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { createRequire } from 'module';
-import { paths, storybookAddons, storybookStoryStore } from '../../context';
-
-const require = createRequire(import.meta.url);
-
-/** @type {import("@storybook/react-webpack5").StorybookConfig} */
-export default {
-  stories: paths.src
-    .filter((srcPath) => fs.statSync(srcPath).isDirectory())
-    .map((srcPath) => path.join(srcPath, '**/*.stories.@(js|ts|tsx)')),
-  addons: storybookAddons,
-  framework: {
-    name: '@storybook/react-webpack5',
-    options: {},
-  },
-  core: {
-    builder: {
-      name: '@storybook/builder-webpack5',
-      options: {
-        fsCache: true,
-      },
-    },
-  },
-  features: {
-    storyStoreV7: storybookStoryStore,
-  },
-  babel: (config) => ({
-    ...config,
-    presets: [
-      ...config.presets,
-      [
-        require.resolve('@babel/preset-env'),
-        {
-          targets: {
-            chrome: 100,
-          },
-        },
-      ],
-      require.resolve('@babel/preset-typescript'),
-    ],
-  }),
-};

package/config/storybook/start/main.js

@@ -1 +0,0 @@
-export { default } from '../config';

package/config/storybook/start/middleware.js

@@ -1,10 +0,0 @@
-const { paths, useDevServerMiddleware } = require('../../../context');
-
-const dummyMiddleware = (app) => app;
-let middleware = dummyMiddleware;
-
-if (useDevServerMiddleware) {
-  middleware = require(paths.devServerMiddleware);
-}
-
-module.exports = middleware;

package/config/storybook/start/webpack.config.js

@@ -1,4 +0,0 @@
-const storybookWebpackConfig = require('../storybookWebpackConfig');
-
-module.exports = (storybookConfig) =>
-  storybookWebpackConfig(storybookConfig, { isDevServer: true });

package/lib/detectYarn.js

@@ -1,10 +0,0 @@
-const { execSync } = require('child_process');
-
-module.exports = () => {
-  try {
-    execSync('yarnpkg --version', { stdio: 'ignore' });
-    return true;
-  } catch (err) {
-    return false;
-  }
-};

package/lib/isYarn.js

@@ -1,6 +0,0 @@
-const { existsSync } = require('fs');
-const { getPathFromCwd } = require('./cwd');
-
-const isYarn = existsSync(getPathFromCwd('yarn.lock'));
-
-module.exports = isYarn;