Fix rollup watch mode (#3270)

* Fix rollup watch mode * changelog * fix sourcemap issue
maplibre · Oct 24, 2023 · d8f5ae1 · d8f5ae1
1 parent 6447f95
commit d8f5ae1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - Add terrain property to map style object ([#3234](https://github.com/maplibre/maplibre-gl-js/pull/3234))
 - Fix exception thrown from `isWebGL2` check ([#3238](https://github.com/maplibre/maplibre-gl-js/pull/3238))
+- Fix rollup watch mode ([#3270](https://github.com/maplibre/maplibre-gl-js/pull/3270))
 - _...Add new stuff here..._
 
 ## 3.5.1

diff --git a/build/rollup_plugins.ts b/build/rollup_plugins.ts
@@ -47,3 +47,12 @@ export const plugins = (production: boolean): Plugin[] => [
         ignoreGlobal: true
     })
 ].filter(Boolean);
+
+export const watchStagingPlugin: Plugin = {
+    name: 'watch-external',
+    buildStart() {
+        this.addWatchFile('staging/maplibregl/index.js');
+        this.addWatchFile('staging/maplibregl/shared.js');
+        this.addWatchFile('staging/maplibregl/worker.js');
+    }
+};
diff --git a/rollup.config.ts b/rollup.config.ts
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
-import {plugins} from './build/rollup_plugins';
+import {plugins, watchStagingPlugin} from './build/rollup_plugins';
 import banner from './build/banner';
 import {RollupOptions} from 'rollup';
 
@@ -45,11 +45,19 @@ const config: RollupOptions[] = [{
         intro: fs.readFileSync('build/rollup/bundle_prelude.js', 'utf8'),
         banner
     },
+    watch: {
+        // give the staging chunks a chance to finish before rebuilding the dev build
+        buildDelay: 1000
+    },
     treeshake: false,
     plugins: [
         // Ingest the sourcemaps produced in the first step of the build.
         // This is the only reason we use Rollup for this second pass
-        sourcemaps()
+        sourcemaps(),
+        // When running in development watch mode, tell rollup explicitly to watch
+        // for changes to the staging chunks built by the previous step. Otherwise
+        // only they get built, but not the merged dev build js
+        ...production ? [] : [watchStagingPlugin]
     ],
 }];
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,7 +12,6 @@
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "skipLibCheck": false,
-    "sourceMap": true,
     "strict": false,
     "target": "ES2016",
     "lib": [