@hubspot/ui-extensions-dev-server 0.6.1-next.9 → 0.7.0

package/cli/run.js

@@ -15,7 +15,7 @@ const { loadConfigByPath, loadExtensionConfig } = require('./config');
 
 // eslint-disable-next-line no-floating-promise/no-floating-promise
 (async () => {
-  const { DEV_MODE, BUILD_MODE, extension, help, alpha } = parseArgs();
+  const { DEV_MODE, BUILD_MODE, extension, help } = parseArgs();
 
   if (help || !(DEV_MODE || BUILD_MODE)) {
     showHelp(OUTPUT_DIR);
@@ -31,7 +31,6 @@ const { loadConfigByPath, loadExtensionConfig } = require('./config');
         allExtensionsConfig[path.join(extensionPath, extension)];
     }
     await DevModeInterface.setup({
-      alpha,
       promptUser: inquirer.createPromptModule(),
       components: {
         [appConfig.name]: {

package/cli/utils.js

@@ -14,7 +14,6 @@ function parseArgs() {
   const optionDefinitions = [
     { name: 'port', alias: 'p', type: Number },
     { name: 'extension', alias: 'e', type: String },
-    { name: 'alpha', type: Boolean },
     { name: 'help', alias: 'h', type: Boolean },
   ];
 
@@ -49,10 +48,6 @@ function showHelp(OUTPUT_DIR) {
           description:
             'The extension entrypoint file to build or start local development for',
         },
-        {
-          name: 'alpha',
-          description: 'Run app functions locally.',
-        },
         {
           name: 'help',
           alias: 'h',

package/lib/DevModeInterface.js

@@ -55,11 +55,6 @@ class DevModeInterface {
   }
 
   async setup({
-    // This flag is used for whether to enable local serverless on the dev server pre-INBOUND.
-    // If the user runs `hs project dev --local-all`, the flag is set to true.
-    // By INBOUND, we will remove the flag and make the dev server handle both extensions
-    // and app functions locally.
-    alpha = false,
     debug = false,
     accountId,
     httpClient,
@@ -68,7 +63,6 @@ class DevModeInterface {
     extensionConfig,
     logger,
   }) {
-    this.alpha = alpha;
     this.debug = debug;
     this.accountId = accountId;
     this.httpClient = httpClient;
@@ -111,7 +105,6 @@ class DevModeInterface {
       app: { path: appPath },
       accountId: this.accountId,
       httpClient: this.httpClient,
-      enabled: !!this.alpha,
     };
 
     this.shutdown = await startDevMode({

package/lib/build.js

@@ -52,7 +52,7 @@ async function buildSingleExtension({
       rollupOptions: {
         ...ROLLUP_OPTIONS,
         plugins: [
-          manifestPlugin({ minify, output, logger }),
+          manifestPlugin({ output, logger }),
           codeInjectionPlugin({ file }),
         ],
       },
@@ -75,12 +75,16 @@ async function remoteBuild(
     throw new Error(`${extensionErrorBaseMessage} ${fileInfo.ext}`);
   }
 
+  const output = getUrlSafeFileName(entryPoint);
   await buildSingleExtension({
     file: entryPoint,
+    outputFileName: output,
     outputDir,
+    plugins: {
+      rollup: [manifestPlugin({ minify: true, output, logger })],
+    },
     minify: true,
     root,
-    logger
   });
 }
 

package/lib/dev.js

@@ -27,7 +27,10 @@ async function _createViteDevServer(
         port: websocketPort,
       },
       watch: {
-        ignored: [path.join(outputDir, '/**/*')],
+        ignored: [
+          path.join(outputDir, '/**/*'),
+          '**/src/app/app.functions/**/*',
+        ],
       },
     },
     build: {

package/lib/plugins/codeInjectionPlugin.js

@@ -1,13 +1,16 @@
 const path = require('path');
 
-function codeInjectionPlugin() {
+function codeInjectionPlugin(options = {}) {
+  const { file, root = process.cwd() } = options;
   return {
     name: 'ui-extensions-code-injection-plugin',
     enforce: 'post', // run after default rollup plugins
-    transform(code, file) {
-      const { dir } = path.parse(file);
+    transform(code, fileBeingTransformed) {
+      const absoluteFilePath = path.isAbsolute(file)
+        ? file
+        : path.join(root, file);
 
-      if (dir.includes('node_modules')) {
+      if (fileBeingTransformed !== absoluteFilePath) {
         return { code, map: null }; // Not the file we care about, return the same code
       }
 

package/lib/plugins/devBuildPlugin.js

@@ -2,7 +2,6 @@ const { ROLLUP_OPTIONS, WEBSOCKET_MESSAGE_VERSION } = require('../constants');
 const { build } = require('vite');
 const manifestPlugin = require('./manifestPlugin');
 const { stripAnsiColorCodes } = require('../utils');
-const codeInjectionPlugin = require('./codeInjectionPlugin');
 
 function devBuildPlugin(options = {}) {
   const { extensionConfig, outputDir, baseMessage, logger } = options;
@@ -66,7 +65,6 @@ function devBuildPlugin(options = {}) {
                 output: extensionConfig.output,
                 logger,
               }),
-              codeInjectionPlugin({ file: extensionConfig.data.module.file }),
             ],
             output: {
               ...ROLLUP_OPTIONS.output,
@@ -103,7 +101,7 @@ function devBuildPlugin(options = {}) {
         });
       });
       localServer.ws.on('build', async () => {
-        logger.info('Browser has requested a build, rebuilding');
+        logger.debug('Browser has requested a build, rebuilding');
         const successful = await devBuild(localServer);
         if (successful) {
           server.ws.send({
@@ -121,12 +119,14 @@ function devBuildPlugin(options = {}) {
         return [];
       }
 
+      logger.info(`Extension ${extensionConfig.data.title} updated, compiled`);
+
       if (server.ws.clients.size === 0) {
-        logger.warn('Bundle updated, no browsers connected to notify');
+        logger.debug('Bundle updated, no browsers connected to notify');
         return [];
       }
 
-      logger.info('Bundle updated, notifying connected browsers');
+      logger.debug('Bundle updated, notifying connected browsers');
       server.ws.send({
         ...versionedBaseMessage,
         event: 'update',
@@ -137,7 +137,7 @@ function devBuildPlugin(options = {}) {
       if (error) {
         logger.error(error);
       }
-      logger.info('Sending shutdown message to connected browsers');
+      logger.debug('Sending shutdown message to connected browsers');
       if (localServer && localServer.ws) {
         localServer.ws.send({
           ...versionedBaseMessage,

package/lib/server.js

@@ -21,22 +21,18 @@ function startDevServer({
   app.use(cors());
   app.use(express.static(outputDir));
 
-  const capabilities = functionsConfig.enabled ? SERVER_CAPABILITIES : [];
-
-  if (functionsConfig.enabled) {
-    app.use(
-      '/api/crm-extensibility/execution/internal/v3',
-      AppFunctionExecutionService({ ...functionsConfig, logger })
-    );
-    logger.info('Serving app functions locally');
-  }
+  app.use(
+    '/api/crm-extensibility/execution/internal/v3',
+    AppFunctionExecutionService({ ...functionsConfig, logger })
+  );
+  logger.info('Serving app functions locally');
 
   const endpointsAdded = extensionsService.add(
     app,
     webSocketPort,
     outputDir,
     baseMessage,
-    capabilities
+    SERVER_CAPABILITIES
   );
 
   endpointsAdded.forEach(endpoint => {
@@ -54,7 +50,7 @@ function startDevServer({
     await viteDevServer.pluginContainer.close();
     // Stop new connections to express server
     server.close(() => {});
-    logger.info('Clean up done, exiting.');
+    logger.info('Extension dev server done cleaning up');
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/ui-extensions-dev-server",
-  "version": "0.6.1-next.9+85660802",
+  "version": "0.7.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@hubspot/app-functions-dev-server": "^0.6.0",
+    "@hubspot/app-functions-dev-server": "^0.7.0",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^7.0.1",
     "console-log-colors": "^0.4.0",
@@ -67,5 +67,5 @@
       "optional": true
     }
   },
-  "gitHead": "85660802fede329b3da761adabb509cb9f376d3e"
+  "gitHead": "60f780b26b92ab097b24f162bf485fde5fd26528"
 }