@hubspot/ui-extensions-dev-server 0.8.9 → 0.8.12

package/dist/lib/DevModeInterface.d.ts

@@ -1,23 +1,18 @@
-import type { ExtensionConfig, PlatformVersion, ProjectComponentMap } from './types';
-import type { ServiceConfiguration } from '@hubspot/app-functions-dev-server/dist/types';
+import { ExtensionConfig, Logger, PlatformVersion, ProjectComponentMap, ProjectConfig } from './types';
 import { PromptModule } from 'inquirer';
 import { DevServerState } from './DevServerState';
 interface SetupArguments {
     components: ProjectComponentMap;
-    debug?: boolean;
-    extensionConfig?: ExtensionConfig;
     onUploadRequired?: VoidFunction;
     promptUser: PromptModule;
-}
-interface ProjectConfig {
-    name: string;
-    srcDir: string;
-    platformVersion?: PlatformVersion;
+    logger: Logger;
+    urls: {
+        api: string;
+        web: string;
+    };
 }
 interface StartArguments {
     accountId?: number;
-    debug?: boolean;
-    httpClient?: ServiceConfiguration['httpClient'];
     requestPorts?: (requestPortsData: Array<{
         instanceId: string;
         port?: number;
@@ -35,11 +30,15 @@ declare class DevModeInterface {
     devServerState?: DevServerState;
     onUploadRequired?: VoidFunction;
     shutdown?: () => Promise<void>;
+    logger: Logger;
+    urls?: SetupArguments['urls'];
+    isConfigured?: boolean;
+    isRunning?: boolean;
     _generateAppExtensionMappings(components: ProjectComponentMap): AppExtensionMapping[];
     _getPlatformVersion(projectConfig?: ProjectConfig): PlatformVersion;
-    setup({ components, debug, extensionConfig, onUploadRequired, promptUser, }: SetupArguments): Promise<void>;
+    setup({ components, onUploadRequired, promptUser, logger, urls, }: SetupArguments): Promise<void>;
     fileChange(filePath: string, __event: unknown): Promise<void>;
-    start({ requestPorts, accountId, debug, httpClient, projectConfig, }: StartArguments): Promise<void>;
+    start({ requestPorts, accountId, projectConfig }: StartArguments): Promise<void>;
     cleanup(): Promise<void>;
 }
 declare const _default: DevModeInterface;

package/dist/lib/DevModeInterface.js

@@ -15,19 +15,33 @@ const dev_1 = require("./dev");
 const constants_1 = require("./constants");
 const constants_2 = require("./constants");
 const config_1 = require("./config");
-// @ts-expect-error no type defs
-const logger_1 = require("@hubspot/cli-lib/logger");
 const DevServerState_1 = require("./DevServerState");
 const utils_1 = require("./utils");
+const defaultLogger = {
+    info: (...args) => {
+        console.log(...args);
+    },
+    debug: (...args) => {
+        console.log(...args);
+    },
+    warn: (...args) => {
+        console.error(...args);
+    },
+    error: (...args) => {
+        console.error(...args);
+    },
+};
 class DevModeInterface {
+    constructor() {
+        this.logger = defaultLogger;
+    }
     _generateAppExtensionMappings(components) {
         // Loop over all of the app configs that are passed in
         const allComponentNames = Object.keys(components);
         return allComponentNames.reduce((appExtensionMappings, componentName) => {
-            var _a, _b;
             const component = components[componentName];
-            if (!((_b = (_a = component.config.extensions) === null || _a === void 0 ? void 0 : _a.crm) === null || _b === void 0 ? void 0 : _b.cards)) {
-                return appExtensionMappings; // It's not an app
+            if (!constants_1.SUPPORTED_APP_TYPES.includes(component.type)) {
+                return appExtensionMappings; // It's not a modern app, skip it
             }
             // Load all of the extension configs for a particular app.json file
             const extensionsConfigForApp = (0, config_1.loadExtensionConfig)(component.config, component.path);
@@ -57,14 +71,16 @@ class DevModeInterface {
                 return (0, utils_1.throwUnhandledPlatformVersionError)(platformVersion);
         }
     }
-    setup({ components, debug = false, extensionConfig, onUploadRequired, promptUser, }) {
+    setup({ components, onUploadRequired, promptUser, logger, urls, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, logger_1.setLogLevel)(debug ? logger_1.LOG_LEVEL.DEBUG : logger_1.LOG_LEVEL.LOG);
-            this.onUploadRequired = onUploadRequired;
-            if (extensionConfig) {
-                this.configs = [extensionConfig];
+            logger.debug('Setup function was invoked', { components, urls });
+            if (this.isConfigured) {
+                logger.debug('Dev server has already been configured, skipping');
                 return;
             }
+            this.logger = logger;
+            this.onUploadRequired = onUploadRequired;
+            this.urls = urls;
             const choices = this._generateAppExtensionMappings(components);
             if (choices.length === 0) {
                 throw new Error('No extensions to run');
@@ -91,6 +107,7 @@ class DevModeInterface {
                 });
                 this.configs = answers.extensions;
             }
+            this.isConfigured = true;
         });
     }
     // The contract is for this to be async, so eslint can chill
@@ -106,10 +123,15 @@ class DevModeInterface {
             }
         });
     }
-    start({ requestPorts, accountId, debug, httpClient, projectConfig, }) {
+    start({ requestPorts, accountId, projectConfig }) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (debug !== undefined) {
-                (0, logger_1.setLogLevel)(debug ? logger_1.LOG_LEVEL.DEBUG : logger_1.LOG_LEVEL.LOG);
+            this.logger.debug('Start function was invoked', {
+                accountId,
+                projectConfig,
+            });
+            if (this.isRunning) {
+                this.logger.debug('Dev server is already running, not starting again');
+                return;
             }
             let expressPort = constants_1.EXPRESS_DEFAULT_PORT;
             let webSocketPort = constants_1.WEBSOCKET_DEFAULT_PORT;
@@ -123,28 +145,32 @@ class DevModeInterface {
                     webSocketPort = portData[constants_1.VITE_DEV_SERVER_ID];
                 }
                 catch (e) {
-                    logger_1.logger.debug('Call to port manager failed, using default ports');
+                    this.logger.debug('Call to port manager failed, using default ports');
                 }
             }
             this.devServerState = new DevServerState_1.DevServerState({
                 extensionConfigs: this.configs,
                 accountId,
-                httpClient,
                 platformVersion: this._getPlatformVersion(projectConfig),
                 expressPort,
                 webSocketPort,
+                logger: this.logger,
+                urls: this.urls,
             });
             this.shutdown = yield (0, dev_1.startDevMode)(this.devServerState);
-            this.devServerState.extensionsMetadata.forEach((metadata) => {
+            const { extensionsMetadata } = this.devServerState;
+            extensionsMetadata.forEach((metadata) => {
                 const { config: { data: { title, appName }, }, } = metadata;
-                logger_1.logger.info(`Running extension '${title}' from app '${appName}'`);
+                this.logger.info(`Running extension '${title}' from app '${appName}'`);
             });
+            this.isRunning = true;
         });
     }
     cleanup() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.shutdown) {
+            if (this.shutdown && this.isRunning) {
                 yield this.shutdown();
+                this.isRunning = false;
             }
         });
     }

package/dist/lib/DevServerState.d.ts

@@ -1,12 +1,16 @@
-import { ExtensionConfig, ExtensionMetadata, PlatformVersion } from './types';
+import { ExtensionConfig, ExtensionMetadata, Logger, PlatformVersion } from './types';
 import { ServiceConfiguration } from '@hubspot/app-functions-dev-server/dist/types';
 interface DevServerStateArgs {
     extensionConfigs?: ExtensionConfig[];
     accountId: number | undefined;
-    httpClient: ServiceConfiguration['httpClient'] | undefined;
     expressPort: number;
     webSocketPort: number;
     platformVersion: PlatformVersion;
+    logger: Logger;
+    urls: {
+        api: string;
+        web: string;
+    };
 }
 export declare class DevServerState {
     private _webSocketPort;
@@ -16,7 +20,8 @@ export declare class DevServerState {
     private _appPath;
     private _extensionsMetadata;
     private _portalId?;
-    constructor({ extensionConfigs, accountId, httpClient, expressPort, webSocketPort, platformVersion, }: DevServerStateArgs);
+    logger: Logger;
+    constructor({ extensionConfigs, accountId, expressPort, webSocketPort, platformVersion, logger, urls, }: DevServerStateArgs);
     get portalId(): number | undefined;
     get webSocketPort(): number;
     get expressPort(): number;

package/dist/lib/DevServerState.js

@@ -7,7 +7,7 @@ exports.DevServerState = void 0;
 const constants_1 = require("./constants");
 const path_1 = __importDefault(require("path"));
 class DevServerState {
-    constructor({ extensionConfigs, accountId, httpClient, expressPort, webSocketPort, platformVersion, }) {
+    constructor({ extensionConfigs, accountId, expressPort, webSocketPort, platformVersion, logger, urls, }) {
         if (!extensionConfigs) {
             throw new Error('Unable to load the required extension configuration files');
         }
@@ -35,9 +35,11 @@ class DevServerState {
         this._functionsConfig = {
             app: { path: this._appPath },
             accountId,
-            httpClient,
             platformVersion,
+            hubspotApiOrigin: urls.api,
+            hubspotWebsiteOrigin: urls.web,
         };
+        this.logger = logger;
         Object.freeze(this);
     }
     get portalId() {

package/dist/lib/build.js

@@ -18,8 +18,8 @@ const constants_1 = require("./constants");
 const manifestPlugin_1 = __importDefault(require("./plugins/manifestPlugin"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
-const codeInjectionPlugin_1 = __importDefault(require("./plugins/codeInjectionPlugin"));
 const codeBlockingPlugin_1 = __importDefault(require("./plugins/codeBlockingPlugin"));
+const friendlyLoggingPlugin_1 = __importDefault(require("./plugins/friendlyLoggingPlugin"));
 const allowedExtensions = ['.js', '.ts', '.tsx', '.jsx'];
 exports.extensionErrorBaseMessage = `Supported file extensions are [${allowedExtensions.join(', ')}], received:`;
 function buildSingleExtension({ file, outputDir = constants_1.OUTPUT_DIR, emptyOutDir = true, minify = false, root = process.cwd(), // This is the vite default, so using that as our default
@@ -39,9 +39,9 @@ function buildSingleExtension({ file, outputDir = constants_1.OUTPUT_DIR, emptyO
                     fileName: () => output,
                 },
                 rollupOptions: Object.assign(Object.assign({}, constants_1.ROLLUP_OPTIONS), { plugins: [
-                        (0, manifestPlugin_1.default)({ output, extensionPath: root }),
-                        (0, codeInjectionPlugin_1.default)({ file }),
-                        (0, codeBlockingPlugin_1.default)(),
+                        (0, manifestPlugin_1.default)({ output, extensionPath: root, logger: console }),
+                        (0, friendlyLoggingPlugin_1.default)({ logger: console }),
+                        (0, codeBlockingPlugin_1.default)({ logger: console }),
                     ] }),
                 outDir: outputDir,
                 emptyOutDir,

package/dist/lib/constants.d.ts

@@ -1,5 +1,4 @@
 export declare const OUTPUT_DIR = "dist";
-export declare const MAIN_APP_CONFIG = "app.json";
 export declare const MANIFEST_FILE = "manifest.json";
 export declare const EXPRESS_SERVER_ID = "ui-extensions-dev-server";
 export declare const VITE_DEV_SERVER_ID = "ui-extensions-vite-dev-server";
@@ -22,3 +21,6 @@ export declare const PLATFORM_VERSION: {
     readonly V20231: "2023.1";
     readonly V20232: "2023.2";
 };
+export declare const PUBLIC_APP = "public-app";
+export declare const PRIVATE_APP = "private-app";
+export declare const SUPPORTED_APP_TYPES: string[];

package/dist/lib/constants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLATFORM_VERSION = exports.SERVER_CAPABILITIES = exports.WEBSOCKET_MESSAGE_VERSION = exports.EXTENSIONS_MESSAGE_VERSION = exports.ROLLUP_OPTIONS = exports.WEBSOCKET_DEFAULT_PORT = exports.EXPRESS_DEFAULT_PORT = exports.VITE_DEV_SERVER_ID = exports.EXPRESS_SERVER_ID = exports.MANIFEST_FILE = exports.MAIN_APP_CONFIG = exports.OUTPUT_DIR = void 0;
+exports.SUPPORTED_APP_TYPES = exports.PRIVATE_APP = exports.PUBLIC_APP = exports.PLATFORM_VERSION = exports.SERVER_CAPABILITIES = exports.WEBSOCKET_MESSAGE_VERSION = exports.EXTENSIONS_MESSAGE_VERSION = exports.ROLLUP_OPTIONS = exports.WEBSOCKET_DEFAULT_PORT = exports.EXPRESS_DEFAULT_PORT = exports.VITE_DEV_SERVER_ID = exports.EXPRESS_SERVER_ID = exports.MANIFEST_FILE = exports.OUTPUT_DIR = void 0;
 exports.OUTPUT_DIR = 'dist';
-exports.MAIN_APP_CONFIG = 'app.json';
 exports.MANIFEST_FILE = 'manifest.json';
 exports.EXPRESS_SERVER_ID = 'ui-extensions-dev-server';
 exports.VITE_DEV_SERVER_ID = 'ui-extensions-vite-dev-server';
@@ -32,3 +31,8 @@ exports.PLATFORM_VERSION = {
     V20231: '2023.1',
     V20232: '2023.2',
 };
+exports.PUBLIC_APP = 'public-app';
+// You gotta be kidding me linter
+// eslint-disable-next-line hubspot-dev/no-private-classes
+exports.PRIVATE_APP = 'private-app';
+exports.SUPPORTED_APP_TYPES = [exports.PUBLIC_APP, exports.PRIVATE_APP];

package/dist/lib/extensionsService.d.ts

@@ -1,7 +1,5 @@
-import { Response } from 'express/lib/response';
-import { Request } from 'express/lib/request';
-import { Application } from 'express/lib/application';
 import { DevServerState } from './DevServerState';
+import { Request, Response, Application } from 'express';
 declare class ExtensionsService {
     endpoint: string;
     constructor();

package/dist/lib/plugins/codeBlockingPlugin.d.ts

@@ -1,4 +1,7 @@
 import { Rollup } from 'vite';
-export type CodeBlockingPlugin = () => Rollup.Plugin;
+import { Logger } from '../types';
+export type CodeBlockingPlugin = ({ logger, }: {
+    logger: Logger;
+}) => Rollup.Plugin;
 declare const codeBlockingPlugin: CodeBlockingPlugin;
 export default codeBlockingPlugin;

package/dist/lib/plugins/codeBlockingPlugin.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const ast_1 = require("../ast");
-// @ts-expect-error no types
-const logger_1 = require("@hubspot/cli-lib/logger");
-const codeBlockingPlugin = () => {
+const codeBlockingPlugin = ({ logger }) => {
     return {
         name: 'ui-extensions-code-blocking-plugin',
         enforce: 'post',
@@ -25,12 +23,12 @@ const codeBlockingPlugin = () => {
                 ]);
             }
             catch (e) {
-                logger_1.logger.debug('Unable to parse and traverse source code');
+                logger.debug('Unable to parse and traverse source code');
                 return { code, map: null };
             }
             if (sourceCodeMetadata.functions[requireFunctionName] &&
                 sourceCodeMetadata.functions[requireFunctionName].scope === 'Global') {
-                logger_1.logger.warn('require statements are not supported, replace require statements with import');
+                logger.warn('require statements are not supported, replace require statements with import');
             }
             return { code, map: null };
         },

package/dist/lib/plugins/codeCheckingPlugin.d.ts

@@ -1,6 +1,8 @@
 import { Rollup } from 'vite';
+import { Logger } from '../types';
 export interface CodeCheckingPluginOptions {
     output: string;
+    logger: Logger;
 }
 export type CodeCheckingPlugin = (options: CodeCheckingPluginOptions) => Rollup.Plugin;
 declare const codeCheckingPlugin: CodeCheckingPlugin;

package/dist/lib/plugins/codeCheckingPlugin.js

@@ -4,10 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-// @ts-expect-error no type defs for the logger
-const logger_1 = require("@hubspot/cli-lib/logger");
 const codeCheckingPlugin = (options) => {
-    const { output } = options;
+    const { output, logger } = options;
     return {
         name: 'ui-extensions-code-checking-plugin',
         enforce: 'post',
@@ -16,11 +14,11 @@ const codeCheckingPlugin = (options) => {
                 const code = fs_1.default.readFileSync(output).toString();
                 if (!code.includes('const extend = (...args) => self.extend(...args);') &&
                     !code.includes('self.extend_V2(renderExtensionCallback)')) {
-                    logger_1.logger.warn('Unable to determine if your extension entry point is calling hubspot.extend, this may prevent it from rendering as expected');
+                    logger.warn('Unable to determine if your extension entry point is calling hubspot.extend, this may prevent it from rendering as expected');
                 }
             }
             catch (e) {
-                logger_1.logger.error('Unable to load bundle for code checking');
+                logger.error('Unable to load bundle for code checking');
             }
         },
     };

package/dist/lib/plugins/devBuildPlugin.js

@@ -43,8 +43,6 @@ const manifestPlugin_1 = __importDefault(require("./manifestPlugin"));
 const utils_1 = require("../utils");
 const codeCheckingPlugin_1 = __importDefault(require("./codeCheckingPlugin"));
 const path_1 = __importDefault(require("path"));
-// @ts-expect-error no type defs
-const logger_1 = require("@hubspot/cli-lib/logger");
 const friendlyLoggingPlugin_1 = __importDefault(require("./friendlyLoggingPlugin"));
 const relevantModulesPlugin_1 = __importStar(require("./relevantModulesPlugin"));
 const codeBlockingPlugin_1 = __importDefault(require("./codeBlockingPlugin"));
@@ -53,6 +51,7 @@ function addVersionToBaseMessage(baseMessage) {
 }
 const devBuildPlugin = (options) => {
     const { devServerState } = options;
+    const { logger } = devServerState;
     let lastBuildErrorContext;
     const handleBuildError = (error, server) => {
         const { error: { plugin, errors, frame, loc, id }, extensionMetadata, } = error;
@@ -97,13 +96,18 @@ const devBuildPlugin = (options) => {
                                 minify: false,
                                 output: extensionConfig.output,
                                 extensionPath: extensionConfig.extensionPath,
+                                logger,
                             }),
                             (0, codeCheckingPlugin_1.default)({
                                 output: path_1.default.join(devServerState.outputDir, extensionConfig.output),
+                                logger,
                             }),
-                            (0, friendlyLoggingPlugin_1.default)(),
-                            (0, relevantModulesPlugin_1.default)({ output: extensionConfig.output }),
-                            (0, codeBlockingPlugin_1.default)(),
+                            (0, friendlyLoggingPlugin_1.default)({ logger }),
+                            (0, relevantModulesPlugin_1.default)({
+                                output: extensionConfig.output,
+                                logger,
+                            }),
+                            (0, codeBlockingPlugin_1.default)({ logger }),
                         ], output: Object.assign(Object.assign({}, constants_1.ROLLUP_OPTIONS.output), { sourcemap: 'inline' }) }),
                     outDir: devServerState.outputDir,
                     emptyOutDir,
@@ -119,7 +123,7 @@ const devBuildPlugin = (options) => {
                 error: error,
                 extensionMetadata,
             };
-            logger_1.logger.debug(error);
+            logger.debug(error);
             handleBuildError(lastBuildErrorContext, server);
             return false;
         }
@@ -133,7 +137,7 @@ const devBuildPlugin = (options) => {
             // See https://vitejs.dev/guide/api-plugin.html#configureserver for information on this pattern
             localServer = server;
             localServer.ws.on('connection', () => {
-                logger_1.logger.info('Browser connected and listening for bundle updates');
+                logger.info('Browser connected and listening for bundle updates');
                 devServerState.extensionsMetadata.forEach((metadata) => {
                     // @ts-expect-error Our websocket messages don't match Vite format
                     localServer.ws.send(Object.assign(Object.assign({}, addVersionToBaseMessage(metadata.baseMessage)), { event: 'start' }));
@@ -159,12 +163,12 @@ const devBuildPlugin = (options) => {
                     return [];
                 }
                 const { config: extensionConfig } = toRebuild;
-                logger_1.logger.info(`Extension ${extensionConfig.data.title} updated, compiled`);
+                logger.info(`Extension ${extensionConfig.data.title} updated, compiled`);
                 if (server.ws.clients.size === 0) {
-                    logger_1.logger.debug('Bundle updated, no browsers connected to notify');
+                    logger.debug('Bundle updated, no browsers connected to notify');
                     return [];
                 }
-                logger_1.logger.debug('Bundle updated, notifying connected browsers');
+                logger.debug('Bundle updated, notifying connected browsers');
                 // @ts-expect-error Our websocket messages don't match Vite format
                 server.ws.send(Object.assign(Object.assign({}, addVersionToBaseMessage(toRebuild.baseMessage)), { event: 'update' }));
             }
@@ -172,10 +176,10 @@ const devBuildPlugin = (options) => {
         }),
         buildEnd(error) {
             if (error) {
-                logger_1.logger.error(error);
+                logger.error(error);
             }
             if (localServer && localServer.ws) {
-                logger_1.logger.debug('Sending shutdown message to connected browsers');
+                logger.debug('Sending shutdown message to connected browsers');
                 devServerState.extensionsMetadata.forEach((metadata) => {
                     // @ts-expect-error Our websocket messages don't match Vite format
                     localServer.ws.send(Object.assign(Object.assign({}, addVersionToBaseMessage(metadata.baseMessage)), { event: 'shutdown' }));

package/dist/lib/plugins/friendlyLoggingPlugin.d.ts

@@ -1,11 +1,14 @@
-import { RollupLog } from 'rollup';
+import { RollupLog, LogLevel } from 'rollup';
 import Vite from 'vite';
+import { Logger } from '../types';
 export interface MappedLog {
     message?: string;
-    level?: 'error' | 'info' | 'warning' | 'debug';
+    level?: 'error' | LogLevel;
 }
 export interface CodeToLogMapper {
     [key: string]: (loggable: RollupLog) => MappedLog;
 }
-declare function friendlyLoggingPlugin(): Vite.Plugin;
+declare function friendlyLoggingPlugin({ logger }: {
+    logger: Logger;
+}): Vite.Plugin;
 export default friendlyLoggingPlugin;

package/dist/lib/plugins/friendlyLoggingPlugin.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-expect-error no type defs
-const logger_1 = require("@hubspot/cli-lib/logger");
 const path_1 = __importDefault(require("path"));
 const unfriendlyCodeMapper = Object.freeze({
     UNRESOLVED_IMPORT: (loggable) => {
@@ -22,7 +20,7 @@ const unfriendlyCodeMapper = Object.freeze({
     },
 });
 const unfriendlyCodeList = Object.freeze(Object.keys(unfriendlyCodeMapper));
-function friendlyLoggingPlugin() {
+function friendlyLoggingPlugin({ logger }) {
     return {
         name: 'ui-extensions-friendly-logging-plugin',
         enforce: 'post',
@@ -30,7 +28,7 @@ function friendlyLoggingPlugin() {
             if (unfriendlyCodeList.includes(log.code || '')) {
                 const { message, level } = _mapMessageToFriendlyVersion(log);
                 if (message && level) {
-                    logger_1.logger[level](message);
+                    logger[level](message);
                 }
                 return false; // Filter the log message
             }

package/dist/lib/plugins/manifestPlugin.d.ts

@@ -1,8 +1,10 @@
 import { Rollup } from 'vite';
+import { Logger } from '../types';
 export interface ManifestPluginOptions {
     output: string;
     minify?: boolean;
     extensionPath?: string;
+    logger: Logger;
 }
 export type ManifestPlugin = (options: ManifestPluginOptions) => Rollup.Plugin;
 declare const manifestPlugin: ManifestPlugin;

package/dist/lib/plugins/manifestPlugin.js

@@ -9,8 +9,6 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const constants_1 = require("../constants");
 const path_2 = __importDefault(require("path"));
-// @ts-expect-error no type defs for the logger
-const logger_1 = require("@hubspot/cli-lib/logger");
 const utils_1 = require("../utils");
 const PACKAGE_LOCK_FILE = 'package-lock.json';
 const PACKAGE_FILE = 'package.json';
@@ -20,7 +18,7 @@ const manifestPlugin = (options) => {
         name: 'ui-extensions-manifest-generation-plugin',
         enforce: 'post',
         generateBundle(_rollupOptions, bundle) {
-            const { output, minify = false, extensionPath = process.cwd() } = options;
+            const { output, minify = false, extensionPath = process.cwd(), logger, } = options;
             try {
                 const filename = path_2.default.parse(output).name;
                 const manifest = _generateManifestContents(bundle, extensionPath);
@@ -33,7 +31,7 @@ const manifestPlugin = (options) => {
                 });
             }
             catch (e) {
-                logger_1.logger.warn(`\nUnable to write manifest file in ${output}, ${e}`);
+                logger.warn(`\nUnable to write manifest file in ${output}, ${e}`);
             }
         },
     };

package/dist/lib/plugins/relevantModulesPlugin.d.ts

@@ -1,10 +1,12 @@
 import Vite from 'vite';
+import { Logger } from '../types';
 export interface RelevantModules {
     [key: string]: string[];
 }
 export declare function getRelevantModules(output: string): string[];
 export interface RelevantModulesPluginOptions {
     output: string;
+    logger: Logger;
 }
 export type RelevantModulesPlugin = (options: RelevantModulesPluginOptions) => Vite.Plugin;
 declare const relevantModulesPlugin: RelevantModulesPlugin;

package/dist/lib/plugins/relevantModulesPlugin.js

@@ -2,26 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelevantModules = void 0;
 const utils_1 = require("../utils");
-// @ts-expect-error no type defs for the logger
-const logger_1 = require("@hubspot/cli-lib/logger");
 const relevantModules = {};
 function getRelevantModules(output) {
     return relevantModules[output] || [];
 }
 exports.getRelevantModules = getRelevantModules;
-const relevantModulesPlugin = ({ output }) => {
+const relevantModulesPlugin = ({ output, logger }) => {
     return {
         name: 'ui-extensions-relevant-modules-plugin',
         generateBundle(_options, bundle) {
             const subBundle = bundle[output];
             if (!subBundle || !subBundle.moduleIds) {
                 // If this happens, something has gone horribly wrong
-                logger_1.logger.error('Invalid bundle format, please try saving the extension again.  If the problem persists try restarting `hs project dev`');
+                logger.error('Invalid bundle format, please try saving the extension again.  If the problem persists try restarting `hs project dev`');
                 return;
             }
             const updatedRelevantModules = subBundle.moduleIds.filter((moduleId) => !(0, utils_1.isNodeModule)(moduleId));
             if (updatedRelevantModules.length === 0) {
-                logger_1.logger.error('Unable to determine relevant files to watch, please try saving the extension again. If the problem persists try restarting `hs project dev`');
+                logger.error('Unable to determine relevant files to watch, please try saving the extension again. If the problem persists try restarting `hs project dev`');
                 return;
             }
             relevantModules[output] = updatedRelevantModules;

package/dist/lib/server.js

@@ -19,8 +19,6 @@ const cors_1 = __importDefault(require("cors"));
 const constants_1 = require("./constants");
 const extensionsService_1 = __importDefault(require("./extensionsService"));
 const app_functions_dev_server_1 = require("@hubspot/app-functions-dev-server");
-// @ts-expect-error no type defs
-const logger_1 = require("@hubspot/cli-lib/logger");
 function listen(app, port) {
     return new Promise((resolve, reject) => {
         const server = app
@@ -39,12 +37,12 @@ function startDevServer({ devServerState, viteDevServer, }) {
         // Setup middleware
         app.use((0, cors_1.default)());
         app.use(express_1.default.static(devServerState.outputDir));
-        app.use('/api/crm-extensibility/execution/internal/v3', (0, app_functions_dev_server_1.AppFunctionExecutionService)(Object.assign(Object.assign({}, devServerState.functionsConfig), { logger: logger_1.logger })));
-        logger_1.logger.info(`Serving app functions locally (platform version ${devServerState.functionsConfig.platformVersion})`);
+        app.use('/api/crm-extensibility/execution/internal/v3', (0, app_functions_dev_server_1.AppFunctionExecutionService)(Object.assign(Object.assign({}, devServerState.functionsConfig), { logger: devServerState.logger })));
+        devServerState.logger.info(`Serving app functions locally (platform version ${devServerState.functionsConfig.platformVersion})`);
         const endpointsAdded = extensionsService_1.default.add(app, devServerState, constants_1.SERVER_CAPABILITIES);
         const { expressPort } = devServerState;
         endpointsAdded.forEach((endpoint) => {
-            logger_1.logger.debug(`Listening at http://hslocal.net:${expressPort}${endpoint}`);
+            devServerState.logger.debug(`Listening at http://hslocal.net:${expressPort}${endpoint}`);
         });
         // Vite middlewares needs to go last because it's greedy and will block other middleware
         app.use(viteDevServer.middlewares);
@@ -60,14 +58,14 @@ function startDevServer({ devServerState, viteDevServer, }) {
         }
         (_a = devServerState.extensionsMetadata) === null || _a === void 0 ? void 0 : _a.forEach((metadata) => {
             const { baseMessage } = metadata;
-            logger_1.logger.debug(`Listening at ${baseMessage.callback}`);
+            devServerState.logger.debug(`Listening at ${baseMessage.callback}`);
         });
         return function shutdown() {
             return __awaiter(this, void 0, void 0, function* () {
                 yield viteDevServer.pluginContainer.close();
                 // Stop new connections to express server
                 server.close(() => { });
-                logger_1.logger.info('Extension dev server done cleaning up');
+                devServerState.logger.info('Extension dev server done cleaning up');
             });
         };
     });

package/dist/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { PLATFORM_VERSION } from './constants';
+import { PLATFORM_VERSION, PRIVATE_APP, PUBLIC_APP } from './constants';
 export interface ObjectTypes {
     name: string;
 }
@@ -26,7 +26,12 @@ export interface ExtensionConfigMap {
 interface CardConfig {
     file: string;
 }
-export interface AppConfig {
+export interface ProjectConfig {
+    name: string;
+    srcDir: string;
+    platformVersion?: PlatformVersion;
+}
+export interface PrivateAppConfig {
     name: string;
     description: string;
     scopes: string[];
@@ -38,7 +43,35 @@ export interface AppConfig {
     };
     uid?: string;
 }
+export interface PublicAppConfig {
+    name: string;
+    uid: string;
+    logo?: string;
+    description?: string;
+    allowedExternalUrls?: string[];
+    auth?: {
+        preventAdditionalScopes: boolean;
+        preventOptionalScopes: boolean;
+        redirectUrls: string[];
+        requiredScopes: string[];
+        optionalScopes: string[];
+        additionalScopes: string[];
+    };
+    support?: {
+        supportUrl: string;
+        supportEmail: string;
+        documentationUrl: string;
+        supportPhone: string;
+    };
+    extensions: {
+        crm: {
+            cards: CardConfig[];
+        };
+    };
+}
+export type AppConfig = PrivateAppConfig | PublicAppConfig;
 export interface ProjectComponent {
+    type: typeof PUBLIC_APP | typeof PRIVATE_APP;
     config: AppConfig;
     path: string;
 }
@@ -71,4 +104,10 @@ export interface FunctionInvocationCheck {
     functionName: string;
 }
 export type SourceCodeChecks = FunctionInvocationCheck[];
+export interface Logger {
+    info: (...args: any[]) => void;
+    debug: (...args: any[]) => void;
+    warn: (...args: any[]) => void;
+    error: (...args: any[]) => void;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/ui-extensions-dev-server",
-  "version": "0.8.9",
+  "version": "0.8.12",
   "description": "",
   "scripts": {
     "test": "jest",
@@ -10,14 +10,15 @@
     "prepare": "npm run build",
     "lint": "echo 'no lint step for @hubspot/ui-extensions-dev-server'",
     "jest": "jest --watch",
-    "integration-test": "npm run build && npm run integration-test --prefix ./integrationTests/fixtures"
+    "integration-test-private-app": "npm run integration-test-private-app --prefix ./integrationTests/fixtures",
+    "integration-test-public-app": "npm run integration-test-public-app --prefix ./integrationTests/fixtures",
+    "integration-test": "npm run build && npm run integration-test-private-app && npm run integration-test-public-app"
   },
   "publishConfig": {
     "access": "public"
   },
   "exports": {
-    ".": "./dist/index.js",
-    "./self": "./dist/lib/self.js"
+    ".": "./dist/index.js"
   },
   "files": [
     "dist",
@@ -25,11 +26,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@hubspot/app-functions-dev-server": "^0.8.9",
-    "@hubspot/cli-lib": "^4.1.6",
-    "command-line-args": "^5.2.1",
-    "command-line-usage": "^7.0.1",
-    "console-log-colors": "^0.4.0",
+    "@hubspot/app-functions-dev-server": "^0.8.11",
     "cors": "^2.8.5",
     "detect-port": "1.5.1",
     "estraverse": "^5.3.0",
@@ -39,7 +36,7 @@
   },
   "devDependencies": {
     "@types/estree": "^1.0.5",
-    "@types/express": "types/express",
+    "@types/express": "^4.17.17",
     "@types/inquirer": "^9.0.3",
     "@types/jest": "^29.5.4",
     "acorn": "^8.11.2",
@@ -67,5 +64,5 @@
       "optional": true
     }
   },
-  "gitHead": "03c10fd116330e174654829acfa99c5e41ff870e"
+  "gitHead": "de63cea5e941c10de794210c1a095ae2468d6a9d"
 }

package/dist/lib/plugins/codeInjectionPlugin.d.ts

@@ -1,8 +0,0 @@
-import { Rollup } from 'vite';
-export interface CodeInjectionPluginOptions {
-    file: string;
-    root?: string;
-}
-export type CodeInjectionPlugin = (options: CodeInjectionPluginOptions) => Rollup.Plugin;
-declare const codeInjectionPlugin: CodeInjectionPlugin;
-export default codeInjectionPlugin;

package/dist/lib/plugins/codeInjectionPlugin.js

@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const codeInjectionPlugin = (options) => {
-    const { file, root = process.cwd() } = options;
-    return {
-        name: 'ui-extensions-code-injection-plugin',
-        enforce: 'post',
-        transform(code, fileBeingTransformed) {
-            const absoluteFilePath = path_1.default.isAbsolute(file)
-                ? file
-                : path_1.default.join(root, file);
-            if (fileBeingTransformed !== absoluteFilePath) {
-                return { code, map: null }; // Not the file we care about, return the same code
-            }
-            // Update the code to import the self script which houses our overrides
-            // This needs to be the first line in the source file so that the overrides get hoisted
-            // to the top of the generated source file
-            const updatedCode = `import "@hubspot/ui-extensions-dev-server/self"; ${code}`;
-            // Return the updated source code.  We don't need to include the new code in the
-            // sourcemap because we don't want it to show up in the users code when they
-            // view the source mapped code in the browser
-            return { code: updatedCode, map: null };
-        },
-    };
-};
-exports.default = codeInjectionPlugin;

package/dist/lib/self.js

@@ -1,4 +0,0 @@
-"use strict";
-/* eslint-disable hubspot-dev/no-confusing-browser-globals */
-// Set methods on the self object to undefined so they are not available within the worker code
-self.importScripts = undefined;