v3.3.0-beta.1

.circleci/config.yml

@@ -1,12 +1,10 @@
 version: 2.1
 orbs:
-  aws-cli: circleci/[email protected]
-  browser-tools: circleci/[email protected]
-  macos: circleci/[email protected]
+  aws-cli: circleci/[email protected]
+  browser-tools: circleci/[email protected]
   win: circleci/[email protected]
 
 workflows:
-  version: 2
   default:
     jobs:
       - prepare-linux:
@@ -155,14 +153,14 @@ workflows:
 
 linux-defaults: &linux-defaults
   docker:
-    - image: cimg/node:18.16-browsers
+    - image: cimg/node:18.19-browsers
   working_directory: ~/mapbox-gl-js
 
 mac-defaults: &mac-defaults
   resource_class: macos.m1.medium.gen1
   macos:
-    # https://circleci.com/docs/using-macos/#supported-xcode-versions
-    xcode: 14.3.0 # macOS 13.2 (Ventura)
+    # https://circleci.com/docs/using-macos/#supported-xcode-versions-silicon
+    xcode: 14.3.1 # macOS 13.2.1 (Ventura)
   environment:
     HOMEBREW_NO_AUTO_UPDATE: 1
   working_directory: ~/mapbox-gl-js
@@ -181,15 +179,15 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v0-linux-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }}
-            - v0-linux-yarn-{{ .Branch }}-
-            - v0-linux-yarn-
-      - run: yarn --frozen-lockfile --cache-folder ~/.cache/yarn
-      - run: yarn run build-dev
+            - v0-linux-npm-{{ .Branch }}-{{ checksum "package-lock.json" }}
+            - v0-linux-npm-{{ .Branch }}-
+            - v0-linux-npm-
+      - run: npm ci --no-audit --no-fund
+      - run: npm run build-dev
       - save_cache:
-          key: v0-linux-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }}
+          key: v0-linux-npm-{{ .Branch }}-{{ checksum "package-lock.json" }}
           paths:
-           - ~/.cache/yarn
+            - ~/.npm
       - persist_to_workspace:
           root: ~/
           paths:
@@ -222,8 +220,8 @@ jobs:
           keys:
             - v2-lint-{{ .Branch }}
             - v2-lint
-      - run: yarn run lint
-      - run: yarn run lint-css
+      - run: npm run lint
+      - run: npm run lint-css
       - save_cache:
           key: v2-lint-{{ .Branch }}-{{ .Revision }}
           paths:
@@ -234,13 +232,13 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
-      - run: yarn run build-prod-min
-      - run: yarn run build-prod
-      - run: yarn run build-csp
-      - run: yarn run build-css
-      - run: yarn run build-style-spec
-      - run: yarn run build-flow-types
-      - run: yarn run test-build
+      - run: npm run build-prod-min
+      - run: npm run build-prod
+      - run: npm run build-csp
+      - run: npm run build-css
+      - run: npm run build-style-spec
+      - run: npm run build-flow-types
+      - run: npm run test-build
       - run: while read l; do cp debug/$l test/release/$l; done < test/release/local_release_page_list.txt
       - store_artifacts:
           path: "dist"
@@ -258,31 +256,38 @@ jobs:
           at: ~/
       - run:
           name: Check bundle size
-          command: yarn check-bundle-size
+          command: npm run check-bundle-size
 
   test-flow:
     <<: *linux-defaults
     steps:
       - attach_workspace:
           at: ~/
-      - run: yarn run test-flow
+      - run: npm run test-flow
 
   test-unit:
     <<: *linux-defaults
     steps:
       - attach_workspace:
           at: ~/
+      - restore_cache:
+          keys:
+            - v0-playwright
       - run:
-          command: yarn run test-unit
+          command: npm run test-unit
           no_output_timeout: 5m
+      - save_cache:
+          key: v0-playwright
+          paths:
+           - ~/.cache
 
   test-query:
     <<: *linux-defaults
     steps:
       - attach_workspace:
           at: ~/
       - browser-tools/install-chrome
-      - run: yarn run test-query
+      - run: npm run test-query
       - store_test_results:
           path: test/integration/query-tests
       - store_artifacts:
@@ -297,7 +302,7 @@ jobs:
           name: Build Webpack
           command: |
             cd ./test/build/transpilation &&
-            yarn &&
+            npm ci &&
             npm run build &&
             rm -rf node_modules
       - store_artifacts:
@@ -308,7 +313,7 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
-      - run: yarn run test-style-spec
+      - run: npm run test-style-spec
 
   verify-codegen:
     <<: *linux-defaults
@@ -318,15 +323,17 @@ jobs:
       - run:
           name: Verify codegen output
           command: |
-            yarn run codegen
+            npm run codegen
             git add -A && git diff --staged --exit-code | tee check.patch
+      - store_artifacts:
+          path: "check.patch"
 
   test-expressions:
     <<: *linux-defaults
     steps:
       - attach_workspace:
           at: ~/
-      - run: yarn run test-expressions
+      - run: npm run test-expressions
 
   deploy-release:
     <<: *linux-defaults
@@ -357,7 +364,7 @@ jobs:
       - run:
           name: Running tests in parallel
           command: |
-            yarn run test-render
+            npm run test-render
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:
@@ -369,7 +376,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - browser-tools/install-chrome
-      - run: yarn run test-render-prod
+      - run: npm run test-render-prod
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:
@@ -381,7 +388,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - browser-tools/install-chrome
-      - run: yarn run test-render-csp
+      - run: npm run test-render-csp
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:
@@ -393,7 +400,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - browser-tools/install-firefox
-      - run: yarn run test-render-firefox
+      - run: npm run test-render-firefox
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:
@@ -405,16 +412,16 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v0-mac-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }}
-            - v0-mac-yarn-{{ .Branch }}-
-            - v0-mac-yarn-
+            - v0-mac-npm-{{ .Branch }}-{{ checksum "package-lock.json" }}
+            - v0-mac-npm-{{ .Branch }}-
+            - v0-mac-npm-
       - run: nvm install && cat .nvmrc | nvm alias default `xargs`
-      - run: yarn --frozen-lockfile --cache-folder ~/.cache/yarn
+      - run: npm ci --no-audit --no-fund
       - save_cache:
-          key: v0-mac-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }}
+          key: v0-mac-npm-{{ .Branch }}-{{ checksum "package-lock.json" }}
           paths:
-           - ~/.cache/yarn
-      - run: yarn run build-dev
+           - ~/.npm
+      - run: npm run build-dev
       - persist_to_workspace:
           root: ~/
           paths:
@@ -431,7 +438,7 @@ jobs:
           name: Creating test list
           command: |
             circleci tests glob "test/integration/render-tests/**/*.json" | circleci tests split --split-by=timings > tests-to-run.txt
-      - run: yarn run test-render
+      - run: npm run test-render
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:
@@ -442,7 +449,7 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
-      - run: yarn run test-render-safari
+      - run: npm run test-render-safari
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:
@@ -452,24 +459,31 @@ jobs:
     <<: *windows-defaults
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - v2-windows-npm-{{ .Branch }}-{{ checksum "package-lock.json" }}
+            - v2-windows-npm-{{ .Branch }}-
+            - v2-windows-npm-
       - run:
-          name: Setup Node.js and Yarn
+          name: Setup Node.js
           command: |
             $nodeVersion = Get-Content .nvmrc
             nvm install $nodeVersion
             nvm use $nodeVersion
-            npm install -g yarn
-      - run: yarn --frozen-lockfile
-      - run: yarn run build-dev
+      - run: npm ci --no-audit --no-fund --cache ~/.npm
+      - save_cache:
+          key: v2-windows-npm-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          paths:
+            - ~/log.txt
+      - store_artifacts:
+          path: "test/integration/render-tests/index.html"
+      - run: npm run build-dev
       - run:
           name: Clean up workspace to persist faster
           command: |
             Remove-Item .git -Recurse -Force;
             Remove-Item node_modules/flow-bin -Recurse -Force;
-            Remove-Item node_modules/tap -Recurse -Force;
-            Remove-Item node_modules/gl -Recurse -Force;
             Remove-Item node_modules/@mapbox/mvt-fixtures/real-world/osm-qa-* -Recurse -Force;
-            Remove-Item node_modules/react-devtools-core -Recurse -Force;
             Remove-Item node_modules/@octokit -Recurse -Force;
             Remove-Item node_modules/puppeteer-core -Recurse -Force;
             Remove-Item node_modules/lodash -Recurse -Force;
@@ -485,12 +499,11 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Setup Node.js and Yarn
+          name: Setup Node.js
           command: |
             $nodeVersion = Get-Content .nvmrc
             nvm install $nodeVersion
             nvm use $nodeVersion
-            npm install -g yarn
       # The browser-tools orb doesn't work on Windows, so we install chrome manually.
       - run:
           name: Installing Chrome on Windows
@@ -509,7 +522,7 @@ jobs:
           name: Creating test list
           command: |
             circleci tests glob "test/integration/render-tests/**/*.json" | circleci tests split | Out-File -Encoding utf8 -FilePath tests-to-run.txt
-      - run: yarn run test-render
+      - run: npm run test-render
       - store_test_results:
           path: test/integration/render-tests
       - store_artifacts:

.eslintrc

@@ -143,7 +143,6 @@
         "src/ui/control/**",
         "src/ui/handler/**",
         "src/geo/lng_lat.js",
-        "src/geo/lng_lat_bounds.js",
         "src/geo/mercator_coordinate.js",
         "src/source/**",
       ],
@@ -202,6 +201,14 @@
           {
             "selector": "ClassProperty[value]",
             "message": "ClassProperty values are not allowed."
+          },
+          {
+            "selector": "LogicalExpression[operator='??']",
+            "message": "Nullish coalescing is not allowed."
+          },
+          {
+            "selector": "ChainExpression",
+            "message": "Optional chaining is now allowed."
           }
         ]
       }

.gitignore

@@ -6,7 +6,7 @@
 *.js.map
 *.cjs.map
 node_modules
-package-lock.json
+yarn.lock
 .vscode/
 *.sublime-*
 coverage

.nvmrc

@@ -1 +1 @@
-18.16.0
+18.19.0

3d-style/data/bucket/model_bucket.js

@@ -10,11 +10,11 @@ import {vec3} from 'gl-matrix';
 import {InstanceVertexArray} from '../../../src/data/array_types.js';
 import assert from 'assert';
 import {warnOnce} from '../../../src/util/util.js';
-import ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
 import {rotationScaleYZFlipMatrix} from '../../util/model_util.js';
 import {tileToMeter} from '../../../src/geo/mercator_coordinate.js';
 import {instanceAttributes} from '../model_attributes.js';
 
+import type ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
 import type {EvaluationFeature} from '../../../src/data/evaluation_feature.js';
 import type {Mat4} from 'gl-matrix';
 import type {CanonicalTileID, OverscaledTileID} from '../../../src/source/tile_id.js';
@@ -155,7 +155,11 @@ class ModelBucket implements Bucket {
             const modelId = this.addFeature(bucketFeature, bucketFeature.geometry, evaluationFeature);
 
             if (modelId) {
-                options.featureIndex.insert(feature, bucketFeature.geometry, index, sourceLayerIndex, this.index, this.instancesPerModel[modelId].instancedDataArray.length);
+                // Since 3D model geometry extends over footprint or point geometry, it is important
+                // to add some padding to envelope calculated for grid index lookup, in order to
+                // prevent false negatives in FeatureIndex's coarse check.
+                // Envelope padding is a half of featureIndex.grid cell size.
+                options.featureIndex.insert(feature, bucketFeature.geometry, index, sourceLayerIndex, this.index, this.instancesPerModel[modelId].instancedDataArray.length, EXTENT / 32);
             }
         }
         this.lookup = null;