Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use with for json modules instead of assert #4092

Merged
merged 1 commit into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/banner.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import packageJSON from '../package.json' assert {type: 'json'};
import packageJSON from '../package.json' with {type: 'json'};

export default
`/**
Expand Down
2 changes: 1 addition & 1 deletion build/generate-doc-images.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from 'path';
import fs from 'fs';
import puppeteer from 'puppeteer';
import packageJson from '../package.json' assert { type: 'json' };
import packageJson from '../package.json' with { type: 'json' };

const exampleName = process.argv[2];
const examplePath = path.resolve('test', 'examples');
Expand Down
4 changes: 2 additions & 2 deletions build/generate-docs.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'fs';
import path from 'path';
import typedocConfig from '../typedoc.json' assert {type: 'json'};
import packageJson from '../package.json' assert {type: 'json'};
import typedocConfig from '../typedoc.json' with {type: 'json'};
import packageJson from '../package.json' with {type: 'json'};

type HtmlDoc = {
title: string;
Expand Down
2 changes: 1 addition & 1 deletion src/data/bucket/symbol_bucket.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {RGBAImage} from '../../util/image';
import {ImagePosition} from '../../render/image_atlas';
import {IndexedFeature, PopulateParameters} from '../bucket';
import {StyleImage} from '../../style/style_image';
import glyphs from '../../../test/unit/assets/fontstack-glyphs.json' assert {type: 'json'};
import glyphs from '../../../test/unit/assets/fontstack-glyphs.json' with {type: 'json'};
import {StyleGlyph} from '../../style/style_glyph';

// Load a point feature from fixture tile.
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import packageJSON from '../package.json' assert {type: 'json'};
import packageJSON from '../package.json' with {type: 'json'};
import {Map} from './ui/map';
import {NavigationControl} from './ui/control/navigation_control';
import {GeolocateControl} from './ui/control/geolocate_control';
Expand Down
2 changes: 1 addition & 1 deletion src/source/vector_tile_source.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Tile} from './tile';
import {OverscaledTileID} from './tile_id';
import {Evented} from '../util/evented';
import {RequestManager} from '../util/request_manager';
import fixturesSource from '../../test/unit/assets/source.json' assert {type: 'json'};
import fixturesSource from '../../test/unit/assets/source.json' with {type: 'json'};
import {getMockDispatcher, getWrapDispatcher, sleep, waitForMetadataEvent} from '../util/test/util';
import {Map} from '../ui/map';
import {WorkerTileParameters} from './worker_source';
Expand Down
2 changes: 1 addition & 1 deletion src/ui/map.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {extend, warnOnce, uniqueId, isImageBitmap} from '../util/util';
import {browser} from '../util/browser';
import {DOM} from '../util/dom';
import packageJSON from '../../package.json' assert {type: 'json'};
import packageJSON from '../../package.json' with {type: 'json'};
import {GetResourceResponse, getJSON} from '../util/ajax';
import {ImageRequest} from '../util/image_request';
import {RequestManager, ResourceType} from '../util/request_manager';
Expand Down
2 changes: 1 addition & 1 deletion test/bench/benchmarks/filter_create.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Benchmark from '../lib/benchmark';

import {featureFilter as createFilter} from '@maplibre/maplibre-gl-style-spec';
import filters from '../data/filters.json' assert {type: 'json'};
import filters from '../data/filters.json' with {type: 'json'};

export default class FilterCreate extends Benchmark {
bench() {
Expand Down
2 changes: 1 addition & 1 deletion test/bench/benchmarks/filter_evaluate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Benchmark from '../lib/benchmark';
import {VectorTile} from '@mapbox/vector-tile';
import Pbf from 'pbf';
import {featureFilter as createFilter} from '@maplibre/maplibre-gl-style-spec';
import filters from '../data/filters.json' assert {type: 'json'};
import filters from '../data/filters.json' with {type: 'json'};

export default class FilterEvaluate extends Benchmark {
layers: any[];
Expand Down
2 changes: 1 addition & 1 deletion test/bench/benchmarks/layers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import Benchmark from '../lib/benchmark';
import createMap from '../lib/create_map';
import style from '../data/empty.json' assert {type: 'json'};
import style from '../data/empty.json' with {type: 'json'};

const width = 1024;
const height = 768;
Expand Down
2 changes: 1 addition & 1 deletion test/bench/benchmarks/paint_states.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import emptystyle from '../data/empty.json' assert {type: 'json'};
import emptystyle from '../data/empty.json' with {type: 'json'};
import Benchmark from '../lib/benchmark';
import createMap from '../lib/create_map';

Expand Down
2 changes: 1 addition & 1 deletion test/bench/benchmarks/remove_paint_state.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import emptystyle from '../data/empty.json' assert {type: 'json'};
import emptystyle from '../data/empty.json' with {type: 'json'};
import Benchmark from '../lib/benchmark';
import createMap from '../lib/create_map';

Expand Down
2 changes: 1 addition & 1 deletion test/bench/styles/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import locationsWithTileID from '../lib/locations_with_tile_id';
import styleBenchmarkLocations from '../data/style-benchmark-locations.json' assert {type: 'json'};
import styleBenchmarkLocations from '../data/style-benchmark-locations.json' with {type: 'json'};
import StyleLayerCreate from '../benchmarks/style_layer_create';
import Validate from '../benchmarks/style_validate';
import Layout from '../benchmarks/layout';
Expand Down
2 changes: 1 addition & 1 deletion test/bench/versions/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import locationsWithTileID from '../lib/locations_with_tile_id';
import styleBenchmarkLocations from '../data/style-benchmark-locations.json' assert {type: 'json'};
import styleBenchmarkLocations from '../data/style-benchmark-locations.json' with {type: 'json'};
import Layout from '../benchmarks/layout';
import Placement from '../benchmarks/placement';
import SymbolLayout from '../benchmarks/symbol_layout';
Expand Down
2 changes: 1 addition & 1 deletion test/build/min.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import packageJson from '../../package.json' assert {type: 'json'};
import packageJson from '../../package.json' with {type: 'json'};

const minBundle = fs.readFileSync('dist/maplibre-gl.js', 'utf8');

Expand Down
2 changes: 1 addition & 1 deletion test/build/sourcemaps.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import packageJson from '../../package.json' assert {type: 'json'};
import packageJson from '../../package.json' with {type: 'json'};
import {globSync, glob} from 'glob';
import path, {dirname} from 'path';
import fs from 'node:fs/promises';
Expand Down
2 changes: 1 addition & 1 deletion test/integration/symbol-shaping/shaping.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fs from 'fs';
import path from 'path';
import {WritingMode, shapeIcon, shapeText, fitIconToText, PositionedIcon, Shaping} from '../../../src/symbol/shaping';
import {ResolvedImage, Formatted, FormattedSection} from '@maplibre/maplibre-gl-style-spec';
import expectedJson from './tests/text-shaping-linebreak.json' assert {type: 'json'};
import expectedJson from './tests/text-shaping-linebreak.json' with {type: 'json'};
import {ImagePosition} from '../../../src/render/image_atlas';
import {StyleImage} from '../../../src/style/style_image';

Expand Down