Skip to content

Commit

Permalink
Merge pull request #4303 from GordonSmith/DROP_LEAFLET_SHIM
Browse files Browse the repository at this point in the history
chore: Drop leaflet-shim as no longer needed
  • Loading branch information
GordonSmith authored Nov 15, 2024
2 parents 76a236e + 1296e23 commit 8dcbc73
Show file tree
Hide file tree
Showing 43 changed files with 768 additions and 1,712 deletions.
1,269 changes: 663 additions & 606 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"packages/graph",
"packages/html",
"packages/layout",
"packages/leaflet-shim",
"xpackages/loader",
"packages/map",
"packages/map-deck",
Expand Down Expand Up @@ -56,7 +55,7 @@
"scripts": {
"uninstall": "lerna clean && rimraf --glob packages/**/node_modules demos/**/node_modules apps/**/node_modules package-lock.json node_modules",
"clean-root": "rimraf --glob build coverage dist lib* types temp tmp *.tsbuildinfo .vitepress/dist .vitepress/cache docs/api",
"clean": "lerna run clean && npm run clean-root",
"clean": "lerna run clean --no-sort && npm run clean-root",
"stamp": "lerna run stamp",
"stamp-main": "node ./utils/bundle/src/stamp-main.js",
"stamp-all": "run-s stamp stamp-main",
Expand Down
8 changes: 5 additions & 3 deletions packages/esbuild-plugins/src/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as process from "process";
import { readFileSync } from "fs";
import * as path from "path";
import * as esbuild from "esbuild";
import type { BuildOptions, Format, Plugin } from "esbuild";
import type { BuildOptions, Format, Loader, Plugin } from "esbuild";
import { umdWrapper } from "esbuild-plugin-umd-wrapper";
import { rebuildLogger } from "./rebuild-logger.ts";
import { sfxWasm } from "./sfx-wrapper.ts";
Expand Down Expand Up @@ -56,19 +56,21 @@ export type TplOptions = {
keepNames?: boolean;
external?: string[];
plugins?: Plugin[];
loader?: { [ext: string]: Loader };
supported?: Record<string, boolean>;
alias?: Record<string, string>;
};

export function browserTpl(input: string, output: string, { format = "esm", globalName, libraryName, keepNames, external = [], plugins = [], alias = {} }: TplOptions = {}) {
export function browserTpl(input: string, output: string, { format = "esm", globalName, libraryName, keepNames, external = [], plugins = [], alias = {}, loader = {} }: TplOptions = {}) {
return buildWatch(input, format, external, {
outfile: `${output}.${format === "esm" ? "js" : `${format}.js`}`,
platform: "browser",
target: "es2022",
globalName,
keepNames,
plugins: format === "umd" ? [umdWrapper({ libraryName }), ...plugins] : [...plugins],
alias
alias,
loader
} as BuildOptions);
}

Expand Down
Loading

0 comments on commit 8dcbc73

Please sign in to comment.