@servicetitan/startup 23.5.2 → 24.0.0

package/src/cli/utils/__tests__/bundle.test.ts

@@ -34,7 +34,7 @@ describe('[startup] Cli Utils', () => {
         jest.resetAllMocks();
         jest.mocked(createWebpackConfig).mockReturnValue(createWebpackResult);
         jest.mocked(webpack).mockImplementation((): any => compiler);
-        compiler = { close: jest.fn(callback => callback()) };
+        compiler = { close: jest.fn(callback => callback(null)) };
     });
 
     afterEach(() => vol.reset());
@@ -120,11 +120,11 @@ describe('[startup] Cli Utils', () => {
 
         describe('when webpack reports unexpected results', () => {
             beforeEach(() => {
-                jest.mocked(compiler.run)!.mockImplementation(callback => callback());
+                jest.mocked(compiler.run)!.mockImplementation(callback => callback(null));
             });
 
             test('returns error', () => {
-                expect(subject).rejects.toThrowError(/something went wrong/i);
+                expect(subject).rejects.toThrow(/something went wrong/i);
             });
         });
 
@@ -270,7 +270,7 @@ describe('[startup] Cli Utils', () => {
         });
 
         const subject = async () => {
-            await expect(bundleWatch(options)).rejects.toThrowError('stopped');
+            await expect(bundleWatch(options)).rejects.toThrow('stopped');
         };
 
         test('runs webpack development server', async () => {

package/src/cli/utils/__tests__/cli-os.test.ts

@@ -96,7 +96,7 @@ describe('[startup] Cli Utils (OS)', () => {
 
         ['', [], ['']].forEach(command =>
             test(`throws error when called with ${JSON.stringify(command)}`, () => {
-                expect(() => subject(command)).toThrowError();
+                expect(() => subject(command)).toThrow();
             })
         );
     });

package/src/cli/utils/__tests__/lerna-exec.test.ts

@@ -0,0 +1,64 @@
+import execa from 'execa';
+
+import { log } from '../../../utils';
+import { lernaExec } from '../lerna-exec';
+
+jest.mock('execa');
+
+describe(`${lernaExec.name}`, () => {
+    let args: Parameters<typeof lernaExec>[0];
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.spyOn(log, 'info').mockImplementation(jest.fn()); // suppress log output
+        args = { cmd: 'foo' };
+    });
+
+    const subject = () => lernaExec(args);
+
+    function expectExecaCalledWith(commandLine: string) {
+        const [cmd, ...args] = commandLine.split(' ');
+        expect(execa).toHaveBeenCalledWith(cmd, args, { stdio: 'inherit' });
+    }
+
+    test('runs "lerna exec -- {cmd}" command', () => {
+        subject();
+
+        expectExecaCalledWith(`lerna exec -- ${args.cmd}`);
+    });
+
+    describe.each([
+        { arg: { parallel: true }, option: '--parallel' },
+        { arg: { stream: true }, option: '--stream' },
+        { arg: { bail: false }, option: '--no-bail' },
+    ] as { arg: Partial<typeof args>; option: string }[])('with $arg', ({ arg, option }) => {
+        beforeEach(() => Object.assign(args, arg));
+
+        test(`runs "lerna exec ${option} -- {cmd}"`, () => {
+            subject();
+
+            expectExecaCalledWith(`lerna exec ${option} -- ${args.cmd}`);
+        });
+    });
+
+    describe('with scope', () => {
+        beforeEach(() => (args.scope = ['foo', 'bar']));
+
+        test('runs "lerna exec --scope={scope-1} ... --scope={scope-N} -- {cmd}', () => {
+            subject();
+
+            const scopes = args.scope!.map(name => `--scope=${name}`).join(' ');
+            expectExecaCalledWith(`lerna exec ${scopes} -- ${args.cmd}`);
+        });
+    });
+
+    describe('with pass-thru arguments', () => {
+        beforeEach(() => (args['--'] = ['--foo bar', '--bax=qux']));
+
+        test('runs "lerna exec -- {cmd} {arguments}', () => {
+            subject();
+
+            expectExecaCalledWith(`lerna exec -- ${args.cmd} ${args['--']!.join(' ')}`);
+        });
+    });
+});

package/src/cli/utils/index.ts

@@ -8,6 +8,7 @@ export * from './compile-sass';
 export * from './eslint';
 export * from './get-module-type';
 export * from './is-module-installed';
+export * from './lerna-exec';
 export * from './set-node-options';
 export * from './styles-copy';
 export * from './tcm';

package/src/cli/utils/lerna-exec.ts

@@ -0,0 +1,37 @@
+import execa from 'execa';
+import { log } from '../../utils';
+
+interface Args {
+    'bail'?: boolean;
+    'cmd': string;
+    'scope'?: string[];
+    'stream'?: boolean;
+    'parallel'?: boolean;
+    '--'?: string[];
+}
+
+export async function lernaExec(args: Args) {
+    const lernaArguments = [
+        'exec',
+        ...getOptions(args),
+        '--',
+        ...args.cmd.split(' '),
+        ...(args['--'] ?? []).flatMap(arg => arg.split(' ')),
+    ];
+    log.info(`Running ${[args.cmd, ...(args['--'] ?? [])].join(' ')}`);
+    await execa('lerna', lernaArguments, { stdio: 'inherit' });
+}
+
+function getOptions(args: Args) {
+    const result = (args.scope ?? []).map(name => `--scope=${name}`);
+    if (args.bail === false) {
+        result.push('--no-bail');
+    }
+    if (args.parallel) {
+        result.push('--parallel');
+    }
+    if (args.stream) {
+        result.push('--stream');
+    }
+    return result;
+}

package/src/utils/__tests__/get-configuration.test.ts

@@ -73,7 +73,7 @@ describe('[startup] Utils', () => {
             beforeEach(() => vol.reset());
 
             test('throws error', () => {
-                expect(subject).toThrowError();
+                expect(subject).toThrow();
             });
         });
     });

package/src/utils/__tests__/log.test.ts

@@ -133,7 +133,7 @@ describe(`[startup] Utils`, () => {
                 });
 
             test('logs error', () => {
-                expect(subject).toThrowError(error);
+                expect(subject).toThrow(error);
 
                 expect(log.error).toHaveBeenCalledWith(String(error));
             });
@@ -146,7 +146,7 @@ describe(`[startup] Utils`, () => {
                 });
 
             test('logs error', async () => {
-                await expect(subject).rejects.toThrowError(error);
+                await expect(subject).rejects.toThrow(error);
 
                 expect(log.error).toHaveBeenCalledWith(String(error));
             });
@@ -156,7 +156,7 @@ describe(`[startup] Utils`, () => {
             const subject = () => instance.foo;
 
             test('logs nothing', () => {
-                expect(subject).toThrowError(error);
+                expect(subject).toThrow(error);
 
                 expect(log.error).not.toHaveBeenCalled();
             });

package/src/utils/load-shared-dependencies.ts

@@ -1,5 +1,6 @@
 const getDefaultSharedDependencies = () => ({
     '@servicetitan/design-system': 'SharedDependencies.ServiceTitan.DesignSystem',
+    '@servicetitan/anvil2': 'SharedDependencies.ServiceTitan.Anvil2',
     'classnames': 'SharedDependencies.ClassNames',
     'formstate': 'SharedDependencies.FormState',
     'mobx': 'SharedDependencies.MobX',

package/src/webpack/__tests__/create-webpack-config-shared-dependencies.test.ts

@@ -108,6 +108,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
                 expect(subject().module?.rules).toContainEqual({
                     test: getModuleEntryPath(name),
                     loader: require.resolve('../loaders/expose-loader'),
+                    type: 'javascript/auto',
                     options: { exposes: value },
                 });
             });
@@ -133,7 +134,14 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
 
         test('configures "design-system.css" rules', () => {
             expect(subject().module?.rules).toContainEqual({
-                test: /design-system.css$/,
+                test: /design-system\.css$/,
+                use: [MiniCssExtractPlugin.loader, 'css-loader'],
+            });
+        });
+
+        test('configures anvil2 css" rules', () => {
+            expect(subject().module?.rules).toContainEqual({
+                test: /@servicetitan\/anvil2\/.*\.css$/,
                 use: [MiniCssExtractPlugin.loader, 'css-loader'],
             });
         });

package/src/webpack/__tests__/create-webpack-config-web-component.test.ts

@@ -72,7 +72,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
             ...(embed ? [] : [`require('./design-system.css');`]),
             `import { register } from '@servicetitan/web-components';`,
             `import { App } from './app';`,
-            `register(App, ${embed}, { legacyRoot: ${legacyRoot} });`,
+            `register(App, ${embed}, { legacyRoot: ${legacyRoot}, sharedDependenciesNames: [] });`,
         ].join('\n');
 
     let overrides: Parameters<typeof createWebpackConfig>[0];
@@ -289,7 +289,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
                 beforeEach(() => jest.mocked(getCallerFile).mockReturnValue(configFileName));
 
                 test('throws error', () => {
-                    expect(subject).toThrowError(/cannot call createWebpackConfig/);
+                    expect(subject).toThrow(/cannot call createWebpackConfig/);
                 });
             }
         );

package/src/webpack/configs/optimization-config.ts

@@ -22,6 +22,12 @@ export function optimizationConfig(context: Context, _: Overrides): Result {
                 chunks: 'all',
                 enforce: true,
             },
+            'anvil2': {
+                test: /@servicetitan\/anvil2\/.*\.css$/,
+                name: 'anvil2',
+                chunks: 'all',
+                enforce: true,
+            },
         });
     }
 

package/src/webpack/configs/plugins/virtual-modules-plugin.ts

@@ -31,8 +31,10 @@ function designSystemCode() {
     ].join('\n');
 }
 
-function indexCode({ embed = false, isLegacyRoot }: Context) {
-    const options = `{ legacyRoot: ${isLegacyRoot} }`;
+function indexCode({ embed = false, isLegacyRoot, sharedDependencies }: Context) {
+    const options = `{ legacyRoot: ${isLegacyRoot}, sharedDependenciesNames: ${JSON.stringify(
+        Object.keys(sharedDependencies)
+    )} }`;
     return [
         ...(embed ? [] : [`require('./design-system.css');`]),
         `import { register } from '@servicetitan/web-components';`,

package/src/webpack/configs/rules/css-rules.ts

@@ -3,13 +3,15 @@ import { RuleSetRule } from 'webpack';
 import { cssLoader, styleLoader } from '../loaders';
 import { Context } from '../types';
 
+const sharedCssDependencies = [/design-system\.css$/, /@servicetitan\/anvil2\/.*\.css$/];
+
 export function cssRules(context: Context): RuleSetRule[] {
     const { isExposeSharedDependencies, isProduction } = context;
 
     const excludeCallback = (path: string) => {
         return (
             path.endsWith('.module.css') ||
-            (isExposeSharedDependencies && path.endsWith('design-system.css'))
+            (isExposeSharedDependencies && sharedCssDependencies.some(regex => regex.test(path)))
         );
     };
 
@@ -26,10 +28,12 @@ export function cssRules(context: Context): RuleSetRule[] {
     ];
 
     if (isExposeSharedDependencies && !isProduction) {
-        result.push({
-            test: /design-system.css$/,
-            use: [MiniCssExtractPlugin.loader, cssLoader(context)],
-        });
+        result.push(
+            ...sharedCssDependencies.map(test => ({
+                test,
+                use: [MiniCssExtractPlugin.loader, cssLoader(context)],
+            }))
+        );
     }
 
     return result;

package/src/webpack/configs/rules-config.ts

@@ -43,6 +43,7 @@ function sharedDependenciesRules(context: Context): RuleSetRule[] {
     return Object.entries(sharedDependencies).map(([dependency, variable]) => ({
         test: getModuleEntryPath(dependency),
         loader: require.resolve('../loaders/expose-loader'),
+        type: 'javascript/auto',
         options: { exposes: variable },
     }));
 }

package/src/webpack/utils/testing/get-compiler.ts

@@ -38,7 +38,7 @@ export function getCompilerFactory(cwd: string) {
             )
         );
 
-        compiler.outputFileSystem = createFsFromVolume(new Volume());
+        compiler.outputFileSystem = createFsFromVolume(new Volume()) as any;
 
         return compiler;
     };

package/template-react18/packages/application/package.json

@@ -19,8 +19,8 @@
         "feature-c": "^0.0.0",
         "history": "~4.10.1",
         "mobx": "~6.10.2",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "react-router-dom": "^5.3.0"
     },
     "devDependencies": {
@@ -28,7 +28,7 @@
         "@testing-library/jest-dom": "^6.4.2",
         "@testing-library/react": "^14.2.1",
         "@testing-library/react-hooks": "^8.0.1",
-        "@types/react": "^18.2.55",
+        "@types/react": "^18.3.1",
         "@types/react-dom": "^18.3.0",
         "@types/react-router-dom": "^5.3.2"
     }

package/template-react18/packages/feature-a/package.json

@@ -6,11 +6,11 @@
     "main": "./dist/index.js",
     "typings": "./dist/index.d.ts",
     "dependencies": {
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1"
     },
     "devDependencies": {
-        "@types/react": "^18.2.55",
+        "@types/react": "^18.3.1",
         "@types/react-dom": "^18.3.0"
     },
     "cli": {

package/template-react18/packages/feature-b/package.json

@@ -6,11 +6,11 @@
     "main": "./dist/index.js",
     "typings": "./dist/index.d.ts",
     "dependencies": {
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1"
     },
     "devDependencies": {
-        "@types/react": "^18.2.55",
+        "@types/react": "^18.3.1",
         "@types/react-dom": "^18.3.0"
     },
     "cli": {

package/template-react18/packages/feature-c/package.json

@@ -6,11 +6,11 @@
     "main": "./dist/index.js",
     "typings": "./dist/index.d.ts",
     "dependencies": {
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1"
     },
     "devDependencies": {
-        "@types/react": "^18.2.55",
+        "@types/react": "^18.3.1",
         "@types/react-dom": "^18.3.0"
     },
     "cli": {

package/tsconfig/base.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json.schemastore.org/tsconfig.json",
     "compilerOptions": {
         "incremental": true,
         "target": "es6",
@@ -16,7 +17,8 @@
         "useDefineForClassFields": true,
         "emitDecoratorMetadata": true,
         "forceConsistentCasingInFileNames": true,
-        "resolveJsonModule": true
+        "resolveJsonModule": true,
+        "skipLibCheck": true
     },
     "files": ["./types.d.ts"]
 }