Merge branch 'mapbox:main' into fix-update-image-before-load

.circleci/config.yml

@@ -92,26 +92,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - collect-stats:
-          requires:
-            - build
-            - install-mbx-ci
-          filters:
-            tags:
-              ignore: /.*/
-            branches:
-              only: main
-      - deploy-benchmarks:
-          requires:
-            - install-mbx-ci
-            - build
-          filters:
-            tags:
-              only: /v[0-9]+.[0-9]+.[0-9]+(-.+)?/
-            branches:
-              only:
-                - main
-                - /release-.*/
       - deploy-release:
           requires:
             - install-mbx-ci
@@ -171,6 +151,13 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - trigger-performance-tests:
+          context:
+            - "sdk-cicd/circleci-api"
+          filters:
+            branches:
+              only:
+                  - internal
 
 linux-defaults: &linux-defaults
   docker:
@@ -340,20 +327,6 @@ jobs:
             yarn run codegen
             git add -A && git diff --staged --exit-code | tee check.patch
 
-  collect-stats:
-    <<: *linux-defaults
-    steps:
-      - attach_workspace:
-          at: ~/
-      - browser-tools/install-chrome
-      - run:
-          name: Collect performance stats
-          command: node bench/gl-stats.js
-      - aws-cli/install
-      - run:
-          name: Upload performance stats
-          command: aws s3 cp data.json.gz s3://mapbox-loading-dock/raw/gl_js.perf_metrics_staging/ci/`git show -s --date=short --format=%cd-%h HEAD`.json.gz
-
   test-browser:
     <<: *linux-defaults
     steps:
@@ -382,22 +355,6 @@ jobs:
           at: ~/
       - run: yarn run test-expressions
 
-  deploy-benchmarks:
-    <<: *linux-defaults
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Build
-          command: BENCHMARK_VERSION="${CIRCLE_TAG:-$CIRCLE_BRANCH} $(git rev-parse --short=7 HEAD)" yarn run build-benchmarks
-      - aws-cli/install
-      - run:
-          name: Upload benchmark
-          command: aws s3 cp --acl public-read --content-type application/javascript bench/versions/benchmarks_generated.js s3://mapbox-gl-js/${CIRCLE_TAG:-$CIRCLE_BRANCH}/benchmarks.js
-      - run:
-          name: Upload source maps
-          command: aws s3 cp --acl public-read --content-type application/javascript bench/versions/benchmarks_generated.js.map s3://mapbox-gl-js/${CIRCLE_TAG:-$CIRCLE_BRANCH}/benchmarks.js.map
-
   deploy-release:
     <<: *linux-defaults
     steps:
@@ -584,3 +541,13 @@ jobs:
           path: test/integration/render-tests
       - store_artifacts:
           path: "test/integration/render-tests/index.html"
+
+  trigger-performance-tests:
+    <<: *linux-defaults
+    steps:
+      - checkout
+      - run:
+          name: Trigger SLA performance tests
+          command: |
+            sha=$(git rev-parse HEAD)
+            curl --location --request POST 'https://circleci.com/api/v2/project/github/mapbox/mapbox-gl-js-performance-internal/pipeline' --header 'Content-Type: application/json' -u $CIRCLECI_API_TOKEN: -d "{ \"parameters\": { \"setup_sha\": \"$sha\", \"setup_source_branch\": \"internal\" } }"

.eslintrc

@@ -27,9 +27,6 @@
     "no-duplicate-imports": "off",
     "import/no-duplicates": "error",
 
-    // prevent issues with esbuild/vite https://github.com/mapbox/mapbox-gl-js/issues/12656
-    "no-restricted-syntax": ["error", "ClassProperty[value]"],
-
     // ensure compatibility with Node's native ESM
     "import/extensions": ["error", {
       "js": "always",
@@ -176,6 +173,38 @@
         "jsdoc/require-property-type": "error",
         "jsdoc/require-returns-type": "error",
       }
+    },
+    {
+      "files": [
+        "src/**/*",
+        "3d-style/**/*"
+      ],
+      "rules": {
+        "no-restricted-syntax": [
+          "error",
+          {
+            "selector": "AwaitExpression",
+            "message": "Async/await syntax is not allowed."
+          },
+          {
+            "selector": "FunctionDeclaration[async=true]",
+            "message": "Async function declarations are not allowed."
+          },
+          {
+            "selector": "FunctionExpression[async=true]",
+            "message": "Async function expressions are not allowed."
+          },
+          {
+            "selector": "ArrowFunctionExpression[async=true]",
+            "message": "Async arrow functions are not allowed."
+          },
+          // prevent issues with esbuild/vite https://github.com/mapbox/mapbox-gl-js/issues/12656
+          {
+            "selector": "ClassProperty[value]",
+            "message": "ClassProperty values are not allowed."
+          }
+        ]
+      }
     }
   ],
   "globals": {

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,10 @@
 ## Launch Checklist
 
-<!-- Thanks for the PR! Feel free to add or remove items from the checklist. -->
-
- - [ ] briefly describe the changes in this PR
- - [ ] include before/after visuals or gifs if this PR includes visual changes
- - [ ] write tests for all new functionality
- - [ ] document any changes to public APIs
- - [ ] post benchmark scores
- - [ ] manually test the debug page
- - [ ] tagged `@mapbox/map-design-team` `@mapbox/static-apis` if this PR includes style spec API or visual changes
- - [ ] tagged `@mapbox/gl-native` if this PR includes shader changes or needs a native port
- - [ ] apply changelog label ('bug', 'feature', 'docs', etc) or use the label 'skip changelog'
- - [ ] add an entry inside this element for inclusion in the `mapbox-gl-js` changelog: `<changelog></changelog>`
+ - [ ] Make sure the PR title is descriptive and preferably reflects the change from the user's perspective.
+ - [ ] Add additional detail and context in the PR description (with screenshots/videos if there are visual changes).
+ - [ ] Manually test the debug page.
+ - [ ] Write tests for all new functionality and make sure the CI checks pass.
+ - [ ] Document any changes to public APIs.
+ - [ ] Post benchmark scores if the change could affect performance.
+ - [ ] Tag `@mapbox/map-design-team` `@mapbox/static-apis` if this PR includes style spec API or visual changes.
+ - [ ] Tag `@mapbox/gl-native` if this PR includes shader changes or needs a native port.