Skip to content

Commit 4608806

Browse files
authored
Merge pull request #1337 from OpenGeoscience/update-packages
build: Update packages
2 parents e735210 + 4f323e0 commit 4608806

File tree

12 files changed

+1192
-1184
lines changed

12 files changed

+1192
-1184
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-node@v4
2222
with:
23-
node-version: '18'
23+
node-version: '20'
2424
- uses: browser-actions/setup-firefox@latest
2525
- run: sudo apt-get install --yes --no-install-recommends optipng imagemagick
2626
- run: sudo apt-get remove --yes fonts-lato

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# pre-commit install --hook-type commit-msg
44
# See https://pre-commit.com for more information
55
# See https://pre-commit.com/hooks.html for more hooks
6-
default_stages: [commit, push]
6+
default_stages: [pre-commit, pre-push]
77
repos:
88
- repo: https://github.com/pre-commit/pre-commit-hooks
9-
rev: v4.6.0
9+
rev: v5.0.0
1010
hooks:
1111
- id: check-added-large-files
1212
- id: check-ast
@@ -55,9 +55,10 @@ repos:
5555
- --skip
5656
- examples/sld/index.pug,package-lock.json,examples/reprojection/proj.json,website/themes/agency/source/vendor/jquery/jquery.min.js,examples/reprojection/capitals.json
5757
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
58-
rev: v9.17.0
58+
rev: v9.18.0
5959
hooks:
6060
- id: commitlint
61+
language_version: "22.10.0"
6162
stages: [commit-msg]
6263
additional_dependencies: ['@commitlint/config-conventional']
6364
verbose: true

package-lock.json

Lines changed: 1163 additions & 1157 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"color-name": "^2.0.0",
1616
"docdash": "^2.0.1",
17-
"earcut": "^2.2.3",
17+
"earcut": "^3.0.0",
1818
"gl-mat3": "^2.0.0",
1919
"gl-mat4": "^1.2.0",
2020
"gl-vec3": "^1.1.3",
@@ -37,23 +37,23 @@
3737
"@babel/preset-env": "^7.16.5",
3838
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
3939
"babel-loader": "^9.0.1",
40-
"babel-plugin-istanbul": "^6.1.1",
40+
"babel-plugin-istanbul": "^7.0.0",
4141
"bootstrap": "^3.4.1",
4242
"bootswatch": "^3.4.1",
4343
"codemirror": "^5.65.0",
4444
"colorbrewer": "^1.5.1",
45-
"css-loader": "^6.6.0",
45+
"css-loader": "^7.1.0",
4646
"docco": "^0.9.1",
47-
"eslint": "^8.20.0",
47+
"eslint": "^8.57.1",
4848
"eslint-config-semistandard": "^17.0.0",
4949
"eslint-config-standard": "^17.0.0",
5050
"eslint-plugin-import": "^2.25.3",
51-
"eslint-plugin-n": "^15.2.4",
52-
"eslint-plugin-promise": "^6.0.0",
51+
"eslint-plugin-n": "^15.7.0",
52+
"eslint-plugin-promise": "^6.6.0",
5353
"expose-loader": "^5.0.0",
5454
"express": "^4.17.2",
5555
"fs-extra": "^11.0.0",
56-
"glob": "^10.1.0",
56+
"glob": "^11.0.0",
5757
"imports-loader": "^5.0.0",
5858
"jasmine-core": "^5.0.0",
5959
"js-yaml": "^4.1.0",
@@ -77,23 +77,23 @@
7777
"pug": "^3.0.2",
7878
"pug-lint": "^2.6.0",
7979
"pug-load": "^3.0.0",
80-
"raw-body": "^2.4.2",
80+
"raw-body": "^3.0.0",
8181
"resemblejs": "^5.0.0",
8282
"serve-index": "^1.9.1",
8383
"shader-loader": "git+https://github.com/Makio64/shader-loader",
84-
"sinon": "^17.0.0",
85-
"style-loader": "^3.3.1",
84+
"sinon": "^19.0.2",
85+
"style-loader": "^4.0.0",
8686
"stylelint": "<16.3.0 || >16.3.0",
8787
"stylelint-stylus": "^1.0.0",
88-
"stylus": "^0.62.0",
88+
"stylus": "^0.64.0",
8989
"stylus-loader": "^8.0.0",
90-
"tar": "^6.1.13",
90+
"tar": "^7.4.3",
9191
"terser-webpack-plugin": "^5.3.1",
9292
"touch-emulator": "^1.0.0",
9393
"typeface-lato": "^1.1.13",
9494
"webpack": "^5.68.0",
9595
"webpack-cli": "^5.0.0",
96-
"webpack-merge": "^5.8.0",
96+
"webpack-merge": "^6.0.1",
9797
"webpack-string-replacer": "^0.0.20"
9898
},
9999
"release": {

src/map.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,10 +1594,10 @@ var map = function (arg) {
15941594
this.layers = this.children;
15951595

15961596
/**
1597-
* Comapare two layers by zIndex. If the zIndex is the same, the order in
1598-
* the parent element is used. If the two layers don't have the same parent
1599-
* (for instance, one layer isn't attached to the map), layers in the map
1600-
* are sorted below detached layers.
1597+
* Compare two layers by zIndex. If the zIndex is the same, the order in the
1598+
* parent element is used. If the two layers don't have the same parent (for
1599+
* instance, one layer isn't attached to the map), layers in the map are
1600+
* sorted below detached layers.
16011601
*
16021602
* @param {geo.layer} a First layer to compare.
16031603
* @param {geo.layer} b Second layer to compare.

src/mapInteractor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var Mousetrap = require('mousetrap');
4545
* @property {boolean} [keyboard.focusHighlight=true] If truthy, when the map
4646
* gains focus, a highlight style is shown around it. This gives an
4747
* indicator that keyboard events will affect the map, but may not be
48-
* visuallly desirabel.
48+
* visually desirable.
4949
* @property {boolean} [alwaysTouch=false] If true, add touch support even if
5050
* the browser doesn't apepar to be touch-aware.
5151
* @property {number} [wheelScaleX=1] A scale multiplier for horizontal wheel

src/pointFeature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ var pointFeature = function (arg) {
156156
m_allData.forEach(function (d, i) {
157157

158158
// for each point in the data set normalize the coordinate
159-
// representation and add the point to the cluster treee
159+
// representation and add the point to the cluster tree
160160
var pt = util.normalizeCoordinates(position(d, i));
161161
pt.index = i;
162162
m_clusterTree.addPoint(pt);

src/polygonFeature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ var polygonFeature = function (arg) {
639639
return data;
640640
}
641641

642-
/* Set the reduced polgons as the data and use simple accessors. */
642+
/* Set the reduced polygons as the data and use simple accessors. */
643643
m_this.style('position', util.identityFunction);
644644
m_this.style('polygon', util.identityFunction);
645645
m_this.data(data);

src/ui/scaleWidget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require('./scaleWidget.styl');
4949
* that determine what round values are displayed.
5050
* @property {number} multiples.multiple The value that is selected for display.
5151
* @property {number} multiples.digit The number of significant digits in
52-
* `mutliple`.
52+
* `multiple`.
5353
*/
5454

5555
/**

src/vtkjs/vtkjsRenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ var vtkjsRenderer = function (arg) {
105105
/* If we are already scheduled to render, don't schedule again. Rather,
106106
* mark that we should render after other animation frame requests occur.
107107
* It would be nice if we could just reschedule the call by removing and
108-
* readding the animation frame request, but this doesn't work for if the
108+
* re-adding the animation frame request, but this doesn't work for if the
109109
* reschedule occurs during another animation frame callback (it then waits
110110
* until a subsequent frame). */
111111
m_this.layer().map().scheduleAnimationFrame(m_this._renderFrame, true);

0 commit comments

Comments
 (0)