Merge branch 'main' into dependabot/npm_and_yarn/react-i18next-15.4.1

.github/ISSUE_TEMPLATE/other-issue.md

@@ -8,4 +8,3 @@ assignees: ''
 ---
 
 <!-- Thanks for reaching out! If you are having general Maputnik mapping questions, please asking them at https://gis.stackexchange.com/ using the 'maputnik' tag https://gis.stackexchange.com/questions/tagged/maputnik and read https://gis.stackexchange.com/help/how-to-ask before you do so (please keep in mind that you're asking there in a general GIS forum, not a dedicated support channel) -->
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,4 +8,3 @@
  - [ ] Include before/after visuals or gifs if this PR includes visual changes.
  - [ ] Write tests for all new functionality.
  - [ ] Add an entry to `CHANGELOG.md` under the `## main` section.
-

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - run: docker build -t test-docker-image-build .
+      - run: docker build -t test-docker-image-build .
 
   # build the editor
   build-node:
@@ -27,17 +27,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
-      with:
+        with:
-        node-version-file: '.nvmrc'
+          node-version-file: '.nvmrc'
-    - run: npm ci
+      - run: npm ci
-    - run: npm run build
+      - run: npm run build
-    - run: npm run lint
+      - run: npm run lint
-    - run: npm run lint-css
+      - run: npm run lint-css
 
 
 
@@ -47,53 +47,53 @@ jobs:
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
-      with:
+        with:
-        node-version-file: '.nvmrc'
+          node-version-file: '.nvmrc'
-    - run: npm ci
+      - run: npm ci
-    - run: npm run build
+      - run: npm run build
-    - name: artifacts/maputnik
+      - name: artifacts/maputnik
-      uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        name: maputnik
+          name: maputnik
-        path: dist
+          path: dist
 
-    # Build and upload desktop CLI artifacts
+      # Build and upload desktop CLI artifacts
-    - name: Set up Go
+      - name: Set up Go
-      uses: actions/setup-go@v5
+        uses: actions/setup-go@v5
-      with:
+        with:
-        go-version: ^1.23.x
+          go-version: ^1.23.x
-        cache-dependency-path: desktop/go.sum
+          cache-dependency-path: desktop/go.sum
-      id: go
+        id: go
 
-    - name: Build desktop artifacts
+      - name: Build desktop artifacts
-      run: npm run build-desktop
+        run: npm run build-desktop
 
-    - name: Artifacts/linux
+      - name: Artifacts/linux
-      uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        name: maputnik-linux
+          name: maputnik-linux
-        path: ./desktop/bin/linux/
+          path: ./desktop/bin/linux/
 
-    - name: Artifacts/darwin
+      - name: Artifacts/darwin
-      uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        name: maputnik-darwin
+          name: maputnik-darwin
-        path: ./desktop/bin/darwin/
+          path: ./desktop/bin/darwin/
 
-    - name: Artifacts/windows
+      - name: Artifacts/windows
-      uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        name: maputnik-windows
+          name: maputnik-windows
-        path: ./desktop/bin/windows/
+          path: ./desktop/bin/windows/
 
   e2e-tests:
     name: "E2E tests using ${{ matrix.browser }}"
     strategy:
       fail-fast: false
       matrix:
-        browser: [chrome]
+        browser: [ chrome ]
 
     runs-on: ubuntu-22.04
     steps:

.github/workflows/deploy.yml

@@ -40,12 +40,12 @@ jobs:
       fail-fast: false
 
     steps:
-    - name: Login to GitHub Container Registry
+      - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
+        uses: docker/login-action@v3
-      with:
+        with:
-        registry: ghcr.io
+          registry: ghcr.io
-        username: ${{ github.actor }}
+          username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - run: docker build -t ghcr.io/maplibre/maputnik:main .
+      - run: docker build -t ghcr.io/maplibre/maputnik:main .
-    - run: docker push ghcr.io/maplibre/maputnik:main
+      - run: docker push ghcr.io/maplibre/maputnik:main

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:
@@ -99,4 +99,3 @@ jobs:
           allowUpdates: true
           draft: false
           prerelease: false
-

.pre-commit-config.yaml

@@ -0,0 +1,24 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+
+ci:
+  autoupdate_schedule: monthly
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-executables-have-shebangs
+      - id: check-json
+        exclude: 'tsconfig(\.node)?\.json'
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-yaml
+        args: [ --allow-multiple-documents ]
+      - id: destroyed-symlinks
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: [ --fix=lf ]
+      - id: trailing-whitespace

CHANGELOG.md

@@ -32,4 +32,3 @@
 ## 1.7.0
 
 - See release notes at https://maputnik.github.io/blog/2020/04/23/release-v1.7.0
-

LICENSE

@@ -20,4 +20,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

cypress/e2e/modals.cy.ts

@@ -245,7 +245,7 @@ describe("modals", () => {
       when.click("nav:open");
 
       get.elementByAttribute('aria-label', "MapTiler Basic").should('exist').click();
-
+      when.wait(1000);
       when.click("nav:settings");
 
       when.select("modal:settings.maputnik:renderer", "mlgljs");

cypress/fixtures/example-layer-style.json

@@ -15,4 +15,3 @@
     }
   ]
 }
-

package.json

@@ -39,7 +39,7 @@
     "events": "^3.3.0",
     "file-saver": "^2.0.5",
     "i18next": "^24.2.2",
-    "i18next-browser-languagedetector": "^8.0.2",
+    "i18next-browser-languagedetector": "^8.0.4",
     "i18next-resources-to-backend": "^1.2.1",
     "json-stringify-pretty-compact": "^4.0.0",
     "json-to-ast": "^2.1.0",
@@ -50,11 +50,11 @@
     "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",
     "lodash.throttle": "^4.1.1",
-    "maplibre-gl": "^5.1.0",
+    "maplibre-gl": "^5.1.1",
     "maputnik-design": "github:maputnik/design#172b06c",
     "ol": "^10.4.0",
-    "ol-mapbox-style": "^12.4.0",
+    "ol-mapbox-style": "^12.5.0",
-    "pmtiles": "^4.1.0",
+    "pmtiles": "^4.3.0",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-accessible-accordion": "^5.0.0",
@@ -93,7 +93,7 @@
     }
   },
   "devDependencies": {
-    "@cypress/code-coverage": "^3.13.11",
+    "@cypress/code-coverage": "^3.13.12",
     "@eslint/js": "^9.19.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@rollup/plugin-replace": "^6.0.2",
@@ -125,25 +125,25 @@
     "@types/wicg-file-system-access": "^2023.10.5",
     "@vitejs/plugin-react": "^4.3.4",
     "cors": "^2.8.5",
-    "cypress": "^14.0.2",
+    "cypress": "^14.1.0",
     "cypress-plugin-tab": "^1.0.5",
-    "eslint": "^9.19.0",
+    "eslint": "^9.21.0",
     "eslint-plugin-react": "^7.37.4",
-    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.18",
+    "eslint-plugin-react-refresh": "^0.4.19",
-    "i18next-parser": "^9.1.0",
+    "i18next-parser": "^9.3.0",
     "istanbul": "^0.4.5",
     "istanbul-lib-coverage": "^3.2.2",
     "postcss": "^8.5.1",
     "react-hot-loader": "^4.13.1",
-    "sass": "^1.83.4",
+    "sass": "^1.85.1",
-    "stylelint": "^16.14.1",
+    "stylelint": "^16.15.0",
     "stylelint-config-recommended-scss": "^14.1.0",
-    "stylelint-scss": "^6.11.0",
+    "stylelint-scss": "^6.11.1",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.22.0",
+    "typescript-eslint": "^8.25.0",
-    "uuid": "^11.0.5",
+    "uuid": "^11.1.0",
-    "vite": "^6.1.0",
+    "vite": "^6.2.0",
-    "vite-plugin-istanbul": "^6.0.2"
+    "vite-plugin-istanbul": "^7.0.0"
   }
 }

src/components/Block.tsx

@@ -102,4 +102,3 @@ export default class Block extends React.Component<BlockProps, BlockState> {
     </label>
   }
 }
-

src/components/Collapse.tsx

@@ -31,4 +31,3 @@ export default class Collapse extends React.Component<CollapseProps> {
     }
   }
 }
-

src/components/Collapser.tsx

@@ -16,4 +16,3 @@ export default class Collapser extends React.Component<CollapserProps> {
     return this.props.isCollapsed ? <MdArrowDropUp style={iconStyle}/> : <MdArrowDropDown style={iconStyle} />
   }
 }
-

src/components/FieldArray.tsx

@@ -16,4 +16,3 @@ export default class FieldArray extends React.Component<FieldArrayProps> {
     </Fieldset>
   }
 }
-

src/components/FieldAutocomplete.tsx

@@ -15,4 +15,3 @@ export default class FieldAutocomplete extends React.Component<FieldAutocomplete
     </Block>
   }
 }
-

src/components/FieldCheckbox.tsx

@@ -15,4 +15,3 @@ export default class FieldCheckbox extends React.Component<FieldCheckboxProps> {
     </Block>
   }
 }
-

src/components/FieldColor.tsx

@@ -18,4 +18,3 @@ export default class FieldColor extends React.Component<FieldColorProps> {
     </Block>
   }
 }
-

src/components/FieldDynamicArray.tsx

@@ -13,4 +13,3 @@ export default class FieldDynamicArray extends React.Component<FieldDynamicArray
     </Fieldset>
   }
 }
-

src/components/FieldFunction.tsx

@@ -404,4 +404,3 @@ export default class FieldFunction extends React.Component<FieldFunctionProps, F
     </div>
   }
 }
-

src/components/FieldJson.tsx

@@ -10,4 +10,3 @@ export default class FieldJson extends React.Component<FieldJsonProps> {
     return <InputJson {...this.props} />
   }
 }
-

src/components/FieldMultiInput.tsx

@@ -15,4 +15,3 @@ export default class FieldMultiInput extends React.Component<FieldMultiInputProp
     </Fieldset>
   }
 }
-

src/components/FieldSelect.tsx

@@ -18,5 +18,3 @@ export default class FieldSelect extends React.Component<FieldSelectProps> {
     </Block>
   }
 }
-
-

src/components/FieldUrl.tsx

@@ -20,4 +20,3 @@ export default class FieldUrl extends React.Component<FieldUrlProps> {
     );
   }
 }
-

src/components/IconBackground.tsx

@@ -11,5 +11,3 @@ export default class IconBackground extends React.Component {
     )
   }
 }
-
-

src/components/IconCircle.tsx

@@ -11,5 +11,3 @@ export default class IconCircle extends React.Component {
     )
   }
 }
-
-

src/components/IconFill.tsx

@@ -11,5 +11,3 @@ export default class IconFill extends React.Component {
     )
   }
 }
-
-

src/components/IconLayer.tsx

@@ -30,4 +30,3 @@ export default class IconLayer extends React.Component<IconLayerProps> {
     }
   }
 }
-

src/components/IconLine.tsx

@@ -11,5 +11,3 @@ export default class IconLine extends React.Component {
     )
   }
 }
-
-

src/components/IconSymbol.tsx

@@ -13,6 +13,3 @@ export default class IconSymbol extends React.Component {
     )
   }
 }
-
-
-

src/components/InputArray.tsx

@@ -115,4 +115,3 @@ export default class FieldArray extends React.Component<FieldArrayProps, FieldAr
     )
   }
 }
-

src/components/InputAutocomplete.tsx

@@ -98,5 +98,3 @@ export default class InputAutocomplete extends React.Component<InputAutocomplete
     </div>
   }
 }
-
-

src/components/InputColor.tsx

@@ -133,4 +133,3 @@ export default class InputColor extends React.Component<InputColorProps> {
     </div>
   }
 }
-

src/components/InputDynamicArray.tsx

@@ -152,4 +152,3 @@ class DeleteValueInputButton extends React.Component<DeleteValueInputButtonProps
     </InputButton>
   }
 }
-

src/components/InputEnum.tsx

@@ -47,4 +47,3 @@ export default class InputEnum extends React.Component<InputEnumProps> {
     }
   }
 }
-

src/components/InputMultiInput.tsx

@@ -37,5 +37,3 @@ export default class InputMultiInput extends React.Component<InputMultiInputProp
     </fieldset>
   }
 }
-
-

src/components/InputNumber.tsx

@@ -244,5 +244,3 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
     }
   }
 }
-
-

src/components/InputSelect.tsx

@@ -30,5 +30,3 @@ export default class InputSelect extends React.Component<InputSelectProps> {
     </select>
   }
 }
-
-

src/components/InputString.tsx

@@ -97,5 +97,3 @@ export default class InputString extends React.Component<InputStringProps, Input
     });
   }
 }
-
-

src/components/ScrollContainer.tsx

@@ -11,4 +11,3 @@ export default class ScrollContainer extends React.Component<ScrollContainerProp
     </div>
   }
 }
-

src/components/SingleFilterEditor.tsx

@@ -90,4 +90,3 @@ export default class SingleFilterEditor extends React.Component<SingleFilterEdit
     </div>
   }
 }
-

src/components/SpecField.tsx

@@ -44,4 +44,3 @@ export default class SpecField extends React.Component<SpecFieldProps> {
     </TypeBlock>
   }
 }
-

src/libs/source.ts

@@ -24,4 +24,3 @@ export function changeSource(mapStyle: StyleSpecification, sourceId: string, sou
     sources: changedSources
   }
 }
-

src/locales/README.md

@@ -57,5 +57,3 @@ The following users can help you with the relevant languages:
 You can test the UI in different languages using the dropdown in the top menu
 Note that Maputnik automatically localize based on browser language settings and stores this language in local storage.
 You can use incognito mode to check a first time usage.
-
-

src/maplibregl.css

@@ -88,4 +88,3 @@
 .maplibregl-ctrl-map {
   background-image: url('data:image/svg+xml;charset=utf8,<svg%20xmlns="http://www.w3.org/2000/svg"%20fill="#8e8e8e%22%20viewBox=%22-10%20-10%2060%2060%22%20preserveAspectRatio=%22xMidYMid%20meet%22%3E%3Cg%3E%3Cpath%20d=%22m25%2031.640000000000004v-19.766666666666673l-10-3.511666666666663v19.766666666666666z%20m9.140000000000008-26.640000000000004q0.8599999999999923%200%200.8599999999999923%200.8600000000000003v25.156666666666666q0%200.625-0.625%200.783333333333335l-9.375%203.1999999999999993-10-3.5133333333333354-8.906666666666668%203.4383333333333326-0.2333333333333334%200.07833333333333314q-0.8616666666666664%200-0.8616666666666664-0.8599999999999994v-25.156666666666663q0-0.625%200.6233333333333331-0.7833333333333332l9.378333333333334-3.198333333333334%2010%203.5133333333333336%208.905000000000001-3.4383333333333344z%22%3E%3C/path%3E%3C/g%3E%3C/svg%3E');
 }
-

src/styles/_components.scss

@@ -308,4 +308,3 @@
   color: currentColor;
   cursor: pointer;
 }
-

src/styles/_modal.scss

@@ -323,4 +323,3 @@
     margin-left: 4px;
   }
 }
-

src/styles/_toolbar.scss

@@ -154,4 +154,3 @@
     border-color: vars.$color-lowgray;
   }
 }
-

src/styles/index.scss

@@ -155,4 +155,3 @@
     overflow: hidden;
   }
 }
-

tsconfig.node.json

@@ -8,4 +8,3 @@
     },
     "include": ["vite.config.ts"]
   }
-