move version.json

lossir · Dec 9, 2020 · 0930e4d · 0930e4d
1 parent e717ab1
commit 0930e4d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -38,7 +38,7 @@
     "versions.json"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js && node ./scripts/generate-sb-packages-versions.js",
+    "prepare": "node ./scripts/generate-sb-packages-versions.js && node ../../scripts/prepare.js",
     "test": "jest test/**/*.test.js",
     "postversion": "node ./scripts/generate-sb-packages-versions.js"
   },

diff --git a/lib/cli/scripts/generate-sb-packages-versions.js b/lib/cli/scripts/generate-sb-packages-versions.js
@@ -32,7 +32,9 @@ const run = async () => {
     .sort((package1, package2) => package1.name.localeCompare(package2.name))
     .reduce((acc, { name, version }) => ({ ...acc, [name]: version }), {});
 
-  await writeJson(path.join(__dirname, '..', 'versions.json'), packageToVersionMap, { spaces: 2 });
+  await writeJson(path.join(__dirname, '..', 'src', 'versions.json'), packageToVersionMap, {
+    spaces: 2,
+  });
 };
 
 run().catch((e) => {

diff --git a/lib/cli/src/js-package-manager/JsPackageManager.ts b/lib/cli/src/js-package-manager/JsPackageManager.ts
@@ -4,10 +4,9 @@ import { sync as spawnSync } from 'cross-spawn';
 import { commandLog } from '../helpers';
 import { PackageJson, PackageJsonWithDepsAndDevDeps } from './PackageJson';
 import { readPackageJson, writePackageJson } from './PackageJsonHelper';
+import storybookPackagesVersions from '../versions.json';
 
 const logger = console;
-// Cannot be `import` as it's not under TS root dir
-const storybookPackagesVersions = require('../../versions.json');
 
 export abstract class JsPackageManager {
   public abstract readonly type: 'npm' | 'yarn1' | 'yarn2';
@@ -137,9 +136,10 @@ export abstract class JsPackageManager {
   }
 
   public async getVersion(packageName: string, constraint?: string): Promise<string> {
-    let current;
+    let current: string;
 
     if (/@storybook/.test(packageName)) {
+      // @ts-ignore
       current = storybookPackagesVersions[packageName];
     }
 

diff --git a/lib/cli/src/js-package-manager/NPMProxy.test.ts b/lib/cli/src/js-package-manager/NPMProxy.test.ts
@@ -86,7 +86,7 @@ describe('NPM Proxy', () => {
   describe('getVersion', () => {
     it('with a Storybook package listed in versions.json it returns the version', async () => {
       // eslint-disable-next-line global-require
-      const storybookAngularVersion = require('../../versions.json')['@storybook/angular'];
+      const storybookAngularVersion = require('../versions.json')['@storybook/angular'];
       const executeCommandSpy = jest.spyOn(npmProxy, 'executeCommand').mockReturnValue('"5.3.19"');
 
       const version = await npmProxy.getVersion('@storybook/angular');

diff --git a/lib/cli/versions.json → lib/cli/src/versions.json b/lib/cli/versions.json → lib/cli/src/versions.json
diff --git a/lib/cli/tsconfig.json b/lib/cli/tsconfig.json
@@ -9,7 +9,8 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "resolveJsonModule": true
   },
   "include": ["src/**/*"],
   "exclude": ["src/**/template*", "src/frameworks/**/*"]