aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2021-10-15 22:12:42 +0530
committerLibravatar GitHub <noreply@github.com>2021-10-15 22:12:42 +0530
commit765697f6047d71a080afd6868c180524d31290ec (patch)
treeb0cfac484b58d14ae1612620cc1122d0b1066f77
parentupgrade 'pnpm' to '6.17.1' (diff)
downloadferdium-app-765697f6047d71a080afd6868c180524d31290ec.tar.gz
ferdium-app-765697f6047d71a080afd6868c180524d31290ec.tar.zst
ferdium-app-765697f6047d71a080afd6868c180524d31290ec.zip
upgrade 'node' to '14.18.1' (#2083)
Diffstat
-rw-r--r--.github/workflows/dependency-updates.yml12
-rw-r--r--.github/workflows/ferdi-builds.yml36
-rw-r--r--.nvmrc2
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--Dockerfile2
-rw-r--r--package-lock.json6
-rw-r--r--package.json4
m---------recipes0
8 files changed, 32 insertions, 32 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 3b488ec4a..8e7b5ae8e 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -37,21 +37,21 @@ jobs:
37 cache-name: cache-node-modules 37 cache-name: cache-node-modules
38 with: 38 with:
39 path: ${{ env.NPM_CACHE }} 39 path: ${{ env.NPM_CACHE }}
40 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 40 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
41 restore-keys: | 41 restore-keys: |
42 ${{ runner.os }}-14.17-build-${{ env.cache-name }}- 42 ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
43 ${{ runner.os }}-14.17-build- 43 ${{ runner.os }}-14.18-build-
44 - name: Cache pnpm modules 44 - name: Cache pnpm modules
45 uses: actions/cache@v2 45 uses: actions/cache@v2
46 env: 46 env:
47 cache-name: cache-pnpm-store 47 cache-name: cache-pnpm-store
48 with: 48 with:
49 path: ${{ env.PNPM_CACHE }} 49 path: ${{ env.PNPM_CACHE }}
50 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} 50 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
51 - name: Use Node.js 14.17.6 51 - name: Use Node.js 14.18.1
52 uses: actions/setup-node@v2 52 uses: actions/setup-node@v2
53 with: 53 with:
54 node-version: 14.17.6 54 node-version: 14.18.1
55 - name: Install pnpm 55 - name: Install pnpm
56 uses: pnpm/action-setup@v2.0.1 56 uses: pnpm/action-setup@v2.0.1
57 with: 57 with:
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index e5bb95fe9..bbd001a0a 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -120,17 +120,17 @@ jobs:
120 cache-name: cache-node-modules 120 cache-name: cache-node-modules
121 with: 121 with:
122 path: ${{ env.NPM_CACHE }} 122 path: ${{ env.NPM_CACHE }}
123 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 123 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
124 restore-keys: | 124 restore-keys: |
125 ${{ runner.os }}-14.17-build-${{ env.cache-name }}- 125 ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
126 ${{ runner.os }}-14.17-build- 126 ${{ runner.os }}-14.18-build-
127 - name: Cache pnpm modules 127 - name: Cache pnpm modules
128 uses: actions/cache@v2 128 uses: actions/cache@v2
129 env: 129 env:
130 cache-name: cache-pnpm-store 130 cache-name: cache-pnpm-store
131 with: 131 with:
132 path: ${{ env.PNPM_CACHE }} 132 path: ${{ env.PNPM_CACHE }}
133 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} 133 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
134 - name: Cache electron modules 134 - name: Cache electron modules
135 uses: actions/cache@v2 135 uses: actions/cache@v2
136 env: 136 env:
@@ -145,10 +145,10 @@ jobs:
145 with: 145 with:
146 key: ${{ runner.os }}-${{ env.cache-name }} 146 key: ${{ runner.os }}-${{ env.cache-name }}
147 path: ${{ env.ELECTRON_BUILDER_CACHE }} 147 path: ${{ env.ELECTRON_BUILDER_CACHE }}
148 - name: Use Node.js 14.17.6 148 - name: Use Node.js 14.18.1
149 uses: actions/setup-node@v2 149 uses: actions/setup-node@v2
150 with: 150 with:
151 node-version: 14.17.6 151 node-version: 14.18.1
152 - name: Install pnpm 152 - name: Install pnpm
153 uses: pnpm/action-setup@v2.0.1 153 uses: pnpm/action-setup@v2.0.1
154 with: 154 with:
@@ -223,17 +223,17 @@ jobs:
223 cache-name: cache-node-modules 223 cache-name: cache-node-modules
224 with: 224 with:
225 path: ${{ env.NPM_CACHE }} 225 path: ${{ env.NPM_CACHE }}
226 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 226 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
227 restore-keys: | 227 restore-keys: |
228 ${{ runner.os }}-14.17-build-${{ env.cache-name }}- 228 ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
229 ${{ runner.os }}-14.17-build- 229 ${{ runner.os }}-14.18-build-
230 - name: Cache pnpm modules 230 - name: Cache pnpm modules
231 uses: actions/cache@v2 231 uses: actions/cache@v2
232 env: 232 env:
233 cache-name: cache-pnpm-store 233 cache-name: cache-pnpm-store
234 with: 234 with:
235 path: ${{ env.PNPM_CACHE }} 235 path: ${{ env.PNPM_CACHE }}
236 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} 236 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
237 - name: Cache electron modules 237 - name: Cache electron modules
238 uses: actions/cache@v2 238 uses: actions/cache@v2
239 env: 239 env:
@@ -248,10 +248,10 @@ jobs:
248 with: 248 with:
249 key: ${{ runner.os }}-${{ env.cache-name }} 249 key: ${{ runner.os }}-${{ env.cache-name }}
250 path: ${{ env.ELECTRON_BUILDER_CACHE }} 250 path: ${{ env.ELECTRON_BUILDER_CACHE }}
251 - name: Use Node.js 14.17.6 251 - name: Use Node.js 14.18.1
252 uses: actions/setup-node@v2 252 uses: actions/setup-node@v2
253 with: 253 with:
254 node-version: 14.17.6 254 node-version: 14.18.1
255 - name: Install pnpm 255 - name: Install pnpm
256 uses: pnpm/action-setup@v2.0.1 256 uses: pnpm/action-setup@v2.0.1
257 with: 257 with:
@@ -347,17 +347,17 @@ jobs:
347 cache-name: cache-node-modules 347 cache-name: cache-node-modules
348 with: 348 with:
349 path: ${{ env.NPM_CACHE }} 349 path: ${{ env.NPM_CACHE }}
350 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 350 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
351 restore-keys: | 351 restore-keys: |
352 ${{ runner.os }}-14.17-build-${{ env.cache-name }}- 352 ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
353 ${{ runner.os }}-14.17-build- 353 ${{ runner.os }}-14.18-build-
354 - name: Cache pnpm modules 354 - name: Cache pnpm modules
355 uses: actions/cache@v2 355 uses: actions/cache@v2
356 env: 356 env:
357 cache-name: cache-pnpm-store 357 cache-name: cache-pnpm-store
358 with: 358 with:
359 path: ${{ env.PNPM_CACHE }} 359 path: ${{ env.PNPM_CACHE }}
360 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} 360 key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
361 - name: Cache electron modules 361 - name: Cache electron modules
362 uses: actions/cache@v2 362 uses: actions/cache@v2
363 env: 363 env:
@@ -372,10 +372,10 @@ jobs:
372 with: 372 with:
373 key: ${{ runner.os }}-${{ env.cache-name }} 373 key: ${{ runner.os }}-${{ env.cache-name }}
374 path: ${{ env.ELECTRON_BUILDER_CACHE }} 374 path: ${{ env.ELECTRON_BUILDER_CACHE }}
375 - name: Use Node.js 14.17.6 375 - name: Use Node.js 14.18.1
376 uses: actions/setup-node@v2 376 uses: actions/setup-node@v2
377 with: 377 with:
378 node-version: 14.17.6 378 node-version: 14.18.1
379 - name: Install pnpm 379 - name: Install pnpm
380 uses: pnpm/action-setup@v2.0.1 380 uses: pnpm/action-setup@v2.0.1
381 with: 381 with:
diff --git a/.nvmrc b/.nvmrc
index 5595ae1aa..31102b28d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
14.17.6 14.18.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 278f77027..4459c46f7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,7 +60,7 @@ Currently, these are the combinations of system dependencies that work for MacOS
60 60
61```bash 61```bash
62node -v 62node -v
63v14.17.6 63v14.18.1
64npm -v 64npm -v
656.14.13 656.14.13
66pnpm -v 66pnpm -v
diff --git a/Dockerfile b/Dockerfile
index 070702cc5..404502283 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
1# Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture 1# Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture
2 2
3FROM docker.io/library/node:14.17.6-buster as builder 3FROM docker.io/library/node:14.18.1-buster as builder
4 4
5ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" 5ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"
6 6
diff --git a/package-lock.json b/package-lock.json
index deb8eab73..e2eb3cb7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3834,9 +3834,9 @@
3834 "dev": true 3834 "dev": true
3835 }, 3835 },
3836 "@types/node": { 3836 "@types/node": {
3837 "version": "14.17.6", 3837 "version": "14.17.27",
3838 "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.6.tgz", 3838 "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
3839 "integrity": "sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ==", 3839 "integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
3840 "dev": true 3840 "dev": true
3841 }, 3841 },
3842 "@types/normalize-package-data": { 3842 "@types/normalize-package-data": {
diff --git a/package.json b/package.json
index 2f9feaa55..31e297862 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
11 "repository": "https://github.com/getferdi/ferdi.git", 11 "repository": "https://github.com/getferdi/ferdi.git",
12 "private": true, 12 "private": true,
13 "engines": { 13 "engines": {
14 "node": "^14.17", 14 "node": "^14.18",
15 "npm": "^6.14", 15 "npm": "^6.14",
16 "node-gyp": "^8.2" 16 "node-gyp": "^8.2"
17 }, 17 },
@@ -141,7 +141,7 @@
141 "@types/mime-types": "2.1.1", 141 "@types/mime-types": "2.1.1",
142 "@types/mocha": "9.0.0", 142 "@types/mocha": "9.0.0",
143 "@types/ms": "0.7.31", 143 "@types/ms": "0.7.31",
144 "@types/node": "14.17.6", 144 "@types/node": "14.17.27",
145 "@types/react": "17.0.27", 145 "@types/react": "17.0.27",
146 "@types/react-dom": "17.0.9", 146 "@types/react-dom": "17.0.9",
147 "@types/route-parser": "0.1.3", 147 "@types/route-parser": "0.1.3",
diff --git a/recipes b/recipes
Subproject d9cd43eab21246ce4f865d5b09f80493dfc2534 Subproject 447501f1c05d36614dd37b50fd1dd0240d7d9c7
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-30 14:08:36 +0000