Fix dev server (#5333)

* Fix dev server * Clean up
microsoft · Oct 25, 2024 · e6bfd8a · e6bfd8a
1 parent 51385f7
commit e6bfd8a
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 135 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bundle/package.json b/packages/bundle/package.json
@@ -56,9 +56,7 @@
     "precommit:eslint": "../../node_modules/.bin/eslint --report-unused-disable-directives --max-warnings 0",
     "precommit:typecheck": "tsc --project ./src --emitDeclarationOnly false --esModuleInterop true --noEmit --pretty false",
     "preversion": "cat package.json | jq '(.localDependencies // {} | to_entries | map([if .value == \"production\" then \"dependencies\" else \"devDependencies\" end, .key])) as $P | delpaths($P)' > package-temp.json && mv package-temp.json package.json",
-    "start": "concurrently --kill-others --prefix-colors \"auto\" \"npm:start:*\"",
-    "start:devserver": "node ./scripts/devServer.mjs",
-    "start:tsup": "npm run build:tsup -- --watch"
+    "start": "npm run build:tsup -- --watch"
   },
   "localDependencies": {
     "botframework-directlinespeech-sdk": "production",

diff --git a/packages/bundle/scripts/.eslintrc.yml b/packages/bundle/scripts/.eslintrc.yml
diff --git a/packages/bundle/scripts/devServer.mjs b/packages/bundle/scripts/devServer.mjs
diff --git a/packages/test/dev-server/package.json b/packages/test/dev-server/package.json
@@ -23,11 +23,8 @@
     ]
   },
   "devDependencies": {
-    "chalk": "^5.3.0",
     "compression": "^1.7.4",
     "express": "^4.19.2",
-    "http-proxy-middleware": "^2.0.6",
     "serve-handler": "^6.1.5"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/packages/test/dev-server/src/index.js b/packages/test/dev-server/src/index.js
@@ -1,13 +1,11 @@
-import chalk from 'chalk';
 import compression from 'compression';
 import express from 'express';
 import { readFile } from 'fs/promises';
-import { createProxyMiddleware } from 'http-proxy-middleware';
 import { resolve } from 'path';
 import serve from 'serve-handler';
 import { fileURLToPath } from 'url';
 
-const { ESBUILD_TARGET = 'http://127.0.0.1:8000/', PORT = 5001 } = process.env;
+const { PORT = 5001 } = process.env;
 const resolveFromProjectRoot = resolve.bind(undefined, fileURLToPath(import.meta.url), '../../');
 const resolveFromRepositoryRoot = resolveFromProjectRoot.bind(undefined, '../../../');
 
@@ -64,72 +62,32 @@ const resolveFromRepositoryRoot = resolveFromProjectRoot.bind(undefined, '../../
   app.use(
     '/__dist__/fluent-bundle.development.js',
     express.static(
-      resolve(
-        fileURLToPath(import.meta.url),
-        '../../../../test/fluent-bundle/dist/fluent-bundle.development.js'
-      )
+      resolve(fileURLToPath(import.meta.url), '../../../../test/fluent-bundle/dist/fluent-bundle.development.js')
     )
   );
 
   app.use(
     '/__dist__/fluent-bundle.development.js.map',
     express.static(
-      resolve(
-        fileURLToPath(import.meta.url),
-        '../../../../test/fluent-bundle/dist/fluent-bundle.development.js.map'
-      )
+      resolve(fileURLToPath(import.meta.url), '../../../../test/fluent-bundle/dist/fluent-bundle.development.js.map')
     )
   );
 
   app.use(
     '/__dist__/fluent-bundle.production.min.js',
     express.static(
-      resolve(
-        fileURLToPath(import.meta.url),
-        '../../../../test/fluent-bundle/dist/fluent-bundle.production.min.js'
-      )
+      resolve(fileURLToPath(import.meta.url), '../../../../test/fluent-bundle/dist/fluent-bundle.production.min.js')
     )
   );
 
   app.use(
     '/__dist__/fluent-bundle.production.min.js.map',
     express.static(
-      resolve(
-        fileURLToPath(import.meta.url),
-        '../../../../test/fluent-bundle/dist/fluent-bundle.production.min.js.map'
-      )
+      resolve(fileURLToPath(import.meta.url), '../../../../test/fluent-bundle/dist/fluent-bundle.production.min.js.map')
     )
   );
 
-  // /__dist__/ will be serve from ESBuild development server.
-  app.use(
-    '/__dist__/',
-    createProxyMiddleware({
-      changeOrigin: true,
-      logLevel: 'warn',
-      pathRewrite: { '^\\/__dist__\\/': '/' },
-      onProxyReq(_proxyReq, _req, res) {
-        res.setHeader('x-request-time', new Date().toISOString());
-      },
-      onProxyRes(_, req, res) {
-        const duration = Date.now() - new Date(res.getHeader('x-request-time'));
-        const durationString = `(${duration} ms)`;
-
-        console.log(
-          `${req.url} ${
-            duration < 1000
-              ? chalk.greenBright(durationString)
-              : duration < 2000
-                ? chalk.yellowBright(durationString)
-                : chalk.redBright(durationString)
-          }`
-        );
-
-        res.removeHeader('x-request-time');
-      },
-      target: ESBUILD_TARGET
-    })
-  );
+  app.use('/__dist__/webchat*', express.static(resolve(fileURLToPath(import.meta.url), '../../../bundle/dist')));
 
   // Other requests will be served by `serve-handler` based on `/serve-test.json`.
   app.use((req, res) => serve(req, res, { ...serveConfigJSON, public: resolveFromRepositoryRoot() }));