@servicetitan/startup 39.0.1 → 39.2.0

package/src/vite/config/base-config.ts

@@ -33,6 +33,7 @@ import { assetFileNames } from './asset-file-names';
 import { getCodeSplitting } from './code-splitting';
 import { createCssConfig } from './create-css-config';
 import { createFilteringLogger } from './create-filtering-logger';
+import { createResolveConfig } from './create-resolve-config';
 
 function importMetaRemap(
     ...definitions: (Record<string, string> | undefined)[]
@@ -79,6 +80,7 @@ function createPlugins(context: ViteBuildContext) {
 }
 
 export function createBaseConfig(context: ViteBuildContext): InlineConfig {
+    const optimizedStartupDependencies = ['@servicetitan/startup-utils', 'react-refresh/runtime'];
     const { isProduction } = context.build;
     const { isWebComponent } = context.package;
 
@@ -120,10 +122,10 @@ export function createBaseConfig(context: ViteBuildContext): InlineConfig {
             ),
             ...(getProcessEnv(context) ?? {}),
         },
+        resolve: createResolveConfig(context, optimizedStartupDependencies),
         optimizeDeps: {
             include: [
-                '@servicetitan/startup-utils',
-                'react-refresh/runtime',
+                ...optimizedStartupDependencies,
                 'react/jsx-runtime',
                 'react/jsx-dev-runtime',
             ],

package/src/vite/config/create-resolve-config.ts

@@ -0,0 +1,43 @@
+import { createRequire } from 'module';
+import path from 'path';
+import type { InlineConfig } from 'vite';
+import { buildEscapedRegExp } from '../build-escaped-reg-exp';
+import type { ViteBuildContext } from '../types';
+
+type Result = InlineConfig['resolve'];
+
+const startupRequire = createRequire(__filename);
+
+/*
+ * Returns a resolver that, when normal resolution fails for a specifier,
+ * tries resolving from startup's location.
+ */
+export function createResolveConfig(context: ViteBuildContext, specifiers: string[]): Result {
+    const source = path.resolve(context.package.source);
+
+    const alias = specifiers
+        .filter(specifier => !isResolvableFrom(specifier, source))
+        .map(specifier => ({
+            find: buildEscapedRegExp(specifier),
+            replacement: resolveFromStartup(specifier),
+        }));
+
+    return { alias };
+}
+
+function isResolvableFrom(specifier: string, source: string): boolean {
+    try {
+        require.resolve(specifier, { paths: [source] });
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+function resolveFromStartup(specifier: string): string {
+    try {
+        return startupRequire.resolve(specifier);
+    } catch (cause) {
+        throw new Error(`[startup] Cannot resolve ${specifier}`, { cause });
+    }
+}

package/src/vite/plugins/__tests__/css-injector-plugin.test.ts

@@ -64,7 +64,7 @@ describe(cssInjectorPlugin.name, () => {
             const result = transform(viteCssOutput, viteId);
 
             expect(result.code).toContain(
-                `import { MfeStyleRegistry as __mfe__Registry } from '@servicetitan/web-components'`
+                `import { MfeStyleRegistry as __mfe__Registry } from '@servicetitan/web-components/css-injector/mfe-style-registry'`
             );
         });
 

package/src/vite/plugins/css-injector-plugin.ts

@@ -48,7 +48,12 @@ export function cssInjectorPlugin(context: BuildContext): Plugin | undefined {
             transformed = transformed
                 .replace(
                     importPattern,
-                    `import { MfeStyleRegistry as __mfe__Registry } from '@servicetitan/web-components'`
+                    /*
+                     * Leaf module, not the package root: the root reaches anvil2, whose
+                     * stylesheets are rewritten here, and the cycle leaves the registry
+                     * undefined.
+                     */
+                    `import { MfeStyleRegistry as __mfe__Registry } from '@servicetitan/web-components/css-injector/mfe-style-registry'`
                 )
                 .replace(
                     callPattern,

package/src/vite/plugins/externals-plugin.ts

@@ -2,10 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import type { Plugin } from 'vite';
 import { BuildContext, getExternals } from '../../core';
-
-/* Dots are the only valid regex-special character in package names */
-const buildEscapedRegExp = (dependency: string) =>
-    new RegExp(`^${dependency.replace(/\./g, '\\.')}$`);
+import { buildEscapedRegExp } from '../build-escaped-reg-exp';
 
 /*
  * Externalizes shared dependencies by redirecting imports to CJS proxy modules

package/dist/cli/commands/utils/constants.d.ts

@@ -1,2 +0,0 @@
-export declare const DEFAULT_MFE_REGISTRY = "https://verdaccio.servicetitan.com";
-//# sourceMappingURL=constants.d.ts.map

package/dist/cli/commands/utils/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,uCAAuC,CAAC"}

package/dist/cli/commands/utils/constants.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "DEFAULT_MFE_REGISTRY", {
-    enumerable: true,
-    get: function() {
-        return DEFAULT_MFE_REGISTRY;
-    }
-});
-const DEFAULT_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';
-
-//# sourceMappingURL=constants.js.map

package/dist/cli/commands/utils/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/cli/commands/utils/constants.ts"],"sourcesContent":["export const DEFAULT_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';\n"],"names":["DEFAULT_MFE_REGISTRY"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,uBAAuB"}

package/src/cli/commands/utils/constants.ts

@@ -1 +0,0 @@
-export const DEFAULT_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';