Merge pull request #1599 from geoman-io/feat/upgrade-deps

Author: mscno

.eslintrc

@@ -14,34 +14,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v3
-        with:
-          version: 8
-
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: pnpm
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+          cache: npm
 
       - uses: actions/cache@v4
-        name: Setup pnpm cache
+        name: Setup npm cache
         with:
           path: |
-            ${{ env.STORE_PATH }}
+            ~/.npm
             /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-npm-
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile --store-dir ${{ env.STORE_PATH }}
-      - run: pnpm run build
-      - run: pnpm test
+        run: npm ci
+      - run: npm run build
+      - run: npm test
         env:
           CI: true

.github/workflows/nodejs.yml

@@ -7,11 +7,11 @@ on:
       - 'v*.*.*'
 
 permissions:
+  id-token: write
   contents: write
 
 env:
   FILE_NAME_PREFIX: geoman-io-leaflet-geoman
-  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
 jobs:
   build:
@@ -37,34 +37,29 @@ jobs:
             exit 1
           fi
 
-      - uses: pnpm/action-setup@v3
-        with:
-          version: 8
-
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: pnpm
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+          cache: npm
+          registry-url: 'https://registry.npmjs.org'
 
       - uses: actions/cache@v4
-        name: Setup pnpm cache
+        name: Setup npm cache
         with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          path: ~/.npm
+          key: ${{ runner.os }}-npm-store-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-npm-store-
+
+      - name: Update npm
+        run: npm install -g npm@latest
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile --store-dir ${{ env.STORE_PATH }}
+        run: npm ci
 
       - name: Prepare package
-        run: pnpm pack
+        run: npm pack
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -77,17 +72,7 @@ jobs:
             LICENSE
 
       - name: Publish to NPM
-        shell: bash
-        run: |
-          #!/bin/bash
-
-          # Set npm configurations
-          pnpm config set shamefully-hoist true
-          pnpm config set strict-peer-dependencies false
-
-          # Set auth token
-          pnpm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
-          pnpm publish --no-git-checks
+        run: npm publish --no-git-checks
 
       - name: Merge changes from develop into master
         # Only run when a tag triggers the workflow

.github/workflows/release.yml

@@ -5,6 +5,7 @@ npm-debug.log
 /.idea/
 /dist/
 \.source*
+/cypress/downloads
 /cypress/screenshots
 /cypress/videos
 .eslintcache

.gitignore

@@ -1 +1 @@
-v20.5.1
+v22.11.0

.nvmrc

@@ -1 +1 @@
-nodejs 20.5.1
+nodejs 22.11.0

.tool-versions

@@ -10,7 +10,8 @@ const plugins = [{
       const message = errors.length === 0 && warnings.length === 0
         ? 'Build completed.'
         : `Build completed with ${errors.length} error(s) and ${warnings.length} warning(s).`;
-        console.log(`[BUILD #${count.toString().padStart(3, '0')}]:`, message);    });
+      console.log(`[BUILD #${count.toString().padStart(3, '0')}]:`, message);
+    });
   },
 }];
 
@@ -20,7 +21,8 @@ const buildOptions = {
   loader: {
     '.js': 'jsx',
     '.css': 'css',
-    '.svg': 'dataurl' },
+    '.svg': 'dataurl'
+  },
   minify: true,
   outfile: './dist/leaflet-geoman.js',
   sourcemap: true,
@@ -32,19 +34,19 @@ if (process.env.DEV) {
   // Watch in dev mode
   await ctx.watch();
   console.log('watching...');
-    const { host, port } = await ctx.serve({
-      port: 5500,
-      servedir: '.',
-      fallback: "./index.html"
-    });
-  console.log(`Serving app at http://${host}:${port}/demo`);
+  const { host, port } = await ctx.serve({
+    port: 5500,
+    servedir: '.',
+    fallback: "./index.html"
+  });
+  console.log(`Serving app at http://${host || 'localhost'}:${port}/demo`);
 } else {
   // Clean /dist folder
   fs.rmSync("./dist", { recursive: true, force: true });
 
   // Build
   await ctx.rebuild();
-  
+
   // Dispose context
   ctx.dispose();
 

bundle.mjs

@@ -1,5 +1,3 @@
-/* eslint-disable no-console */
-/* eslint-disable no-alert */
 const map = L.map('map').setView([40.0269319, 32.83604819], 13);
 
 L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {

demo/customcontrols.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 const tiles1 = L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
   maxZoom: 19,
   attribution:

demo/demo-canvas.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 const tiles1 = L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
   maxZoom: 19,
   attribution:
@@ -50,7 +49,6 @@ const m1 = L.circleMarker([51.50313, -0.091223], { radius: 10 });
 const m2 = L.marker([51.50614, -0.0989]);
 const m3 = L.marker([51.50915, -0.096112], { pmIgnore: true });
 
-// eslint-disable-next-line no-unused-vars
 const mGroup = L.layerGroup([m1, m2, m3]).addTo(map2);
 // mGroup.pm.enable();