Skip to content

Commit

Permalink
remove @rollup/plugin-json
Browse files Browse the repository at this point in the history
This was conflicting with rollup-plugin-import-assert
  • Loading branch information
rotu committed Nov 30, 2022
1 parent 018f6ec commit 136e29a
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

### 🐞 Bug fixes
- *...Add new stuff here...*
:q- Remove dependency on `@rollup/plugin-json`, whcih was in conflict with `rollup-plugin-import-assert`
- Fix `getElevation()` causing uncaught error ([#1650](https://github.com/maplibre/maplibre-gl-js/issues/1650)).
- Add dev version for csp build ([#1730](https://github.com/maplibre/maplibre-gl-js/pull/1730))
- Fix headless benchmark execution especially on VM ([#1732](https://github.com/maplibre/maplibre-gl-js/pull/1732))
Expand Down
3 changes: 1 addition & 2 deletions build/rollup_plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import typescript from '@rollup/plugin-typescript';
import resolve from '@rollup/plugin-node-resolve';
import replace from '@rollup/plugin-replace';
import commonjs from '@rollup/plugin-commonjs';
import json from '@rollup/plugin-json';
import {terser} from 'rollup-plugin-terser';
import minifyStyleSpec from './rollup_plugin_minify_style_spec';
import strip from '@rollup/plugin-strip';
Expand All @@ -21,7 +20,7 @@ export const nodeResolve = resolve({
export const plugins = (production: boolean): Plugin[] => [
minifyStyleSpec(),
importAssertionsPlugin(),
json(),
// json(),
// https://github.com/zaach/jison/issues/351
replace({
preventAssignment: true,
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"@mapbox/mapbox-gl-rtl-text": "^0.2.3",
"@mapbox/mvt-fixtures": "^3.10.0",
"@rollup/plugin-commonjs": "^23.0.3",
"@rollup/plugin-json": "^5.0.2",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.1",
"@rollup/plugin-strip": "^3.0.1",
Expand All @@ -69,7 +68,6 @@
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"@types/request": "^2.48.8",
"@types/rollup-plugin-json": "^3.0.3",
"@types/shuffle-seed": "^1.1.0",
"@types/supercluster": "^7.1.0",
"@types/window-or-global": "^1.0.4",
Expand Down Expand Up @@ -183,8 +181,8 @@
"src/",
"postinstall.js"
],
"engines" : {
"npm" : ">=8.1.0",
"node" : ">=16.14.0"
"engines": {
"npm": ">=8.1.0",
"node": ">=16.14.0"
}
}
2 changes: 0 additions & 2 deletions rollup.config.style-spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import path, {dirname} from 'path';
import replace from '@rollup/plugin-replace';
import commonjs from '@rollup/plugin-commonjs';
import json from '@rollup/plugin-json';
import {fileURLToPath, pathToFileURL} from 'url';
import {RollupOptions} from 'rollup';
import {nodeResolve} from './build/rollup_plugins';
Expand Down Expand Up @@ -49,7 +48,6 @@ const config: RollupOptions[] = [{
}
}),
importAssertionsPlugin(),
json(),
nodeResolve,
typescript(),
commonjs()
Expand Down
143 changes: 143 additions & 0 deletions src/style-spec/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 136e29a

Please sign in to comment.