CHANGE cli to not check registry when --no-install (#8948)

CHANGE cli to not check registry when --no-install
storybookjs · Nov 25, 2019 · 9af24c0 · 9af24c0 · vercel · Nov 25, 2019
2 parents 4a1c749 + a4e7ddb
commit 9af24c0
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 34 deletions.
diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts
@@ -1 +1 @@
-export const version = '5.3.0-beta.5';
+export const version = '5.3.0-beta.7';
diff --git a/lib/cli/generators/ANGULAR/index.js b/lib/cli/generators/ANGULAR/index.js
@@ -43,7 +43,7 @@ async function addDependencies(npmOptions, { storyFormat }) {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 }
 
 function editAngularAppTsConfig() {

diff --git a/lib/cli/generators/EMBER/index.js b/lib/cli/generators/EMBER/index.js
@@ -35,7 +35,7 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/ember@${storybookVersion}`,
     `@storybook/addon-actions@${actionsVersion}`,
     `@storybook/addon-links@${linksVersion}`,

diff --git a/lib/cli/generators/HTML/index.js b/lib/cli/generators/HTML/index.js
@@ -29,5 +29,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/MARKO/index.js b/lib/cli/generators/MARKO/index.js
@@ -30,7 +30,7 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/marko@${storybookVersion}`,
     `@storybook/addon-actions@${addonActionVersion}`,
     `@storybook/addon-knobs@${addonKnobsVersion}`,

diff --git a/lib/cli/generators/METEOR/index.js b/lib/cli/generators/METEOR/index.js
@@ -83,8 +83,11 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
   }
 
   if (dependencies.length > 0) {
-    installDependencies({ ...npmOptions, installAsDevDependencies: false }, dependencies);
+    installDependencies(
+      { ...npmOptions, packageJson, installAsDevDependencies: false },
+      dependencies
+    );
   }
 
-  installDependencies(npmOptions, [...devDependencies, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...devDependencies, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/MITHRIL/index.js b/lib/cli/generators/MITHRIL/index.js
@@ -31,7 +31,7 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/mithril@${storybookVersion}`,
     `@storybook/addon-actions@${actionsVersion}`,
     `@storybook/addon-links@${linksVersion}`,

diff --git a/lib/cli/generators/POLYMER/index.js b/lib/cli/generators/POLYMER/index.js
@@ -36,5 +36,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...devDependencies, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...devDependencies, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/PREACT/index.js b/lib/cli/generators/PREACT/index.js
@@ -31,7 +31,7 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/preact@${storybookVersion}`,
     `@storybook/addon-actions@${actionsVersion}`,
     `@storybook/addon-links@${linksVersion}`,

diff --git a/lib/cli/generators/RAX/index.js b/lib/cli/generators/RAX/index.js
@@ -50,7 +50,7 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/rax@${storybookVersion}`,
     `@storybook/addon-actions@${actionsVersion}`,
     `@storybook/addon-links@${linksVersion}`,

diff --git a/lib/cli/generators/REACT/index.js b/lib/cli/generators/REACT/index.js
@@ -35,5 +35,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/REACT_NATIVE/index.js b/lib/cli/generators/REACT_NATIVE/index.js
@@ -71,5 +71,5 @@ export default async (npmOptions, installServer, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...devDependencies, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...devDependencies, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js
@@ -53,5 +53,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
     babelDependencies = await getBabelDependencies(npmOptions, packageJson);
   }
 
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/RIOT/index.js b/lib/cli/generators/RIOT/index.js
@@ -50,5 +50,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...dependencies, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...dependencies, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/SFC_VUE/index.js b/lib/cli/generators/SFC_VUE/index.js
@@ -34,5 +34,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/SVELTE/index.js b/lib/cli/generators/SVELTE/index.js
@@ -40,7 +40,7 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/svelte@${storybookVersion}`,
     `@storybook/addon-actions@${actionsVersion}`,
     `@storybook/addon-links@${linksVersion}`,

diff --git a/lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js b/lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
@@ -47,7 +47,7 @@ async function updatePackageJson(npmOptions) {
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
   if (babelDependencies.length > 0) {
-    installDependencies(npmOptions, babelDependencies);
+    installDependencies({ ...npmOptions, packageJson }, babelDependencies);
   }
 }
 

diff --git a/lib/cli/generators/VUE/index.js b/lib/cli/generators/VUE/index.js
@@ -54,5 +54,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   // We should probably just not even be using babel-preset-vue directly
   // see: https://github.com/storybookjs/storybook/issues/4475#issuecomment-432141296
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 };
diff --git a/lib/cli/generators/WEB-COMPONENTS/index.js b/lib/cli/generators/WEB-COMPONENTS/index.js
@@ -25,7 +25,7 @@ export default async npmOptions => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
+  installDependencies({ ...npmOptions, packageJson }, [
     `@storybook/web-components@${storybookVersion}`,
     ...babelDependencies,
   ]);

diff --git a/lib/cli/generators/WEBPACK_REACT/index.js b/lib/cli/generators/WEBPACK_REACT/index.js
@@ -34,5 +34,5 @@ export default async (npmOptions, { storyFormat = 'csf' }) => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
+  installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]);
 };
diff --git a/lib/cli/lib/helpers.js b/lib/cli/lib/helpers.js
@@ -206,23 +206,33 @@ export function installDependencies(npmOptions, dependencies) {
   const { skipInstall } = npmOptions;
 
   if (skipInstall) {
-    const spawnCommand = 'pkg-add-deps';
-
-    const installArgs = dependencies;
+    const { packageJson } = npmOptions;
 
     if (npmOptions.installAsDevDependencies) {
-      installArgs.push('-D');
+      packageJson.devDependencies = {
+        ...packageJson.devDependencies,
+        ...dependencies.reduce((acc, i) => {
+          const c = i.lastIndexOf('@');
+          const n = i.slice(0, c);
+          const v = i.slice(c + 1);
+
+          return { ...acc, [n]: v };
+        }, {}),
+      };
+    } else {
+      packageJson.dependencies = {
+        ...packageJson.dependencies,
+        ...dependencies.reduce((acc, i) => {
+          const c = i.lastIndexOf('@');
+          const n = i.slice(0, c);
+          const v = i.slice(c + 1);
+
+          return { ...acc, [n]: v };
+        }, {}),
+      };
     }
 
-    const dependencyResult = spawnSync(spawnCommand, installArgs, {
-      stdio: 'inherit',
-    });
-
-    if (dependencyResult.status !== 0) {
-      logger.error('An error occurred while installing dependencies.');
-      logger.log(dependencyResult);
-      process.exit(1);
-    }
+    writePackageJson(packageJson);
   } else {
     const spawnCommand = npmOptions.useYarn ? 'yarn' : 'npm';
     const installCommand = npmOptions.useYarn ? 'add' : 'install';