piral-cli 1.3.3-beta.6187 → 1.3.3-beta.6201

package/src/apps/new-piral.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect, vitest } from 'vitest';
 import { mkdtempSync, existsSync, readFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
@@ -7,8 +8,8 @@ function createTempDir() {
   return mkdtempSync(join(tmpdir(), 'piral-tests-new-piral-'));
 }
 
-jest.mock('../common/clients/npm', () => {
-  const original = jest.requireActual('../common/clients/npm');
+vitest.mock('../npm-clients/npm', async () => {
+  const original: any = await vitest.importActual('../npm-clients/npm');
 
   return {
     ...original,
@@ -18,87 +19,109 @@ jest.mock('../common/clients/npm', () => {
   };
 });
 
-jest.setTimeout(90000);
+const testOptions = {
+  timeout: 60000,
+};
 
 describe('New Piral Command', () => {
-  it('scaffolding in an empty directory works', async () => {
-    const dir = createTempDir();
-    await newPiral(dir, { install: false });
-    expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
-    expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
-  });
+  it(
+    'scaffolding in an empty directory works',
+    async () => {
+      const dir = createTempDir();
+      await newPiral(dir, { install: false });
+      expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
+      expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
+    },
+    testOptions,
+  );
 
-  it('scaffolding with language JS works', async () => {
-    const dir = createTempDir();
-    await newPiral(dir, {
-      language: 'js',
-      install: false,
-    });
-    expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeFalsy();
-    expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
-    expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
-  });
+  it(
+    'scaffolding with language JS works',
+    async () => {
+      const dir = createTempDir();
+      await newPiral(dir, {
+        language: 'js',
+        install: false,
+      });
+      expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
+      expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
+    },
+    testOptions,
+  );
 
-  it('scaffolding with custom app name works', async () => {
-    const dir = createTempDir();
-    await newPiral(dir, {
-      name: 'test-name',
-      install: false,
-    });
+  it(
+    'scaffolding with custom app name works',
+    async () => {
+      const dir = createTempDir();
+      await newPiral(dir, {
+        name: 'test-name',
+        install: false,
+      });
 
-    expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
-    expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
+      expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
 
-    const packageContent = await JSON.parse(readFileSync(`${dir}/package.json`, 'utf8'));
-    expect(packageContent.name).toBe('test-name');
-  });
+      const packageContent = await JSON.parse(readFileSync(`${dir}/package.json`, 'utf8'));
+      expect(packageContent.name).toBe('test-name');
+    },
+    testOptions,
+  );
 
-  it('scaffolding for piral-core works', async () => {
-    const dir = createTempDir();
-    await newPiral(dir, {
-      framework: 'piral-core',
-      install: false,
-    });
-    expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeFalsy();
-    expect(existsSync(resolve(dir, 'node_modules/piral-core/package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeFalsy();
-    expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
-    expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
-  });
+  it(
+    'scaffolding for piral-core works',
+    async () => {
+      const dir = createTempDir();
+      await newPiral(dir, {
+        framework: 'piral-core',
+        install: false,
+      });
+      expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'node_modules/piral-core/package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
+      expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
+    },
+    testOptions,
+  );
 
-  it('scaffolding for piral-base works', async () => {
-    const dir = createTempDir();
-    await newPiral(dir, {
-      framework: 'piral-base',
-      install: false,
-    });
-    expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeFalsy();
-    expect(existsSync(resolve(dir, 'node_modules/piral-core/package.json'))).toBeFalsy();
-    expect(existsSync(resolve(dir, 'node_modules/piral-base/package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeFalsy();
-    expect(existsSync(resolve(dir, 'src/index.ts'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
-    expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
-    expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
-  });
+  it(
+    'scaffolding for piral-base works',
+    async () => {
+      const dir = createTempDir();
+      await newPiral(dir, {
+        framework: 'piral-base',
+        install: false,
+      });
+      expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'node_modules/piral-core/package.json'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'node_modules/piral-base/package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeFalsy();
+      expect(existsSync(resolve(dir, 'src/index.ts'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/index.html'))).toBeTruthy();
+      expect(existsSync(resolve(dir, 'src/mocks/backend.js'))).toBeTruthy();
+      expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
+    },
+    testOptions,
+  );
 });

package/src/apps/pack-pilet.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { mkdtempSync, existsSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
@@ -40,11 +41,9 @@ describe('Pack Pilet Command', () => {
       }),
       'utf8',
     );
-    process.chdir(dir);
 
-    await packPilet();
+    await packPilet(dir);
 
-    process.chdir(originalDir);
     expect(existsSync(resolve(dir, 'my-pilet-1.0.0.tgz'))).toBeTruthy();
   });
 

package/src/apps/upgrade-pilet.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { mkdtempSync } from 'fs';
 import { tmpdir } from 'os';
 import { join } from 'path';

package/src/bundler.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect, vitest } from 'vitest';
 import {
   setBundler,
   callPiletBuild,
@@ -13,20 +14,20 @@ const defaults = {
   bundler: false,
 };
 
-jest.mock('./build/bundler-calls.ts', () => ({
-  callDynamic: jest.fn(() =>
+vitest.mock('./build/bundler-calls.ts', () => ({
+  callDynamic: vitest.fn(() =>
     Promise.resolve({
       bundle: {},
     }),
   ),
-  callStatic: jest.fn(() =>
+  callStatic: vitest.fn(() =>
     Promise.resolve({
       bundle: {},
     }),
   ),
 }));
 
-jest.mock('./inject', () => ({
+vitest.mock('./inject', () => ({
   inject() {
     if (defaults.bundler) {
       setBundler({
@@ -43,7 +44,7 @@ jest.mock('./inject', () => ({
   },
 }));
 
-jest.mock('./common', () => ({
+vitest.mock('./common', () => ({
   config: {
     bundler: 'parcel',
   },
@@ -51,7 +52,7 @@ jest.mock('./common', () => ({
     return Promise.resolve(defval);
   },
   compatVersion: '1',
-  installNpmPackage: jest.fn(),
+  installNpmPackage: vitest.fn(),
   fail(msg) {
     throw new Error(msg);
   },
@@ -60,7 +61,7 @@ jest.mock('./common', () => ({
   determineNpmClient() {
     return 'npm';
   },
-  patchModules: jest.fn(),
+  patchModules: vitest.fn(),
   logReset() {},
 }));
 

package/src/bundler.ts

@@ -57,7 +57,8 @@ async function installDefaultBundler(root: string) {
   await installNpmPackage(client, packageId, root, '--save-dev', '--save-exact');
   log('generalDebug_0003', `Installed bundler from "${selectedPackage}".`);
 
-  require('./inject').inject(selectedPackage);
+  const { inject } = await import('./inject');
+  inject(selectedPackage);
 }
 
 function checkDefaultBundler(bundler: QualifiedBundler) {

package/src/cli.ts

@@ -1,4 +1,4 @@
-import * as yargs from 'yargs';
+import yargs from 'yargs';
 import { detailed } from 'yargs-parser';
 import { caterpillerIcon, zapIcon, butterflyIcon, cliName, cliVersion } from './common';
 import { runQuestionnaireFor } from './questionnaire';

package/src/common/archive.test.ts

@@ -1,4 +1,5 @@
-import { createTarball, unpackTarball, unpackGzTar } from './archive';
+import { describe, it, expect, vitest } from 'vitest';
+import { createTarball, unpackTarball } from './archive';
 import { Stream, Readable } from 'stream';
 
 class ReadableString extends Readable {
@@ -32,21 +33,23 @@ interface ExtractOptions {
   keep: boolean;
 }
 
-jest.mock('path', () =>
-  // extend the auto mock of path
-  Object.assign(jest.genMockFromModule('path'), {
+vitest.mock('path', async () => {
+  const original = await vitest.importActual('path') as any;
+
+  return {
+    ...original,
     relative: (from: string, to: string) => {
       return to;
     },
     resolve: (...pathSegments: string[]) => {
       return pathSegments[1];
     },
-  }),
-);
+  };
+});
 
 const fileNotFoundError = 'File not found!';
 
-jest.mock('../external', () => ({
+vitest.mock('../external', () => ({
   ora() {
     return {};
   },

package/src/common/browser.test.ts

@@ -1,8 +1,9 @@
+import { describe, it, expect, vitest } from 'vitest';
 import { openBrowser } from './browser';
 
 let error = false;
 
-jest.mock('../external', () => ({
+vitest.mock('../external', () => ({
   rc(_, cfg) {
     return cfg;
   },

package/src/common/compatibility.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { checkAppShellCompatibility } from './compatibility';
 import { cliVersion } from './info';
 

package/src/common/envs.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect, vitest, beforeEach, afterEach } from 'vitest';
 import { resolve } from 'path';
 import { setStandardEnvs } from './envs';
 
@@ -7,7 +8,7 @@ describe('Environment Module', () => {
   const oldEnv = process.env;
 
   beforeEach(() => {
-    jest.resetModules();
+    vitest.resetModules();
     process.env = {};
   });
 

package/src/common/hash.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { computeHash, computeMd5 } from './hash';
 
 describe('Hash Module', () => {

package/src/common/http.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect, vitest } from 'vitest';
 import { postFile, downloadFile } from './http';
 
 const apiUrl = 'http://sample.fooo.com/api/v1/pilet';
@@ -7,79 +8,81 @@ let errorOther = false;
 let errorResponse = false;
 let errorResponse2 = false;
 
-jest.mock('../external', () => ({
-  rc(_, cfg) {
-    return cfg;
-  },
-  ora() {
-    return {
-      warn() {},
-      fail() {},
-    };
-  },
-  axios: {
-    default: {
-      post(url, _, options) {
-        const found = url === apiUrl;
-        const auth = options.headers.authorization === 'Basic 123';
+vitest.mock('../external', async () => {
+  return {
+    rc(_, cfg) {
+      return cfg;
+    },
+    ora() {
+      return {
+        warn() {},
+        fail() {},
+      };
+    },
+    axios: {
+      default: {
+        post(url, _, options) {
+          const found = url === apiUrl;
+          const auth = options.headers.authorization === 'Basic 123';
 
-        if (errorRequest) {
-          return Promise.reject({
-            request: {},
-          });
-        } else if (errorOther) {
-          return Promise.reject({
-            message: 'error',
-          });
-        } else if (errorResponse) {
-          return Promise.reject({
-            response: {
-              status: 410,
-              statusText: 'Not Gone',
-              data: '{ "message": "This component is not available anymore." }',
-            },
-          });
-        } else if (errorResponse2) {
-          return Promise.reject({
-            response: {
-              status: 410,
-              statusText: 'Not Gone',
-              data: { message: 'This component is not available anymore.' },
-            },
-          });
-        } else if (!found) {
-          return Promise.reject({
-            response: {
-              status: 404,
-              statusText: 'Not found',
-            },
-          });
-        } else if (!auth) {
-          return Promise.reject({
-            response: {
-              status: 401,
-              statusText: 'Not authorized',
-            },
-          });
-        } else {
-          return Promise.resolve({
-            status: 200,
-            statusText: 'OK',
-          });
-        }
-      },
-      get(url, options) {
-        if (errorOther) {
-          return Promise.reject({
-            message: 'error',
-          });
-        }
-        return Promise.resolve({ data: 'test' });
+          if (errorRequest) {
+            return Promise.reject({
+              request: {},
+            });
+          } else if (errorOther) {
+            return Promise.reject({
+              message: 'error',
+            });
+          } else if (errorResponse) {
+            return Promise.reject({
+              response: {
+                status: 410,
+                statusText: 'Not Gone',
+                data: '{ "message": "This component is not available anymore." }',
+              },
+            });
+          } else if (errorResponse2) {
+            return Promise.reject({
+              response: {
+                status: 410,
+                statusText: 'Not Gone',
+                data: { message: 'This component is not available anymore.' },
+              },
+            });
+          } else if (!found) {
+            return Promise.reject({
+              response: {
+                status: 404,
+                statusText: 'Not found',
+              },
+            });
+          } else if (!auth) {
+            return Promise.reject({
+              response: {
+                status: 401,
+                statusText: 'Not authorized',
+              },
+            });
+          } else {
+            return Promise.resolve({
+              status: 200,
+              statusText: 'OK',
+            });
+          }
+        },
+        get(url, options) {
+          if (errorOther) {
+            return Promise.reject({
+              message: 'error',
+            });
+          }
+          return Promise.resolve({ data: 'test' });
+        },
       },
     },
-  },
-  FormData: jest.requireActual('form-data'),
-}));
+    FormData: (await vitest.importActual('form-data') as any).default,
+  };
+});
 
 describe('HTTP Module', () => {
   it('postFile form posts a file successfully should be ok', async () => {

package/src/common/importmap.test.ts

@@ -1,6 +1,7 @@
+import { describe, it, expect, vitest } from 'vitest';
 import { readImportmap } from './importmap';
 
-jest.mock('./npm', () => ({
+vitest.mock('./npm', () => ({
   tryResolvePackage(id, dir) {
     if (id === 'qxz') {
       return undefined;
@@ -45,7 +46,7 @@ const mockPackages = {
   },
 };
 
-jest.mock('./io', () => ({
+vitest.mock('./io', () => ({
   checkIsDirectory() {},
   getHash() {},
   readJson(dir) {

package/src/common/importmap.ts

@@ -320,7 +320,7 @@ async function consumeImportmap(
 ): Promise<Array<SharedDependency>> {
   const importmap = packageDetails.importmap;
   const appShell = inherited && mode === 'remote';
-  const availableSpecs = appShell ? packageDetails.devDependencies : {};
+  const availableSpecs = appShell ? packageDetails.devDependencies ?? {} : {};
   const inheritanceBehavior = appShell ? 'host' : mode;
 
   if (typeof importmap === 'string') {

package/src/common/info.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { findCompatVersion } from './info';
 
 describe('CLI info module', () => {

package/src/common/interactive.test.ts

@@ -1,8 +1,9 @@
+import { describe, it, expect, vitest } from 'vitest';
 import { promptConfirm, promptSelect } from './interactive';
 
 const answer = 'Yes, really';
 
-jest.mock('../external', () => ({
+vitest.mock('../external', () => ({
   rc(_, cfg) {
     return cfg;
   },

package/src/common/io.ts

@@ -1,4 +1,4 @@
-import * as rimraf from 'rimraf';
+import rimraf from 'rimraf';
 import { transpileModule, ModuleKind, ModuleResolutionKind, ScriptTarget, JsxEmit } from 'typescript';
 import { join, resolve, basename, dirname, extname } from 'path';
 import { exists, lstat, unlink, statSync } from 'fs';

package/src/common/merge.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { deepMerge } from './merge';
 
 describe('Merge Module', () => {