refactor: move PackageJson.ts inside js-package-manager directory

storybookjs · Jun 8, 2020 · d7ed53f · d7ed53f
1 parent 878aec5
commit d7ed53f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/lib/cli/src/add.ts b/lib/cli/src/add.ts
@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs';
 import { sync as spawnSync } from 'cross-spawn';
 import { commandLog, getPackageJson } from './helpers';
-import { PackageJson } from './PackageJson';
+import { PackageJson } from './js-package-manager/PackageJson';
 import { JsPackageManager, JsPackageManagerFactory } from './js-package-manager';
 
 const logger = console;

diff --git a/lib/cli/src/detect.ts b/lib/cli/src/detect.ts
@@ -10,7 +10,7 @@ import {
   TemplateMatcher,
 } from './project_types';
 import { getBowerJson, getPackageJson } from './helpers';
-import { PackageJson } from './PackageJson';
+import { PackageJson } from './js-package-manager/PackageJson';
 
 const hasDependency = (packageJson: PackageJson, name: string) => {
   return !!packageJson.dependencies?.[name] || !!packageJson.devDependencies?.[name];

diff --git a/lib/cli/src/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.ts b/lib/cli/src/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.ts
@@ -3,7 +3,7 @@ import path from 'path';
 import { sync as spawnSync } from 'cross-spawn';
 import { packageNames } from '@storybook/codemod';
 import { getBabelDependencies, getPackageJson, writePackageJson } from '../../helpers';
-import { PackageJson } from '../../PackageJson';
+import { PackageJson } from '../../js-package-manager/PackageJson';
 import { NpmOptions } from '../../NpmOptions';
 import { JsPackageManager } from '../../js-package-manager';
 

diff --git a/lib/cli/src/helpers.ts b/lib/cli/src/helpers.ts
@@ -7,7 +7,7 @@ import { satisfies } from '@storybook/semver';
 import stripJsonComments from 'strip-json-comments';
 
 import { StoryFormat } from './project_types';
-import { PackageJson } from './PackageJson';
+import { PackageJson } from './js-package-manager/PackageJson';
 import { JsPackageManager } from './js-package-manager';
 
 const logger = console;

diff --git a/lib/cli/src/js-package-manager/JsPackageManager.ts b/lib/cli/src/js-package-manager/JsPackageManager.ts
@@ -3,7 +3,7 @@ import fs from 'fs';
 import chalk from 'chalk';
 import { gt, satisfies } from '@storybook/semver';
 import { commandLog, writePackageJson } from '../helpers';
-import { PackageJson } from '../PackageJson';
+import { PackageJson } from './PackageJson';
 
 const logger = console;
 // Cannot be `import` as it's not under TS root dir

diff --git a/lib/cli/src/PackageJson.ts → ...cli/src/js-package-manager/PackageJson.ts b/lib/cli/src/PackageJson.ts → ...cli/src/js-package-manager/PackageJson.ts
diff --git a/lib/cli/src/js-package-manager/index.ts b/lib/cli/src/js-package-manager/index.ts
@@ -1,2 +1,3 @@
 export * from './JsPackageManagerFactory';
 export * from './JsPackageManager';
+export * from './PackageJson';