Skip to content

Commit 65cae99

Browse files
Merge pull request #1230 from Colonists-Game/develop
Update .lock files
2 parents b16f43d + f423540 commit 65cae99

2 files changed

Lines changed: 40 additions & 53 deletions

File tree

islanders-client/package-lock.json

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

islanders-client/yarn.lock

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@babel/compat-data@^7.12.13":
1616
"version" "7.12.13"
1717

18-
"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.12.16", "@babel/core@>=7.11.0":
18+
"@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.12.16":
1919
"version" "7.12.16"
2020
dependencies:
2121
"@babel/code-frame" "^7.12.13"
@@ -1345,7 +1345,7 @@
13451345
dependencies:
13461346
"@types/yargs-parser" "*"
13471347

1348-
"@typescript-eslint/eslint-plugin@^4.15.0", "@typescript-eslint/eslint-plugin@^4.4.0":
1348+
"@typescript-eslint/eslint-plugin@^4.15.0":
13491349
"version" "4.15.0"
13501350
dependencies:
13511351
"@typescript-eslint/experimental-utils" "4.15.0"
@@ -1367,7 +1367,7 @@
13671367
"eslint-scope" "^5.0.0"
13681368
"eslint-utils" "^2.0.0"
13691369

1370-
"@typescript-eslint/parser@^4.0.0", "@typescript-eslint/parser@^4.15.0", "@typescript-eslint/parser@^4.4.0":
1370+
"@typescript-eslint/parser@^4.15.0":
13711371
"version" "4.15.0"
13721372
dependencies:
13731373
"@typescript-eslint/scope-manager" "4.15.0"
@@ -1573,7 +1573,7 @@
15731573
"@vue/cli-plugin-vuex@^4.5.11":
15741574
"version" "4.5.11"
15751575

1576-
"@vue/cli-service@^3.0.0 || ^4.0.0-0", "@vue/cli-service@^4.3.1":
1576+
"@vue/cli-service@^4.3.1":
15771577
"version" "4.5.11"
15781578
dependencies:
15791579
"@intervolga/optimize-cssnano-plugin" "^1.0.5"
@@ -1834,15 +1834,15 @@
18341834
"acorn@^5.5.3":
18351835
"version" "5.7.4"
18361836

1837-
"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.0", "acorn@^7.1.1", "acorn@^7.4.0":
1838-
"version" "7.4.1"
1839-
18401837
"acorn@^6.0.1":
18411838
"version" "6.4.2"
18421839

18431840
"acorn@^6.4.1":
18441841
"version" "6.4.2"
18451842

1843+
"acorn@^7.1.0", "acorn@^7.1.1", "acorn@^7.4.0":
1844+
"version" "7.4.1"
1845+
18461846
"address@^1.1.2":
18471847
"version" "1.1.2"
18481848

@@ -1858,7 +1858,7 @@
18581858
"ajv-keywords@^3.1.0", "ajv-keywords@^3.4.1", "ajv-keywords@^3.5.2":
18591859
"version" "3.5.2"
18601860

1861-
"ajv@^6.1.0", "ajv@^6.10.0", "ajv@^6.10.2", "ajv@^6.12.2", "ajv@^6.12.3", "ajv@^6.12.4", "ajv@^6.9.1", "ajv@>=5.0.0":
1861+
"ajv@^6.1.0", "ajv@^6.10.0", "ajv@^6.10.2", "ajv@^6.12.2", "ajv@^6.12.3", "ajv@^6.12.4":
18621862
"version" "6.12.6"
18631863
dependencies:
18641864
"fast-deep-equal" "^3.1.1"
@@ -2087,7 +2087,7 @@
20872087
"esutils" "^2.0.2"
20882088
"js-tokens" "^3.0.2"
20892089

2090-
"babel-core@^6.25.0 || ^7.0.0-0", "babel-core@^7.0.0-bridge.0", "babel-core@7.0.0-bridge.0":
2090+
"babel-core@^7.0.0-bridge.0", "babel-core@7.0.0-bridge.0":
20912091
"version" "7.0.0-bridge.0"
20922092

20932093
"babel-eslint@^10.1.0":
@@ -3034,7 +3034,7 @@
30343034
"postcss" "^7.0.1"
30353035
"timsort" "^0.3.0"
30363036

3037-
"css-loader@*", "css-loader@^3.5.3":
3037+
"css-loader@^3.5.3":
30383038
"version" "3.6.0"
30393039
dependencies:
30403040
"camelcase" "^5.3.1"
@@ -3673,7 +3673,7 @@
36733673
"eslint-utils" "^2.0.0"
36743674
"regexpp" "^3.0.0"
36753675

3676-
"eslint-plugin-import@^2.20.2", "eslint-plugin-import@^2.22.1", "eslint-plugin-import@>= 2.18.0", "eslint-plugin-import@>=1.4.0", "eslint-plugin-import@>=2.18.0":
3676+
"eslint-plugin-import@^2.20.2":
36773677
"version" "2.22.1"
36783678
dependencies:
36793679
"array-includes" "^3.1.1"
@@ -3690,7 +3690,7 @@
36903690
"resolve" "^1.17.0"
36913691
"tsconfig-paths" "^3.9.0"
36923692

3693-
"eslint-plugin-node@^11.1.0", "eslint-plugin-node@>= 9.1.0", "eslint-plugin-node@>=9.1.0":
3693+
"eslint-plugin-node@^11.1.0":
36943694
"version" "11.1.0"
36953695
dependencies:
36963696
"eslint-plugin-es" "^3.0.0"
@@ -3700,13 +3700,13 @@
37003700
"resolve" "^1.10.1"
37013701
"semver" "^6.1.0"
37023702

3703-
"eslint-plugin-promise@^4.2.1", "eslint-plugin-promise@>= 4.2.1", "eslint-plugin-promise@>=4.2.1":
3703+
"eslint-plugin-promise@^4.2.1":
37043704
"version" "4.3.1"
37053705

3706-
"eslint-plugin-standard@^4.0.0", "eslint-plugin-standard@>= 4.0.0", "eslint-plugin-standard@>=4.0.0":
3706+
"eslint-plugin-standard@^4.0.0":
37073707
"version" "4.1.0"
37083708

3709-
"eslint-plugin-vue@^5.2.3 || ^6.0.0 || ^7.0.0", "eslint-plugin-vue@^7.5.0", "eslint-plugin-vue@>= 6.1.2":
3709+
"eslint-plugin-vue@^7.5.0":
37103710
"version" "7.5.0"
37113711
dependencies:
37123712
"eslint-utils" "^2.1.0"
@@ -3743,7 +3743,7 @@
37433743
"eslint-visitor-keys@^2.0.0":
37443744
"version" "2.0.0"
37453745

3746-
"eslint@*", "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0", "eslint@^5.0.0 || ^6.0.0 || ^7.0.0", "eslint@^5.16.0 || ^6.8.0 || ^7.2.0", "eslint@^6.2.0 || ^7.0.0", "eslint@^7.20.0", "eslint@>= 1.6.0 < 7.0.0", "eslint@>= 4.12.1", "eslint@>=1.6.0 <7.0.0", "eslint@>=4.19.1", "eslint@>=5.0.0", "eslint@>=5.16.0", "eslint@>=6.2.2", "eslint@>=7.5.0":
3746+
"eslint@^7.20.0":
37473747
"version" "7.20.0"
37483748
dependencies:
37493749
"@babel/code-frame" "7.12.11"
@@ -4053,7 +4053,7 @@
40534053
dependencies:
40544054
"flat-cache" "^3.0.4"
40554055

4056-
"file-loader@*", "file-loader@^4.2.0":
4056+
"file-loader@^4.2.0":
40574057
"version" "4.3.0"
40584058
dependencies:
40594059
"loader-utils" "^1.2.3"
@@ -4555,7 +4555,7 @@
45554555
"html-tags@^3.1.0":
45564556
"version" "3.1.0"
45574557

4558-
"html-webpack-plugin@^3.2.0", "html-webpack-plugin@>=2.26.0":
4558+
"html-webpack-plugin@^3.2.0":
45594559
"version" "3.2.0"
45604560
dependencies:
45614561
"html-minifier" "^3.2.3"
@@ -5235,7 +5235,7 @@
52355235
"jest-regex-util" "^24.3.0"
52365236
"jest-snapshot" "^24.9.0"
52375237

5238-
"jest-resolve@*", "jest-resolve@^24.9.0":
5238+
"jest-resolve@^24.9.0":
52395239
"version" "24.9.0"
52405240
dependencies:
52415241
"@jest/types" "^24.9.0"
@@ -5392,7 +5392,7 @@
53925392
"merge-stream" "^2.0.0"
53935393
"supports-color" "^7.0.0"
53945394

5395-
"jest@^24.9.0", "jest@>=24 <25", "jest@>=26 <27":
5395+
"jest@^24.9.0":
53965396
"version" "24.9.0"
53975397
dependencies:
53985398
"import-local" "^2.0.0"
@@ -6577,7 +6577,7 @@
65776577
dependencies:
65786578
"penner" "^0.1.3"
65796579

6580-
"pixi.js@^5.3.7", "pixi.js@>=4.6.0":
6580+
"pixi.js@^5.3.7":
65816581
"version" "5.3.7"
65826582
dependencies:
65836583
"@pixi/accessibility" "5.3.7"
@@ -7265,7 +7265,7 @@
72657265
"stealthy-require" "^1.1.1"
72667266
"tough-cookie" "^2.3.3"
72677267

7268-
"request@^2.34", "request@^2.87.0", "request@^2.88.0", "request@^2.88.2":
7268+
"request@^2.87.0", "request@^2.88.0", "request@^2.88.2":
72697269
"version" "2.88.2"
72707270
dependencies:
72717271
"aws-sign2" "~0.7.0"
@@ -7436,7 +7436,7 @@
74367436
"schema-utils" "^2.6.1"
74377437
"semver" "^6.3.0"
74387438

7439-
"sass@^1.26.5", "sass@^1.3.0":
7439+
"sass@^1.26.5":
74407440
"version" "1.32.7"
74417441
dependencies:
74427442
"chokidar" ">=2.0.0 <4.0.0"
@@ -8330,7 +8330,7 @@
83308330
"typedarray@^0.0.6":
83318331
"version" "0.0.6"
83328332

8333-
"typescript@*", "typescript@^4.1.3", "typescript@>=2", "typescript@>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev", "typescript@>=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", "typescript@>=3.8 <5.0":
8333+
"typescript@^4.1.3":
83348334
"version" "4.1.5"
83358335

83368336
"uglify-js@3.4.x":
@@ -8567,7 +8567,7 @@
85678567
"hash-sum" "^1.0.2"
85688568
"loader-utils" "^1.0.2"
85698569

8570-
"vue-template-compiler@^2.0.0", "vue-template-compiler@^2.6.11", "vue-template-compiler@^2.x":
8570+
"vue-template-compiler@^2.6.11":
85718571
"version" "2.6.12"
85728572
dependencies:
85738573
"de-indent" "^1.0.2"
@@ -8576,7 +8576,7 @@
85768576
"vue-template-es2015-compiler@^1.6.0", "vue-template-es2015-compiler@^1.9.0":
85778577
"version" "1.9.1"
85788578

8579-
"vue@*", "vue@^2 || ^3.0.0-0", "vue@^2.0.0", "vue@^2.6.11", "vue@^2.6.4", "vue@^2.x", "vue@2.x":
8579+
"vue@^2.6.11":
85808580
"version" "2.6.12"
85818581

85828582
"vuetify@^2.4.3":
@@ -8715,7 +8715,7 @@
87158715
"source-list-map" "^2.0.0"
87168716
"source-map" "~0.6.1"
87178717

8718-
"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.3.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=1.11.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
8718+
"webpack@^4.0.0":
87198719
"version" "4.46.0"
87208720
dependencies:
87218721
"@webassemblyjs/ast" "1.9.0"

0 commit comments

Comments
 (0)