aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2024-03-31 07:19:53 +0530
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2024-03-31 07:19:53 +0530
commit684543c22e66af31bcae302e2b586803339034ff (patch)
tree24b3842762a56b4f744a744d46593dbd6d742da3
parent6.7.3-nightly.4 [skip ci] (diff)
downloadferdium-app-684543c22e66af31bcae302e2b586803339034ff.tar.gz
ferdium-app-684543c22e66af31bcae302e2b586803339034ff.tar.zst
ferdium-app-684543c22e66af31bcae302e2b586803339034ff.zip
Revert "Bring in missing python (system dependency) (#1639)"
Since its causing all builds to fail This reverts commit 53c72ea5ac4f103291fdd347b7cd9cc0dbafa4b5.
-rw-r--r--.github/workflows/builds.yml9
-rw-r--r--.python-version1
-rw-r--r--CONTRIBUTING.md11
-rw-r--r--Dockerfile2
-rw-r--r--package.json8
-rw-r--r--pnpm-lock.yaml183
-rwxr-xr-xscripts/build-unix.sh19
-rw-r--r--scripts/build-windows.ps12
8 files changed, 84 insertions, 151 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 1788e42d9..6ad31da9e 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -55,9 +55,6 @@ jobs:
55 with: 55 with:
56 node-version-file: '.nvmrc' 56 node-version-file: '.nvmrc'
57 cache: 'pnpm' 57 cache: 'pnpm'
58 - name: Use python specified in the '.python-version' file
59 uses: actions/setup-python@v5
60 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
61 - name: Install node dependencies 58 - name: Install node dependencies
62 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} 59 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
63 uses: nick-fields/retry@v3 60 uses: nick-fields/retry@v3
@@ -180,8 +177,6 @@ jobs:
180 with: 177 with:
181 node-version-file: '.nvmrc' 178 node-version-file: '.nvmrc'
182 cache: 'pnpm' 179 cache: 'pnpm'
183 - name: Use python specified in the '.python-version' file
184 uses: actions/setup-python@v5
185 - name: Install node dependencies 180 - name: Install node dependencies
186 uses: nick-fields/retry@v3 181 uses: nick-fields/retry@v3
187 with: 182 with:
@@ -261,8 +256,6 @@ jobs:
261 with: 256 with:
262 node-version-file: '.nvmrc' 257 node-version-file: '.nvmrc'
263 cache: 'pnpm' 258 cache: 'pnpm'
264 - name: Use python specified in the '.python-version' file
265 uses: actions/setup-python@v5
266 - name: Install node dependencies 259 - name: Install node dependencies
267 uses: nick-fields/retry@v3 260 uses: nick-fields/retry@v3
268 with: 261 with:
@@ -363,8 +356,6 @@ jobs:
363 with: 356 with:
364 node-version-file: '.nvmrc' 357 node-version-file: '.nvmrc'
365 cache: 'pnpm' 358 cache: 'pnpm'
366 - name: Use python specified in the '.python-version' file
367 uses: actions/setup-python@v5
368 #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved 359 #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved
369 - name: Tweak pnpm.cjs 360 - name: Tweak pnpm.cjs
370 run: | 361 run: |
diff --git a/.python-version b/.python-version
deleted file mode 100644
index b6d8b7612..000000000
--- a/.python-version
+++ /dev/null
@@ -1 +0,0 @@
13.11.8
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 753068434..887a72a5a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@
13 - [How can I contribute?](#how-can-i-contribute) 13 - [How can I contribute?](#how-can-i-contribute)
14 - [Setting up your development machine](#setting-up-your-development-machine) 14 - [Setting up your development machine](#setting-up-your-development-machine)
15 - [Install system-level dependencies](#install-system-level-dependencies) 15 - [Install system-level dependencies](#install-system-level-dependencies)
16 - [Node.js, pnpm, python](#nodejs-pnpm-python) 16 - [Node.js, pnpm](#nodejs-pnpm)
17 - [Git](#git) 17 - [Git](#git)
18 - [On Debian/Ubuntu](#on-debianubuntu) 18 - [On Debian/Ubuntu](#on-debianubuntu)
19 - [On Fedora](#on-fedora) 19 - [On Fedora](#on-fedora)
@@ -52,7 +52,7 @@ If so, engage in the already existing discussion.
52 52
53_Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile). 53_Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile).
54 54
55#### Node.js, pnpm, python 55#### Node.js, pnpm
56 56
57Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [`package.json`](./package.json#engines) and [`recipes/package.json`](./recipes/package.json#engine) files. 57Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [`package.json`](./package.json#engines) and [`recipes/package.json`](./recipes/package.json#engine) files.
58 58
@@ -63,14 +63,11 @@ Currently, these are the combinations of system dependencies that work for MacOS
63$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json 63$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
64{ 64{
65 "node": "20.11.1", 65 "node": "20.11.1",
66 "pnpm": "8.15.5", 66 "pnpm": "8.15.5"
67 "python": "3.11.8"
68} 67}
69``` 68```
70 69
71Python is only/mainly required to compile any dependencies for which the binary is not found, and we have to resort to compiling from source (for eg sqlite3) 70_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf).
72
73_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [mise](https://github.com/jdx/mise).
74 71
75#### Git 72#### Git
76 73
diff --git a/Dockerfile b/Dockerfile
index ffb309bfb..83baba00b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true
12 12
13# Note: 'fpm' is needed for building on ARM machines 13# Note: 'fpm' is needed for building on ARM machines
14RUN apt-get update -y \ 14RUN apt-get update -y \
15 && apt-get install --no-install-recommends -y python3 rpm ruby gem \ 15 && apt-get install --no-install-recommends -y rpm ruby gem \
16 && gem install dotenv -v 2.8.1 --no-ri --no-rdoc --no-document \ 16 && gem install dotenv -v 2.8.1 --no-ri --no-rdoc --no-document \
17 && gem install fpm --no-ri --no-rdoc --no-document 17 && gem install fpm --no-ri --no-rdoc --no-document
18 18
diff --git a/package.json b/package.json
index 73297834c..40842a6bf 100644
--- a/package.json
+++ b/package.json
@@ -14,14 +14,12 @@
14 "private": true, 14 "private": true,
15 "engines": { 15 "engines": {
16 "node": "20.11.1", 16 "node": "20.11.1",
17 "pnpm": "8.15.5", 17 "pnpm": "8.15.5"
18 "python": "3.11.8"
19 }, 18 },
20 "engine-strict": true, 19 "engine-strict": true,
21 "volta": { 20 "volta": {
22 "node": "20.11.1", 21 "node": "20.11.1",
23 "pnpm": "8.15.5", 22 "pnpm": "8.15.5"
24 "python": "3.11.8"
25 }, 23 },
26 "packageManager": "pnpm@8.15.5", 24 "packageManager": "pnpm@8.15.5",
27 "scripts": { 25 "scripts": {
@@ -129,7 +127,7 @@
129 "route-parser": "0.0.5", 127 "route-parser": "0.0.5",
130 "sanitize-filename": "1.6.3", 128 "sanitize-filename": "1.6.3",
131 "semver": "7.6.0", 129 "semver": "7.6.0",
132 "sqlite3": "5.1.7", 130 "sqlite3": "5.1.6",
133 "tar": "6.2.0", 131 "tar": "6.2.0",
134 "tslib": "2.6.2", 132 "tslib": "2.6.2",
135 "useragent-generator": "1.1.1-amkt-22079-finish.0", 133 "useragent-generator": "1.1.1-amkt-22079-finish.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c900a412a..c3252c82e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,7 +34,7 @@ dependencies:
34 version: 2.0.8 34 version: 2.0.8
35 '@adonisjs/lucid': 35 '@adonisjs/lucid':
36 specifier: 6.3.0 36 specifier: 6.3.0
37 version: 6.3.0(sqlite3@5.1.7) 37 version: 6.3.0(sqlite3@5.1.6)
38 '@adonisjs/session': 38 '@adonisjs/session':
39 specifier: 1.1.0 39 specifier: 1.1.0
40 version: 1.1.0 40 version: 1.1.0
@@ -237,8 +237,8 @@ dependencies:
237 specifier: 7.6.0 237 specifier: 7.6.0
238 version: 7.6.0 238 version: 7.6.0
239 sqlite3: 239 sqlite3:
240 specifier: 5.1.7 240 specifier: 5.1.6
241 version: 5.1.7 241 version: 5.1.6
242 tar: 242 tar:
243 specifier: 6.2.0 243 specifier: 6.2.0
244 version: 6.2.0 244 version: 6.2.0
@@ -585,13 +585,13 @@ packages:
585 - supports-color 585 - supports-color
586 dev: false 586 dev: false
587 587
588 /@adonisjs/lucid@6.3.0(sqlite3@5.1.7): 588 /@adonisjs/lucid@6.3.0(sqlite3@5.1.6):
589 resolution: {integrity: sha512-4LNUAh/ruU2I0xIwwugrqbFPDB5xGZYPPWzODt3QAQhDhws76T/+HDuZmCdngzE0QC1Vi9Nd1Uqejgliq1N0Dg==} 589 resolution: {integrity: sha512-4LNUAh/ruU2I0xIwwugrqbFPDB5xGZYPPWzODt3QAQhDhws76T/+HDuZmCdngzE0QC1Vi9Nd1Uqejgliq1N0Dg==}
590 dependencies: 590 dependencies:
591 '@adonisjs/generic-exceptions': 2.0.1 591 '@adonisjs/generic-exceptions': 2.0.1
592 chance: 1.1.9 592 chance: 1.1.9
593 debug: 4.3.4(supports-color@5.5.0) 593 debug: 4.3.4(supports-color@5.5.0)
594 knex: 0.21.21(sqlite3@5.1.7) 594 knex: 0.21.21(sqlite3@5.1.6)
595 lodash: 4.17.21 595 lodash: 4.17.21
596 moment: 2.30.1 596 moment: 2.30.1
597 pluralize: 8.0.0 597 pluralize: 8.0.0
@@ -2401,6 +2401,24 @@ packages:
2401 - supports-color 2401 - supports-color
2402 dev: true 2402 dev: true
2403 2403
2404 /@mapbox/node-pre-gyp@1.0.11:
2405 resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
2406 hasBin: true
2407 dependencies:
2408 detect-libc: 2.0.1
2409 https-proxy-agent: 5.0.1
2410 make-dir: 3.1.0
2411 node-fetch: 2.6.11
2412 nopt: 5.0.0
2413 npmlog: 5.0.1
2414 rimraf: 3.0.2
2415 semver: 7.6.0
2416 tar: 6.2.0
2417 transitivePeerDependencies:
2418 - encoding
2419 - supports-color
2420 dev: false
2421
2404 /@mdi/js@7.4.47: 2422 /@mdi/js@7.4.47:
2405 resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==} 2423 resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==}
2406 dev: false 2424 dev: false
@@ -3525,7 +3543,6 @@ packages:
3525 resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} 3543 resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
3526 requiresBuild: true 3544 requiresBuild: true
3527 dev: false 3545 dev: false
3528 optional: true
3529 3546
3530 /accepts@1.3.8: 3547 /accepts@1.3.8:
3531 resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} 3548 resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
@@ -3997,7 +4014,6 @@ packages:
3997 resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} 4014 resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
3998 requiresBuild: true 4015 requiresBuild: true
3999 dev: false 4016 dev: false
4000 optional: true
4001 4017
4002 /archiver-utils@2.1.0: 4018 /archiver-utils@2.1.0:
4003 resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==} 4019 resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
@@ -4044,6 +4060,14 @@ packages:
4044 zip-stream: 4.1.1 4060 zip-stream: 4.1.1
4045 dev: true 4061 dev: true
4046 4062
4063 /are-we-there-yet@2.0.0:
4064 resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==}
4065 engines: {node: '>=10'}
4066 dependencies:
4067 delegates: 1.0.0
4068 readable-stream: 3.6.2
4069 dev: false
4070
4047 /are-we-there-yet@3.0.1: 4071 /are-we-there-yet@3.0.1:
4048 resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} 4072 resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
4049 engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} 4073 engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -4498,6 +4522,7 @@ packages:
4498 dependencies: 4522 dependencies:
4499 file-uri-to-path: 1.0.0 4523 file-uri-to-path: 1.0.0
4500 dev: false 4524 dev: false
4525 optional: true
4501 4526
4502 /bl@1.2.3: 4527 /bl@1.2.3:
4503 resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} 4528 resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==}
@@ -4512,6 +4537,7 @@ packages:
4512 buffer: 5.7.1 4537 buffer: 5.7.1
4513 inherits: 2.0.4 4538 inherits: 2.0.4
4514 readable-stream: 3.6.2 4539 readable-stream: 3.6.2
4540 dev: true
4515 4541
4516 /bluebird-lst@1.0.9: 4542 /bluebird-lst@1.0.9:
4517 resolution: {integrity: sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==} 4543 resolution: {integrity: sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==}
@@ -4909,10 +4935,6 @@ packages:
4909 fsevents: 2.3.3 4935 fsevents: 2.3.3
4910 dev: true 4936 dev: true
4911 4937
4912 /chownr@1.1.4:
4913 resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
4914 dev: false
4915
4916 /chownr@2.0.0: 4938 /chownr@2.0.0:
4917 resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} 4939 resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
4918 engines: {node: '>=10'} 4940 engines: {node: '>=10'}
@@ -5241,7 +5263,6 @@ packages:
5241 resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} 5263 resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
5242 requiresBuild: true 5264 requiresBuild: true
5243 dev: false 5265 dev: false
5244 optional: true
5245 5266
5246 /content-disposition@0.5.4: 5267 /content-disposition@0.5.4:
5247 resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} 5268 resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
@@ -5681,11 +5702,6 @@ packages:
5681 optional: true 5702 optional: true
5682 dev: true 5703 dev: true
5683 5704
5684 /deep-extend@0.6.0:
5685 resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
5686 engines: {node: '>=4.0.0'}
5687 dev: false
5688
5689 /deep-is@0.1.4: 5705 /deep-is@0.1.4:
5690 resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} 5706 resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
5691 dev: true 5707 dev: true
@@ -5782,7 +5798,6 @@ packages:
5782 resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} 5798 resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
5783 requiresBuild: true 5799 requiresBuild: true
5784 dev: false 5800 dev: false
5785 optional: true
5786 5801
5787 /depd@1.1.2: 5802 /depd@1.1.2:
5788 resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} 5803 resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
@@ -7039,11 +7054,6 @@ packages:
7039 - supports-color 7054 - supports-color
7040 dev: false 7055 dev: false
7041 7056
7042 /expand-template@2.0.3:
7043 resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
7044 engines: {node: '>=6'}
7045 dev: false
7046
7047 /expand-tilde@2.0.2: 7057 /expand-tilde@2.0.2:
7048 resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==} 7058 resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
7049 engines: {node: '>=0.10.0'} 7059 engines: {node: '>=0.10.0'}
@@ -7281,6 +7291,7 @@ packages:
7281 resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} 7291 resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
7282 requiresBuild: true 7292 requiresBuild: true
7283 dev: false 7293 dev: false
7294 optional: true
7284 7295
7285 /filelist@1.0.4: 7296 /filelist@1.0.4:
7286 resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} 7297 resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
@@ -7549,6 +7560,21 @@ packages:
7549 resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} 7560 resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
7550 dev: true 7561 dev: true
7551 7562
7563 /gauge@3.0.2:
7564 resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
7565 engines: {node: '>=10'}
7566 dependencies:
7567 aproba: 2.0.0
7568 color-support: 1.1.3
7569 console-control-strings: 1.1.0
7570 has-unicode: 2.0.1
7571 object-assign: 4.1.1
7572 signal-exit: 3.0.7
7573 string-width: 4.2.3
7574 strip-ansi: 6.0.1
7575 wide-align: 1.1.5
7576 dev: false
7577
7552 /gauge@4.0.4: 7578 /gauge@4.0.4:
7553 resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} 7579 resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
7554 engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} 7580 engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -7663,10 +7689,6 @@ packages:
7663 split2: 4.2.0 7689 split2: 4.2.0
7664 dev: true 7690 dev: true
7665 7691
7666 /github-from-package@0.0.0:
7667 resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
7668 dev: false
7669
7670 /glob-parent@5.1.2: 7692 /glob-parent@5.1.2:
7671 resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} 7693 resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
7672 engines: {node: '>= 6'} 7694 engines: {node: '>= 6'}
@@ -7910,7 +7932,6 @@ packages:
7910 resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} 7932 resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
7911 requiresBuild: true 7933 requiresBuild: true
7912 dev: false 7934 dev: false
7913 optional: true
7914 7935
7915 /has-value@0.3.1: 7936 /has-value@0.3.1:
7916 resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} 7937 resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
@@ -9629,7 +9650,7 @@ packages:
9629 engines: {node: '>=6'} 9650 engines: {node: '>=6'}
9630 dev: false 9651 dev: false
9631 9652
9632 /knex@0.21.21(sqlite3@5.1.7): 9653 /knex@0.21.21(sqlite3@5.1.6):
9633 resolution: {integrity: sha512-cjw5qO1EzVKjbywcVa61IQJMLt7PfYBRI/2NwCA/B9beXgbw652wDNLz+JM+UKKNsfwprq0ugYqBYc9q4JN36A==} 9654 resolution: {integrity: sha512-cjw5qO1EzVKjbywcVa61IQJMLt7PfYBRI/2NwCA/B9beXgbw652wDNLz+JM+UKKNsfwprq0ugYqBYc9q4JN36A==}
9634 engines: {node: '>=10'} 9655 engines: {node: '>=10'}
9635 hasBin: true 9656 hasBin: true
@@ -9660,7 +9681,7 @@ packages:
9660 liftoff: 3.1.0 9681 liftoff: 3.1.0
9661 lodash: 4.17.21 9682 lodash: 4.17.21
9662 pg-connection-string: 2.4.0 9683 pg-connection-string: 2.4.0
9663 sqlite3: 5.1.7 9684 sqlite3: 5.1.6
9664 tarn: 3.0.2 9685 tarn: 3.0.2
9665 tildify: 2.0.0 9686 tildify: 2.0.0
9666 v8flags: 3.2.0 9687 v8flags: 3.2.0
@@ -9980,7 +10001,6 @@ packages:
9980 engines: {node: '>=8'} 10001 engines: {node: '>=8'}
9981 dependencies: 10002 dependencies:
9982 semver: 6.3.1 10003 semver: 6.3.1
9983 dev: true
9984 10004
9985 /make-error@1.3.6: 10005 /make-error@1.3.6:
9986 resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} 10006 resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -10335,10 +10355,6 @@ packages:
10335 is-extendable: 0.1.1 10355 is-extendable: 0.1.1
10336 dev: false 10356 dev: false
10337 10357
10338 /mkdirp-classic@0.5.3:
10339 resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
10340 dev: false
10341
10342 /mkdirp@0.5.6: 10358 /mkdirp@0.5.6:
10343 resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} 10359 resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
10344 hasBin: true 10360 hasBin: true
@@ -10471,10 +10487,6 @@ packages:
10471 - supports-color 10487 - supports-color
10472 dev: false 10488 dev: false
10473 10489
10474 /napi-build-utils@1.0.2:
10475 resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
10476 dev: false
10477
10478 /natural-compare@1.4.0: 10490 /natural-compare@1.4.0:
10479 resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} 10491 resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
10480 dev: true 10492 dev: true
@@ -10492,13 +10504,6 @@ packages:
10492 resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} 10504 resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
10493 dev: false 10505 dev: false
10494 10506
10495 /node-abi@3.56.0:
10496 resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==}
10497 engines: {node: '>=10'}
10498 dependencies:
10499 semver: 7.6.0
10500 dev: false
10501
10502 /node-addon-api@1.7.2: 10507 /node-addon-api@1.7.2:
10503 resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==} 10508 resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==}
10504 requiresBuild: true 10509 requiresBuild: true
@@ -10517,9 +10522,8 @@ packages:
10517 dev: false 10522 dev: false
10518 optional: true 10523 optional: true
10519 10524
10520 /node-addon-api@7.1.0: 10525 /node-addon-api@4.3.0:
10521 resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==} 10526 resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==}
10522 engines: {node: ^16 || ^18 || >= 20}
10523 dev: false 10527 dev: false
10524 10528
10525 /node-cookie@2.1.2: 10529 /node-cookie@2.1.2:
@@ -10554,7 +10558,6 @@ packages:
10554 optional: true 10558 optional: true
10555 dependencies: 10559 dependencies:
10556 whatwg-url: 5.0.0 10560 whatwg-url: 5.0.0
10557 dev: true
10558 10561
10559 /node-guard@1.0.0: 10562 /node-guard@1.0.0:
10560 resolution: {integrity: sha512-LX911hOl63/YBO3Skl/jQ9QQG+lE++66xaF9/lg7G02bBpdgHMmSdMK5+jgo7p/3i5hn4fGOipX3Ko17Yzfi2w==} 10563 resolution: {integrity: sha512-LX911hOl63/YBO3Skl/jQ9QQG+lE++66xaF9/lg7G02bBpdgHMmSdMK5+jgo7p/3i5hn4fGOipX3Ko17Yzfi2w==}
@@ -10653,7 +10656,6 @@ packages:
10653 dependencies: 10656 dependencies:
10654 abbrev: 1.1.1 10657 abbrev: 1.1.1
10655 dev: false 10658 dev: false
10656 optional: true
10657 10659
10658 /nopt@6.0.0: 10660 /nopt@6.0.0:
10659 resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==} 10661 resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==}
@@ -10700,6 +10702,15 @@ packages:
10700 path-key: 4.0.0 10702 path-key: 4.0.0
10701 dev: true 10703 dev: true
10702 10704
10705 /npmlog@5.0.1:
10706 resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
10707 dependencies:
10708 are-we-there-yet: 2.0.0
10709 console-control-strings: 1.1.0
10710 gauge: 3.0.2
10711 set-blocking: 2.0.0
10712 dev: false
10713
10703 /npmlog@6.0.2: 10714 /npmlog@6.0.2:
10704 resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} 10715 resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
10705 engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} 10716 engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -11183,25 +11194,6 @@ packages:
11183 resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} 11194 resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
11184 dev: false 11195 dev: false
11185 11196
11186 /prebuild-install@7.1.2:
11187 resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==}
11188 engines: {node: '>=10'}
11189 hasBin: true
11190 dependencies:
11191 detect-libc: 2.0.1
11192 expand-template: 2.0.3
11193 github-from-package: 0.0.0
11194 minimist: 1.2.8
11195 mkdirp-classic: 0.5.3
11196 napi-build-utils: 1.0.2
11197 node-abi: 3.56.0
11198 pump: 3.0.0
11199 rc: 1.2.8
11200 simple-get: 4.0.1
11201 tar-fs: 2.1.1
11202 tunnel-agent: 0.6.0
11203 dev: false
11204
11205 /prelude-ls@1.2.1: 11197 /prelude-ls@1.2.1:
11206 resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} 11198 resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
11207 engines: {node: '>= 0.8.0'} 11199 engines: {node: '>= 0.8.0'}
@@ -11626,16 +11618,6 @@ packages:
11626 react-is: 16.13.1 11618 react-is: 16.13.1
11627 dev: false 11619 dev: false
11628 11620
11629 /rc@1.2.8:
11630 resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
11631 hasBin: true
11632 dependencies:
11633 deep-extend: 0.6.0
11634 ini: 1.3.8
11635 minimist: 1.2.8
11636 strip-json-comments: 2.0.1
11637 dev: false
11638
11639 /react-color@2.19.3(react@18.2.0): 11621 /react-color@2.19.3(react@18.2.0):
11640 resolution: {integrity: sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==} 11622 resolution: {integrity: sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==}
11641 peerDependencies: 11623 peerDependencies:
@@ -12661,10 +12643,6 @@ packages:
12661 requiresBuild: true 12643 requiresBuild: true
12662 dev: true 12644 dev: true
12663 12645
12664 /simple-concat@1.0.1:
12665 resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
12666 dev: false
12667
12668 /simple-encryptor@2.0.0: 12646 /simple-encryptor@2.0.0:
12669 resolution: {integrity: sha512-dqjQbp9RwfMrE+my/7Pgz9viIsHmY3aQtybGJQkv2sL79YuDGmkxUjlmEBFGP6bcUjBRnSvqsBAcv1ro0Y4/5A==} 12647 resolution: {integrity: sha512-dqjQbp9RwfMrE+my/7Pgz9viIsHmY3aQtybGJQkv2sL79YuDGmkxUjlmEBFGP6bcUjBRnSvqsBAcv1ro0Y4/5A==}
12670 dependencies: 12648 dependencies:
@@ -12678,14 +12656,6 @@ packages:
12678 scmp: 2.0.0 12656 scmp: 2.0.0
12679 dev: false 12657 dev: false
12680 12658
12681 /simple-get@4.0.1:
12682 resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
12683 dependencies:
12684 decompress-response: 6.0.0
12685 once: 1.4.0
12686 simple-concat: 1.0.1
12687 dev: false
12688
12689 /simple-git@3.23.0: 12659 /simple-git@3.23.0:
12690 resolution: {integrity: sha512-P9ggTW8vb/21CAL/AmnACAhqBDfnqSSZVpV7WuFtsFR9HLunf5IqQvk+OXAQTfkcZep8pKnt3DV3o7w3TegEkQ==} 12660 resolution: {integrity: sha512-P9ggTW8vb/21CAL/AmnACAhqBDfnqSSZVpV7WuFtsFR9HLunf5IqQvk+OXAQTfkcZep8pKnt3DV3o7w3TegEkQ==}
12691 dependencies: 12661 dependencies:
@@ -12915,18 +12885,18 @@ packages:
12915 requiresBuild: true 12885 requiresBuild: true
12916 optional: true 12886 optional: true
12917 12887
12918 /sqlite3@5.1.7: 12888 /sqlite3@5.1.6:
12919 resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==} 12889 resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==}
12920 requiresBuild: true 12890 requiresBuild: true
12921 dependencies: 12891 dependencies:
12922 bindings: 1.5.0 12892 '@mapbox/node-pre-gyp': 1.0.11
12923 node-addon-api: 7.1.0 12893 node-addon-api: 4.3.0
12924 prebuild-install: 7.1.2
12925 tar: 6.2.0 12894 tar: 6.2.0
12926 optionalDependencies: 12895 optionalDependencies:
12927 node-gyp: 8.4.1 12896 node-gyp: 8.4.1
12928 transitivePeerDependencies: 12897 transitivePeerDependencies:
12929 - bluebird 12898 - bluebird
12899 - encoding
12930 - supports-color 12900 - supports-color
12931 dev: false 12901 dev: false
12932 12902
@@ -13180,11 +13150,6 @@ packages:
13180 min-indent: 1.0.1 13150 min-indent: 1.0.1
13181 dev: true 13151 dev: true
13182 13152
13183 /strip-json-comments@2.0.1:
13184 resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
13185 engines: {node: '>=0.10.0'}
13186 dev: false
13187
13188 /strip-json-comments@3.1.1: 13153 /strip-json-comments@3.1.1:
13189 resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} 13154 resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
13190 engines: {node: '>=8'} 13155 engines: {node: '>=8'}
@@ -13279,15 +13244,6 @@ packages:
13279 acorn-node: 1.8.2 13244 acorn-node: 1.8.2
13280 dev: false 13245 dev: false
13281 13246
13282 /tar-fs@2.1.1:
13283 resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
13284 dependencies:
13285 chownr: 1.1.4
13286 mkdirp-classic: 0.5.3
13287 pump: 3.0.0
13288 tar-stream: 2.2.0
13289 dev: false
13290
13291 /tar-stream@1.6.2: 13247 /tar-stream@1.6.2:
13292 resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==} 13248 resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==}
13293 engines: {node: '>= 0.8.0'} 13249 engines: {node: '>= 0.8.0'}
@@ -13310,6 +13266,7 @@ packages:
13310 fs-constants: 1.0.0 13266 fs-constants: 1.0.0
13311 inherits: 2.0.4 13267 inherits: 2.0.4
13312 readable-stream: 3.6.2 13268 readable-stream: 3.6.2
13269 dev: true
13313 13270
13314 /tar@6.2.0: 13271 /tar@6.2.0:
13315 resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} 13272 resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==}
@@ -13525,7 +13482,6 @@ packages:
13525 13482
13526 /tr46@0.0.3: 13483 /tr46@0.0.3:
13527 resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} 13484 resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
13528 dev: true
13529 13485
13530 /tree-kill@1.2.2: 13486 /tree-kill@1.2.2:
13531 resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} 13487 resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
@@ -14075,7 +14031,6 @@ packages:
14075 14031
14076 /webidl-conversions@3.0.1: 14032 /webidl-conversions@3.0.1:
14077 resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} 14033 resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
14078 dev: true
14079 14034
14080 /websocket-driver@0.7.4: 14035 /websocket-driver@0.7.4:
14081 resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} 14036 resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==}
@@ -14096,7 +14051,6 @@ packages:
14096 dependencies: 14051 dependencies:
14097 tr46: 0.0.3 14052 tr46: 0.0.3
14098 webidl-conversions: 3.0.1 14053 webidl-conversions: 3.0.1
14099 dev: true
14100 14054
14101 /which-boxed-primitive@1.0.2: 14055 /which-boxed-primitive@1.0.2:
14102 resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} 14056 resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
@@ -14182,7 +14136,6 @@ packages:
14182 dependencies: 14136 dependencies:
14183 string-width: 4.2.3 14137 string-width: 4.2.3
14184 dev: false 14138 dev: false
14185 optional: true
14186 14139
14187 /window-size@1.1.1: 14140 /window-size@1.1.1:
14188 resolution: {integrity: sha512-5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA==} 14141 resolution: {integrity: sha512-5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA==}
diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh
index f485f9087..04aa9e70f 100755
--- a/scripts/build-unix.sh
+++ b/scripts/build-unix.sh
@@ -3,7 +3,7 @@
3# INTRO: 3# INTRO:
4# This file is used to build ferdium on both x64 and arm-based for macos and linux (not tested on arm for linux). 4# This file is used to build ferdium on both x64 and arm-based for macos and linux (not tested on arm for linux).
5# It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning) 5# It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning)
6# It will install the system dependencies except for node and python (which are still verified) 6# It will install the system dependencies except for node (which is still verified)
7# I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently 7# I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently
8# This file can live anywhere in your PATH 8# This file can live anywhere in your PATH
9 9
@@ -32,7 +32,6 @@ command_exists() {
32# Checking the developer environment 32# Checking the developer environment
33# Check for installed programmes 33# Check for installed programmes
34command_exists node || fail_with_docs "Node is not installed" 34command_exists node || fail_with_docs "Node is not installed"
35command_exists python || fail_with_docs "python is not installed"
36 35
37# Check node version 36# Check node version
38EXPECTED_NODE_VERSION=$(cat .nvmrc) 37EXPECTED_NODE_VERSION=$(cat .nvmrc)
@@ -43,15 +42,6 @@ if [ "v$EXPECTED_NODE_VERSION" != "$ACTUAL_NODE_VERSION" ]; then
43 actual : [$ACTUAL_NODE_VERSION]" 42 actual : [$ACTUAL_NODE_VERSION]"
44fi 43fi
45 44
46# Check python version
47EXPECTED_PYTHON_VERSION=$(node -p 'require("./package.json").engines.python')
48ACTUAL_PYTHON_VERSION=$(python --version | sed -e "s/Python //")
49if [[ "$ACTUAL_PYTHON_VERSION" != "$EXPECTED_PYTHON_VERSION" ]]; then
50 fail_with_docs "You are not running the expected version of Python!
51 expected: [$EXPECTED_PYTHON_VERSION]
52 actual : [$ACTUAL_PYTHON_VERSION]"
53fi
54
55# Check if the 'recipes' folder is present either as a git submodule or a symbolic link 45# Check if the 'recipes' folder is present either as a git submodule or a symbolic link
56if ! [ -f "recipes/package.json" ]; then 46if ! [ -f "recipes/package.json" ]; then
57 fail_with_docs "'recipes' folder is missing or submodule has not been checked out" 47 fail_with_docs "'recipes' folder is missing or submodule has not been checked out"
@@ -78,7 +68,7 @@ else
78 fi 68 fi
79 69
80 npm cache clean --force 70 npm cache clean --force
81 rm -rf ~/.npm ~/.electron-gyp 71 rm -rf ~/.npm ~/.electron-gyp ~/.asdf/installs/nodejs/*/.npm/
82 72
83 git -C recipes clean -fxd # Clean recipes folder/submodule 73 git -C recipes clean -fxd # Clean recipes folder/submodule
84 git clean -fxd # Note: This will blast away the 'recipes' folder if you have symlinked it 74 git clean -fxd # Note: This will blast away the 'recipes' folder if you have symlinked it
@@ -89,6 +79,8 @@ fi
89 79
90# ----------------------------------------------------------------------------- 80# -----------------------------------------------------------------------------
91# Ensure that the system dependencies are at the correct version - recover if not 81# Ensure that the system dependencies are at the correct version - recover if not
82# If 'asdf' is installed, reshim for new nodejs if necessary
83command_exists asdf && asdf reshim nodejs
92 84
93# Ensure that the system dependencies are at the correct version 85# Ensure that the system dependencies are at the correct version
94# Check pnpm version 86# Check pnpm version
@@ -107,6 +99,9 @@ if [[ "$EXPECTED_PNPM_VERSION" != "$EXPECTED_RECIPES_PNPM_VERSION" ]]; then
107 actual : [$EXPECTED_PNPM_VERSION]" 99 actual : [$EXPECTED_PNPM_VERSION]"
108fi 100fi
109 101
102# If 'asdf' is installed, reshim for new nodejs if necessary
103command_exists asdf && asdf reshim nodejs
104
110# ----------------------------------------------------------------------------- 105# -----------------------------------------------------------------------------
111printf "\n*************** Building recipes ***************\n" 106printf "\n*************** Building recipes ***************\n"
112pushd recipes 107pushd recipes
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index 02289d172..5da7df540 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -1,7 +1,7 @@
1# INTRO: 1# INTRO:
2# This file is used to build ferdium on windows. 2# This file is used to build ferdium on windows.
3# It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning) 3# It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning)
4# It will install the system dependencies except for node and python (which are still verified) 4# It will install the system dependencies except for node (which is still verified)
5# I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently 5# I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently
6# This file can live anywhere in your PATH 6# This file can live anywhere in your PATH
7 7