Skip to content
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
yarn-cache-${{ runner.os }}-

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Install Playwright browsers
run: yarn playwright install --with-deps chromium
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,11 @@ jobs:
node -p "process.versions"

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Install Playwright browser dependencies
if: matrix.playwright
run: |
google-chrome --version
yarn playwright install-deps chrome
run: yarn playwright install --with-deps chromium

- name: Build workers
run: yarn run build-workers
Expand Down Expand Up @@ -199,7 +197,7 @@ jobs:
node -p "process.versions"

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Run Vitest async guardrails
run: yarn run test-vitest-async-guardrails
Expand Down Expand Up @@ -245,7 +243,7 @@ jobs:
website-yarn-cache-${{ runner.os }}-

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Build website
run: |
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
22.22.0
78 changes: 0 additions & 78 deletions .ocularrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {dirname, join} from 'path';
import {fileURLToPath} from 'url';

const packageRoot = dirname(fileURLToPath(import.meta.url));
const devModules = join(packageRoot, 'dev-modules');
const testDir = join(packageRoot, 'test');

/** @type {OcularConfig} */
Expand All @@ -29,72 +28,6 @@ const config = {
'@maplibre/mlt': join(packageRoot, 'modules/mlt/src/libs/mlt-decoder.cjs')
},

coverage: {
test: 'browser'
},

// Local extensions for the in-repo devtools workspace.
// Reusable logic lives under `dev-modules/devtools-extensions/`; repo-specific policy belongs here.
devtools: {
vitest: {
channel: process.env.CI ? 'chrome' : undefined,
// Plain `*.spec.*` files run in both Node and browser projects unless explicitly excluded.
// Use `.node.spec.*`, `.browser.spec.*`, or conditional runtime helpers for runtime-specific cases.
excludePatterns: [
'**/*.disabled.*',
'modules/**/wip/**',
'modules/3d-tiles/test/lib/classes/tile-3d-batch-table-hierarchy.spec.ts',
'modules/3d-tiles/test/lib/styles/**',
'modules/core/test/lib/api/create-data-source.spec.ts',
'modules/csv/test/csv-writer-papaparse.spec.ts',
'modules/i3s/test/i3s-content-loader.spec.ts',
'modules/loader-utils/test/categories/mesh/**',
'modules/math/test/geometry/attributes/compute-vertex-normals.spec.js',
'modules/mvt/test/lib/mapbox-vt-pbf/**',
'modules/mvt/test/table-tile-source-loader-full.spec.ts',
'modules/mvt/test/table-tile-source-loader-multi-world.spec.ts',
'modules/polyfills/test/load-library/require-utils.spec.ts',
'modules/video/test/**',
'modules/xml/test/sax-ts/testcases/issue-30.spec.ts',
'modules/zarr/test/**',
'test/browser.ts',
'test/init-browser-test.ts',
'test/init-tests.ts',
'test/modules.ts',
'test/node.ts',
'test/bench/**',
'test/render/**'
],
nodeExcludePatterns: [
// These shared specs currently depend on browser fetch semantics or worker entrypoints
// that are not valid in the Node Vitest project.
'modules/compression/test/compression.spec.ts',
'modules/crypto/test/crypto-worker.spec.ts',
'modules/deck-layers/test/any-layer.spec.ts',
'modules/deck-layers/test/geoarrow-layer.spec.ts',
'modules/deck-layers/test/image-source-layer.spec.ts',
'modules/deck-layers/test/shared-tile-2d-view.spec.ts',
'modules/deck-layers/test/splat-layer.spec.ts',
'modules/deck-layers/test/tile-2d-source-layer.spec.ts',
'modules/deck-layers/test/tile-3d-source-layer.spec.ts',
'modules/deck-layers/test/vector-source-layer.spec.ts',
'modules/draco/test/draco-loader.spec.ts',
'modules/draco/test/draco-writer.spec.ts',
'modules/parquet/test/parquet-arrow-loader.spec.ts',
'modules/parquet/test/parquetjs/integration.spec.ts',
'modules/potree/test/potree-source.spec.ts',
'modules/textures/test/basis-loader.spec.ts',
'modules/textures/test/ktx2-basis-universal-texture-writer.spec.ts',
'modules/tiles/test/tileset/format-i3s/i3s-lod.spec.ts',
'modules/tiles/test/tileset/helpers/get-frame-state.spec.ts',
'modules/tiles/test/tileset/tileset-3d-traversal.spec.ts',
'modules/tiles/test/tileset/tileset-traverser.spec.ts'
],
browserExcludePatterns: ['modules/las/test/**'],
softwareGpu: Boolean(process.env.CI)
}
},

bundle: {
globalName: 'loaders',
externals: ['fs', 'path', 'util', 'events', 'stream', 'crypto', 'http', 'https'],
Expand All @@ -106,19 +39,8 @@ const config = {
},

entry: {
test: 'test/node.ts',
'test-browser': 'index.html',
bench: 'test/bench/node.js',
'bench-browser': 'test/bench/index.html',
size: 'test/size/import-nothing.js'
}
// entry: {
// test: 'test/index.ts',
// 'test-browser': 'test/browser.ts',
// bench: 'test/bench/index.js',
// 'bench-browser': 'test/bench/browser.js',
// size: 'test/size/import-nothing.js'
// }
};

export default config;
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ logFilters:
pattern: "*Some peer dependencies are incorrectly met*"

nodeLinker: node-modules

npmMinimalAgeGate: 0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// TODO testing external dataset can be flaky. We need to find a way to test I3S locally
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {isBrowser, setLoaderOptions} from '@loaders.gl/core';
// @ts-expect-error promises
import {readdir} from 'fs/promises';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {Tiles3DLoader} from '@loaders.gl/3d-tiles';
import {loadI3STile} from '@loaders.gl/i3s/test/test-utils/load-utils';
import {Tiles3DContentConverter} from '../../../src/3d-tiles-converter/helpers/3d-tiles-content-converter';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {isBrowser} from '@loaders.gl/core';
import {generateAttributes} from '../../../src/i3s-converter/helpers/geometry-attributes';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {load} from '@loaders.gl/core';
import {i3sObbTo3dTilesObb} from '../../../src/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb';
import {PGMLoader} from '../../../src/pgm-loader';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';

// @ts-expect-error it required `@loaders.gl/i3s/src/lib/helpers/i3s-nodepages-tiles` but it fails because tries to get the dependency from
// `@loaders.gl/i3s/src/src/lib/helpers/i3s-nodepages-tiles`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {convertTextureAtlas} from '../../../src/3d-tiles-converter/helpers/texture-atlas';

test('tile-converter(3d-tiles)#convertTextureAtlas - should convert texture atlas', async t => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {AttributeMetadataInfo} from '../../../src/i3s-converter/helpers/attribute-metadata-info';

test('tile-converter(i3s)#createPopupInfo - Should create popup info', async t => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable camelcase */
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {handleBatchIdsExtensions} from '../../../src/i3s-converter/helpers/batch-ids-extensions';

test('tile-converter(i3s)#handleBatchIdsExtensions - Should return empty array if no extensions in primitive', async t => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {BoundingSphere, OrientedBoundingBox} from '@math.gl/culling';
import {convertBoundingVolumeToI3SFullExtent} from '../../../src/i3s-converter/helpers/coordinate-converter';
import {Ellipsoid} from '@math.gl/geospatial';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {
flattenPropertyTableByFeatureIds,
checkPropertiesLength,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {ConvertedAttributes, GeometryAttributes} from '../../../src/i3s-converter/types';
import {generateAttributes} from '../../../src/i3s-converter/helpers/geometry-attributes';
import {areNumberArraysEqual} from '../../utils/compareArrays';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {Tiles3DLoader} from '@loaders.gl/3d-tiles';
import {load, setLoaderOptions, isBrowser} from '@loaders.gl/core';
import {WorkerFarm} from '@loaders.gl/worker-utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {BoundingSphere} from '@math.gl/culling';
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {Matrix4} from '@math.gl/core';
import {load} from '@loaders.gl/core';
import {Tiles3DLoader} from '@loaders.gl/3d-tiles';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import transform from 'json-map-transform';

const inputData = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {Tiles3DLoader} from '@loaders.gl/3d-tiles';
import {load} from '@loaders.gl/core';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {isBrowser} from '@loaders.gl/core';
import {NodeIndexDocument} from '../../../src/i3s-converter/helpers/node-index-document';
import I3SConverter from '../../../src/i3s-converter/i3s-converter';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {default as NodePages} from '../../../src/i3s-converter/helpers/node-pages';
import {isBrowser} from '@loaders.gl/core';
import I3SConverter from '../../../src/i3s-converter/i3s-converter';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {load} from '@loaders.gl/core';
import {Tiles3DLoader} from '@loaders.gl/3d-tiles';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {Progress} from '../../../src/i3s-converter/helpers/progress';

// eslint-disable-next-line max-statements
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import transform from 'json-map-transform';

import {SHARED_RESOURCES as sharedResourcesTemplate} from '../../../src/i3s-converter/json-templates/shared-resources';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {Tiles3DLoader, Tiles3DTileJSONPostprocessed} from '@loaders.gl/3d-tiles';
import {load} from '@loaders.gl/core';
import {traverseDatasetWith} from '../../../src/i3s-converter/helpers/tileset-traversal';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {default as I3SConverter} from '../../src/i3s-converter/i3s-converter';
import {isBrowser, setLoaderOptions} from '@loaders.gl/core';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {isBrowser} from '@loaders.gl/core';
import {path} from '@loaders.gl/loader-utils';
import {getFileByUrl, loadArchive} from '../../../src/i3s-server/controllers/slpk-controller';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {isBrowser} from '@loaders.gl/core';
import {SceneLayer3D} from '@loaders.gl/i3s';
import {createSceneServer} from '../../../src/i3s-server/utils/create-scene-server';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {isBrowser} from '@loaders.gl/core';
import {formErrorHandler, normalizePort} from '../../../src/i3s-server/utils/server-utils';

Expand Down
2 changes: 1 addition & 1 deletion apps/tile-converter/test/lib/utils/conversion-dump.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';
import {
ConversionDump,
ConversionDumpOptions,
Expand Down
2 changes: 1 addition & 1 deletion apps/tile-converter/test/utils/cli-utils.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
getURLValue,
validateOptionsWithEqual
} from '../../src/lib/utils/cli-utils';
import test from 'tape-promise/tape';
import test from 'test/utils/vitest-tape';

test('tile-converter(utils)#reads a string value', async t => {
t.equal(getStringValue(0, ['', 'string']), 'string');
Expand Down
27 changes: 0 additions & 27 deletions babel.config.cjs

This file was deleted.

6 changes: 4 additions & 2 deletions biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
"extends": ["./dev-modules/devtools-extensions/biome/base.jsonc"],
"extends": ["@vis.gl/dev-tools/biome.jsonc"],
"files": {
"includes": [
"modules/**/*.js",
Expand Down Expand Up @@ -100,10 +100,12 @@
"suspicious": {
"noAssignInExpressions": "error",
"noAsyncPromiseExecutor": "error",
"noConsole": "off",
"noDebugger": "error",
"noDoubleEquals": "error",
"noGlobalIsNan": "error",
"noRedeclare": "error"
"noRedeclare": "error",
"noShadowRestrictedNames": "off"
}
}
},
Expand Down
Loading
Loading