Merge branch 'main' into SUMO-5293-continued

yext · Nov 9, 2023 · 10a8433 · 10a8433
2 parents 060efb6 + 827c8db
commit 10a8433
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 36 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        node-version: [17.x, 18.x, 19.x]
+        node-version: [18.x, 20.x]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,10 +18,10 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.2.4
 
-      - name: Set node version to 17.x
+      - name: Set node version to 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 17.x
+          node-version: 18.x
           registry-url: https://registry.npmjs.org/
           cache: "pnpm"
 

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -16,7 +16,7 @@ jobs:
         working-directory: ./packages/${{ inputs.package }}
     strategy:
       matrix:
-        node-version: [17.x, 18.x]
+        node-version: [18.x, 20.x]
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3

diff --git a/packages/pages/package.json b/packages/pages/package.json
@@ -32,7 +32,7 @@
     }
   },
   "engines": {
-    "node": "^17 || ^18 || ^19"
+    "node": "^18 || ^20"
   },
   "scripts": {
     "watch": "node src/bundler --watch",

diff --git a/packages/pages/src/bin/spawn.ts b/packages/pages/src/bin/spawn.ts
@@ -17,7 +17,7 @@ const nodeVersion = Number(
 );
 
 const experimentalFlags = ["--experimental-vm-modules"];
-if (nodeVersion === 17 || nodeVersion === 18) {
+if (nodeVersion === 18) {
   experimentalFlags.push("--experimental-specifier-resolution=node");
 } else {
   experimentalFlags.push("--experimental-loader");

diff --git a/packages/pages/src/bundler.js b/packages/pages/src/bundler.js
@@ -39,7 +39,7 @@ const commonBuildOpts = {
     ".ico": "copy",
   },
   tsconfig: "tsconfig.json",
-  logLevel: "error",
+  logLevel: "info",
   platform: "node",
 };
 
@@ -58,14 +58,17 @@ pluginFiles.map((filepath) =>
 );
 
 try {
-  const ctx = await esbuild.build({
+  const ctx = await esbuild.context({
     ...commonBuildOpts,
     outdir: "dist",
     format: "esm",
   });
 
   if (watch) {
     await ctx.watch();
+  } else {
+    await ctx.rebuild();
+    await ctx.dispose();
   }
 } catch (e) {
   console.error(e);

diff --git a/packages/pages/src/util/fetch.ts b/packages/pages/src/util/fetch.ts
diff --git a/packages/pages/src/util/index.ts b/packages/pages/src/util/index.ts
@@ -1,3 +1,2 @@
-export { fetch } from "./fetch.js";
 export { getRuntime } from "./runtime.js";
 export { isProduction } from "./env.js";