Merge pull request #12 from camptocamp/upgrade-node-18

Upgrade dependencies for node 18 compatibility
camptocamp · Jul 1, 2023 · a2f8d7d · a2f8d7d
2 parents 75fbf9d + eda5b0f
commit a2f8d7d
Show file tree

Hide file tree

Showing 28 changed files with 13,887 additions and 9,646 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -14,7 +14,7 @@ jobs:
  - name: Install Node & NPM
  uses: actions/setup-node@v2
  with:
- node-version: '16' # includes NPM 7
+ node-version: '18'
 
  - name: Cache node modules
  uses: actions/cache@v1

diff --git a/README.md b/README.md
@@ -46,12 +46,11 @@ requests, use:
 ```js
 import { enableFallbackWithoutWorker } from '@camptocamp/ogc-client';
 
-enableFallbackWithoutWorker()
+enableFallbackWithoutWorker();
 ```
 
 All processing will be done on the main thread after this call, including HTTP requests.
 
-
 ### API
 
 > TODO

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -7,14 +7,14 @@
  "build": "vue-cli-service build"
  },
  "dependencies": {
- "core-js": "^3.6.5",
- "marked": "^4.0.3",
- "vue": "^2.6.11"
+ "core-js": "^3.30.2",
+ "marked": "^5.0.5",
+ "vue": "^2.7.14"
  },
  "devDependencies": {
- "@vue/cli-plugin-babel": "~4.5.0",
- "@vue/cli-service": "~4.5.0",
- "vue-template-compiler": "^2.6.11",
+ "@vue/cli-plugin-babel": "~4.5.19",
+ "@vue/cli-service": "~4.5.19",
+ "vue-template-compiler": "^2.7.14",
  "worker-plugin": "^5.0.1"
  }
 }
diff --git a/app/public/index.html b/app/public/index.html
@@ -6,11 +6,23 @@
  <meta name="viewport" content="width=device-width,initial-scale=1.0" />
  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
  <title><%= htmlWebpackPlugin.options.title %></title>
- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
- <link rel="preconnect" href="https://fonts.googleapis.com">
- <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
- <link href="https://fonts.googleapis.com/css2?family=Comfortaa:wght@500;600;700&family=Dongle:wght@300;400;700&display=swap" rel="stylesheet">
+ <link
+ href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+ rel="stylesheet"
+ integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+ crossorigin="anonymous"
+ />
+ <script
+ src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
+ integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
+ crossorigin="anonymous"
+ ></script>
+ <link rel="preconnect" href="https://fonts.googleapis.com" />
+ <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+ <link
+ href="https://fonts.googleapis.com/css2?family=Comfortaa:wght@500;600;700&family=Dongle:wght@300;400;700&display=swap"
+ rel="stylesheet"
+ />
  <link
  rel="stylesheet"
  href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.3.1/styles/base16/railscasts.min.css"

diff --git a/app/vue.config.js b/app/vue.config.js
@@ -3,6 +3,7 @@ module.exports = {
  configureWebpack: {
  output: {
  globalObject: 'this',
+ hashFunction: 'xxhash64', // avoids error ERR_OSSL_EVP_UNSUPPORTED
  },
  plugins: [new WorkerPlugin()],
  },

diff --git a/build/generate-dist.js b/build/generate-dist.js
@@ -4,7 +4,7 @@ const path = require('path');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const commonjs = require('@rollup/plugin-commonjs');
 const { rollup } = require('rollup');
-const { terser } = require('rollup-plugin-terser');
+const terser = require('@rollup/plugin-terser');
 const json = require('@rollup/plugin-json');
 const typescript = require('@rollup/plugin-typescript');
 const fse = require('fs-extra');

diff --git a/fixtures/ogc-api/sample-data.json b/fixtures/ogc-api/sample-data.json
@@ -83,9 +83,7 @@
  "spatial": {
  "bbox": [
  [
- -9.23056668252574,
- 49.81680248396912,
- 2.69547862504583,
+ -9.23056668252574, 49.81680248396912, 2.69547862504583,
  60.78388658611872
  ]
  ],

diff --git a/fixtures/ogc-api/sample-data/collections.json b/fixtures/ogc-api/sample-data/collections.json
@@ -85,9 +85,7 @@
  "spatial": {
  "bbox": [
  [
- -7.942759150065165,
- 49.901607895996534,
- 1.9957427933628138,
+ -7.942759150065165, 49.901607895996534, 1.9957427933628138,
  60.133709755754
  ]
  ],
@@ -144,9 +142,7 @@
  "spatial": {
  "bbox": [
  [
- -3.353443758684184,
- 51.56539937427431,
- -2.030006856546504,
+ -3.353443758684184, 51.56539937427431, -2.030006856546504,
  55.81167771035611
  ]
  ],
@@ -203,9 +199,7 @@
  "spatial": {
  "bbox": [
  [
- -9.229436317495699,
- 49.82026221571111,
- 2.6868283140378657,
+ -9.229436317495699, 49.82026221571111, 2.6868283140378657,
  60.77919884922387
  ]
  ],
@@ -262,9 +256,7 @@
  "spatial": {
  "bbox": [
  [
- -9.161386312800703,
- 49.83051579969082,
- 2.6926347822219707,
+ -9.161386312800703, 49.83051579969082, 2.6926347822219707,
  60.77807759733313
  ]
  ],
@@ -321,9 +313,7 @@
  "spatial": {
  "bbox": [
  [
- -6.289748340048653,
- 50.14037477109227,
- 2.33600775696539,
+ -6.289748340048653, 50.14037477109227, 2.33600775696539,
  58.515541995093926
  ]
  ],
@@ -380,9 +370,7 @@
  "spatial": {
  "bbox": [
  [
- -9.229007463313069,
- 49.81685890446522,
- 2.69547862504583,
+ -9.229007463313069, 49.81685890446522, 2.69547862504583,
  60.783438341201155
  ]
  ],
@@ -439,9 +427,7 @@
  "spatial": {
  "bbox": [
  [
- -9.140209405918318,
- 49.847346158649266,
- 2.6798173070292117,
+ -9.140209405918318, 49.847346158649266, 2.6798173070292117,
  60.72844339242528
  ]
  ],
@@ -498,9 +484,7 @@
  "spatial": {
  "bbox": [
  [
- -9.230549516889134,
- 49.81687027180851,
- 2.6954553633653067,
+ -9.230549516889134, 49.81687027180851, 2.6954553633653067,
  60.78336234918871
  ]
  ],
@@ -557,9 +541,7 @@
  "spatial": {
  "bbox": [
  [
- -9.161552750416005,
- 49.84423409871862,
- 2.693061112022058,
+ -9.161552750416005, 49.84423409871862, 2.693061112022058,
  60.77806491151261
  ]
  ],
@@ -616,9 +598,7 @@
  "spatial": {
  "bbox": [
  [
- -9.223028104021813,
- 49.8211736840672,
- 2.6872590240033913,
+ -9.223028104021813, 49.8211736840672, 2.6872590240033913,
  60.77819537105956
  ]
  ],
@@ -675,9 +655,7 @@
  "spatial": {
  "bbox": [
  [
- -6.000951880798203,
- 50.350225515433486,
- 2.197829108619243,
+ -6.000951880798203, 50.350225515433486, 2.197829108619243,
  57.35677547861099
  ]
  ],
@@ -734,9 +712,7 @@
  "spatial": {
  "bbox": [
  [
- -6.57793449730909,
- 50.11274051097212,
- 2.616645763341211,
+ -6.57793449730909, 50.11274051097212, 2.616645763341211,
  60.35171925328691
  ]
  ],
@@ -793,9 +769,7 @@
  "spatial": {
  "bbox": [
  [
- -6.336940205377114,
- 50.11281330079447,
- 2.373901529064454,
+ -6.336940205377114, 50.11281330079447, 2.373901529064454,
  58.525818197436486
  ]
  ],
@@ -852,9 +826,7 @@
  "spatial": {
  "bbox": [
  [
- -9.157833237161705,
- 49.844845328102735,
- 2.6891998217837148,
+ -9.157833237161705, 49.844845328102735, 2.6891998217837148,
  60.75074152255422
  ]
  ],
@@ -911,9 +883,7 @@
  "spatial": {
  "bbox": [
  [
- -6.4956758012099645,
- 50.08021976237488,
- 2.383883951687144,
+ -6.4956758012099645, 50.08021976237488, 2.383883951687144,
  58.54688148276149
  ]
  ],
@@ -970,9 +940,7 @@
  "spatial": {
  "bbox": [
  [
- -8.140045163468065,
- 49.897828949470515,
- 2.678925679725326,
+ -8.140045163468065, 49.897828949470515, 2.678925679725326,
  60.72856279715021
  ]
  ],
@@ -1029,9 +997,7 @@
  "spatial": {
  "bbox": [
  [
- -8.114938143586947,
- 49.88033059118879,
- 2.6783629940894356,
+ -8.114938143586947, 49.88033059118879, 2.6783629940894356,
  60.68320893890659
  ]
  ],
@@ -1088,9 +1054,7 @@
  "spatial": {
  "bbox": [
  [
- -9.149150953572926,
- 49.849552493410215,
- 2.6791066928139706,
+ -9.149150953572926, 49.849552493410215, 2.6791066928139706,
  60.78388658611872
  ]
  ],
@@ -1147,9 +1111,7 @@
  "spatial": {
  "bbox": [
  [
- -8.053765984889685,
- 49.89774857169156,
- 2.6293155160795716,
+ -8.053765984889685, 49.89774857169156, 2.6293155160795716,
  60.3210966112084
  ]
  ],
@@ -1206,9 +1168,7 @@
  "spatial": {
  "bbox": [
  [
- -9.23056668252574,
- 49.81680248396912,
- 2.69547862504583,
+ -9.23056668252574, 49.81680248396912, 2.69547862504583,
  60.783438341201155
  ]
  ],
@@ -1265,9 +1225,7 @@
  "spatial": {
  "bbox": [
  [
- -8.115229230492005,
- 49.87727148846909,
- 2.67341949373892,
+ -8.115229230492005, 49.87727148846909, 2.67341949373892,
  60.687673069835824
  ]
  ],

diff --git a/fixtures/ogc-api/sample-data/collections/airports.json b/fixtures/ogc-api/sample-data/collections/airports.json
@@ -91,9 +91,7 @@
  "spatial": {
  "bbox": [
  [
- -7.942759150065165,
- 49.901607895996534,
- 1.9957427933628138,
+ -7.942759150065165, 49.901607895996534, 1.9957427933628138,
  60.133709755754
  ]
  ],

diff --git a/fixtures/ogc-api/sample-data/collections/roads_national.json b/fixtures/ogc-api/sample-data/collections/roads_national.json
@@ -86,9 +86,7 @@
  "spatial": {
  "bbox": [
  [
- -6.4956758012099645,
- 50.08021976237488,
- 2.383883951687144,
+ -6.4956758012099645, 50.08021976237488, 2.383883951687144,
  58.54688148276149
  ]
  ],

diff --git a/fixtures/wfs/capabilities-pigma-1-0-0.xml b/fixtures/wfs/capabilities-pigma-1-0-0.xml
@@ -214,8 +214,8 @@
  <Name>cd16:comptages_routiers_l</Name>
  <Title>CD 16 - Comptages routiers</Title>
  <Abstract>Représentation des moyennes journalières des trafics routiers sur les routes départementales de la
- Charente (16) au 1er Janvier 2021.&#13;
- &#13;
+ Charente (16) au 1er Janvier 2021.
+
  Mise à jour : Mars 2021
  </Abstract>
  <Keywords>features, comptages_routiers_l</Keywords>
@@ -227,8 +227,8 @@
  <Name>cd16:hierarchisation_l</Name>
  <Title>CD 16 - Hiérarchisation du réseau</Title>
  <Abstract>Hiérarchisation du réseau routier départemental en fonction des caractéristiques de chaque section
- de route et de son usage au 1er Janvier 2021.&#13;
- &#13;
+ de route et de son usage au 1er Janvier 2021.
+
  Mise à jour : Mars 2021
  </Abstract>
  <Keywords>features, hierarchisation_l</Keywords>

diff --git a/fixtures/wfs/capabilities-pigma-1-1-0.xml b/fixtures/wfs/capabilities-pigma-1-1-0.xml
@@ -317,8 +317,8 @@
  <Name>cd16:comptages_routiers_l</Name>
  <Title>CD 16 - Comptages routiers</Title>
  <Abstract>Représentation des moyennes journalières des trafics routiers sur les routes départementales de la
- Charente (16) au 1er Janvier 2021.&#13;
- &#13;
+ Charente (16) au 1er Janvier 2021.
+
  Mise à jour : Mars 2021
  </Abstract>
  <ows:Keywords>
@@ -352,8 +352,8 @@
  <Name>cd16:hierarchisation_l</Name>
  <Title>CD 16 - Hiérarchisation du réseau</Title>
  <Abstract>Hiérarchisation du réseau routier départemental en fonction des caractéristiques de chaque section
- de route et de son usage au 1er Janvier 2021.&#13;
- &#13;
+ de route et de son usage au 1er Janvier 2021.
+
  Mise à jour : Mars 2021
  </Abstract>
  <ows:Keywords>