Merge remote-tracking branch 'upstream/main'

acalcutt · Aug 27, 2022 · bf99f88 · bf99f88
2 parents dd69c12 + f8e6e35
commit bf99f88
Show file tree

Hide file tree

Showing 677 changed files with 24,927 additions and 46,382 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -44,13 +44,13 @@
     "no-invalid-this": "off",
     "no-buffer-constructor": "off",
 
-    "array-bracket-spacing": "off",
+    "array-bracket-spacing": "error",
     "consistent-return": "off",
     "global-require": "off",
     "import/no-commonjs": "error",
     // TSC throws an error on unresolved imports; eslint doesn't understand .js extension in import statement
     "import/no-unresolved": "off",
-    "key-spacing": "off",
+    "key-spacing": "error",
     "no-eq-null": "off",
     "no-lonely-if": "off",
     "no-new": "off",
@@ -78,6 +78,7 @@
     "no-multiple-empty-lines": [ "error", {
         "max": 1
     }],
+    "import/no-anonymous-default-export": ["error", {"allowLiteral": true} ],
     "jsdoc/check-param-names": "warn",
     "jsdoc/require-param": "warn",
     "jsdoc/require-param-description": "warn",
@@ -108,7 +109,7 @@
   "ignorePatterns": ["build/*.js", "*.json"],
   "overrides": [
     {
-      "files": ["debug/**", "test/**", "src/style-spec/**"],
+      "files": ["test/**", "src/style-spec/**"],
       "rules": {
         "jsdoc/check-param-names": "off",
         "jsdoc/require-param": "off",

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,7 +8,10 @@ updates:
   - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "monthly"
-    ignore:
-      - dependency-name: "documentation"
+      interval: "weekly"
     open-pull-requests-limit: 20
+    versioning-strategy: increase
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -17,9 +17,9 @@ jobs:
     steps:
       # report status back to pull request
       - uses: haya14busa/action-workflow_run-status@v1
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64
@@ -31,15 +31,15 @@ jobs:
           echo "${{ github.event.pull_request.base.sha }}" > build-info/base_sha
           echo "${{ github.event.number }}" > build-info/pull_request_number
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: ./dist
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: build-info
           path: ./build-info
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./test/release
           name: test-release
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,8 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
-          - windows-latest
           - ubuntu-latest
         node_version:
           - 16
@@ -23,9 +21,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}

diff --git a/.github/workflows/publish-style-spec.yml b/.github/workflows/publish-style-spec.yml
@@ -8,12 +8,12 @@ jobs:
     name: Build, publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64
@@ -30,6 +30,7 @@ jobs:
       - name: Build style spec
         run: |
           npm run build-style-spec
+          npm run generate-typings
           cp -r dist/style-spec/* src/style-spec/dist
       
       - name: Check version and publish

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,27 +12,27 @@ jobs:
         shell: bash
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ref: main
 
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64
           registry-url: 'https://registry.npmjs.org'
 
       - name: Get version
         id: package-version
-        uses: martinbeentjes/npm-get-version-action@v1.1.0
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
 
       - name: Check tag does not exist yet
         run: if git rev-list v${{ steps.package-version.outputs.current-version }}; then echo "Tag already exists. Aborting the release process."; exit 1; fi
 
       - name: Tag commit and push
-        uses: mathieudutour/github-tag-action@v5.6
+        uses: mathieudutour/github-tag-action@v6.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           custom_tag: ${{ steps.package-version.outputs.current-version }}
@@ -61,7 +61,7 @@ jobs:
 
       - name: Write dist/package.json
         run: |
-          echo "{ \"type\": \"commonjs\" }" > dist/package.json
+          echo "{ \"type\": \"commonjs\", \"name\": \"maplibre-gl\" }" > dist/package.json
 
       - name: Create Archive
         run: |

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v5
         with:
           stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
           stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 30 days.'

diff --git a/.github/workflows/test-browser.yml b/.github/workflows/test-browser.yml
@@ -7,16 +7,20 @@ on:
 
 jobs:
   test_browser:
-    name: macos-latest
-    runs-on: macos-latest
+    name: ubuntu-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Install fonts-noto-cjk
+        run: |
+          sudo apt-get update
+          sudo apt-get install fonts-noto-cjk
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64
       - run: npm ci
       - run: npm run build-dev
-      - run: npm run test-browser
+      - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-browser
diff --git a/.github/workflows/test-expression.yml b/.github/workflows/test-expression.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64

diff --git a/.github/workflows/test-query.yml b/.github/workflows/test-query.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64

diff --git a/.github/workflows/test-render.yml b/.github/workflows/test-render.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 16.13 x64
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16 x64
+        uses: actions/setup-node@v3.4.1
         with:
-          node-version: 16.13
+          node-version: 16
           architecture: x64
       - run: npm ci
       - run: npm run build-dev

diff --git a/.github/workflows/test-style-spec.yml b/.github/workflows/test-style-spec.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64

diff --git a/.github/workflows/test-symbol-shaping.yml b/.github/workflows/test-symbol-shaping.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -6,28 +6,6 @@ on:
   pull_request:
 
 jobs:
-  test_unit_win_mac:
-    strategy:
-      matrix:
-        os:
-          - macos-latest
-          - windows-latest
-        node_version:
-          - 16
-        architecture:
-          - x64
-
-    name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node_version }}
-          architecture: ${{ matrix.architecture }}
-      - run: npm ci
-      - run: npm run test-unit
 
   test_unit_ubuntu:
     strategy:
@@ -42,9 +20,9 @@ jobs:
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
@@ -0,0 +1,21 @@
+name: TypeCheck with Typescript Compiler
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  test_expression:
+    name: ubuntu-latest
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16 x64
+        uses: actions/[email protected]
+        with:
+          node-version: 16
+          architecture: x64
+      - run: npm ci
+      - run: npm run typecheck
diff --git a/.github/workflows/upload-benchmarks.yml b/.github/workflows/upload-benchmarks.yml
@@ -9,10 +9,10 @@ jobs:
   upload_benchmarks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js 16 x64
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: 16
           architecture: x64

diff --git a/.gitignore b/.gitignore
@@ -20,9 +20,10 @@ test/integration/**/test-results.xml
 test/integration/dist/**/*.js
 test/integration/dist/**/*.json
 test/integration/query/dist/fixtures.json
+test/debug-pages/index.html
 */**/*.g.ts
 .eslintcache
-src/style-spec/dist/index.js
+src/style-spec/dist/index.cjs
 _batfish_site
 _batfish_tmp
 _site