upgrade some deps

romannurik · Jul 2, 2024 · 7dd2ca4 · 7dd2ca4
1 parent 834b3bd
commit 7dd2ca4
Show file tree

Hide file tree

Showing 4 changed files with 4,830 additions and 4,461 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v1

diff --git a/gulpfile.js b/gulpfile.js
@@ -56,20 +56,27 @@ gulp.task('service-worker', () => {
 
 
 function esBuild(extraOptions) {
-  return esbuild.build({
+  return esbuild.context({
     entryPoints: ['index.js'],
     bundle: true,
     minify: !DEV_MODE,
     loader: {
       ".ttf": "file",
     },
-    plugins: [sassPlugin()],
-    outfile: 'dist/index.js',
     ...extraOptions,
+    plugins: [
+      ...(extraOptions?.plugins || []),
+      sassPlugin(),
+    ],
+    outfile: 'dist/index.js',
   });
 }
 
-gulp.task('esbuild', () => esBuild());
+gulp.task('esbuild', async () => {
+  let ctx = await esBuild();
+  ctx.rebuild();
+  ctx.dispose();
+});
 
 
 gulp.task('copy', () => {
@@ -113,13 +120,15 @@ gulp.task('__serve__', gulp.series('build', () => {
   let reload = cb => { browserSync.reload(); cb && cb(); };
 
   esBuild({
-    watch: {
-      onRebuild(error, result) {
-        if (error) console.error('watch build failed:', error)
-        else reload();
+    plugins: [{
+      name: 'on-build-end',
+      setup(build) {
+        build.onEnd((result) => {
+          if (!result.errors.length) reload();
+        });
       },
-    },
-  });
+    }]
+  }).then(ctx => ctx.watch());
 
   gulp.watch(['*.{html,js}'], gulp.series('copy', reload));
 }));