@servicetitan/startup 39.0.1 → 39.2.0

package/src/cli/commands/__tests__/mfe-package-publish.test.ts

@@ -12,7 +12,7 @@ import {
     runCommand,
 } from '../../utils';
 import { MFEPackagePublish } from '../mfe-package-publish';
-import { purgeCache, ROLLBACK_TAG_SUFFIX } from '../utils';
+import { getMfeRegistry, purgeCache, ROLLBACK_TAG_SUFFIX } from '../utils';
 
 jest.mock('fs', () => fs);
 
@@ -34,11 +34,12 @@ jest.mock('../../utils', () => ({
 }));
 jest.mock('../utils', () => ({
     ...jest.requireActual('../utils'),
+    getMfeRegistry: jest.fn(),
     purgeCache: jest.fn(),
 }));
 
 describe(`[startup] ${MFEPackagePublish.name}`, () => {
-    const defaultRegistry = 'https://verdaccio.servicetitan.com';
+    const registry = 'https://foo.com';
     const branch = 'master';
     const tag = 'prod';
     const rollbackTag = `${tag}${ROLLBACK_TAG_SUFFIX}`;
@@ -53,6 +54,7 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
     beforeEach(() => {
         args = {};
         jest.clearAllMocks();
+        jest.mocked(getMfeRegistry).mockImplementation(explicit => explicit ?? registry);
         jest.mocked(isWebComponent).mockReturnValue(true);
         jest.mocked(gitGetBranch).mockReturnValue(branch);
         jest.mocked(gitGetCommitHash).mockReturnValue(commitHash);
@@ -103,7 +105,7 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
     test('sets package registry', async () => {
         await subject();
 
-        expect(npmPackageSet).toHaveBeenCalledWith('publishConfig.registry', defaultRegistry);
+        expect(npmPackageSet).toHaveBeenCalledWith('publishConfig.registry', registry);
     });
 
     test('adds package version to metadata.json', async () => {
@@ -127,23 +129,53 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
         await subject();
 
         expect(runCommand).toHaveBeenCalledWith(
-            `npx startup upload-sourcemaps --releaseVersion=${buildPackageVersion()}`
+            `npx startup upload-sourcemaps --releaseVersion=${buildPackageVersion()} --registry=${registry}`
         );
     });
 
+    function itDoesNotUploadSourcemaps() {
+        test('does not upload sourcemaps', async () => {
+            await subject();
+
+            expect(runCommand).not.toHaveBeenCalledWith(
+                expect.stringContaining('upload-sourcemaps')
+            );
+        });
+    }
+
+    describe('with "uploadSourcemaps: false"', () => {
+        beforeEach(() => (args.uploadSourcemaps = false));
+
+        itDoesNotUploadSourcemaps();
+    });
+
+    describe('when branch configuration includes "uploadSourcemaps: false"', () => {
+        beforeEach(() =>
+            vol.fromJSON({
+                'package.json': JSON.stringify({
+                    name: packageName,
+                    cli: {
+                        'web-component': {
+                            branches: { [branch]: { uploadSourcemaps: false } },
+                        },
+                    },
+                }),
+            })
+        );
+
+        itDoesNotUploadSourcemaps();
+    });
+
     test('purges cache after publishing', async () => {
         await subject();
 
-        expect(purgeCache).toHaveBeenCalledWith({ packageName, tag });
+        expect(purgeCache).toHaveBeenCalledWith({ packageName, registry, tag });
     });
 
     test('gets current tagged versions before publishing', async () => {
         await subject();
 
-        expect(npmView).toHaveBeenCalledWith({
-            packageName,
-            registry: defaultRegistry,
-        });
+        expect(npmView).toHaveBeenCalledWith({ packageName, registry });
     });
 
     test(`tags previous version with {tag}${ROLLBACK_TAG_SUFFIX}`, async () => {
@@ -151,7 +183,7 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
         expect(npmTagVersion).toHaveBeenCalledWith({
             packageName,
             packageVersion: previousVersion,
-            registry: defaultRegistry,
+            registry,
             tag: rollbackTag,
         });
 
@@ -250,31 +282,19 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
             expect(npmTagVersion).not.toHaveBeenCalled();
         });
 
-        test('uploads sourcemaps with "--dry" option', async () => {
-            await subject();
+        describe('with "uploadSourcemaps: true"', () => {
+            beforeEach(() => (args.uploadSourcemaps = true));
 
-            expect(runCommand).toHaveBeenCalledWith(
-                `npx startup upload-sourcemaps --dry --releaseVersion=${buildPackageVersion()}`
-            );
-        });
-
-        itDoesNotPurgeCache();
-    });
-
-    function itDoesNotUploadSourcemaps() {
-        test('does not upload sourcemaps', async () => {
-            await subject();
+            test('uploads sourcemaps with "--dry" option', async () => {
+                await subject();
 
-            expect(runCommand).not.toHaveBeenCalledWith(
-                expect.stringContaining('upload-sourcemaps')
-            );
+                expect(runCommand).toHaveBeenCalledWith(
+                    `npx startup upload-sourcemaps --dry --releaseVersion=${buildPackageVersion()} --registry=${registry}`
+                );
+            });
         });
-    }
-
-    describe('with "uploadSourcemaps: false"', () => {
-        beforeEach(() => (args.uploadSourcemaps = false));
 
-        itDoesNotUploadSourcemaps();
+        itDoesNotPurgeCache();
     });
 
     describe('with "purgeCache: false"', () => {
@@ -283,21 +303,6 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
         itDoesNotPurgeCache();
     });
 
-    describe('when branch configuration includes "uploadSourcemaps: false"', () => {
-        beforeEach(() =>
-            vol.fromJSON({
-                'package.json': JSON.stringify({
-                    name: packageName,
-                    cli: {
-                        'web-component': { branches: { [branch]: { uploadSourcemaps: false } } },
-                    },
-                }),
-            })
-        );
-
-        itDoesNotUploadSourcemaps();
-    });
-
     describe('with "trackHistory: false"', () => {
         beforeEach(() => {
             args.trackHistory = false;
@@ -484,7 +489,7 @@ describe(`[startup] ${MFEPackagePublish.name}`, () => {
             expect(npmTagVersion).toHaveBeenCalledWith({
                 packageName,
                 packageVersion: buildPackageVersion(),
-                registry: defaultRegistry,
+                registry,
                 tag,
             });
             expect(log.info).toHaveBeenCalledWith(

package/src/cli/commands/__tests__/mfe-package-rollback.test.ts

@@ -1,7 +1,7 @@
 import { log, readJson } from '../../../utils';
 import { npmTagVersion, npmView } from '../../utils';
 import { MFEPackageRollback } from '../mfe-package-rollback';
-import { purgeCache } from '../utils';
+import { getMfeRegistry, purgeCache } from '../utils';
 
 jest.mock('../../../utils', () => ({
     ...jest.requireActual('../../../utils'),
@@ -19,6 +19,7 @@ jest.mock('../../utils', () => ({
 }));
 jest.mock('../utils', () => ({
     ...jest.requireActual('../utils'),
+    getMfeRegistry: jest.fn(),
     purgeCache: jest.fn(),
 }));
 
@@ -43,6 +44,7 @@ describe(`[startup] ${MFEPackageRollback.name}`, () => {
         };
 
         jest.resetAllMocks();
+        jest.mocked(getMfeRegistry).mockImplementation(explicit => explicit ?? registry);
         jest.mocked(readJson).mockReturnValue({ name: packageName });
         jest.mocked(npmView).mockReturnValue(packageInfo);
         jest.mocked(npmTagVersion).mockResolvedValue(undefined);
@@ -106,7 +108,7 @@ describe(`[startup] ${MFEPackageRollback.name}`, () => {
     test('purges cache after rollback', async () => {
         await subject();
 
-        expect(purgeCache).toHaveBeenCalledWith({ packageName, tag });
+        expect(purgeCache).toHaveBeenCalledWith({ packageName, registry, tag });
     });
 
     describe('when package is not found in registry', () => {

package/src/cli/commands/__tests__/mfe-publish.test.ts

@@ -1,3 +1,4 @@
+import { isCI } from '@servicetitan/install';
 import { fs, vol } from 'memfs';
 import { createPackage } from '../../../__mocks__';
 import { Package, PackageType, getPackages } from '../../../utils';
@@ -7,6 +8,7 @@ import { entry as mfePackageClean } from '../registry/mfe-package-clean';
 import { entry as mfePackagePublish } from '../registry/mfe-package-publish';
 import { entry as mfePackageRollback } from '../registry/mfe-package-rollback';
 import { entry as mfePublish } from '../registry/mfe-publish';
+import { getMfeRegistry, login } from '../utils';
 
 jest.mock('fs', () => fs);
 
@@ -15,16 +17,27 @@ jest.mock('../../../utils', () => ({
     ...jest.requireActual('../../../utils'),
     getPackages: jest.fn(),
 }));
+jest.mock('@servicetitan/install', () => ({ isCI: jest.fn() }));
+jest.mock('../utils', () => ({
+    ...jest.requireActual('../utils'),
+    getMfeRegistry: jest.fn(),
+    login: jest.fn(),
+}));
 
 describe(`[startup] ${MFEPublish.name}`, () => {
+    const registry = 'https://foo.com';
     let args: ConstructorParameters<typeof MFEPublish>[0];
+    let ci: boolean;
     let packages: Package[];
 
     beforeEach(() => {
         args = {};
+        ci = false;
         packages = [];
         jest.resetAllMocks();
         jest.mocked(getPackages).mockReturnValue(packages);
+        jest.mocked(getMfeRegistry).mockImplementation(explicit => explicit ?? registry);
+        jest.mocked(isCI).mockImplementation(() => ci);
     });
 
     afterEach(() => vol.reset());
@@ -80,7 +93,13 @@ describe(`[startup] ${MFEPublish.name}`, () => {
             mockPackageJson(packages);
         });
 
-        test('publishes the package', async () => {
+        test('authorizes the machine for the registry', async () => {
+            await subject();
+
+            expect(login).toHaveBeenCalledWith(registry);
+        });
+
+        test('publishes to registry', async () => {
             await subject();
 
             expect(lernaExec).toHaveBeenCalledWith({
@@ -88,7 +107,17 @@ describe(`[startup] ${MFEPublish.name}`, () => {
                 'scope': packages.map(({ name }) => name),
                 'stream': true,
                 'parallel': 1,
-                '--': [],
+                '--': [`--registry ${registry}`],
+            });
+        });
+
+        describe('in CI environment', () => {
+            beforeEach(() => (ci = true));
+
+            test('skips authorization', async () => {
+                await subject();
+
+                expect(login).not.toHaveBeenCalled();
             });
         });
 
@@ -105,7 +134,10 @@ describe(`[startup] ${MFEPublish.name}`, () => {
                 await subject();
 
                 expect(lernaExec).toHaveBeenCalledWith(
-                    expect.objectContaining({ cmd: 'startup mfe-package-clean' })
+                    expect.objectContaining({
+                        'cmd': 'startup mfe-package-clean',
+                        '--': [`--registry ${registry}`],
+                    })
                 );
             });
 
@@ -127,9 +159,11 @@ describe(`[startup] ${MFEPublish.name}`, () => {
 
                     expect(lernaExec).toHaveBeenCalledWith(
                         expect.objectContaining({
-                            '--': Array.isArray(expected)
-                                ? expected
-                                : [expected ?? `--${name} ${value}`],
+                            '--': expect.arrayContaining(
+                                Array.isArray(expected)
+                                    ? expected
+                                    : [expected ?? `--${name} ${value}`]
+                            ),
                         })
                     );
                 });
@@ -161,9 +195,9 @@ describe(`[startup] ${MFEPublish.name}`, () => {
 
                 expect(lernaExec).toHaveBeenCalledWith(
                     expect.objectContaining({
-                        '--': Array.isArray(expected)
-                            ? expected
-                            : [expected ?? `--${name} ${value}`],
+                        '--': expect.arrayContaining(
+                            Array.isArray(expected) ? expected : [expected ?? `--${name} ${value}`]
+                        ),
                     })
                 );
             });
@@ -190,8 +224,9 @@ describe(`[startup] ${MFEPublish.name}`, () => {
 
                 expect(lernaExec).toHaveBeenCalledWith(
                     expect.objectContaining({
-                        cmd: 'startup mfe-package-rollback',
-                        scope: [packages[0].name],
+                        'cmd': 'startup mfe-package-rollback',
+                        'scope': [packages[0].name],
+                        '--': [`--registry ${registry}`],
                     })
                 );
             });
@@ -212,9 +247,11 @@ describe(`[startup] ${MFEPublish.name}`, () => {
 
                     expect(lernaExec).toHaveBeenCalledWith(
                         expect.objectContaining({
-                            '--': Array.isArray(expected)
-                                ? expected
-                                : [expected ?? `--${name} ${value}`],
+                            '--': expect.arrayContaining(
+                                Array.isArray(expected)
+                                    ? expected
+                                    : [expected ?? `--${name} ${value}`]
+                            ),
                         })
                     );
                 });

package/src/cli/commands/__tests__/upload-sourcemaps.test.ts

@@ -1,12 +1,11 @@
-import { isCI } from '@servicetitan/install';
 import { execSync } from 'child_process';
 import { vol } from 'memfs';
 import { inspect } from 'node:util';
 import path from 'path';
 import { log } from '../../../utils';
 import { UploadSourcemaps } from '../upload-sourcemaps';
+import { getUnpkgHost } from '../utils';
 
-jest.mock('@servicetitan/install');
 jest.mock('fs', () => require('memfs').fs);
 jest.mock('child_process', () => ({ execSync: jest.fn() }));
 
@@ -14,9 +13,14 @@ jest.mock('../../../utils', () => ({
     ...jest.requireActual('../../../utils'),
     log: { info: jest.fn(), warning: jest.fn() },
 }));
+jest.mock('../utils', () => ({
+    ...jest.requireActual('../utils'),
+    getUnpkgHost: jest.fn(),
+}));
 
 describe(`[startup] ${UploadSourcemaps.name}`, () => {
     const OLD_ENV = process.env;
+    const unpkgHost = 'https://foo.com';
     const packageJSON = { name: '@servicetitan/example-mfe', cli: { 'web-component': true } };
     const tsconfigJSON = { compilerOptions: { outDir: 'dist' } };
     const metadataJSON = { name: `${packageJSON.name}-hash` };
@@ -36,7 +40,7 @@ describe(`[startup] ${UploadSourcemaps.name}`, () => {
 
     beforeEach(() => {
         jest.clearAllMocks();
-        jest.mocked(isCI).mockReturnValue(false);
+        jest.mocked(getUnpkgHost).mockReturnValue(unpkgHost);
 
         // eslint-disable-next-line @typescript-eslint/naming-convention
         process.env = { DATADOG_API_KEY: 'datadog-api-key' };
@@ -62,13 +66,23 @@ describe(`[startup] ${UploadSourcemaps.name}`, () => {
                 path.join(outDir, 'bundle'),
                 `--service=${packageJSON.name.replace('@servicetitan/', '')}`,
                 `--release-version=${args.releaseVersion}`,
-                `--minified-path-prefix=https://unpkg.servicetitan.com/${packageJSON.name}@${args.releaseVersion}/${outDir}/bundle`,
+                `--minified-path-prefix=${unpkgHost}/${packageJSON.name}@${args.releaseVersion}/${outDir}/bundle`,
                 `--project-path=${metadataJSON.name}/`,
             ].join(' '),
             { stdio: 'inherit' }
         );
     });
 
+    describe('with --registry', () => {
+        beforeEach(() => (args.registry = 'https://verdaccio.st.dev'));
+
+        test('uses host associated with registry', async () => {
+            await subject();
+
+            expect(getUnpkgHost).toHaveBeenCalledWith(args.registry);
+        });
+    });
+
     describe('with "--dry"', () => {
         beforeEach(() => (args.dry = true));
 
@@ -92,18 +106,18 @@ describe(`[startup] ${UploadSourcemaps.name}`, () => {
     describe('when DATADOG_API_KEY is not set', () => {
         beforeEach(() => delete process.env.DATADOG_API_KEY);
 
-        itThrowsError('DATADOG_API_KEY environment variable is not set');
+        test('logs warning', async () => {
+            await subject();
 
-        describe('when in CI environment', () => {
-            beforeEach(() => jest.mocked(isCI).mockReturnValue(true));
+            expect(log.warning).toHaveBeenCalledWith(
+                'DATADOG_API_KEY environment variable is not set; skipping sourcemaps'
+            );
+        });
 
-            test('logs warning', async () => {
-                await subject();
+        test('does not run datadog-ci', async () => {
+            await subject();
 
-                expect(log.warning).toHaveBeenCalledWith(
-                    'DATADOG_API_KEY environment variable is not set; skipping sourcemaps'
-                );
-            });
+            expect(execSync).not.toHaveBeenCalled();
         });
     });
 

package/src/cli/commands/mfe-list.ts

@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { npmWhoAmI } from '@servicetitan/install';
+import { isCI } from '@servicetitan/install';
 import chalk from 'chalk';
 import Table from 'cli-table3';
-import readline from 'readline/promises';
 import {
     formatRelativeDate,
     getPackages,
@@ -11,17 +10,19 @@ import {
     logErrors,
     PackageType,
 } from '../../utils';
-import { isTTY, NPMPackageInfo, npmView, runCommand } from '../utils';
+import { NPMPackageInfo, npmView } from '../utils';
 import type { entry } from './registry/mfe-list';
 import { Command } from './types';
-import { DEFAULT_MFE_REGISTRY } from './utils';
+import { login, PROD_MFE_REGISTRY } from './utils';
 
 const collator = new Intl.Collator();
 
 export class MFEList extends Command<typeof entry> {
     @logErrors
     async execute() {
-        await this.login();
+        if (!isCI()) {
+            await login(this.registry);
+        }
 
         this.packageNames.forEach((name, index) => {
             const info = npmView({ packageName: name, registry: this.registry });
@@ -97,36 +98,6 @@ export class MFEList extends Command<typeof entry> {
         );
     }
 
-    private async ask(question: string) {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        const answer = await rl.question(question);
-        rl.close();
-        return answer.trim().toLowerCase();
-    }
-
-    private async login() {
-        if (
-            this.registry !== DEFAULT_MFE_REGISTRY ||
-            npmWhoAmI({ registry: this.registry }) !== undefined
-        ) {
-            return;
-        }
-
-        const message = `This machine is not authorized to access ${this.registry}.`;
-        if (!isTTY()) {
-            throw new Error(message);
-        }
-
-        const answer = await this.ask(chalk.bold.cyan(`${message} Authorize? [Y/n] `));
-        if (answer && answer !== 'y') {
-            throw new Error('Not authorized');
-        }
-
-        await runCommand(`npx --yes verdaccio-okta-oauth@latest --registry=${this.registry}`, {
-            quiet: true,
-        });
-    }
-
     private get limit() {
         if (this.args.all) {
             return Number.MAX_SAFE_INTEGER;
@@ -147,6 +118,6 @@ export class MFEList extends Command<typeof entry> {
     }
 
     private get registry() {
-        return this.args.registry ?? DEFAULT_MFE_REGISTRY;
+        return this.args.registry ?? PROD_MFE_REGISTRY;
     }
 }

package/src/cli/commands/mfe-package-clean.ts

@@ -2,7 +2,7 @@ import { getBranchesConfigs, isWebComponent, log, logErrors, readJson } from '..
 import { gitGetBranch, npmGetPackageVersionsDetails, npmUnpublish, Version } from '../utils';
 import type { entry } from './registry/mfe-package-clean';
 import { Command } from './types';
-import { DEFAULT_MFE_REGISTRY } from './utils';
+import { getMfeRegistry } from './utils';
 
 export class MFEPackageClean extends Command<typeof entry> {
     @logErrors
@@ -80,7 +80,7 @@ export class MFEPackageClean extends Command<typeof entry> {
             branches = [gitGetBranch()];
         }
 
-        const registry = this.args.registry ?? DEFAULT_MFE_REGISTRY;
+        const registry = getMfeRegistry(this.args.registry);
 
         return { count, registry, branches };
     }

package/src/cli/commands/mfe-package-publish.ts

@@ -23,7 +23,7 @@ import {
 } from '../utils';
 import type { entry } from './registry/mfe-package-publish';
 import { Command } from './types';
-import { DEFAULT_MFE_REGISTRY, buildRollbackTag, purgeCache } from './utils';
+import { buildRollbackTag, getMfeRegistry, purgeCache } from './utils';
 
 interface PublishData {
     branch: string;
@@ -63,9 +63,9 @@ export class MFEPackagePublish extends Command<typeof entry> {
 
         await this.maybePublishPackage(packageJson, data);
 
-        const { dry, tag } = data;
+        const { dry, registry, tag } = data;
         if (this.args.purgeCache !== false && !dry) {
-            purgeCache({ packageName: packageJson.name, tag });
+            purgeCache({ packageName: packageJson.name, registry, tag });
         }
 
         if (data.uploadSourcemaps) {
@@ -148,10 +148,12 @@ export class MFEPackagePublish extends Command<typeof entry> {
         }
     }
 
-    private uploadSourcemaps({ dry, version }: PublishData) {
-        const options = [...[dry && '--dry'], `--releaseVersion=${version}`].filter(
-            option => !!option
-        ) as string[];
+    private uploadSourcemaps({ dry, registry, version }: PublishData) {
+        const options = [
+            ...[dry && '--dry'],
+            `--releaseVersion=${version}`,
+            `--registry=${registry}`,
+        ].filter(option => !!option) as string[];
 
         runCommand(`npx startup upload-sourcemaps ${options.join(' ')}`);
     }
@@ -163,7 +165,7 @@ export class MFEPackagePublish extends Command<typeof entry> {
 
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         const buildVersion = cli.build || getDefaultBuildVersion(branch, gitGetCommitHash());
-        const registry = cli.registry ?? DEFAULT_MFE_REGISTRY;
+        const registry = getMfeRegistry(cli.registry);
         const tag = cli.tag ?? branchConfig?.publishTag ?? '';
         const uploadSourcemaps = cli.uploadSourcemaps ?? branchConfig?.uploadSourcemaps ?? true;
         const version = '0.0.0-' + buildVersion;

package/src/cli/commands/mfe-package-rollback.ts

@@ -2,7 +2,7 @@ import { log, logErrors, readJson } from '../../utils';
 import { DRY_RUN_PREFIX, npmTagVersion, npmView } from '../utils';
 import type { entry } from './registry/mfe-package-rollback';
 import { Command } from './types';
-import { DEFAULT_MFE_REGISTRY, buildRollbackTag, purgeCache } from './utils';
+import { buildRollbackTag, getMfeRegistry, purgeCache } from './utils';
 
 interface PackageJson {
     name: string;
@@ -20,15 +20,16 @@ export class MFEPackageRollback extends Command<typeof entry> {
             log.warning('DRY-RUN MODE ENABLED, WILL NOT PERFORM ROLLBACK');
         }
 
-        const packageName = await this.handleRollback();
+        const registry = getMfeRegistry(this.args.registry);
+        const packageName = await this.handleRollback(registry);
 
         if (packageName && this.args.purgeCache !== false && !dry) {
-            purgeCache({ packageName, tag });
+            purgeCache({ packageName, registry, tag });
         }
     }
 
-    private async handleRollback() {
-        const { tag, registry = DEFAULT_MFE_REGISTRY, dry } = this.args;
+    private async handleRollback(registry: string) {
+        const { tag, dry } = this.args;
 
         const packageJson = readJson<PackageJson>('package.json');
         const packageName = packageJson.name;