aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-07-16 20:02:46 +0530
committerLibravatar Vijay A <avijayr@protonmail.com>2021-07-16 20:02:46 +0530
commit7fc4b762de52e4e1f150b8c86e45a533b7c43e84 (patch)
tree9bde97ce2aa7ca40135fd200c5230fb3b084758c
parentBumped up beta version to: 5.6.0-beta7 (diff)
parent5.6.0-nightly.87 (diff)
downloadferdium-app-7fc4b762de52e4e1f150b8c86e45a533b7c43e84.tar.gz
ferdium-app-7fc4b762de52e4e1f150b8c86e45a533b7c43e84.tar.zst
ferdium-app-7fc4b762de52e4e1f150b8c86e45a533b7c43e84.zip
Merge branch 'nightly' into release
Diffstat
-rw-r--r--.babelrc15
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md6
-rw-r--r--.github/workflows/dependency-updates.yml18
-rw-r--r--.github/workflows/ferdi-builds.yml57
-rw-r--r--.nvmrc2
-rw-r--r--.prettierrc.js3
-rw-r--r--CONTRIBUTING.md20
-rw-r--r--Dockerfile6
-rw-r--r--README.md2
-rw-r--r--electron-builder.yml2
-rw-r--r--gulpfile.babel.js59
-rw-r--r--package-lock.json1146
-rw-r--r--package.json16
-rw-r--r--packages/forms/package-lock.json214
-rw-r--r--packages/ui/package-lock.json94
m---------recipes0
-rw-r--r--src/api/server/ServerApi.js5
-rw-r--r--src/components/ui/ImageUpload.js8
-rw-r--r--src/environment.js5
-rw-r--r--src/features/publishDebugInfo/Component.js22
-rw-r--r--src/helpers/userAgent-helpers.js38
-rw-r--r--src/i18n/locales/defaultMessages.json28
-rw-r--r--src/i18n/locales/es.json4
-rw-r--r--src/i18n/locales/pl.json98
-rw-r--r--src/i18n/messages/src/features/publishDebugInfo/Component.json28
m---------src/internal-server0
-rw-r--r--src/lib/TouchBar.js5
-rw-r--r--src/models/Recipe.js3
-rw-r--r--src/models/UserAgent.js4
-rw-r--r--src/stores/AppStore.js5
-rw-r--r--src/styles/toggle.scss18
-rw-r--r--src/webview/lib/RecipeWebview.js10
-rw-r--r--src/webview/zoom.js2
33 files changed, 638 insertions, 1305 deletions
diff --git a/.babelrc b/.babelrc
index 9012929c1..6c589d42e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -4,7 +4,7 @@
4 "@babel/preset-env", 4 "@babel/preset-env",
5 { 5 {
6 "targets": { 6 "targets": {
7 "electron": 4 7 "electron": 13
8 } 8 }
9 } 9 }
10 ], 10 ],
@@ -26,11 +26,14 @@
26 ], 26 ],
27 "@babel/proposal-throw-expressions", 27 "@babel/proposal-throw-expressions",
28 "@babel/syntax-dynamic-import", 28 "@babel/syntax-dynamic-import",
29 ["react-intl", { 29 [
30 "messagesDir": "./src/i18n/messages/", 30 "react-intl",
31 "enforceDescriptions": false, 31 {
32 "extractSourceLocation": true 32 "messagesDir": "./src/i18n/messages/",
33 }], 33 "enforceDescriptions": false,
34 "extractSourceLocation": true
35 }
36 ],
34 [ 37 [
35 "@babel/plugin-proposal-private-methods", 38 "@babel/plugin-proposal-private-methods",
36 { 39 {
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3092767fd..44de8e2e2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,9 +12,9 @@
12 👉 https://github.com/sponsors/getferdi 12 👉 https://github.com/sponsors/getferdi
13 👉 https://opencollective.com/getferdi/donate 13 👉 https://opencollective.com/getferdi/donate
145. Please ensure you've completed all of the following. 145. Please ensure you've completed all of the following.
15 - [ ] I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project. 15- [ ] I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project.
16 - [ ] I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to. 16- [ ] I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to.
17 - [ ] I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success. 17- [ ] I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success.
18 18
19#### Description of Change 19#### Description of Change
20<!-- Describe your changes in detail. --> 20<!-- Describe your changes in detail. -->
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 38de90dbd..cd06b8392 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -36,15 +36,14 @@ jobs:
36 cache-name: cache-node-modules 36 cache-name: cache-node-modules
37 with: 37 with:
38 path: ${{ env.NPM_CACHE }} 38 path: ${{ env.NPM_CACHE }}
39 key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 39 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
40 restore-keys: | 40 restore-keys: |
41 ${{ runner.os }}-build-${{ env.cache-name }}- 41 ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
42 ${{ runner.os }}-build- 42 ${{ runner.os }}-14.17-build-
43 ${{ runner.os }}- 43 - name: Use Node.js 14.17.3
44 - name: Use Node.js 14.16.1
45 uses: actions/setup-node@v2 44 uses: actions/setup-node@v2
46 with: 45 with:
47 node-version: 14.16.1 46 node-version: 14.17.3
48 - name: Uninstall locally and reinstall node-gyp globally 47 - name: Uninstall locally and reinstall node-gyp globally
49 run: | 48 run: |
50 npm uninstall node-gyp 49 npm uninstall node-gyp
@@ -52,15 +51,12 @@ jobs:
52 - name: Install node dependencies recursively 51 - name: Install node dependencies recursively
53 run: npx lerna bootstrap 52 run: npx lerna bootstrap
54 - name: Update submodules 53 - name: Update submodules
55 run: git submodule update --remote -f 54 run: npm run update-submodules
56 - name: Update browserslist db 55 - name: Update browserslist db
57 run: npx browserslist@latest --update-db 56 run: npx browserslist@latest --update-db
58 - name: Run linter, reformatter, rebrander and tests 57 - name: Run linter, reformatter, rebrander and tests
59 run: | 58 run: |
60 npm run lint 59 npm run prepare-code
61 npm run reformat-files
62 npm run manage-translations
63 npm run apply-branding
64 npm run test 60 npm run test
65 - name: Commit submodules, dependency-updates and linter changes 61 - name: Commit submodules, dependency-updates and linter changes
66 run: | 62 run: |
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index de93bb9fb..6f89fbe25 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -2,13 +2,13 @@
2# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions 2# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3 3
4# Note: This workflow requires some secrets setup, and set on this repo with the names: 4# Note: This workflow requires some secrets setup, and set on this repo with the names:
5 # 'FERDI_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts) 5# 'FERDI_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts)
6 # 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts) 6# 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts)
7 # 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts) 7# 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts)
8 # 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts) 8# 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts)
9 # 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts) 9# 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts)
10 # 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts) 10# 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts)
11 # 'WIN_CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of windows artifacts) 11# 'WIN_CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of windows artifacts)
12 12
13name: Ferdi Builds 13name: Ferdi Builds
14 14
@@ -102,11 +102,10 @@ jobs:
102 cache-name: cache-node-modules 102 cache-name: cache-node-modules
103 with: 103 with:
104 path: ${{ env.NPM_CACHE }} 104 path: ${{ env.NPM_CACHE }}
105 key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 105 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
106 restore-keys: | 106 restore-keys: |
107 ${{ runner.os }}-build-${{ env.cache-name }}- 107 ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
108 ${{ runner.os }}-build- 108 ${{ runner.os }}-14.17-build-
109 ${{ runner.os }}-
110 - name: Cache electron modules 109 - name: Cache electron modules
111 uses: actions/cache@v2 110 uses: actions/cache@v2
112 env: 111 env:
@@ -121,10 +120,10 @@ jobs:
121 with: 120 with:
122 key: ${{ runner.os }}-${{ env.cache-name }} 121 key: ${{ runner.os }}-${{ env.cache-name }}
123 path: ${{ env.ELECTRON_BUILDER_CACHE }} 122 path: ${{ env.ELECTRON_BUILDER_CACHE }}
124 - name: Use Node.js 14.16.1 123 - name: Use Node.js 14.17.3
125 uses: actions/setup-node@v2 124 uses: actions/setup-node@v2
126 with: 125 with:
127 node-version: 14.16.1 126 node-version: 14.17.3
128 - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions 127 - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions
129 run: | 128 run: |
130 sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* 129 sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
@@ -133,6 +132,8 @@ jobs:
133 run: | 132 run: |
134 npm uninstall node-gyp 133 npm uninstall node-gyp
135 npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)" 134 npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)"
135 - name: Fix corrupted node cache
136 run: npm cache clean --force
136 - name: Install node dependencies recursively 137 - name: Install node dependencies recursively
137 run: npx lerna bootstrap 138 run: npx lerna bootstrap
138 - name: Package recipes 139 - name: Package recipes
@@ -200,11 +201,10 @@ jobs:
200 cache-name: cache-node-modules 201 cache-name: cache-node-modules
201 with: 202 with:
202 path: ${{ env.NPM_CACHE }} 203 path: ${{ env.NPM_CACHE }}
203 key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 204 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
204 restore-keys: | 205 restore-keys: |
205 ${{ runner.os }}-build-${{ env.cache-name }}- 206 ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
206 ${{ runner.os }}-build- 207 ${{ runner.os }}-14.17-build-
207 ${{ runner.os }}-
208 - name: Cache electron modules 208 - name: Cache electron modules
209 uses: actions/cache@v2 209 uses: actions/cache@v2
210 env: 210 env:
@@ -219,14 +219,16 @@ jobs:
219 with: 219 with:
220 key: ${{ runner.os }}-${{ env.cache-name }} 220 key: ${{ runner.os }}-${{ env.cache-name }}
221 path: ${{ env.ELECTRON_BUILDER_CACHE }} 221 path: ${{ env.ELECTRON_BUILDER_CACHE }}
222 - name: Use Node.js 14.16.1 222 - name: Use Node.js 14.17.3
223 uses: actions/setup-node@v2 223 uses: actions/setup-node@v2
224 with: 224 with:
225 node-version: 14.16.1 225 node-version: 14.17.3
226 - name: Uninstall locally and reinstall node-gyp globally 226 - name: Uninstall locally and reinstall node-gyp globally
227 run: | 227 run: |
228 npm uninstall node-gyp 228 npm uninstall node-gyp
229 npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)" 229 npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)"
230 - name: Fix corrupted node cache
231 run: npm cache clean --force
230 - name: Install node dependencies recursively 232 - name: Install node dependencies recursively
231 run: npx lerna bootstrap 233 run: npx lerna bootstrap
232 - name: Package recipes 234 - name: Package recipes
@@ -290,11 +292,10 @@ jobs:
290 cache-name: cache-node-modules 292 cache-name: cache-node-modules
291 with: 293 with:
292 path: ${{ env.NPM_CACHE }} 294 path: ${{ env.NPM_CACHE }}
293 key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} 295 key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
294 restore-keys: | 296 restore-keys: |
295 ${{ runner.os }}-build-${{ env.cache-name }}- 297 ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
296 ${{ runner.os }}-build- 298 ${{ runner.os }}-14.17-build-
297 ${{ runner.os }}-
298 - name: Cache electron modules 299 - name: Cache electron modules
299 uses: actions/cache@v2 300 uses: actions/cache@v2
300 env: 301 env:
@@ -309,17 +310,23 @@ jobs:
309 with: 310 with:
310 key: ${{ runner.os }}-${{ env.cache-name }} 311 key: ${{ runner.os }}-${{ env.cache-name }}
311 path: ${{ env.ELECTRON_BUILDER_CACHE }} 312 path: ${{ env.ELECTRON_BUILDER_CACHE }}
312 - name: Use Node.js 14.16.1 313 - name: Use Node.js 14.17.3
313 uses: actions/setup-node@v2 314 uses: actions/setup-node@v2
314 with: 315 with:
315 node-version: 14.16.1 316 node-version: 14.17.3
317 - name: Fix corrupted node cache
318 run: npm cache clean --force
319 shell: bash
316 - name: Install node dependencies recursively 320 - name: Install node dependencies recursively
317 run: npx lerna bootstrap 321 run: npx lerna bootstrap
322 shell: bash
318 - name: Package recipes 323 - name: Package recipes
319 run: npm i && npm run package 324 run: npm i && npm run package
320 working-directory: ./recipes 325 working-directory: ./recipes
326 shell: bash
321 - name: Run linter and tests 327 - name: Run linter and tests
322 run: npm run lint && npm run test 328 run: npm run lint && npm run test
329 shell: bash
323 - name: Build Ferdi without publish for any branch not 'nightly' and not 'release' 330 - name: Build Ferdi without publish for any branch not 'nightly' and not 'release'
324 if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }} 331 if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }}
325 run: npm run build -- --publish never 332 run: npm run build -- --publish never
diff --git a/.nvmrc b/.nvmrc
index 6b17d228d..c6244cda0 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
14.16.1 14.17.3
diff --git a/.prettierrc.js b/.prettierrc.js
index 6db0775a3..6a0a09497 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,4 +1,5 @@
1module.exports = { 1module.exports = {
2 singleQuote: true, 2 singleQuote: true,
3 arrowParens: 'avoid' 3 arrowParens: 'avoid',
4 trailingComma: 'all',
4}; 5};
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c26de8a12..0b643ea10 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,13 +52,13 @@ As a basic rule, before filing issues, feature requests or anything else. Take a
52 52
53#### Node.js, npm, node-gyp 53#### Node.js, npm, node-gyp
54 54
55Please make sure you are running the exact node version used by the developers/contributors as specified in the [nvmrc file](./.nvmrc). 55Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [package.json file](./package.json#engines).
56 56
57Currently, these are the combinations of system dependencies that work on an intel-based machines for MacOS/Linux/Windows (building on an ARM-based machine is still a work-in-progress due to node-sass native dependencies) 57Currently, these are the combinations of system dependencies that work for MacOS/Linux/Windows:
58 58
59```bash 59```bash
60node -v 60node -v
61v14.16.1 61v14.17.3
62npm -v 62npm -v
636.14.12 636.14.12
64node-gyp -v 64node-gyp -v
@@ -74,7 +74,7 @@ _Note:_ This list can likely get outdated. If so, please refer to the specific v
74#### Debian/Ubuntu 74#### Debian/Ubuntu
75 75
76```bash 76```bash
77apt install ca-certificates curl netbase wget tzdata rpm 77apt-get update -y && apt-get install --no-install-recommends -y rpm ruby gem && gem install fpm --no-ri --no-rdoc --no-document
78``` 78```
79 79
80#### Fedora 80#### Fedora
@@ -181,7 +181,7 @@ npm run dev
181DEBUG=Ferdi:* npm run start 181DEBUG=Ferdi:* npm run start
182``` 182```
183 183
184Optionally, you can run both commands in one terminal with [misty](https://github.com/adlk/misty) (see [misty.yml](https://github.com/getferdi/ferdi/blob/develop/misty.yml)): 184- Optionally, you can run both commands in one terminal with [misty](https://github.com/adlk/misty) (see [misty.yml](https://github.com/getferdi/ferdi/blob/develop/misty.yml)):
185 185
186```bash 186```bash
187DEBUG=Ferdi:* npx misty 187DEBUG=Ferdi:* npx misty
@@ -213,15 +213,11 @@ Assets will be available in the `out` folder.
213 213
214## Release 214## Release
215 215
216Create a new [draft release](https://github.com/getferdi/ferdi/releases/new) that targets the `release` branch, then:
217
218```bash 216```bash
219git checkout develop && git pull -r 217git checkout nightly && git pull -r
220git checkout release 218git checkout release
221git submodule update --remote --force 219git merge --no-ff nightly --no-verify
222git commit -am "Update submodules"
223git merge --no-ff develop
224git push 220git push
225``` 221```
226 222
227Once the draft release assets are uploaded (13 assets), publish the release (you will need elevated permissions in GitHub for doing this). The last commit of the `release` branch will be tagged. You can then merge `release` into `master` and back into `develop` if needed 223This will automatically trigger the build, as part of which, a new, draft release will be created [here](https://github.com/getferdi/ferdi/releases/). Once all the assets are uploaded (19 assets in total), publish the release (you will need elevated permissions in GitHub for doing this). The last commit of the `release` branch will be tagged.
diff --git a/Dockerfile b/Dockerfile
index b6526460f..bb0381d31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,12 +8,12 @@ ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sna
8 8
9ARG DEBIAN_FRONTEND=noninteractive 9ARG DEBIAN_FRONTEND=noninteractive
10# Note: This is added for building on ARM machines 10# Note: This is added for building on ARM machines
11ARG USE_SYSTEM_FPM="true" 11ARG USE_SYSTEM_FPM=true
12# Note: Added to bypass the error with missing git repo information for the 'preval-build-info' module 12# Note: Added to bypass the error with missing git repo information for the 'preval-build-info' module
13ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true 13ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true
14 14
15RUN apt-get update \ 15RUN apt-get update -y \
16 && apt-get install -y rpm ruby gem \ 16 && apt-get install --no-install-recommends -y rpm ruby gem \
17 && gem install fpm --no-ri --no-rdoc --no-document 17 && gem install fpm --no-ri --no-rdoc --no-document
18 18
19WORKDIR /usr/src/ferdi 19WORKDIR /usr/src/ferdi
diff --git a/README.md b/README.md
index b3d4b685e..99e234ba3 100644
--- a/README.md
+++ b/README.md
@@ -217,7 +217,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
217 217
218### Adds internal changes 218### Adds internal changes
219 219
220- [x] Upgrades to Electron 13.1.6 220- [x] Upgrades to Electron 13.1.7
221- [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size 221- [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
222- [x] Minifies build files to improve app size 222- [x] Minifies build files to improve app size
223- [x] Adds "npm run prepare-code" command for development to lint and beautify code 223- [x] Adds "npm run prepare-code" command for development to lint and beautify code
diff --git a/electron-builder.yml b/electron-builder.yml
index e3737150c..48b3c4767 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -55,6 +55,7 @@ linux:
55 target: 55 target:
56 - target: AppImage 56 - target: AppImage
57 - target: deb 57 - target: deb
58 arch: [x64, arm64, armv7l]
58 - target: tar.gz 59 - target: tar.gz
59 - target: rpm 60 - target: rpm
60 - target: freebsd 61 - target: freebsd
@@ -70,3 +71,4 @@ protocols:
70asarUnpack: 71asarUnpack:
71 - ./recipes 72 - ./recipes
72 - ./assets/images/taskbar 73 - ./assets/images/taskbar
74 - ./node_modules/@meetfranz
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 9a04732b7..ed5245ee1 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -1,8 +1,8 @@
1/* eslint max-len: 0 */
2import gulp from 'gulp'; 1import gulp from 'gulp';
3import gulpIf from 'gulp-if'; 2import gulpIf from 'gulp-if';
4import babel from 'gulp-babel'; 3import babel from 'gulp-babel';
5import sass from 'gulp-sass'; 4import dartSass from 'sass';
5import gulpSass from 'gulp-sass';
6import csso from 'gulp-csso'; 6import csso from 'gulp-csso';
7import terser from 'terser'; 7import terser from 'terser';
8import composer from 'gulp-uglify/composer'; 8import composer from 'gulp-uglify/composer';
@@ -22,19 +22,18 @@ import * as rawStyleConfig from './src/theme/default/legacy.js';
22 22
23dotenv.config(); 23dotenv.config();
24 24
25const sass = gulpSass(dartSass);
25const uglify = composer(terser, console); 26const uglify = composer(terser, console);
26 27
27const isDevBuild = process.env.NODE_ENV === 'development'; 28const isDevBuild = process.env.NODE_ENV === 'development';
28 29
29const getTargetEnv = isDevBuild ? 'development' : 'production'; 30const getTargetEnv = isDevBuild ? 'development' : 'production';
30 31
31const styleConfig = Object.keys(rawStyleConfig).map((key) => { 32const styleConfig = Object.keys(rawStyleConfig).map(key => {
32 const isHex = /^#[0-9A-F]{6}$/i.test(rawStyleConfig[key]); 33 const isHex = /^#[0-9A-F]{6}$/i.test(rawStyleConfig[key]);
33 return { 34 return {
34 [`$raw_${kebabCase(key)}`]: isHex 35 [`$raw_${kebabCase(key)}`]: isHex
35 ? hexRgb(rawStyleConfig[key], { format: 'array' }) 36 ? hexRgb(rawStyleConfig[key], { format: 'array' }).splice(0, 3).join(',')
36 .splice(0, 3)
37 .join(',')
38 : rawStyleConfig[key], 37 : rawStyleConfig[key],
39 }; 38 };
40}); 39});
@@ -107,7 +106,7 @@ function _shell(cmd, cb) {
107 ); 106 );
108} 107}
109 108
110const clean = (done) => { 109const clean = done => {
111 removeSync(paths.tmp); 110 removeSync(paths.tmp);
112 removeSync(paths.dest); 111 removeSync(paths.dest);
113 removeSync(paths.dist); 112 removeSync(paths.dist);
@@ -140,7 +139,7 @@ export function mvLernaPackages() {
140} 139}
141 140
142export function exportBuildInfo() { 141export function exportBuildInfo() {
143 var buildInfoData = { 142 const buildInfoData = {
144 timestamp: buildInfo.timestamp, 143 timestamp: buildInfo.timestamp,
145 gitHashShort: buildInfo.gitHashShort, 144 gitHashShort: buildInfo.gitHashShort,
146 gitBranch: buildInfo.gitBranch, 145 gitBranch: buildInfo.gitBranch,
@@ -151,10 +150,16 @@ export function exportBuildInfo() {
151export function html() { 150export function html() {
152 return gulp 151 return gulp
153 .src(paths.html.src, { since: gulp.lastRun(html) }) 152 .src(paths.html.src, { since: gulp.lastRun(html) })
154 .pipe(gulpIf(!isDevBuild, htmlMin({ // Only minify in production to speed up dev builds 153 .pipe(
155 collapseWhitespace: true, 154 gulpIf(
156 removeComments: true, 155 !isDevBuild,
157 }))) 156 htmlMin({
157 // Only minify in production to speed up dev builds
158 collapseWhitespace: true,
159 removeComments: true,
160 }),
161 ),
162 )
158 .pipe(gulp.dest(paths.html.dest)) 163 .pipe(gulp.dest(paths.html.dest))
159 .pipe(connect.reload()); 164 .pipe(connect.reload());
160} 165}
@@ -177,9 +182,15 @@ export function styles() {
177 includePaths: ['./node_modules', '../node_modules'], 182 includePaths: ['./node_modules', '../node_modules'],
178 }).on('error', sass.logError), 183 }).on('error', sass.logError),
179 ) 184 )
180 .pipe((gulpIf(!isDevBuild, csso({ // Only minify in production to speed up dev builds 185 .pipe(
181 restructure: false, // Don't restructure CSS, otherwise it will break the styles 186 gulpIf(
182 })))) 187 !isDevBuild,
188 csso({
189 // Only minify in production to speed up dev builds
190 restructure: false, // Don't restructure CSS, otherwise it will break the styles
191 }),
192 ),
193 )
183 .pipe(gulp.dest(paths.styles.dest)) 194 .pipe(gulp.dest(paths.styles.dest))
184 .pipe(connect.reload()); 195 .pipe(connect.reload());
185} 196}
@@ -202,9 +213,15 @@ export function verticalStyle() {
202 includePaths: ['./node_modules', '../node_modules'], 213 includePaths: ['./node_modules', '../node_modules'],
203 }).on('error', sass.logError), 214 }).on('error', sass.logError),
204 ) 215 )
205 .pipe((gulpIf(!isDevBuild, csso({ // Only minify in production to speed up dev builds 216 .pipe(
206 restructure: false, // Don't restructure CSS, otherwise it will break the styles 217 gulpIf(
207 })))) 218 !isDevBuild,
219 csso({
220 // Only minify in production to speed up dev builds
221 restructure: false, // Don't restructure CSS, otherwise it will break the styles
222 }),
223 ),
224 )
208 .pipe(gulp.dest(paths.verticalStyle.dest)) 225 .pipe(gulp.dest(paths.verticalStyle.dest))
209 .pipe(connect.reload()); 226 .pipe(connect.reload());
210} 227}
@@ -240,11 +257,13 @@ export function webserver() {
240} 257}
241 258
242export function recipes() { 259export function recipes() {
243 return gulp.src(paths.recipes.src, { since: gulp.lastRun(recipes) }) 260 return gulp
261 .src(paths.recipes.src, { since: gulp.lastRun(recipes) })
244 .pipe(gulp.dest(paths.recipes.dest)); 262 .pipe(gulp.dest(paths.recipes.dest));
245} 263}
246export function recipeInfo() { 264export function recipeInfo() {
247 return gulp.src(paths.recipeInfo.src, { since: gulp.lastRun(recipeInfo) }) 265 return gulp
266 .src(paths.recipeInfo.src, { since: gulp.lastRun(recipeInfo) })
248 .pipe(gulp.dest(paths.recipeInfo.dest)); 267 .pipe(gulp.dest(paths.recipeInfo.dest));
249} 268}
250 269
diff --git a/package-lock.json b/package-lock.json
index 9c263bbcf..dff7eadce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4056,20 +4056,12 @@
4056 }, 4056 },
4057 "dependencies": { 4057 "dependencies": {
4058 "debug": { 4058 "debug": {
4059 "version": "4.3.1", 4059 "version": "4.3.2",
4060 "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", 4060 "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
4061 "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", 4061 "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
4062 "dev": true, 4062 "dev": true,
4063 "requires": { 4063 "requires": {
4064 "ms": "2.1.2" 4064 "ms": "2.1.2"
4065 },
4066 "dependencies": {
4067 "ms": {
4068 "version": "2.1.2",
4069 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
4070 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
4071 "dev": true
4072 }
4073 } 4065 }
4074 }, 4066 },
4075 "fs-extra": { 4067 "fs-extra": {
@@ -4094,6 +4086,12 @@
4094 "universalify": "^2.0.0" 4086 "universalify": "^2.0.0"
4095 } 4087 }
4096 }, 4088 },
4089 "ms": {
4090 "version": "2.1.2",
4091 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
4092 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
4093 "dev": true
4094 },
4097 "universalify": { 4095 "universalify": {
4098 "version": "2.0.0", 4096 "version": "2.0.0",
4099 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", 4097 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -8763,9 +8761,9 @@
8763 "dev": true 8761 "dev": true
8764 }, 8762 },
8765 "@types/debug": { 8763 "@types/debug": {
8766 "version": "4.1.5", 8764 "version": "4.1.6",
8767 "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz", 8765 "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.6.tgz",
8768 "integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==", 8766 "integrity": "sha512-7fDOJFA/x8B+sO1901BmHlf5dE1cxBU8mRXj8QOEDnn16hhGJv/IHxJtZhvsabZsIMn0eLIyeOKAeqSNJJYTpA==",
8769 "dev": true 8767 "dev": true
8770 }, 8768 },
8771 "@types/eslint": { 8769 "@types/eslint": {
@@ -9048,9 +9046,9 @@
9048 "dev": true 9046 "dev": true
9049 }, 9047 },
9050 "@types/verror": { 9048 "@types/verror": {
9051 "version": "1.10.4", 9049 "version": "1.10.5",
9052 "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.4.tgz", 9050 "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.5.tgz",
9053 "integrity": "sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg==", 9051 "integrity": "sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw==",
9054 "dev": true, 9052 "dev": true,
9055 "optional": true 9053 "optional": true
9056 }, 9054 },
@@ -9925,12 +9923,6 @@
9925 } 9923 }
9926 } 9924 }
9927 }, 9925 },
9928 "amdefine": {
9929 "version": "1.0.1",
9930 "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
9931 "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
9932 "dev": true
9933 },
9934 "ansi-align": { 9926 "ansi-align": {
9935 "version": "3.0.0", 9927 "version": "3.0.0",
9936 "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", 9928 "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
@@ -10219,15 +10211,15 @@
10219 } 10211 }
10220 }, 10212 },
10221 "app-builder-bin": { 10213 "app-builder-bin": {
10222 "version": "3.5.13", 10214 "version": "3.7.1",
10223 "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz", 10215 "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz",
10224 "integrity": "sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==", 10216 "integrity": "sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==",
10225 "dev": true 10217 "dev": true
10226 }, 10218 },
10227 "app-builder-lib": { 10219 "app-builder-lib": {
10228 "version": "22.11.7", 10220 "version": "22.11.9",
10229 "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.7.tgz", 10221 "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.9.tgz",
10230 "integrity": "sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==", 10222 "integrity": "sha512-mS8aFN16IlzXzD1LwuheHliCI7wiJjC+agiCh+mxRtY8TKinb0vSI4pggib4RHvVq55l3RxDX4EEWGuqGMScIA==",
10231 "dev": true, 10223 "dev": true,
10232 "requires": { 10224 "requires": {
10233 "7zip-bin": "~5.1.1", 10225 "7zip-bin": "~5.1.1",
@@ -10236,12 +10228,13 @@
10236 "@malept/flatpak-bundler": "^0.4.0", 10228 "@malept/flatpak-bundler": "^0.4.0",
10237 "async-exit-hook": "^2.0.1", 10229 "async-exit-hook": "^2.0.1",
10238 "bluebird-lst": "^1.0.9", 10230 "bluebird-lst": "^1.0.9",
10239 "builder-util": "22.11.7", 10231 "builder-util": "22.11.9",
10240 "builder-util-runtime": "8.7.7", 10232 "builder-util-runtime": "8.7.8",
10241 "chromium-pickle-js": "^0.2.0", 10233 "chromium-pickle-js": "^0.2.0",
10242 "debug": "^4.3.2", 10234 "debug": "^4.3.2",
10243 "ejs": "^3.1.6", 10235 "ejs": "^3.1.6",
10244 "electron-publish": "22.11.7", 10236 "electron-osx-sign": "^0.5.0",
10237 "electron-publish": "22.11.9",
10245 "fs-extra": "^10.0.0", 10238 "fs-extra": "^10.0.0",
10246 "hosted-git-info": "^4.0.2", 10239 "hosted-git-info": "^4.0.2",
10247 "is-ci": "^3.0.0", 10240 "is-ci": "^3.0.0",
@@ -10262,9 +10255,9 @@
10262 "dev": true 10255 "dev": true
10263 }, 10256 },
10264 "builder-util-runtime": { 10257 "builder-util-runtime": {
10265 "version": "8.7.7", 10258 "version": "8.7.8",
10266 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", 10259 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.8.tgz",
10267 "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", 10260 "integrity": "sha512-j7V45HIXX5dzminZLVKlmgmqaXpt44CcpFVEjlkO6zPM3IQFjeb+jvOKcqygg5MK3Q1Q5l4Jj9m9xZp0Rc4TiQ==",
10268 "dev": true, 10261 "dev": true,
10269 "requires": { 10262 "requires": {
10270 "debug": "^4.3.2", 10263 "debug": "^4.3.2",
@@ -10284,25 +10277,6 @@
10284 "dev": true, 10277 "dev": true,
10285 "requires": { 10278 "requires": {
10286 "ms": "2.1.2" 10279 "ms": "2.1.2"
10287 },
10288 "dependencies": {
10289 "ms": {
10290 "version": "2.1.2",
10291 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
10292 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
10293 "dev": true
10294 }
10295 }
10296 },
10297 "fs-extra": {
10298 "version": "10.0.0",
10299 "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
10300 "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
10301 "dev": true,
10302 "requires": {
10303 "graceful-fs": "^4.2.0",
10304 "jsonfile": "^6.0.1",
10305 "universalify": "^2.0.0"
10306 } 10280 }
10307 }, 10281 },
10308 "hosted-git-info": { 10282 "hosted-git-info": {
@@ -10332,16 +10306,6 @@
10332 "argparse": "^2.0.1" 10306 "argparse": "^2.0.1"
10333 } 10307 }
10334 }, 10308 },
10335 "jsonfile": {
10336 "version": "6.1.0",
10337 "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
10338 "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
10339 "dev": true,
10340 "requires": {
10341 "graceful-fs": "^4.1.6",
10342 "universalify": "^2.0.0"
10343 }
10344 },
10345 "lazy-val": { 10309 "lazy-val": {
10346 "version": "1.0.5", 10310 "version": "1.0.5",
10347 "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", 10311 "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
@@ -10357,19 +10321,10 @@
10357 "yallist": "^4.0.0" 10321 "yallist": "^4.0.0"
10358 } 10322 }
10359 }, 10323 },
10360 "semver": { 10324 "ms": {
10361 "version": "7.3.5", 10325 "version": "2.1.2",
10362 "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", 10326 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
10363 "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", 10327 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
10364 "dev": true,
10365 "requires": {
10366 "lru-cache": "^6.0.0"
10367 }
10368 },
10369 "universalify": {
10370 "version": "2.0.0",
10371 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
10372 "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
10373 "dev": true 10328 "dev": true
10374 }, 10329 },
10375 "yallist": { 10330 "yallist": {
@@ -11081,12 +11036,6 @@
11081 "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", 11036 "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
11082 "dev": true 11037 "dev": true
11083 }, 11038 },
11084 "async-foreach": {
11085 "version": "0.1.3",
11086 "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
11087 "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
11088 "dev": true
11089 },
11090 "async-limiter": { 11039 "async-limiter": {
11091 "version": "1.0.1", 11040 "version": "1.0.1",
11092 "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", 11041 "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
@@ -11701,6 +11650,7 @@
11701 "version": "0.0.9", 11650 "version": "0.0.9",
11702 "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", 11651 "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
11703 "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", 11652 "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
11653 "optional": true,
11704 "requires": { 11654 "requires": {
11705 "inherits": "~2.0.0" 11655 "inherits": "~2.0.0"
11706 } 11656 }
@@ -12205,17 +12155,17 @@
12205 "dev": true 12155 "dev": true
12206 }, 12156 },
12207 "builder-util": { 12157 "builder-util": {
12208 "version": "22.11.7", 12158 "version": "22.11.9",
12209 "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.7.tgz", 12159 "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.9.tgz",
12210 "integrity": "sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==", 12160 "integrity": "sha512-phiEuT361Pzb8kNN2ZQDr7PHV+TTNMydqIow9Wcrl69VxM1q89qJPLvHsDhR9m9T0OCMHaO0UsZsJ8Jsx2LDJQ==",
12211 "dev": true, 12161 "dev": true,
12212 "requires": { 12162 "requires": {
12213 "7zip-bin": "~5.1.1", 12163 "7zip-bin": "~5.1.1",
12214 "@types/debug": "^4.1.5", 12164 "@types/debug": "^4.1.6",
12215 "@types/fs-extra": "^9.0.11", 12165 "@types/fs-extra": "^9.0.11",
12216 "app-builder-bin": "3.5.13", 12166 "app-builder-bin": "3.7.1",
12217 "bluebird-lst": "^1.0.9", 12167 "bluebird-lst": "^1.0.9",
12218 "builder-util-runtime": "8.7.7", 12168 "builder-util-runtime": "8.7.8",
12219 "chalk": "^4.1.1", 12169 "chalk": "^4.1.1",
12220 "debug": "^4.3.2", 12170 "debug": "^4.3.2",
12221 "fs-extra": "^10.0.0", 12171 "fs-extra": "^10.0.0",
@@ -12227,9 +12177,9 @@
12227 }, 12177 },
12228 "dependencies": { 12178 "dependencies": {
12229 "@types/fs-extra": { 12179 "@types/fs-extra": {
12230 "version": "9.0.11", 12180 "version": "9.0.12",
12231 "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz", 12181 "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
12232 "integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==", 12182 "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
12233 "dev": true, 12183 "dev": true,
12234 "requires": { 12184 "requires": {
12235 "@types/node": "*" 12185 "@types/node": "*"
@@ -12251,9 +12201,9 @@
12251 "dev": true 12201 "dev": true
12252 }, 12202 },
12253 "builder-util-runtime": { 12203 "builder-util-runtime": {
12254 "version": "8.7.7", 12204 "version": "8.7.8",
12255 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", 12205 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.8.tgz",
12256 "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", 12206 "integrity": "sha512-j7V45HIXX5dzminZLVKlmgmqaXpt44CcpFVEjlkO6zPM3IQFjeb+jvOKcqygg5MK3Q1Q5l4Jj9m9xZp0Rc4TiQ==",
12257 "dev": true, 12207 "dev": true,
12258 "requires": { 12208 "requires": {
12259 "debug": "^4.3.2", 12209 "debug": "^4.3.2",
@@ -12298,25 +12248,6 @@
12298 "dev": true, 12248 "dev": true,
12299 "requires": { 12249 "requires": {
12300 "ms": "2.1.2" 12250 "ms": "2.1.2"
12301 },
12302 "dependencies": {
12303 "ms": {
12304 "version": "2.1.2",
12305 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
12306 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
12307 "dev": true
12308 }
12309 }
12310 },
12311 "fs-extra": {
12312 "version": "10.0.0",
12313 "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
12314 "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
12315 "dev": true,
12316 "requires": {
12317 "graceful-fs": "^4.2.0",
12318 "jsonfile": "^6.0.1",
12319 "universalify": "^2.0.0"
12320 } 12251 }
12321 }, 12252 },
12322 "has-flag": { 12253 "has-flag": {
@@ -12343,25 +12274,11 @@
12343 "argparse": "^2.0.1" 12274 "argparse": "^2.0.1"
12344 } 12275 }
12345 }, 12276 },
12346 "jsonfile": { 12277 "ms": {
12347 "version": "6.1.0", 12278 "version": "2.1.2",
12348 "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", 12279 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
12349 "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", 12280 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
12350 "dev": true, 12281 "dev": true
12351 "requires": {
12352 "graceful-fs": "^4.1.6",
12353 "universalify": "^2.0.0"
12354 }
12355 },
12356 "source-map-support": {
12357 "version": "0.5.19",
12358 "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
12359 "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
12360 "dev": true,
12361 "requires": {
12362 "buffer-from": "^1.0.0",
12363 "source-map": "^0.6.0"
12364 }
12365 }, 12282 },
12366 "supports-color": { 12283 "supports-color": {
12367 "version": "7.2.0", 12284 "version": "7.2.0",
@@ -12371,12 +12288,6 @@
12371 "requires": { 12288 "requires": {
12372 "has-flag": "^4.0.0" 12289 "has-flag": "^4.0.0"
12373 } 12290 }
12374 },
12375 "universalify": {
12376 "version": "2.0.0",
12377 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
12378 "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
12379 "dev": true
12380 } 12291 }
12381 } 12292 }
12382 }, 12293 },
@@ -12589,9 +12500,9 @@
12589 } 12500 }
12590 }, 12501 },
12591 "caniuse-lite": { 12502 "caniuse-lite": {
12592 "version": "1.0.30001243", 12503 "version": "1.0.30001245",
12593 "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz", 12504 "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz",
12594 "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==", 12505 "integrity": "sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==",
12595 "dev": true 12506 "dev": true
12596 }, 12507 },
12597 "caseless": { 12508 "caseless": {
@@ -13136,6 +13047,12 @@
13136 "dot-prop": "^5.1.0" 13047 "dot-prop": "^5.1.0"
13137 } 13048 }
13138 }, 13049 },
13050 "compare-version": {
13051 "version": "0.1.2",
13052 "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
13053 "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
13054 "dev": true
13055 },
13139 "component-emitter": { 13056 "component-emitter": {
13140 "version": "1.3.0", 13057 "version": "1.3.0",
13141 "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", 13058 "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -15127,14 +15044,14 @@
15127 } 15044 }
15128 }, 15045 },
15129 "dmg-builder": { 15046 "dmg-builder": {
15130 "version": "22.11.7", 15047 "version": "22.11.9",
15131 "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.7.tgz", 15048 "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.9.tgz",
15132 "integrity": "sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==", 15049 "integrity": "sha512-9RCNW4oJI0zFswgumgbgopFZRZ+7zt6J7H6RQ3YB/vjehdfAxzWutFhiy3ExTwSX8QF9rAUWvfH5wk/hJjNrqA==",
15133 "dev": true, 15050 "dev": true,
15134 "requires": { 15051 "requires": {
15135 "app-builder-lib": "22.11.7", 15052 "app-builder-lib": "22.11.9",
15136 "builder-util": "22.11.7", 15053 "builder-util": "22.11.9",
15137 "builder-util-runtime": "8.7.6", 15054 "builder-util-runtime": "8.7.8",
15138 "dmg-license": "^1.0.9", 15055 "dmg-license": "^1.0.9",
15139 "fs-extra": "^10.0.0", 15056 "fs-extra": "^10.0.0",
15140 "iconv-lite": "^0.6.2", 15057 "iconv-lite": "^0.6.2",
@@ -15148,9 +15065,9 @@
15148 "dev": true 15065 "dev": true
15149 }, 15066 },
15150 "builder-util-runtime": { 15067 "builder-util-runtime": {
15151 "version": "8.7.6", 15068 "version": "8.7.8",
15152 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz", 15069 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.8.tgz",
15153 "integrity": "sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==", 15070 "integrity": "sha512-j7V45HIXX5dzminZLVKlmgmqaXpt44CcpFVEjlkO6zPM3IQFjeb+jvOKcqygg5MK3Q1Q5l4Jj9m9xZp0Rc4TiQ==",
15154 "dev": true, 15071 "dev": true,
15155 "requires": { 15072 "requires": {
15156 "debug": "^4.3.2", 15073 "debug": "^4.3.2",
@@ -15164,25 +15081,6 @@
15164 "dev": true, 15081 "dev": true,
15165 "requires": { 15082 "requires": {
15166 "ms": "2.1.2" 15083 "ms": "2.1.2"
15167 },
15168 "dependencies": {
15169 "ms": {
15170 "version": "2.1.2",
15171 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
15172 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
15173 "dev": true
15174 }
15175 }
15176 },
15177 "fs-extra": {
15178 "version": "10.0.0",
15179 "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
15180 "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
15181 "dev": true,
15182 "requires": {
15183 "graceful-fs": "^4.2.0",
15184 "jsonfile": "^6.0.1",
15185 "universalify": "^2.0.0"
15186 } 15084 }
15187 }, 15085 },
15188 "iconv-lite": { 15086 "iconv-lite": {
@@ -15203,20 +15101,10 @@
15203 "argparse": "^2.0.1" 15101 "argparse": "^2.0.1"
15204 } 15102 }
15205 }, 15103 },
15206 "jsonfile": { 15104 "ms": {
15207 "version": "6.1.0", 15105 "version": "2.1.2",
15208 "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", 15106 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
15209 "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", 15107 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
15210 "dev": true,
15211 "requires": {
15212 "graceful-fs": "^4.1.6",
15213 "universalify": "^2.0.0"
15214 }
15215 },
15216 "universalify": {
15217 "version": "2.0.0",
15218 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
15219 "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
15220 "dev": true 15108 "dev": true
15221 } 15109 }
15222 } 15110 }
@@ -15559,9 +15447,9 @@
15559 } 15447 }
15560 }, 15448 },
15561 "electron": { 15449 "electron": {
15562 "version": "13.1.6", 15450 "version": "13.1.7",
15563 "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.6.tgz", 15451 "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.7.tgz",
15564 "integrity": "sha512-XiB55/JTaQpDFQrD9pulYnOGwaWeMyRIub5ispvoE2bWBvM5zVMLptwMLb0m3KTMrfSkzhedZvOu7fwYvR7L7Q==", 15452 "integrity": "sha512-sVfpP/0s6a82FK32LMuEe9L+aWZw15u3uYn9xUJArPjy4OZHteE6yM5871YCNXNiDnoCLQ5eqQWipiVgHsf8nQ==",
15565 "dev": true, 15453 "dev": true,
15566 "requires": { 15454 "requires": {
15567 "@electron/get": "^1.0.1", 15455 "@electron/get": "^1.0.1",
@@ -15570,25 +15458,25 @@
15570 }, 15458 },
15571 "dependencies": { 15459 "dependencies": {
15572 "@types/node": { 15460 "@types/node": {
15573 "version": "14.17.4", 15461 "version": "14.17.5",
15574 "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz", 15462 "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz",
15575 "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==", 15463 "integrity": "sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==",
15576 "dev": true 15464 "dev": true
15577 } 15465 }
15578 } 15466 }
15579 }, 15467 },
15580 "electron-builder": { 15468 "electron-builder": {
15581 "version": "22.11.7", 15469 "version": "22.11.9",
15582 "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.7.tgz", 15470 "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.9.tgz",
15583 "integrity": "sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==", 15471 "integrity": "sha512-A+qopfZuFRuMBKLL6/L+VkFmPZFbQwvZEdnHRYlY7B58MhOANUGJKPVAm07U44IjSq5UK5U9/3xRDR7y3jnsug==",
15584 "dev": true, 15472 "dev": true,
15585 "requires": { 15473 "requires": {
15586 "@types/yargs": "^16.0.2", 15474 "@types/yargs": "^17.0.1",
15587 "app-builder-lib": "22.11.7", 15475 "app-builder-lib": "22.11.9",
15588 "builder-util": "22.11.7", 15476 "builder-util": "22.11.9",
15589 "builder-util-runtime": "8.7.7", 15477 "builder-util-runtime": "8.7.8",
15590 "chalk": "^4.1.1", 15478 "chalk": "^4.1.1",
15591 "dmg-builder": "22.11.7", 15479 "dmg-builder": "22.11.9",
15592 "fs-extra": "^10.0.0", 15480 "fs-extra": "^10.0.0",
15593 "is-ci": "^3.0.0", 15481 "is-ci": "^3.0.0",
15594 "lazy-val": "^1.0.5", 15482 "lazy-val": "^1.0.5",
@@ -15598,9 +15486,9 @@
15598 }, 15486 },
15599 "dependencies": { 15487 "dependencies": {
15600 "@types/yargs": { 15488 "@types/yargs": {
15601 "version": "16.0.3", 15489 "version": "17.0.2",
15602 "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.3.tgz", 15490 "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.2.tgz",
15603 "integrity": "sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==", 15491 "integrity": "sha512-JhZ+pNdKMfB0rXauaDlrIvm+U7V4m03PPOSVoPS66z8gf+G4Z/UW8UlrVIj2MRQOBzuoEvYtjS0bqYwnpZaS9Q==",
15604 "dev": true, 15492 "dev": true,
15605 "requires": { 15493 "requires": {
15606 "@types/yargs-parser": "*" 15494 "@types/yargs-parser": "*"
@@ -15622,9 +15510,9 @@
15622 } 15510 }
15623 }, 15511 },
15624 "builder-util-runtime": { 15512 "builder-util-runtime": {
15625 "version": "8.7.7", 15513 "version": "8.7.8",
15626 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", 15514 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.8.tgz",
15627 "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", 15515 "integrity": "sha512-j7V45HIXX5dzminZLVKlmgmqaXpt44CcpFVEjlkO6zPM3IQFjeb+jvOKcqygg5MK3Q1Q5l4Jj9m9xZp0Rc4TiQ==",
15628 "dev": true, 15516 "dev": true,
15629 "requires": { 15517 "requires": {
15630 "debug": "^4.3.2", 15518 "debug": "^4.3.2",
@@ -15680,14 +15568,6 @@
15680 "dev": true, 15568 "dev": true,
15681 "requires": { 15569 "requires": {
15682 "ms": "2.1.2" 15570 "ms": "2.1.2"
15683 },
15684 "dependencies": {
15685 "ms": {
15686 "version": "2.1.2",
15687 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
15688 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
15689 "dev": true
15690 }
15691 } 15571 }
15692 }, 15572 },
15693 "emoji-regex": { 15573 "emoji-regex": {
@@ -15696,17 +15576,6 @@
15696 "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", 15576 "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
15697 "dev": true 15577 "dev": true
15698 }, 15578 },
15699 "fs-extra": {
15700 "version": "10.0.0",
15701 "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
15702 "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
15703 "dev": true,
15704 "requires": {
15705 "graceful-fs": "^4.2.0",
15706 "jsonfile": "^6.0.1",
15707 "universalify": "^2.0.0"
15708 }
15709 },
15710 "get-caller-file": { 15579 "get-caller-file": {
15711 "version": "2.0.5", 15580 "version": "2.0.5",
15712 "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", 15581 "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -15734,22 +15603,18 @@
15734 "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", 15603 "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
15735 "dev": true 15604 "dev": true
15736 }, 15605 },
15737 "jsonfile": {
15738 "version": "6.1.0",
15739 "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
15740 "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
15741 "dev": true,
15742 "requires": {
15743 "graceful-fs": "^4.1.6",
15744 "universalify": "^2.0.0"
15745 }
15746 },
15747 "lazy-val": { 15606 "lazy-val": {
15748 "version": "1.0.5", 15607 "version": "1.0.5",
15749 "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", 15608 "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
15750 "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", 15609 "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==",
15751 "dev": true 15610 "dev": true
15752 }, 15611 },
15612 "ms": {
15613 "version": "2.1.2",
15614 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
15615 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
15616 "dev": true
15617 },
15753 "string-width": { 15618 "string-width": {
15754 "version": "4.2.2", 15619 "version": "4.2.2",
15755 "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", 15620 "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -15779,12 +15644,6 @@
15779 "has-flag": "^4.0.0" 15644 "has-flag": "^4.0.0"
15780 } 15645 }
15781 }, 15646 },
15782 "universalify": {
15783 "version": "2.0.0",
15784 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
15785 "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
15786 "dev": true
15787 },
15788 "wrap-ansi": { 15647 "wrap-ansi": {
15789 "version": "7.0.0", 15648 "version": "7.0.0",
15790 "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", 15649 "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -15818,9 +15677,9 @@
15818 } 15677 }
15819 }, 15678 },
15820 "yargs-parser": { 15679 "yargs-parser": {
15821 "version": "20.2.7", 15680 "version": "20.2.9",
15822 "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", 15681 "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
15823 "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", 15682 "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
15824 "dev": true 15683 "dev": true
15825 } 15684 }
15826 } 15685 }
@@ -15911,15 +15770,61 @@
15911 } 15770 }
15912 } 15771 }
15913 }, 15772 },
15773 "electron-osx-sign": {
15774 "version": "0.5.0",
15775 "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz",
15776 "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==",
15777 "dev": true,
15778 "requires": {
15779 "bluebird": "^3.5.0",
15780 "compare-version": "^0.1.2",
15781 "debug": "^2.6.8",
15782 "isbinaryfile": "^3.0.2",
15783 "minimist": "^1.2.0",
15784 "plist": "^3.0.1"
15785 },
15786 "dependencies": {
15787 "debug": {
15788 "version": "2.6.9",
15789 "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
15790 "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
15791 "dev": true,
15792 "requires": {
15793 "ms": "2.0.0"
15794 }
15795 },
15796 "isbinaryfile": {
15797 "version": "3.0.3",
15798 "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
15799 "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
15800 "dev": true,
15801 "requires": {
15802 "buffer-alloc": "^1.2.0"
15803 }
15804 },
15805 "minimist": {
15806 "version": "1.2.5",
15807 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
15808 "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
15809 "dev": true
15810 },
15811 "ms": {
15812 "version": "2.0.0",
15813 "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
15814 "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
15815 "dev": true
15816 }
15817 }
15818 },
15914 "electron-publish": { 15819 "electron-publish": {
15915 "version": "22.11.7", 15820 "version": "22.11.9",
15916 "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.7.tgz", 15821 "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.9.tgz",
15917 "integrity": "sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==", 15822 "integrity": "sha512-jFMiAsNvssne8RKMihZhPjGr4fJOBIj6N1WCG6jIl99lw1PGl45uCd4yXDxd8fMUvY4f6221LcbUA+ov/jFQnA==",
15918 "dev": true, 15823 "dev": true,
15919 "requires": { 15824 "requires": {
15920 "@types/fs-extra": "^9.0.11", 15825 "@types/fs-extra": "^9.0.11",
15921 "builder-util": "22.11.7", 15826 "builder-util": "22.11.9",
15922 "builder-util-runtime": "8.7.7", 15827 "builder-util-runtime": "8.7.8",
15923 "chalk": "^4.1.1", 15828 "chalk": "^4.1.1",
15924 "fs-extra": "^10.0.0", 15829 "fs-extra": "^10.0.0",
15925 "lazy-val": "^1.0.5", 15830 "lazy-val": "^1.0.5",
@@ -15927,9 +15832,9 @@
15927 }, 15832 },
15928 "dependencies": { 15833 "dependencies": {
15929 "@types/fs-extra": { 15834 "@types/fs-extra": {
15930 "version": "9.0.11", 15835 "version": "9.0.12",
15931 "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz", 15836 "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
15932 "integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==", 15837 "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
15933 "dev": true, 15838 "dev": true,
15934 "requires": { 15839 "requires": {
15935 "@types/node": "*" 15840 "@types/node": "*"
@@ -15945,9 +15850,9 @@
15945 } 15850 }
15946 }, 15851 },
15947 "builder-util-runtime": { 15852 "builder-util-runtime": {
15948 "version": "8.7.7", 15853 "version": "8.7.8",
15949 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", 15854 "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.8.tgz",
15950 "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", 15855 "integrity": "sha512-j7V45HIXX5dzminZLVKlmgmqaXpt44CcpFVEjlkO6zPM3IQFjeb+jvOKcqygg5MK3Q1Q5l4Jj9m9xZp0Rc4TiQ==",
15951 "dev": true, 15856 "dev": true,
15952 "requires": { 15857 "requires": {
15953 "debug": "^4.3.2", 15858 "debug": "^4.3.2",
@@ -15986,25 +15891,6 @@
15986 "dev": true, 15891 "dev": true,
15987 "requires": { 15892 "requires": {
15988 "ms": "2.1.2" 15893 "ms": "2.1.2"
15989 },
15990 "dependencies": {
15991 "ms": {
15992 "version": "2.1.2",
15993 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
15994 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
15995 "dev": true
15996 }
15997 }
15998 },
15999 "fs-extra": {
16000 "version": "10.0.0",
16001 "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
16002 "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
16003 "dev": true,
16004 "requires": {
16005 "graceful-fs": "^4.2.0",
16006 "jsonfile": "^6.0.1",
16007 "universalify": "^2.0.0"
16008 } 15894 }
16009 }, 15895 },
16010 "has-flag": { 15896 "has-flag": {
@@ -16013,16 +15899,6 @@
16013 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", 15899 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
16014 "dev": true 15900 "dev": true
16015 }, 15901 },
16016 "jsonfile": {
16017 "version": "6.1.0",
16018 "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
16019 "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
16020 "dev": true,
16021 "requires": {
16022 "graceful-fs": "^4.1.6",
16023 "universalify": "^2.0.0"
16024 }
16025 },
16026 "lazy-val": { 15902 "lazy-val": {
16027 "version": "1.0.5", 15903 "version": "1.0.5",
16028 "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", 15904 "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
@@ -16035,6 +15911,12 @@
16035 "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", 15911 "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
16036 "dev": true 15912 "dev": true
16037 }, 15913 },
15914 "ms": {
15915 "version": "2.1.2",
15916 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
15917 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
15918 "dev": true
15919 },
16038 "supports-color": { 15920 "supports-color": {
16039 "version": "7.2.0", 15921 "version": "7.2.0",
16040 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", 15922 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -16043,12 +15925,6 @@
16043 "requires": { 15925 "requires": {
16044 "has-flag": "^4.0.0" 15926 "has-flag": "^4.0.0"
16045 } 15927 }
16046 },
16047 "universalify": {
16048 "version": "2.0.0",
16049 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
16050 "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
16051 "dev": true
16052 } 15928 }
16053 } 15929 }
16054 }, 15930 },
@@ -19746,6 +19622,7 @@
19746 "version": "1.0.12", 19622 "version": "1.0.12",
19747 "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", 19623 "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
19748 "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", 19624 "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
19625 "optional": true,
19749 "requires": { 19626 "requires": {
19750 "graceful-fs": "^4.1.2", 19627 "graceful-fs": "^4.1.2",
19751 "inherits": "~2.0.0", 19628 "inherits": "~2.0.0",
@@ -19812,15 +19689,6 @@
19812 } 19689 }
19813 } 19690 }
19814 }, 19691 },
19815 "gaze": {
19816 "version": "1.1.3",
19817 "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
19818 "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
19819 "dev": true,
19820 "requires": {
19821 "globule": "^1.0.0"
19822 }
19823 },
19824 "gensync": { 19692 "gensync": {
19825 "version": "1.0.0-beta.2", 19693 "version": "1.0.0-beta.2",
19826 "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", 19694 "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -20687,17 +20555,6 @@
20687 } 20555 }
20688 } 20556 }
20689 }, 20557 },
20690 "globule": {
20691 "version": "1.3.2",
20692 "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
20693 "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
20694 "dev": true,
20695 "requires": {
20696 "glob": "~7.1.1",
20697 "lodash": "~4.17.10",
20698 "minimatch": "~3.0.2"
20699 }
20700 },
20701 "glogg": { 20558 "glogg": {
20702 "version": "1.0.2", 20559 "version": "1.0.2",
20703 "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", 20560 "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
@@ -21661,342 +21518,89 @@
21661 } 21518 }
21662 }, 21519 },
21663 "gulp-sass": { 21520 "gulp-sass": {
21664 "version": "4.1.0", 21521 "version": "5.0.0",
21665 "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.1.0.tgz", 21522 "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-5.0.0.tgz",
21666 "integrity": "sha512-xIiwp9nkBLcJDpmYHbEHdoWZv+j+WtYaKD6Zil/67F3nrAaZtWYN5mDwerdo7EvcdBenSAj7Xb2hx2DqURLGdA==", 21523 "integrity": "sha512-J0aH0/2N4+2szGCeut0ktGHK0Wg8L9uWivuigrl7xv+nhxozBQRAKLrhnDDaTa3FeUWYtgT8w4RlgdhRy5v16w==",
21667 "dev": true, 21524 "dev": true,
21668 "requires": { 21525 "requires": {
21669 "chalk": "^2.3.0", 21526 "chalk": "^4.1.1",
21670 "lodash": "^4.17.11", 21527 "lodash": "^4.17.20",
21671 "node-sass": "^4.8.3",
21672 "plugin-error": "^1.0.1", 21528 "plugin-error": "^1.0.1",
21673 "replace-ext": "^1.0.0", 21529 "replace-ext": "^2.0.0",
21674 "strip-ansi": "^4.0.0", 21530 "strip-ansi": "^6.0.0",
21675 "through2": "^2.0.0", 21531 "transfob": "^1.0.0",
21676 "vinyl-sourcemaps-apply": "^0.2.0" 21532 "vinyl-sourcemaps-apply": "^0.2.1"
21677 }, 21533 },
21678 "dependencies": { 21534 "dependencies": {
21679 "ansi-regex": { 21535 "ansi-regex": {
21680 "version": "2.1.1", 21536 "version": "5.0.0",
21681 "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", 21537 "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
21682 "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", 21538 "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
21683 "dev": true 21539 "dev": true
21684 }, 21540 },
21685 "ansi-styles": { 21541 "ansi-styles": {
21686 "version": "2.2.1", 21542 "version": "4.3.0",
21687 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", 21543 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
21688 "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", 21544 "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
21689 "dev": true
21690 },
21691 "camelcase": {
21692 "version": "2.1.1",
21693 "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
21694 "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
21695 "dev": true
21696 },
21697 "camelcase-keys": {
21698 "version": "2.1.0",
21699 "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
21700 "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
21701 "dev": true,
21702 "requires": {
21703 "camelcase": "^2.0.0",
21704 "map-obj": "^1.0.0"
21705 }
21706 },
21707 "cross-spawn": {
21708 "version": "3.0.1",
21709 "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
21710 "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
21711 "dev": true,
21712 "requires": {
21713 "lru-cache": "^4.0.1",
21714 "which": "^1.2.9"
21715 }
21716 },
21717 "find-up": {
21718 "version": "1.1.2",
21719 "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
21720 "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
21721 "dev": true,
21722 "requires": {
21723 "path-exists": "^2.0.0",
21724 "pinkie-promise": "^2.0.0"
21725 }
21726 },
21727 "indent-string": {
21728 "version": "2.1.0",
21729 "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
21730 "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
21731 "dev": true,
21732 "requires": {
21733 "repeating": "^2.0.0"
21734 }
21735 },
21736 "load-json-file": {
21737 "version": "1.1.0",
21738 "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
21739 "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
21740 "dev": true,
21741 "requires": {
21742 "graceful-fs": "^4.1.2",
21743 "parse-json": "^2.2.0",
21744 "pify": "^2.0.0",
21745 "pinkie-promise": "^2.0.0",
21746 "strip-bom": "^2.0.0"
21747 }
21748 },
21749 "map-obj": {
21750 "version": "1.0.1",
21751 "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
21752 "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
21753 "dev": true
21754 },
21755 "meow": {
21756 "version": "3.7.0",
21757 "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
21758 "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
21759 "dev": true,
21760 "requires": {
21761 "camelcase-keys": "^2.0.0",
21762 "decamelize": "^1.1.2",
21763 "loud-rejection": "^1.0.0",
21764 "map-obj": "^1.0.1",
21765 "minimist": "^1.1.3",
21766 "normalize-package-data": "^2.3.4",
21767 "object-assign": "^4.0.1",
21768 "read-pkg-up": "^1.0.1",
21769 "redent": "^1.0.0",
21770 "trim-newlines": "^1.0.0"
21771 }
21772 },
21773 "minimist": {
21774 "version": "1.2.5",
21775 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
21776 "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
21777 "dev": true
21778 },
21779 "node-gyp": {
21780 "version": "3.8.0",
21781 "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
21782 "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
21783 "dev": true,
21784 "requires": {
21785 "fstream": "^1.0.0",
21786 "glob": "^7.0.3",
21787 "graceful-fs": "^4.1.2",
21788 "mkdirp": "^0.5.0",
21789 "nopt": "2 || 3",
21790 "npmlog": "0 || 1 || 2 || 3 || 4",
21791 "osenv": "0",
21792 "request": "^2.87.0",
21793 "rimraf": "2",
21794 "semver": "~5.3.0",
21795 "tar": "^2.0.0",
21796 "which": "1"
21797 }
21798 },
21799 "node-sass": {
21800 "version": "4.14.1",
21801 "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
21802 "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
21803 "dev": true,
21804 "requires": {
21805 "async-foreach": "^0.1.3",
21806 "chalk": "^1.1.1",
21807 "cross-spawn": "^3.0.0",
21808 "gaze": "^1.0.0",
21809 "get-stdin": "^4.0.1",
21810 "glob": "^7.0.3",
21811 "in-publish": "^2.0.0",
21812 "lodash": "^4.17.15",
21813 "meow": "^3.7.0",
21814 "mkdirp": "^0.5.1",
21815 "nan": "^2.13.2",
21816 "node-gyp": "^3.8.0",
21817 "npmlog": "^4.0.0",
21818 "request": "^2.88.0",
21819 "sass-graph": "2.2.5",
21820 "stdout-stream": "^1.4.0",
21821 "true-case-path": "^1.0.2"
21822 },
21823 "dependencies": {
21824 "chalk": {
21825 "version": "1.1.3",
21826 "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
21827 "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
21828 "dev": true,
21829 "requires": {
21830 "ansi-styles": "^2.2.1",
21831 "escape-string-regexp": "^1.0.2",
21832 "has-ansi": "^2.0.0",
21833 "strip-ansi": "^3.0.0",
21834 "supports-color": "^2.0.0"
21835 }
21836 },
21837 "strip-ansi": {
21838 "version": "3.0.1",
21839 "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
21840 "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
21841 "dev": true,
21842 "requires": {
21843 "ansi-regex": "^2.0.0"
21844 }
21845 }
21846 }
21847 },
21848 "parse-json": {
21849 "version": "2.2.0",
21850 "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
21851 "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
21852 "dev": true,
21853 "requires": {
21854 "error-ex": "^1.2.0"
21855 }
21856 },
21857 "path-exists": {
21858 "version": "2.1.0",
21859 "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
21860 "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
21861 "dev": true,
21862 "requires": {
21863 "pinkie-promise": "^2.0.0"
21864 }
21865 },
21866 "path-type": {
21867 "version": "1.1.0",
21868 "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
21869 "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
21870 "dev": true,
21871 "requires": {
21872 "graceful-fs": "^4.1.2",
21873 "pify": "^2.0.0",
21874 "pinkie-promise": "^2.0.0"
21875 }
21876 },
21877 "pify": {
21878 "version": "2.3.0",
21879 "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
21880 "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
21881 "dev": true
21882 },
21883 "read-pkg": {
21884 "version": "1.1.0",
21885 "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
21886 "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
21887 "dev": true,
21888 "requires": {
21889 "load-json-file": "^1.0.0",
21890 "normalize-package-data": "^2.3.2",
21891 "path-type": "^1.0.0"
21892 }
21893 },
21894 "read-pkg-up": {
21895 "version": "1.0.1",
21896 "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
21897 "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
21898 "dev": true, 21545 "dev": true,
21899 "requires": { 21546 "requires": {
21900 "find-up": "^1.0.0", 21547 "color-convert": "^2.0.1"
21901 "read-pkg": "^1.0.0"
21902 } 21548 }
21903 }, 21549 },
21904 "readable-stream": { 21550 "chalk": {
21905 "version": "2.3.7", 21551 "version": "4.1.1",
21906 "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", 21552 "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
21907 "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", 21553 "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
21908 "dev": true, 21554 "dev": true,
21909 "requires": { 21555 "requires": {
21910 "core-util-is": "~1.0.0", 21556 "ansi-styles": "^4.1.0",
21911 "inherits": "~2.0.3", 21557 "supports-color": "^7.1.0"
21912 "isarray": "~1.0.0",
21913 "process-nextick-args": "~2.0.0",
21914 "safe-buffer": "~5.1.1",
21915 "string_decoder": "~1.1.1",
21916 "util-deprecate": "~1.0.1"
21917 } 21558 }
21918 }, 21559 },
21919 "redent": { 21560 "color-convert": {
21920 "version": "1.0.0", 21561 "version": "2.0.1",
21921 "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", 21562 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
21922 "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", 21563 "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
21923 "dev": true, 21564 "dev": true,
21924 "requires": { 21565 "requires": {
21925 "indent-string": "^2.1.0", 21566 "color-name": "~1.1.4"
21926 "strip-indent": "^1.0.1"
21927 } 21567 }
21928 }, 21568 },
21929 "safe-buffer": { 21569 "color-name": {
21930 "version": "5.1.2", 21570 "version": "1.1.4",
21931 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", 21571 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
21932 "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", 21572 "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
21933 "dev": true 21573 "dev": true
21934 }, 21574 },
21935 "semver": { 21575 "has-flag": {
21936 "version": "5.3.0", 21576 "version": "4.0.0",
21937 "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", 21577 "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
21938 "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", 21578 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
21939 "dev": true 21579 "dev": true
21940 }, 21580 },
21941 "string_decoder": { 21581 "replace-ext": {
21942 "version": "1.1.1",
21943 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
21944 "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
21945 "dev": true,
21946 "requires": {
21947 "safe-buffer": "~5.1.0"
21948 }
21949 },
21950 "strip-bom": {
21951 "version": "2.0.0",
21952 "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
21953 "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
21954 "dev": true,
21955 "requires": {
21956 "is-utf8": "^0.2.0"
21957 }
21958 },
21959 "strip-indent": {
21960 "version": "1.0.1",
21961 "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
21962 "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
21963 "dev": true,
21964 "requires": {
21965 "get-stdin": "^4.0.1"
21966 }
21967 },
21968 "supports-color": {
21969 "version": "2.0.0", 21582 "version": "2.0.0",
21970 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", 21583 "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
21971 "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", 21584 "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
21972 "dev": true 21585 "dev": true
21973 }, 21586 },
21974 "tar": { 21587 "strip-ansi": {
21975 "version": "2.2.2", 21588 "version": "6.0.0",
21976 "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", 21589 "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
21977 "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", 21590 "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
21978 "dev": true, 21591 "dev": true,
21979 "requires": { 21592 "requires": {
21980 "block-stream": "*", 21593 "ansi-regex": "^5.0.0"
21981 "fstream": "^1.0.12",
21982 "inherits": "2"
21983 } 21594 }
21984 }, 21595 },
21985 "through2": { 21596 "supports-color": {
21986 "version": "2.0.5", 21597 "version": "7.2.0",
21987 "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", 21598 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
21988 "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", 21599 "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
21989 "dev": true, 21600 "dev": true,
21990 "requires": { 21601 "requires": {
21991 "readable-stream": "~2.3.6", 21602 "has-flag": "^4.0.0"
21992 "xtend": "~4.0.1"
21993 } 21603 }
21994 },
21995 "trim-newlines": {
21996 "version": "1.0.0",
21997 "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
21998 "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
21999 "dev": true
22000 } 21604 }
22001 } 21605 }
22002 }, 21606 },
@@ -22158,23 +21762,6 @@
22158 "function-bind": "^1.1.1" 21762 "function-bind": "^1.1.1"
22159 } 21763 }
22160 }, 21764 },
22161 "has-ansi": {
22162 "version": "2.0.0",
22163 "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
22164 "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
22165 "dev": true,
22166 "requires": {
22167 "ansi-regex": "^2.0.0"
22168 },
22169 "dependencies": {
22170 "ansi-regex": {
22171 "version": "2.1.1",
22172 "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
22173 "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
22174 "dev": true
22175 }
22176 }
22177 },
22178 "has-bigints": { 21765 "has-bigints": {
22179 "version": "1.0.1", 21766 "version": "1.0.1",
22180 "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", 21767 "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
@@ -22817,12 +22404,6 @@
22817 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", 22404 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
22818 "dev": true 22405 "dev": true
22819 }, 22406 },
22820 "in-publish": {
22821 "version": "2.0.1",
22822 "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
22823 "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
22824 "dev": true
22825 },
22826 "indefinite-observable": { 22407 "indefinite-observable": {
22827 "version": "1.0.2", 22408 "version": "1.0.2",
22828 "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz", 22409 "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz",
@@ -25595,12 +25176,6 @@
25595 } 25176 }
25596 } 25177 }
25597 }, 25178 },
25598 "js-base64": {
25599 "version": "2.6.4",
25600 "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
25601 "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
25602 "dev": true
25603 },
25604 "js-tokens": { 25179 "js-tokens": {
25605 "version": "4.0.0", 25180 "version": "4.0.0",
25606 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", 25181 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -29126,6 +28701,7 @@
29126 "version": "3.0.6", 28701 "version": "3.0.6",
29127 "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", 28702 "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
29128 "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", 28703 "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
28704 "optional": true,
29129 "requires": { 28705 "requires": {
29130 "abbrev": "1" 28706 "abbrev": "1"
29131 } 28707 }
@@ -29160,9 +28736,14 @@
29160 } 28736 }
29161 }, 28737 },
29162 "normalize-url": { 28738 "normalize-url": {
29163 "version": "5.3.1", 28739 "version": "6.1.0",
29164 "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-5.3.1.tgz", 28740 "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
29165 "integrity": "sha512-K1c7+vaAP+Yh5bOGmA10PGPpp+6h7WZrl7GwqKhUflBc9flU9pzG27DDeB9+iuhZkE3BJZOcgN1P/2sS5pqrWw==" 28741 "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
28742 },
28743 "normalize-version": {
28744 "version": "1.0.5",
28745 "resolved": "https://registry.npmjs.org/normalize-version/-/normalize-version-1.0.5.tgz",
28746 "integrity": "sha1-pqK5AC3G+i5fFewvCywChPtJlxI="
29166 }, 28747 },
29167 "now-and-later": { 28748 "now-and-later": {
29168 "version": "2.0.1", 28749 "version": "2.0.1",
@@ -30935,7 +30516,6 @@
30935 "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", 30516 "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
30936 "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==", 30517 "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
30937 "dev": true, 30518 "dev": true,
30938 "optional": true,
30939 "requires": { 30519 "requires": {
30940 "base64-js": "^1.5.1", 30520 "base64-js": "^1.5.1",
30941 "xmlbuilder": "^9.0.7", 30521 "xmlbuilder": "^9.0.7",
@@ -30946,15 +30526,13 @@
30946 "version": "1.5.1", 30526 "version": "1.5.1",
30947 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", 30527 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
30948 "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", 30528 "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
30949 "dev": true, 30529 "dev": true
30950 "optional": true
30951 }, 30530 },
30952 "xmlbuilder": { 30531 "xmlbuilder": {
30953 "version": "9.0.7", 30532 "version": "9.0.7",
30954 "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", 30533 "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
30955 "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", 30534 "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
30956 "dev": true, 30535 "dev": true
30957 "optional": true
30958 } 30536 }
30959 } 30537 }
30960 }, 30538 },
@@ -33256,108 +32834,6 @@
33256 } 32834 }
33257 } 32835 }
33258 }, 32836 },
33259 "sass-graph": {
33260 "version": "2.2.5",
33261 "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
33262 "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
33263 "dev": true,
33264 "requires": {
33265 "glob": "^7.0.0",
33266 "lodash": "^4.0.0",
33267 "scss-tokenizer": "^0.2.3",
33268 "yargs": "^13.3.2"
33269 },
33270 "dependencies": {
33271 "ansi-regex": {
33272 "version": "4.1.0",
33273 "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
33274 "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
33275 "dev": true
33276 },
33277 "cliui": {
33278 "version": "5.0.0",
33279 "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
33280 "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
33281 "dev": true,
33282 "requires": {
33283 "string-width": "^3.1.0",
33284 "strip-ansi": "^5.2.0",
33285 "wrap-ansi": "^5.1.0"
33286 }
33287 },
33288 "get-caller-file": {
33289 "version": "2.0.5",
33290 "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
33291 "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
33292 "dev": true
33293 },
33294 "require-main-filename": {
33295 "version": "2.0.0",
33296 "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
33297 "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
33298 "dev": true
33299 },
33300 "string-width": {
33301 "version": "3.1.0",
33302 "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
33303 "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
33304 "dev": true,
33305 "requires": {
33306 "emoji-regex": "^7.0.1",
33307 "is-fullwidth-code-point": "^2.0.0",
33308 "strip-ansi": "^5.1.0"
33309 }
33310 },
33311 "strip-ansi": {
33312 "version": "5.2.0",
33313 "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
33314 "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
33315 "dev": true,
33316 "requires": {
33317 "ansi-regex": "^4.1.0"
33318 }
33319 },
33320 "wrap-ansi": {
33321 "version": "5.1.0",
33322 "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
33323 "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
33324 "dev": true,
33325 "requires": {
33326 "ansi-styles": "^3.2.0",
33327 "string-width": "^3.0.0",
33328 "strip-ansi": "^5.0.0"
33329 }
33330 },
33331 "yargs": {
33332 "version": "13.3.2",
33333 "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
33334 "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
33335 "dev": true,
33336 "requires": {
33337 "cliui": "^5.0.0",
33338 "find-up": "^3.0.0",
33339 "get-caller-file": "^2.0.1",
33340 "require-directory": "^2.1.1",
33341 "require-main-filename": "^2.0.0",
33342 "set-blocking": "^2.0.0",
33343 "string-width": "^3.0.0",
33344 "which-module": "^2.0.0",
33345 "y18n": "^4.0.0",
33346 "yargs-parser": "^13.1.2"
33347 }
33348 },
33349 "yargs-parser": {
33350 "version": "13.1.2",
33351 "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
33352 "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
33353 "dev": true,
33354 "requires": {
33355 "camelcase": "^5.0.0",
33356 "decamelize": "^1.2.0"
33357 }
33358 }
33359 }
33360 },
33361 "sax": { 32837 "sax": {
33362 "version": "1.2.4", 32838 "version": "1.2.4",
33363 "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", 32839 "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -33397,27 +32873,6 @@
33397 "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.0.0.tgz", 32873 "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.0.0.tgz",
33398 "integrity": "sha1-JHEQ7yLM+JexOj8KvdtSeCOTzWo=" 32874 "integrity": "sha1-JHEQ7yLM+JexOj8KvdtSeCOTzWo="
33399 }, 32875 },
33400 "scss-tokenizer": {
33401 "version": "0.2.3",
33402 "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
33403 "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
33404 "dev": true,
33405 "requires": {
33406 "js-base64": "^2.1.8",
33407 "source-map": "^0.4.2"
33408 },
33409 "dependencies": {
33410 "source-map": {
33411 "version": "0.4.4",
33412 "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
33413 "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
33414 "dev": true,
33415 "requires": {
33416 "amdefine": ">=0.0.4"
33417 }
33418 }
33419 }
33420 },
33421 "select-hose": { 32876 "select-hose": {
33422 "version": "2.0.0", 32877 "version": "2.0.0",
33423 "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", 32878 "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -33456,6 +32911,21 @@
33456 } 32911 }
33457 } 32912 }
33458 }, 32913 },
32914 "semver-closest": {
32915 "version": "0.1.2",
32916 "resolved": "https://registry.npmjs.org/semver-closest/-/semver-closest-0.1.2.tgz",
32917 "integrity": "sha512-Q6qk0bPNlK5zG62mWFC8L0Qc6OJX76XRWxiPgZyrh98IZTL3HPErgUlPfCyrAPsHVpU+YP4lf5Mz+LzpId91Og==",
32918 "requires": {
32919 "semver": "^5.4.1"
32920 },
32921 "dependencies": {
32922 "semver": {
32923 "version": "5.7.1",
32924 "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
32925 "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
32926 }
32927 }
32928 },
33459 "semver-compare": { 32929 "semver-compare": {
33460 "version": "1.0.0", 32930 "version": "1.0.0",
33461 "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", 32931 "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
@@ -34338,47 +33808,6 @@
34338 "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", 33808 "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
34339 "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" 33809 "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
34340 }, 33810 },
34341 "stdout-stream": {
34342 "version": "1.4.1",
34343 "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
34344 "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
34345 "dev": true,
34346 "requires": {
34347 "readable-stream": "^2.0.1"
34348 },
34349 "dependencies": {
34350 "readable-stream": {
34351 "version": "2.3.7",
34352 "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
34353 "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
34354 "dev": true,
34355 "requires": {
34356 "core-util-is": "~1.0.0",
34357 "inherits": "~2.0.3",
34358 "isarray": "~1.0.0",
34359 "process-nextick-args": "~2.0.0",
34360 "safe-buffer": "~5.1.1",
34361 "string_decoder": "~1.1.1",
34362 "util-deprecate": "~1.0.1"
34363 }
34364 },
34365 "safe-buffer": {
34366 "version": "5.1.2",
34367 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
34368 "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
34369 "dev": true
34370 },
34371 "string_decoder": {
34372 "version": "1.1.1",
34373 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
34374 "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
34375 "dev": true,
34376 "requires": {
34377 "safe-buffer": "~5.1.0"
34378 }
34379 }
34380 }
34381 },
34382 "stream-browserify": { 33811 "stream-browserify": {
34383 "version": "2.0.2", 33812 "version": "2.0.2",
34384 "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", 33813 "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -35152,35 +34581,6 @@
35152 "requires": { 34581 "requires": {
35153 "async-exit-hook": "^2.0.1", 34582 "async-exit-hook": "^2.0.1",
35154 "fs-extra": "^10.0.0" 34583 "fs-extra": "^10.0.0"
35155 },
35156 "dependencies": {
35157 "fs-extra": {
35158 "version": "10.0.0",
35159 "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
35160 "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
35161 "dev": true,
35162 "requires": {
35163 "graceful-fs": "^4.2.0",
35164 "jsonfile": "^6.0.1",
35165 "universalify": "^2.0.0"
35166 }
35167 },
35168 "jsonfile": {
35169 "version": "6.1.0",
35170 "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
35171 "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
35172 "dev": true,
35173 "requires": {
35174 "graceful-fs": "^4.1.6",
35175 "universalify": "^2.0.0"
35176 }
35177 },
35178 "universalify": {
35179 "version": "2.0.0",
35180 "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
35181 "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
35182 "dev": true
35183 }
35184 } 34584 }
35185 }, 34585 },
35186 "temp-write": { 34586 "temp-write": {
@@ -35723,6 +35123,12 @@
35723 } 35123 }
35724 } 35124 }
35725 }, 35125 },
35126 "transfob": {
35127 "version": "1.0.0",
35128 "resolved": "https://registry.npmjs.org/transfob/-/transfob-1.0.0.tgz",
35129 "integrity": "sha1-x/wnpbVDCtSGJnrmZtkj90oKsyA=",
35130 "dev": true
35131 },
35726 "tree-kill": { 35132 "tree-kill": {
35727 "version": "1.2.1", 35133 "version": "1.2.1",
35728 "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", 35134 "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
@@ -35746,15 +35152,6 @@
35746 "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", 35152 "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
35747 "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" 35153 "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
35748 }, 35154 },
35749 "true-case-path": {
35750 "version": "1.0.3",
35751 "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
35752 "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
35753 "dev": true,
35754 "requires": {
35755 "glob": "^7.1.2"
35756 }
35757 },
35758 "truncate-utf8-bytes": { 35155 "truncate-utf8-bytes": {
35759 "version": "1.0.2", 35156 "version": "1.0.2",
35760 "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", 35157 "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -36385,33 +35782,6 @@
36385 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", 35782 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
36386 "dev": true 35783 "dev": true
36387 }, 35784 },
36388 "lru-cache": {
36389 "version": "6.0.0",
36390 "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
36391 "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
36392 "dev": true,
36393 "requires": {
36394 "yallist": "^4.0.0"
36395 }
36396 },
36397 "pupa": {
36398 "version": "2.1.1",
36399 "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
36400 "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
36401 "dev": true,
36402 "requires": {
36403 "escape-goat": "^2.0.0"
36404 }
36405 },
36406 "semver": {
36407 "version": "7.3.5",
36408 "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
36409 "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
36410 "dev": true,
36411 "requires": {
36412 "lru-cache": "^6.0.0"
36413 }
36414 },
36415 "supports-color": { 35785 "supports-color": {
36416 "version": "7.2.0", 35786 "version": "7.2.0",
36417 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", 35787 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -36420,12 +35790,6 @@
36420 "requires": { 35790 "requires": {
36421 "has-flag": "^4.0.0" 35791 "has-flag": "^4.0.0"
36422 } 35792 }
36423 },
36424 "yallist": {
36425 "version": "4.0.0",
36426 "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
36427 "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
36428 "dev": true
36429 } 35793 }
36430 } 35794 }
36431 }, 35795 },
@@ -36506,6 +35870,23 @@
36506 "tmp": "0.0.x" 35870 "tmp": "0.0.x"
36507 } 35871 }
36508 }, 35872 },
35873 "useragent-generator": {
35874 "version": "1.1.1-amkt-22079-finish.0",
35875 "resolved": "https://registry.npmjs.org/useragent-generator/-/useragent-generator-1.1.1-amkt-22079-finish.0.tgz",
35876 "integrity": "sha512-jUVHvx1t3bVjx2dI9fG4iKzjO5WA6qtjWaR/PitNvd6zQMJNlFYehNwRUaAAKkhBCkw1T0U9e2oG9Sg3wSmc6Q==",
35877 "requires": {
35878 "normalize-version": "^1.0.5",
35879 "semver": "^5.4.1",
35880 "semver-closest": "^0.1.0"
35881 },
35882 "dependencies": {
35883 "semver": {
35884 "version": "5.7.1",
35885 "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
35886 "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
35887 }
35888 }
35889 },
36509 "utf8-byte-length": { 35890 "utf8-byte-length": {
36510 "version": "1.0.4", 35891 "version": "1.0.4",
36511 "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", 35892 "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
@@ -38118,8 +37499,7 @@
38118 "version": "0.5.0", 37499 "version": "0.5.0",
38119 "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", 37500 "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
38120 "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", 37501 "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
38121 "dev": true, 37502 "dev": true
38122 "optional": true
38123 }, 37503 },
38124 "xtend": { 37504 "xtend": {
38125 "version": "4.0.2", 37505 "version": "4.0.2",
diff --git a/package.json b/package.json
index 171cb14e5..7f42b55ca 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.16", 14 "node": "^14.17",
15 "npm": "^6.14", 15 "npm": "^6.14",
16 "node-gyp": "^8.0" 16 "node-gyp": "^8.0"
17 }, 17 },
@@ -38,8 +38,8 @@
38 "uidev": "cd uidev && webpack-dev-server", 38 "uidev": "cd uidev && webpack-dev-server",
39 "postinstall": "npx lerna run prepare", 39 "postinstall": "npx lerna run prepare",
40 "apply-branding": "node ./src/i18n/apply-branding.js", 40 "apply-branding": "node ./src/i18n/apply-branding.js",
41 "update-submodules": "git submodule update --remote --force && git add .", 41 "update-submodules": "git submodule update --remote --force",
42 "prepare-code": "npm run update-submodules && npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", 42 "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
43 "build-theme-info": "node src/scripts/build-theme-info.js", 43 "build-theme-info": "node src/scripts/build-theme-info.js",
44 "link-readme": "node src/scripts/link-readme.js", 44 "link-readme": "node src/scripts/link-readme.js",
45 "minify-images": "./scripts/minify-images.sh" 45 "minify-images": "./scripts/minify-images.sh"
@@ -106,7 +106,7 @@
106 "ms": "2.1.3", 106 "ms": "2.1.3",
107 "node-fetch": "2.6.1", 107 "node-fetch": "2.6.1",
108 "node-mac-permissions": "2.2.0", 108 "node-mac-permissions": "2.2.0",
109 "normalize-url": "5.3.1", 109 "normalize-url": "6.1.0",
110 "os-name": "4.0.0", 110 "os-name": "4.0.0",
111 "pretty-bytes": "^5.6.0", 111 "pretty-bytes": "^5.6.0",
112 "prop-types": "^15.5.10", 112 "prop-types": "^15.5.10",
@@ -130,6 +130,7 @@
130 "tar": "4.4.13", 130 "tar": "4.4.13",
131 "targz": "1.0.1", 131 "targz": "1.0.1",
132 "terser": "4.4.0", 132 "terser": "4.4.0",
133 "useragent-generator": "1.1.1-amkt-22079-finish.0",
133 "uuid": "3.3.3", 134 "uuid": "3.3.3",
134 "validator": "11.0.0", 135 "validator": "11.0.0",
135 "ws": "7.4.6" 136 "ws": "7.4.6"
@@ -150,7 +151,6 @@
150 "@babel/register": "7.14.5", 151 "@babel/register": "7.14.5",
151 "@types/classnames": "2.2.9", 152 "@types/classnames": "2.2.9",
152 "@types/color": "^3.0.1", 153 "@types/color": "^3.0.1",
153 "@types/color-convert": "^1.9.0",
154 "@types/fs-extra": "^7.0.0", 154 "@types/fs-extra": "^7.0.0",
155 "@types/jss": "^9.5.7", 155 "@types/jss": "^9.5.7",
156 "@types/lodash": "4.14.170", 156 "@types/lodash": "4.14.170",
@@ -166,8 +166,8 @@
166 "cross-env": "^5.0.5", 166 "cross-env": "^5.0.5",
167 "cz-conventional-changelog": "^2.1.0", 167 "cz-conventional-changelog": "^2.1.0",
168 "dotenv": "10.0.0", 168 "dotenv": "10.0.0",
169 "electron": "13.1.6", 169 "electron": "13.1.7",
170 "electron-builder": "22.11.7", 170 "electron-builder": "22.11.9",
171 "electron-notarize": "1.0.0", 171 "electron-notarize": "1.0.0",
172 "electron-rebuild": "2.3.5", 172 "electron-rebuild": "2.3.5",
173 "eslint": "7.29.0", 173 "eslint": "7.29.0",
@@ -182,7 +182,7 @@
182 "gulp-babel": "^8.0.0", 182 "gulp-babel": "^8.0.0",
183 "gulp-cli": "2.3.0", 183 "gulp-cli": "2.3.0",
184 "gulp-connect": "^5.7.0", 184 "gulp-connect": "^5.7.0",
185 "gulp-sass": "^4.1.0", 185 "gulp-sass": "^5.0.0",
186 "gulp-sass-variables": "^1.2.0", 186 "gulp-sass-variables": "^1.2.0",
187 "hex-rgb": "^3.0.0", 187 "hex-rgb": "^3.0.0",
188 "html-webpack-plugin": "4.5.2", 188 "html-webpack-plugin": "4.5.2",
diff --git a/packages/forms/package-lock.json b/packages/forms/package-lock.json
index 9cad86535..8f939c0bb 100644
--- a/packages/forms/package-lock.json
+++ b/packages/forms/package-lock.json
@@ -15,118 +15,71 @@
15 "integrity": "sha512-c0+avMYEZ6i7Pg1ULLFs+p7k8bDPiie9rrgGYs8VWQhw2tUUYz7r0lIPVzD3bzMghWfyhfkArj88K5Of0WTMNw==" 15 "integrity": "sha512-c0+avMYEZ6i7Pg1ULLFs+p7k8bDPiie9rrgGYs8VWQhw2tUUYz7r0lIPVzD3bzMghWfyhfkArj88K5Of0WTMNw=="
16 }, 16 },
17 "@meetfranz/theme": { 17 "@meetfranz/theme": {
18 "version": "1.0.14", 18 "version": "file:../theme",
19 "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.14.tgz",
20 "integrity": "sha512-iWP+3ifiNum98sHKiNdUJK+R0p4Z7TT8OenA1N2BnSC6CFob+dLhzAK+o5lxcyEcKZKYDwd7JKRZj93wqpBPpg==",
21 "requires": { 19 "requires": {
22 "color": "^3.1.0" 20 "color": "^3.1.0"
21 },
22 "dependencies": {
23 "color": {
24 "version": "3.1.0",
25 "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz",
26 "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==",
27 "requires": {
28 "color-convert": "^1.9.1",
29 "color-string": "^1.5.2"
30 }
31 },
32 "color-convert": {
33 "version": "1.9.3",
34 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
35 "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
36 "requires": {
37 "color-name": "1.1.3"
38 }
39 },
40 "color-name": {
41 "version": "1.1.3",
42 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
43 "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
44 },
45 "color-string": {
46 "version": "1.5.5",
47 "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
48 "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
49 "requires": {
50 "color-name": "^1.0.0",
51 "simple-swizzle": "^0.2.2"
52 }
53 },
54 "is-arrayish": {
55 "version": "0.3.2",
56 "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
57 "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
58 },
59 "simple-swizzle": {
60 "version": "0.2.2",
61 "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
62 "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
63 "requires": {
64 "is-arrayish": "^0.3.1"
65 }
66 }
23 } 67 }
24 }, 68 },
25 "asap": {
26 "version": "2.0.6",
27 "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
28 "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
29 },
30 "color": {
31 "version": "3.1.3",
32 "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
33 "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
34 "requires": {
35 "color-convert": "^1.9.1",
36 "color-string": "^1.5.4"
37 }
38 },
39 "color-convert": {
40 "version": "1.9.3",
41 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
42 "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
43 "requires": {
44 "color-name": "1.1.3"
45 }
46 },
47 "color-name": {
48 "version": "1.1.3",
49 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
50 "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
51 },
52 "color-string": {
53 "version": "1.5.5",
54 "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
55 "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
56 "requires": {
57 "color-name": "^1.0.0",
58 "simple-swizzle": "^0.2.2"
59 }
60 },
61 "core-js": {
62 "version": "1.2.7",
63 "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
64 "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
65 },
66 "create-react-class": { 69 "create-react-class": {
67 "version": "15.6.3", 70 "version": "15.7.0",
68 "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz", 71 "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
69 "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==", 72 "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
70 "requires": { 73 "requires": {
71 "fbjs": "^0.8.9",
72 "loose-envify": "^1.3.1", 74 "loose-envify": "^1.3.1",
73 "object-assign": "^4.1.1" 75 "object-assign": "^4.1.1"
74 } 76 }
75 }, 77 },
76 "encoding": {
77 "version": "0.1.12",
78 "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
79 "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
80 "requires": {
81 "iconv-lite": "~0.4.13"
82 }
83 },
84 "fbjs": {
85 "version": "0.8.17",
86 "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
87 "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
88 "requires": {
89 "core-js": "^1.0.0",
90 "isomorphic-fetch": "^2.1.1",
91 "loose-envify": "^1.0.0",
92 "object-assign": "^4.1.0",
93 "promise": "^7.1.1",
94 "setimmediate": "^1.0.5",
95 "ua-parser-js": "^0.7.18"
96 }
97 },
98 "html-element-attributes": { 78 "html-element-attributes": {
99 "version": "1.3.1", 79 "version": "1.3.1",
100 "resolved": "https://registry.npmjs.org/html-element-attributes/-/html-element-attributes-1.3.1.tgz", 80 "resolved": "https://registry.npmjs.org/html-element-attributes/-/html-element-attributes-1.3.1.tgz",
101 "integrity": "sha512-UrRKgp5sQmRnDy4TEwAUsu14XBUlzKB8U3hjIYDjcZ3Hbp86Jtftzxfgrv6E/ii/h78tsaZwAnAE8HwnHr0dPA==" 81 "integrity": "sha512-UrRKgp5sQmRnDy4TEwAUsu14XBUlzKB8U3hjIYDjcZ3Hbp86Jtftzxfgrv6E/ii/h78tsaZwAnAE8HwnHr0dPA=="
102 }, 82 },
103 "iconv-lite": {
104 "version": "0.4.24",
105 "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
106 "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
107 "requires": {
108 "safer-buffer": ">= 2.1.2 < 3"
109 }
110 },
111 "is-arrayish": {
112 "version": "0.3.2",
113 "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
114 "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
115 },
116 "is-stream": {
117 "version": "1.1.0",
118 "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
119 "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
120 },
121 "isomorphic-fetch": {
122 "version": "2.2.1",
123 "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
124 "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
125 "requires": {
126 "node-fetch": "^1.0.1",
127 "whatwg-fetch": ">=0.10.0"
128 }
129 },
130 "js-tokens": { 83 "js-tokens": {
131 "version": "4.0.0", 84 "version": "4.0.0",
132 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", 85 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -140,35 +93,19 @@
140 "js-tokens": "^3.0.0 || ^4.0.0" 93 "js-tokens": "^3.0.0 || ^4.0.0"
141 } 94 }
142 }, 95 },
143 "node-fetch": {
144 "version": "1.7.3",
145 "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
146 "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
147 "requires": {
148 "encoding": "^0.1.11",
149 "is-stream": "^1.0.1"
150 }
151 },
152 "object-assign": { 96 "object-assign": {
153 "version": "4.1.1", 97 "version": "4.1.1",
154 "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", 98 "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
155 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" 99 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
156 }, 100 },
157 "promise": {
158 "version": "7.3.1",
159 "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
160 "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
161 "requires": {
162 "asap": "~2.0.3"
163 }
164 },
165 "prop-types": { 101 "prop-types": {
166 "version": "15.6.2", 102 "version": "15.7.2",
167 "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", 103 "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
168 "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", 104 "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
169 "requires": { 105 "requires": {
170 "loose-envify": "^1.3.1", 106 "loose-envify": "^1.4.0",
171 "object-assign": "^4.1.1" 107 "object-assign": "^4.1.1",
108 "react-is": "^16.8.1"
172 } 109 }
173 }, 110 },
174 "react-html-attributes": { 111 "react-html-attributes": {
@@ -179,48 +116,25 @@
179 "html-element-attributes": "^1.0.0" 116 "html-element-attributes": "^1.0.0"
180 } 117 }
181 }, 118 },
119 "react-is": {
120 "version": "16.13.1",
121 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
122 "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
123 },
182 "react-loader": { 124 "react-loader": {
183 "version": "2.4.5", 125 "version": "2.4.7",
184 "resolved": "https://registry.npmjs.org/react-loader/-/react-loader-2.4.5.tgz", 126 "resolved": "https://registry.npmjs.org/react-loader/-/react-loader-2.4.7.tgz",
185 "integrity": "sha1-zT5VHGzQc4wcDxPwc2VPk4KL5ak=", 127 "integrity": "sha512-pNW5xoSt0Q7HdmQh/EaIeeFbG0Ii74y6Le8gPdDyWyEFNgCiY1NcreQxMioQGjQ4Jo4EenQGKN/qMbxW+dpZkQ==",
186 "requires": { 128 "requires": {
187 "create-react-class": "^15.5.2", 129 "create-react-class": "^15.5.2",
188 "prop-types": "^15.5.8", 130 "prop-types": "^15.5.8",
189 "spin.js": "2.x" 131 "spin.js": "2.x"
190 } 132 }
191 }, 133 },
192 "safer-buffer": {
193 "version": "2.1.2",
194 "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
195 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
196 },
197 "setimmediate": {
198 "version": "1.0.5",
199 "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
200 "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
201 },
202 "simple-swizzle": {
203 "version": "0.2.2",
204 "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
205 "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
206 "requires": {
207 "is-arrayish": "^0.3.1"
208 }
209 },
210 "spin.js": { 134 "spin.js": {
211 "version": "2.3.2", 135 "version": "2.3.2",
212 "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz", 136 "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz",
213 "integrity": "sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho=" 137 "integrity": "sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho="
214 },
215 "ua-parser-js": {
216 "version": "0.7.28",
217 "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
218 "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
219 },
220 "whatwg-fetch": {
221 "version": "3.0.0",
222 "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
223 "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
224 } 138 }
225 } 139 }
226} 140}
diff --git a/packages/ui/package-lock.json b/packages/ui/package-lock.json
index 33f848967..a432404b1 100644
--- a/packages/ui/package-lock.json
+++ b/packages/ui/package-lock.json
@@ -10,42 +10,55 @@
10 "integrity": "sha512-c0+avMYEZ6i7Pg1ULLFs+p7k8bDPiie9rrgGYs8VWQhw2tUUYz7r0lIPVzD3bzMghWfyhfkArj88K5Of0WTMNw==" 10 "integrity": "sha512-c0+avMYEZ6i7Pg1ULLFs+p7k8bDPiie9rrgGYs8VWQhw2tUUYz7r0lIPVzD3bzMghWfyhfkArj88K5Of0WTMNw=="
11 }, 11 },
12 "@meetfranz/theme": { 12 "@meetfranz/theme": {
13 "version": "1.0.14", 13 "version": "file:../theme",
14 "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.14.tgz",
15 "integrity": "sha512-iWP+3ifiNum98sHKiNdUJK+R0p4Z7TT8OenA1N2BnSC6CFob+dLhzAK+o5lxcyEcKZKYDwd7JKRZj93wqpBPpg==",
16 "requires": { 14 "requires": {
17 "color": "^3.1.0" 15 "color": "^3.1.0"
18 } 16 },
19 }, 17 "dependencies": {
20 "color": { 18 "color": {
21 "version": "3.1.2", 19 "version": "3.1.0",
22 "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", 20 "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz",
23 "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", 21 "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==",
24 "requires": { 22 "requires": {
25 "color-convert": "^1.9.1", 23 "color-convert": "^1.9.1",
26 "color-string": "^1.5.2" 24 "color-string": "^1.5.2"
27 } 25 }
28 }, 26 },
29 "color-convert": { 27 "color-convert": {
30 "version": "1.9.3", 28 "version": "1.9.3",
31 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", 29 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
32 "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", 30 "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
33 "requires": { 31 "requires": {
34 "color-name": "1.1.3" 32 "color-name": "1.1.3"
35 } 33 }
36 }, 34 },
37 "color-name": { 35 "color-name": {
38 "version": "1.1.3", 36 "version": "1.1.3",
39 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", 37 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
40 "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" 38 "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
41 }, 39 },
42 "color-string": { 40 "color-string": {
43 "version": "1.5.5", 41 "version": "1.5.5",
44 "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz", 42 "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
45 "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==", 43 "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
46 "requires": { 44 "requires": {
47 "color-name": "^1.0.0", 45 "color-name": "^1.0.0",
48 "simple-swizzle": "^0.2.2" 46 "simple-swizzle": "^0.2.2"
47 }
48 },
49 "is-arrayish": {
50 "version": "0.3.2",
51 "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
52 "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
53 },
54 "simple-swizzle": {
55 "version": "0.2.2",
56 "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
57 "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
58 "requires": {
59 "is-arrayish": "^0.3.1"
60 }
61 }
49 } 62 }
50 }, 63 },
51 "create-react-class": { 64 "create-react-class": {
@@ -57,11 +70,6 @@
57 "object-assign": "^4.1.1" 70 "object-assign": "^4.1.1"
58 } 71 }
59 }, 72 },
60 "is-arrayish": {
61 "version": "0.3.2",
62 "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
63 "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
64 },
65 "js-tokens": { 73 "js-tokens": {
66 "version": "4.0.0", 74 "version": "4.0.0",
67 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", 75 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -105,14 +113,6 @@
105 "spin.js": "2.x" 113 "spin.js": "2.x"
106 } 114 }
107 }, 115 },
108 "simple-swizzle": {
109 "version": "0.2.2",
110 "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
111 "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
112 "requires": {
113 "is-arrayish": "^0.3.1"
114 }
115 },
116 "spin.js": { 116 "spin.js": {
117 "version": "2.3.2", 117 "version": "2.3.2",
118 "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz", 118 "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz",
diff --git a/recipes b/recipes
Subproject fdb8f055927402195d27b08899b0e29305c29d2 Subproject ea77d33daaf8d9ee8e96163bd15f47701220114
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 24d095556..c63aa7dda 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,4 +1,3 @@
1import os from 'os';
2import path from 'path'; 1import path from 'path';
3import tar from 'tar'; 2import tar from 'tar';
4import fs from 'fs-extra'; 3import fs from 'fs-extra';
@@ -15,7 +14,7 @@ import OrderModel from '../../models/Order';
15import { sleep } from '../../helpers/async-helpers'; 14import { sleep } from '../../helpers/async-helpers';
16 15
17import { SERVER_NOT_LOADED } from '../../config'; 16import { SERVER_NOT_LOADED } from '../../config';
18import { RECIPES_PATH } from '../../environment'; 17import { osArch, osPlatform, RECIPES_PATH } from '../../environment';
19import apiBase from '../apiBase'; 18import apiBase from '../apiBase';
20import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; 19import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
21 20
@@ -456,7 +455,7 @@ export default class ServerApi {
456 455
457 // News 456 // News
458 async getLatestNews() { 457 async getLatestNews() {
459 const url = `${apiBase(true)}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`; 458 const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`;
460 const request = await sendAuthRequest(url); 459 const request = await sendAuthRequest(url);
461 if (!request.ok) throw request; 460 if (!request.ok) throw request;
462 const data = await request.json(); 461 const data = await request.json();
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 6a8c7645f..059610aec 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -4,6 +4,7 @@ import { observer } from 'mobx-react';
4import { Field } from 'mobx-react-form'; 4import { Field } from 'mobx-react-form';
5import classnames from 'classnames'; 5import classnames from 'classnames';
6import Dropzone from 'react-dropzone'; 6import Dropzone from 'react-dropzone';
7import { isWindows } from '../../environment';
7 8
8export default @observer class ImageUpload extends Component { 9export default @observer class ImageUpload extends Component {
9 static propTypes = { 10 static propTypes = {
@@ -25,13 +26,18 @@ export default @observer class ImageUpload extends Component {
25 26
26 dropzoneRef = null; 27 dropzoneRef = null;
27 28
29 imgPath = null;
30
28 onDrop(acceptedFiles) { 31 onDrop(acceptedFiles) {
29 const { field } = this.props; 32 const { field } = this.props;
30 33
31 acceptedFiles.forEach((file) => { 34 acceptedFiles.forEach((file) => {
35 this.imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
36
32 this.setState({ 37 this.setState({
33 path: file.path, 38 path: this.imgPath,
34 }); 39 });
40
35 this.props.field.onDrop(file); 41 this.props.field.onDrop(file);
36 }); 42 });
37 43
diff --git a/src/environment.js b/src/environment.js
index be6dc7176..758a33380 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,3 +1,4 @@
1import os from 'os';
1import path from 'path'; 2import path from 'path';
2 3
3import { is, api as electronApi } from 'electron-util'; 4import { is, api as electronApi } from 'electron-util';
@@ -60,6 +61,10 @@ export const useLiveAPI = process.env.LIVE_API;
60export const isMac = is.macos; 61export const isMac = is.macos;
61export const isWindows = is.windows; 62export const isWindows = is.windows;
62export const isLinux = is.linux; 63export const isLinux = is.linux;
64export const osPlatform = os.platform();
65export const osArch = os.arch();
66export const osRelease = os.release();
67export const is64Bit = osArch.match(/64/);
63 68
64export const ctrlKey = isMac ? '⌘' : 'Ctrl'; 69export const ctrlKey = isMac ? '⌘' : 'Ctrl';
65export const cmdKey = isMac ? 'Cmd' : 'Ctrl'; 70export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index e7949a0be..f97a7c750 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -13,6 +13,8 @@ import { DEBUG_API } from '../../config';
13import AppStore from '../../stores/AppStore'; 13import AppStore from '../../stores/AppStore';
14import ServicesStore from '../../stores/ServicesStore'; 14import ServicesStore from '../../stores/ServicesStore';
15 15
16const debug = require('debug')('Ferdi:feature:publishDebugInfo');
17
16const messages = defineMessages({ 18const messages = defineMessages({
17 title: { 19 title: {
18 id: 'feature.publishDebugInfo.title', 20 id: 'feature.publishDebugInfo.title',
@@ -100,6 +102,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
100 } 102 }
101 103
102 async publishDebugInfo() { 104 async publishDebugInfo() {
105 debug('debugInfo: starting publish');
103 this.setState({ 106 this.setState({
104 isSendingLog: true, 107 isSendingLog: true,
105 }); 108 });
@@ -112,17 +115,26 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
112 log: debugInfo, 115 log: debugInfo,
113 }), 116 }),
114 }, false); 117 }, false);
115 const response = await request.json();
116 118
117 if (response.id) { 119 debug(`debugInfo: publishing status: ${request.status}`);
118 this.setState({ 120 if (request.status === 200) {
119 log: response.id, 121 const response = await request.json();
120 }); 122 if (response.id) {
123 this.setState({
124 log: response.id,
125 });
126 } else {
127 this.setState({
128 error: true,
129 });
130 }
121 } else { 131 } else {
122 this.setState({ 132 this.setState({
123 error: true, 133 error: true,
124 }); 134 });
125 } 135 }
136
137 debug('debugInfo: finished publishing');
126 } 138 }
127 139
128 render() { 140 render() {
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js
index fc9a6f507..9c9c8f132 100644
--- a/src/helpers/userAgent-helpers.js
+++ b/src/helpers/userAgent-helpers.js
@@ -1,29 +1,33 @@
1import os from 'os'; 1import os from 'os';
2import macosVersion from 'macos-version'; 2import macosVersion from 'macos-version';
3import { 3import {
4 ferdiVersion, electronVersion, chromeVersion, isMac, isWindows, 4 chromeVersion, isMac, isWindows, is64Bit, osArch, osRelease,
5} from '../environment'; 5} from '../environment';
6 6
7const uaGenerator = require('useragent-generator');
8
7function macOS() { 9function macOS() {
8 const version = macosVersion(); 10 const version = macosVersion();
9 return `Macintosh; Intel Mac OS X ${version.replace(/\./g, '_')}`; 11 let cpuName = os.cpus()[0].model.split(' ')[0];
12 if (cpuName && cpuName.match(/\(/)) {
13 cpuName = cpuName.split('(')[0];
14 }
15 return `Macintosh; ${cpuName} Mac OS X ${version.replace(/\./g, '_')}`;
10} 16}
11 17
12function windows() { 18function windows() {
13 const version = os.release(); 19 const version = osRelease;
14 const [majorVersion, minorVersion] = version.split('.'); 20 const [majorVersion, minorVersion] = version.split('.');
15 return `Windows NT ${majorVersion}.${minorVersion}; Win64; x64`; 21 const archString = is64Bit ? 'Win64' : 'Win32';
22 return `Windows NT ${majorVersion}.${minorVersion}; ${archString}; ${osArch}`;
16} 23}
17 24
18function linux() { 25function linux() {
19 return 'X11; Ubuntu; Linux x86_64'; 26 const archString = is64Bit ? 'x86_64' : osArch;
20} 27 return `X11; Ubuntu; Linux ${archString}`;
21
22export function isChromeless(url) {
23 return url.startsWith('https://accounts.google.com');
24} 28}
25 29
26export default function userAgent(removeChromeVersion = false, addFerdiVersion = false) { 30export default function userAgent() {
27 let platformString = ''; 31 let platformString = '';
28 32
29 if (isMac) { 33 if (isMac) {
@@ -34,17 +38,5 @@ export default function userAgent(removeChromeVersion = false, addFerdiVersion =
34 platformString = linux(); 38 platformString = linux();
35 } 39 }
36 40
37 let chromeVersionString = 'Chrome'; 41 return uaGenerator.chrome({ os: platformString, version: chromeVersion });
38 if (!removeChromeVersion) {
39 chromeVersionString = `Chrome/${chromeVersion}`;
40 }
41
42 let applicationString = '';
43 if (addFerdiVersion) {
44 applicationString = ` Ferdi/${ferdiVersion} Electron/${electronVersion}`;
45 }
46
47 // Chrome is pinned to WebKit 537.36, the latest version before hard forking to Blink.
48 return `Mozilla/5.0 (${platformString}) AppleWebKit/537.36 (KHTML, like Gecko) ${chromeVersionString} Safari/537.36${applicationString}`;
49 // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36 Ferdi/5.5.1-nightly.13 Electron/8.2.3
50} 42}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 4da9390a5..370a6fb92 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -6142,91 +6142,91 @@
6142 "defaultMessage": "!!!Publish debug information", 6142 "defaultMessage": "!!!Publish debug information",
6143 "end": { 6143 "end": {
6144 "column": 3, 6144 "column": 3,
6145 "line": 20 6145 "line": 22
6146 }, 6146 },
6147 "file": "src/features/publishDebugInfo/Component.js", 6147 "file": "src/features/publishDebugInfo/Component.js",
6148 "id": "feature.publishDebugInfo.title", 6148 "id": "feature.publishDebugInfo.title",
6149 "start": { 6149 "start": {
6150 "column": 9, 6150 "column": 9,
6151 "line": 17 6151 "line": 19
6152 } 6152 }
6153 }, 6153 },
6154 { 6154 {
6155 "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service", 6155 "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
6156 "end": { 6156 "end": {
6157 "column": 3, 6157 "column": 3,
6158 "line": 24 6158 "line": 26
6159 }, 6159 },
6160 "file": "src/features/publishDebugInfo/Component.js", 6160 "file": "src/features/publishDebugInfo/Component.js",
6161 "id": "feature.publishDebugInfo.info", 6161 "id": "feature.publishDebugInfo.info",
6162 "start": { 6162 "start": {
6163 "column": 8, 6163 "column": 8,
6164 "line": 21 6164 "line": 23
6165 } 6165 }
6166 }, 6166 },
6167 { 6167 {
6168 "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.", 6168 "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
6169 "end": { 6169 "end": {
6170 "column": 3, 6170 "column": 3,
6171 "line": 28 6171 "line": 30
6172 }, 6172 },
6173 "file": "src/features/publishDebugInfo/Component.js", 6173 "file": "src/features/publishDebugInfo/Component.js",
6174 "id": "feature.publishDebugInfo.error", 6174 "id": "feature.publishDebugInfo.error",
6175 "start": { 6175 "start": {
6176 "column": 9, 6176 "column": 9,
6177 "line": 25 6177 "line": 27
6178 } 6178 }
6179 }, 6179 },
6180 { 6180 {
6181 "defaultMessage": "!!!Privacy policy", 6181 "defaultMessage": "!!!Privacy policy",
6182 "end": { 6182 "end": {
6183 "column": 3, 6183 "column": 3,
6184 "line": 32 6184 "line": 34
6185 }, 6185 },
6186 "file": "src/features/publishDebugInfo/Component.js", 6186 "file": "src/features/publishDebugInfo/Component.js",
6187 "id": "feature.publishDebugInfo.privacy", 6187 "id": "feature.publishDebugInfo.privacy",
6188 "start": { 6188 "start": {
6189 "column": 11, 6189 "column": 11,
6190 "line": 29 6190 "line": 31
6191 } 6191 }
6192 }, 6192 },
6193 { 6193 {
6194 "defaultMessage": "!!!Terms of service", 6194 "defaultMessage": "!!!Terms of service",
6195 "end": { 6195 "end": {
6196 "column": 3, 6196 "column": 3,
6197 "line": 36 6197 "line": 38
6198 }, 6198 },
6199 "file": "src/features/publishDebugInfo/Component.js", 6199 "file": "src/features/publishDebugInfo/Component.js",
6200 "id": "feature.publishDebugInfo.terms", 6200 "id": "feature.publishDebugInfo.terms",
6201 "start": { 6201 "start": {
6202 "column": 9, 6202 "column": 9,
6203 "line": 33 6203 "line": 35
6204 } 6204 }
6205 }, 6205 },
6206 { 6206 {
6207 "defaultMessage": "!!!Accept and publish", 6207 "defaultMessage": "!!!Accept and publish",
6208 "end": { 6208 "end": {
6209 "column": 3, 6209 "column": 3,
6210 "line": 40 6210 "line": 42
6211 }, 6211 },
6212 "file": "src/features/publishDebugInfo/Component.js", 6212 "file": "src/features/publishDebugInfo/Component.js",
6213 "id": "feature.publishDebugInfo.publish", 6213 "id": "feature.publishDebugInfo.publish",
6214 "start": { 6214 "start": {
6215 "column": 11, 6215 "column": 11,
6216 "line": 37 6216 "line": 39
6217 } 6217 }
6218 }, 6218 },
6219 { 6219 {
6220 "defaultMessage": "!!!Your debug log was published and is now availible at", 6220 "defaultMessage": "!!!Your debug log was published and is now availible at",
6221 "end": { 6221 "end": {
6222 "column": 3, 6222 "column": 3,
6223 "line": 44 6223 "line": 46
6224 }, 6224 },
6225 "file": "src/features/publishDebugInfo/Component.js", 6225 "file": "src/features/publishDebugInfo/Component.js",
6226 "id": "feature.publishDebugInfo.published", 6226 "id": "feature.publishDebugInfo.published",
6227 "start": { 6227 "start": {
6228 "column": 13, 6228 "column": 13,
6229 "line": 41 6229 "line": 43
6230 } 6230 }
6231 } 6231 }
6232 ], 6232 ],
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 95e0cb398..6959a3a78 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -283,13 +283,13 @@
283 "settings.account.upgradeToPro.label": "Actualiza a Ferdi Profesional", 283 "settings.account.upgradeToPro.label": "Actualiza a Ferdi Profesional",
284 "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario", 284 "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario",
285 "settings.account.yourLicense": "Su Licencia Ferdi", 285 "settings.account.yourLicense": "Su Licencia Ferdi",
286 "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", 286 "settings.app.accentColorInfo": "Escribe tu color de acento en un formato compatible con CSS. (Predeterminado: {defaultAccentColor})",
287 "settings.app.buttonClearAllCache": "Limpiar caché", 287 "settings.app.buttonClearAllCache": "Limpiar caché",
288 "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización", 288 "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización",
289 "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones", 289 "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones",
290 "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", 290 "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.",
291 "settings.app.cacheNotCleared": "No se ha podido eliminar el cache", 291 "settings.app.cacheNotCleared": "No se ha podido eliminar el cache",
292 "settings.app.closeSettings": "Close settings", 292 "settings.app.closeSettings": "Cerrar ajustes",
293 "settings.app.currentVersion": "Versión actual:", 293 "settings.app.currentVersion": "Versión actual:",
294 "settings.app.form.accentColor": "Color de realce", 294 "settings.app.form.accentColor": "Color de realce",
295 "settings.app.form.adaptableDarkMode": "Sincroniza el modo oscuro con el ajuste del modo oscuro de mi Sistema Operativo", 295 "settings.app.form.adaptableDarkMode": "Sincroniza el modo oscuro con el ajuste del modo oscuro de mi Sistema Operativo",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index dc2ab26cf..f494da546 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -10,15 +10,15 @@
10 "connectionLostBanner.cta": "Przeładuj usługę", 10 "connectionLostBanner.cta": "Przeładuj usługę",
11 "connectionLostBanner.informationLink": "Co się stało?", 11 "connectionLostBanner.informationLink": "Co się stało?",
12 "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.", 12 "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
13 "feature.announcements.changelog.headline": "Zmiany we Ferdiie {version}", 13 "feature.announcements.changelog.headline": "Co nowego w Ferdi {version}",
14 "feature.debugger.title": "Publikuj informacje o debugowaniu", 14 "feature.debugger.title": "Opublikuj dane diagnostyczne",
15 "feature.delayApp.headline": "Aby nie czekać, kup licencję Ferdi Supporter", 15 "feature.delayApp.headline": "Aby nie czekać, kup licencję Ferdi Supporter",
16 "feature.delayApp.text": "Ferdi będzie kontynuował za {seconds} sekund.", 16 "feature.delayApp.text": "Ferdi będzie kontynuował za {seconds} sekund.",
17 "feature.delayApp.trial.action": "Tak, chcę darmową 14-dniową wersję próbną Ferdi Professional", 17 "feature.delayApp.trial.action": "Tak, chcę darmową 14-dniową wersję próbną Ferdi Professional",
18 "feature.delayApp.trial.actionShort": "Aktywuj darmową wersję próbną Ferdi Professional", 18 "feature.delayApp.trial.actionShort": "Aktywuj darmową wersję próbną Ferdi Professional",
19 "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line", 19 "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
20 "feature.delayApp.upgrade.action": "Uzyskaj licencjÄ™ Ferdi Supporter", 20 "feature.delayApp.upgrade.action": "Uzyskaj licencjÄ™ Ferdi Supporter",
21 "feature.delayApp.upgrade.actionShort": "Ulepsz swoje konto", 21 "feature.delayApp.upgrade.actionShort": "Uaktualnij konto",
22 "feature.nightlyBuilds.activate": "Aktywuj", 22 "feature.nightlyBuilds.activate": "Aktywuj",
23 "feature.nightlyBuilds.cancel": "Anuluj", 23 "feature.nightlyBuilds.cancel": "Anuluj",
24 "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.", 24 "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.",
@@ -97,8 +97,8 @@
97 "invite.skip.label": "Chcę to zrobić później", 97 "invite.skip.label": "Chcę to zrobić później",
98 "invite.submit.label": "Wyślij zaproszenia", 98 "invite.submit.label": "Wyślij zaproszenia",
99 "invite.successInfo": "Zaproszenia zostały wysłane", 99 "invite.successInfo": "Zaproszenia zostały wysłane",
100 "locked.headline": "Locked", 100 "locked.headline": "Zablokowane",
101 "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", 101 "locked.info": "Ferdi jest obecnie zablokowany. Odblokuj go przy użyciu hasła, aby zobaczyć swoje wiadomości.",
102 "locked.invalidCredentials": "Nieprawidłowe hasło", 102 "locked.invalidCredentials": "Nieprawidłowe hasło",
103 "locked.password.label": "Hasło", 103 "locked.password.label": "Hasło",
104 "locked.submit.label": "Odblokuj", 104 "locked.submit.label": "Odblokuj",
@@ -165,9 +165,9 @@
165 "menu.view.back": "Wstecz", 165 "menu.view.back": "Wstecz",
166 "menu.view.enterFullScreen": "Włącz tryb pełnoekranowy", 166 "menu.view.enterFullScreen": "Włącz tryb pełnoekranowy",
167 "menu.view.exitFullScreen": "Zakończ tryb pełnoekranowy", 167 "menu.view.exitFullScreen": "Zakończ tryb pełnoekranowy",
168 "menu.view.forward": "Forward", 168 "menu.view.forward": "Prześlij dalej",
169 "menu.view.lockFerdi": "Lock Ferdi", 169 "menu.view.lockFerdi": "Zablokuj Ferdi",
170 "menu.view.openQuickSwitch": "Open Quick Switch", 170 "menu.view.openQuickSwitch": "Otwórz Quick Switch",
171 "menu.view.reloadFranz": "Przeładuj Ferdi", 171 "menu.view.reloadFranz": "Przeładuj Ferdi",
172 "menu.view.reloadService": "Przeładuj usługę", 172 "menu.view.reloadService": "Przeładuj usługę",
173 "menu.view.reloadTodos": "Odśwież Zadania", 173 "menu.view.reloadTodos": "Odśwież Zadania",
@@ -194,7 +194,7 @@
194 "password.noUser": "Nie znaleziono użytkownika z takim adresem email", 194 "password.noUser": "Nie znaleziono użytkownika z takim adresem email",
195 "password.submit.label": "Wyślij", 195 "password.submit.label": "Wyślij",
196 "password.successInfo": "Proszę sprawdzić swój email", 196 "password.successInfo": "Proszę sprawdzić swój email",
197 "premiumFeature.button.upgradeAccount": "Ulepsz swoje konto", 197 "premiumFeature.button.upgradeAccount": "Uaktualnij konto",
198 "pricing.features.accountSync": "Synchronizacja konta", 198 "pricing.features.accountSync": "Synchronizacja konta",
199 "pricing.features.adFree": "Na zawsze bez reklam", 199 "pricing.features.adFree": "Na zawsze bez reklam",
200 "pricing.features.appDelays": "Brak wygaszaczy ekranu", 200 "pricing.features.appDelays": "Brak wygaszaczy ekranu",
@@ -214,11 +214,11 @@
214 "pricing.plan.free": "Ferdi Free", 214 "pricing.plan.free": "Ferdi Free",
215 "pricing.plan.legacy": "Ferdi Premium", 215 "pricing.plan.legacy": "Ferdi Premium",
216 "pricing.plan.personal": "Ferdi Personal", 216 "pricing.plan.personal": "Ferdi Personal",
217 "pricing.plan.personal-monthly": "Ferdi Personal Monthly", 217 "pricing.plan.personal-monthly": "Miesięczny Ferdi Personal",
218 "pricing.plan.personal-yearly": "Ferdi Personal Yearly", 218 "pricing.plan.personal-yearly": "Roczny Ferdi Personal",
219 "pricing.plan.pro": "Ferdi Professional", 219 "pricing.plan.pro": "Ferdi Professional",
220 "pricing.plan.pro-monthly": "Ferdi Professional Monthly", 220 "pricing.plan.pro-monthly": "Miesięczny Ferdi Professional",
221 "pricing.plan.pro-yearly": "Ferdi Professional Yearly", 221 "pricing.plan.pro-yearly": "Roczny Ferdi Professional",
222 "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional", 222 "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
223 "pricing.trial.cta.skip": "Continue to Ferdi", 223 "pricing.trial.cta.skip": "Continue to Ferdi",
224 "pricing.trial.cta.start": "Start using Ferdi", 224 "pricing.trial.cta.start": "Start using Ferdi",
@@ -244,21 +244,21 @@
244 "service.errorHandler.message": "BÅ‚Ä…d", 244 "service.errorHandler.message": "BÅ‚Ä…d",
245 "service.errorHandler.text": "Nie udało się załadować {name}.", 245 "service.errorHandler.text": "Nie udało się załadować {name}.",
246 "service.restrictedHandler.action": "Ulepsz konto", 246 "service.restrictedHandler.action": "Ulepsz konto",
247 "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required", 247 "service.restrictedHandler.customUrl.headline": "Wymagany plan Ferdi Professional",
248 "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.", 248 "service.restrictedHandler.customUrl.text": "Uaktualnij swój plan do Ferdi Professional, aby używać własnych adresów URL i własnego hostowania usług.",
249 "service.restrictedHandler.serviceLimit.headline": "Osiągnięto limit usług.", 249 "service.restrictedHandler.serviceLimit.headline": "Osiągnięto limit usług.",
250 "service.restrictedHandler.serviceLimit.text": "Uaktualnij swoje konto, aby używać więcej niż {count} usług.", 250 "service.restrictedHandler.serviceLimit.text": "Uaktualnij swoje konto, aby używać więcej niż {count} usług.",
251 "service.webviewLoader.loading": "Wczytywanie {service}", 251 "service.webviewLoader.loading": "Wczytywanie {service}",
252 "services.getStarted": "Zacznij", 252 "services.getStarted": "Zacznij",
253 "services.login": "Zaloguj się, aby używać Ferdi.", 253 "services.login": "Zaloguj się, aby używać Ferdi.",
254 "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", 254 "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
255 "services.serverless": "Use Ferdi without an Account", 255 "services.serverless": "Używaj Ferdi bez konta",
256 "services.welcome": "Witaj w programie Ferdi", 256 "services.welcome": "Witaj w programie Ferdi",
257 "settings.account.account.editButton": "Modyfikuj konta", 257 "settings.account.account.editButton": "Modyfikuj konta",
258 "settings.account.accountType.basic": "Podstawowe konto", 258 "settings.account.accountType.basic": "Podstawowe konto",
259 "settings.account.accountType.premium": "Premium Supporter Account", 259 "settings.account.accountType.premium": "Premium Supporter Account",
260 "settings.account.accountUnavailable": "Account is unavailable", 260 "settings.account.accountUnavailable": "Konto jest niedostępne",
261 "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", 261 "settings.account.accountUnavailableInfo": "Używasz Ferdi bez konta. Jeśli chcesz używać Ferdi z kontem i synchronizować swoje usługi pomiędzy klientami, wybierz serwer w zakładce Ustawienia i zaloguj się.",
262 "settings.account.buttonSave": "Uaktualnij profil", 262 "settings.account.buttonSave": "Uaktualnij profil",
263 "settings.account.deleteAccount": "Usuń konto", 263 "settings.account.deleteAccount": "Usuń konto",
264 "settings.account.deleteEmailSent": "Wysłaliśmy email z linkiem do potwierdzenia usunięcia konta. Konto oraz dane są usuwane trwale i nie można tego cofnąć!", 264 "settings.account.deleteEmailSent": "Wysłaliśmy email z linkiem do potwierdzenia usunięcia konta. Konto oraz dane są usuwane trwale i nie można tego cofnąć!",
@@ -271,7 +271,7 @@
271 "settings.account.headlineProfile": "Uaktualnij profil", 271 "settings.account.headlineProfile": "Uaktualnij profil",
272 "settings.account.headlineSubscription": "Twoja subskrypcja", 272 "settings.account.headlineSubscription": "Twoja subskrypcja",
273 "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial", 273 "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
274 "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience", 274 "settings.account.headlineUpgradeAccount": "Uaktualnij swoje konto i zyskaj pełną funkcjonalność Ferdi",
275 "settings.account.invoiceDownload": "Pobierz", 275 "settings.account.invoiceDownload": "Pobierz",
276 "settings.account.manageSubscription.label": "ZarzÄ…dzaj swoimi subskrypcjami", 276 "settings.account.manageSubscription.label": "ZarzÄ…dzaj swoimi subskrypcjami",
277 "settings.account.successInfo": "Twoje zmiany zostały zapisane", 277 "settings.account.successInfo": "Twoje zmiany zostały zapisane",
@@ -282,25 +282,25 @@
282 "settings.account.tryReloadUserInfoRequest": "Spróbuj ponownie", 282 "settings.account.tryReloadUserInfoRequest": "Spróbuj ponownie",
283 "settings.account.upgradeToPro.label": "Ulepsz konto do Ferdi Professional", 283 "settings.account.upgradeToPro.label": "Ulepsz konto do Ferdi Professional",
284 "settings.account.userInfoRequestFailed": "Nie można wczytać informacji o użytkowniku", 284 "settings.account.userInfoRequestFailed": "Nie można wczytać informacji o użytkowniku",
285 "settings.account.yourLicense": "Your Ferdi License", 285 "settings.account.yourLicense": "Twoja licencja Ferdi",
286 "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", 286 "settings.app.accentColorInfo": "Zdefiniuj kolor akcentu w formacie zgodnym z CSS. (Domyślnie: {defaultAccentColor})",
287 "settings.app.buttonClearAllCache": "Wyczyść pamięć podręczną (cache)", 287 "settings.app.buttonClearAllCache": "Wyczyść pamięć podręczną (cache)",
288 "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacjÄ™", 288 "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacjÄ™",
289 "settings.app.buttonSearchForUpdate": "Sprawdź aktualizacje", 289 "settings.app.buttonSearchForUpdate": "Sprawdź aktualizacje",
290 "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej", 290 "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
291 "settings.app.cacheNotCleared": "Couldn't clear all cache", 291 "settings.app.cacheNotCleared": "Błąd czyszczenia pamięci podręcznej",
292 "settings.app.closeSettings": "Close settings", 292 "settings.app.closeSettings": "Zamknij ustawienia",
293 "settings.app.currentVersion": "Aktualna wersja:", 293 "settings.app.currentVersion": "Aktualna wersja:",
294 "settings.app.form.accentColor": "Accent color", 294 "settings.app.form.accentColor": "Kolor akcentu",
295 "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", 295 "settings.app.form.adaptableDarkMode": "Synchronizuj tryb ciemny z ustawieniami mojego systemu",
296 "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer", 296 "settings.app.form.alwaysShowWorkspaces": "Zawsze wyświetlaj szufladę obszaru roboczego",
297 "settings.app.form.autoLaunchInBackground": "Otwórz w tle", 297 "settings.app.form.autoLaunchInBackground": "Otwórz w tle",
298 "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na poczÄ…tku", 298 "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na poczÄ…tku",
299 "settings.app.form.automaticUpdates": "WÅ‚Ä…cz aktualizacje", 299 "settings.app.form.automaticUpdates": "WÅ‚Ä…cz aktualizacje",
300 "settings.app.form.beta": "Uwzględnij wersje beta", 300 "settings.app.form.beta": "Uwzględnij wersje beta",
301 "settings.app.form.clipboardNotifications": "Nie wyświetlaj powiadomień dla schowka", 301 "settings.app.form.clipboardNotifications": "Nie wyświetlaj powiadomień dla schowka",
302 "settings.app.form.closeToSystemTray": "Zminimalizuj Ferdi do paska zadań", 302 "settings.app.form.closeToSystemTray": "Zminimalizuj Ferdi do paska zadań",
303 "settings.app.form.customTodoServer": "Custom Todo Server", 303 "settings.app.form.customTodoServer": "Własny serwer listy zadań",
304 "settings.app.form.darkMode": "WÅ‚Ä…cz tryb ciemny", 304 "settings.app.form.darkMode": "WÅ‚Ä…cz tryb ciemny",
305 "settings.app.form.enableGPUAcceleration": "WÅ‚Ä…cz akceleracjÄ™ GPU", 305 "settings.app.form.enableGPUAcceleration": "WÅ‚Ä…cz akceleracjÄ™ GPU",
306 "settings.app.form.enableLock": "Włącz blokadę hasłem", 306 "settings.app.form.enableLock": "Włącz blokadę hasłem",
@@ -308,8 +308,8 @@
308 "settings.app.form.enableSpellchecking": "WÅ‚Ä…cz sprawdzanie pisowni", 308 "settings.app.form.enableSpellchecking": "WÅ‚Ä…cz sprawdzanie pisowni",
309 "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień", 309 "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
310 "settings.app.form.enableTodos": "WÅ‚Ä…cz Zadania Ferdi", 310 "settings.app.form.enableTodos": "WÅ‚Ä…cz Zadania Ferdi",
311 "settings.app.form.hibernate": "Enable service hibernation", 311 "settings.app.form.hibernate": "Włącz hibernację usługi",
312 "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup", 312 "settings.app.form.hibernateOnStartup": "Hibernacja usług po starcie systemu",
313 "settings.app.form.hibernationStrategy": "Hibernation strategy", 313 "settings.app.form.hibernationStrategy": "Hibernation strategy",
314 "settings.app.form.iconSize": "Rozmiar ikony usługi", 314 "settings.app.form.iconSize": "Rozmiar ikony usługi",
315 "settings.app.form.inactivityLock": "Zablokuj przy braku aktywności", 315 "settings.app.form.inactivityLock": "Zablokuj przy braku aktywności",
@@ -317,7 +317,7 @@
317 "settings.app.form.language": "Język", 317 "settings.app.form.language": "Język",
318 "settings.app.form.lockPassword": "Hasło", 318 "settings.app.form.lockPassword": "Hasło",
319 "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikacjÄ™ Ferdi", 319 "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikacjÄ™ Ferdi",
320 "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour", 320 "settings.app.form.navigationBarBehaviour": "Zachowanie paska nawigacji",
321 "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message", 321 "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
322 "settings.app.form.passwordToggle": "Password toggle", 322 "settings.app.form.passwordToggle": "Password toggle",
323 "settings.app.form.predefinedTodoServer": "Todo Server", 323 "settings.app.form.predefinedTodoServer": "Todo Server",
@@ -330,13 +330,13 @@
330 "settings.app.form.searchEngine": "Wyszukiwarka", 330 "settings.app.form.searchEngine": "Wyszukiwarka",
331 "settings.app.form.sentry": "Wysyłaj dane telemetrii", 331 "settings.app.form.sentry": "Wysyłaj dane telemetrii",
332 "settings.app.form.serviceRibbonWidth": "Szerokość paska bocznego", 332 "settings.app.form.serviceRibbonWidth": "Szerokość paska bocznego",
333 "settings.app.form.showDisabledServices": "Wyłącz wyświetlanie zakładek z usługami", 333 "settings.app.form.showDisabledServices": "Wyświetlaj karty wyłączonych usług",
334 "settings.app.form.showDragArea": "Show draggable area on window", 334 "settings.app.form.showDragArea": "Show draggable area on window",
335 "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone", 335 "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
336 "settings.app.form.startMinimized": "Uruchom zminimalizowany", 336 "settings.app.form.startMinimized": "Uruchom zminimalizowany",
337 "settings.app.form.universalDarkMode": "WÅ‚Ä…cz uniwersalny tryb ciemny", 337 "settings.app.form.universalDarkMode": "WÅ‚Ä…cz uniwersalny tryb ciemny",
338 "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID", 338 "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
339 "settings.app.form.useVerticalStyle": "Use vertical style", 339 "settings.app.form.useVerticalStyle": "Użyj stylu pionowego",
340 "settings.app.headline": "Ustawienia", 340 "settings.app.headline": "Ustawienia",
341 "settings.app.headlineAdvanced": "Zaawansowane", 341 "settings.app.headlineAdvanced": "Zaawansowane",
342 "settings.app.headlineAppearance": "WyglÄ…d", 342 "settings.app.headlineAppearance": "WyglÄ…d",
@@ -377,7 +377,7 @@
377 "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes", 377 "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
378 "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes", 378 "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
379 "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:", 379 "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
380 "settings.recipes.customService.openDevDocs": "Developer Documentation", 380 "settings.recipes.customService.openDevDocs": "Dokumentacja deweloperska",
381 "settings.recipes.customService.openFolder": "Otwórz folder", 381 "settings.recipes.customService.openFolder": "Otwórz folder",
382 "settings.recipes.headline": "Dostępne usługi", 382 "settings.recipes.headline": "Dostępne usługi",
383 "settings.recipes.missingService": "Brak usługi?", 383 "settings.recipes.missingService": "Brak usługi?",
@@ -402,7 +402,7 @@
402 "settings.service.form.enableAudio": "Włącz dźwięk", 402 "settings.service.form.enableAudio": "Włącz dźwięk",
403 "settings.service.form.enableBadge": "Pokaż znacznik nieprzeczytanych wiadomości", 403 "settings.service.form.enableBadge": "Pokaż znacznik nieprzeczytanych wiadomości",
404 "settings.service.form.enableDarkMode": "WÅ‚Ä…cz Ciemny motyw", 404 "settings.service.form.enableDarkMode": "WÅ‚Ä…cz Ciemny motyw",
405 "settings.service.form.enableHibernation": "Enable hibernation", 405 "settings.service.form.enableHibernation": "WÅ‚Ä…cz hibernacjÄ™",
406 "settings.service.form.enableNotification": "Aktywuj powiadomienia", 406 "settings.service.form.enableNotification": "Aktywuj powiadomienia",
407 "settings.service.form.enableService": "Aktywuj usługę", 407 "settings.service.form.enableService": "Aktywuj usługę",
408 "settings.service.form.headlineBadges": "Znaczniki nieprzeczytanych wiadomości", 408 "settings.service.form.headlineBadges": "Znaczniki nieprzeczytanych wiadomości",
@@ -493,15 +493,15 @@
493 "settings.workspaces.workspaceFeatureHeadline": "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Ferdi", 493 "settings.workspaces.workspaceFeatureHeadline": "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Ferdi",
494 "settings.workspaces.workspaceFeatureInfo": "Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.", 494 "settings.workspaces.workspaceFeatureInfo": "Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.",
495 "settings.workspaces.workspacesRequestFailed": "Nie można załadować obszaru roboczego", 495 "settings.workspaces.workspacesRequestFailed": "Nie można załadować obszaru roboczego",
496 "setupAssistant.headline": "Let's get started", 496 "setupAssistant.headline": "Zaczynajmy",
497 "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.", 497 "setupAssistant.subheadline": "Wybierz spośród naszych najczęściej używanych usług i powróć do rutynowej komunikacji.",
498 "setupAssistant.submit.label": "Let's go", 498 "setupAssistant.submit.label": "Do dzieła",
499 "sidebar.addNewService": "Dodaj kolejną usługę", 499 "sidebar.addNewService": "Dodaj kolejną usługę",
500 "sidebar.closeTodosDrawer": "Close Ferdi Todos", 500 "sidebar.closeTodosDrawer": "Zamknij Listę zadań Ferdi",
501 "sidebar.closeWorkspaceDrawer": "Zamknij edytor obszaru roboczego", 501 "sidebar.closeWorkspaceDrawer": "Zamknij edytor obszaru roboczego",
502 "sidebar.lockFerdi": "Lock Ferdi", 502 "sidebar.lockFerdi": "Zablokuj Ferdi",
503 "sidebar.muteApp": "Wyłącz powiadomienia i dźwięki", 503 "sidebar.muteApp": "Wyłącz powiadomienia i dźwięki",
504 "sidebar.openTodosDrawer": "Open Ferdi Todos", 504 "sidebar.openTodosDrawer": "Otwórz Listę zadań Ferdi",
505 "sidebar.openWorkspaceDrawer": "Otwórz edytor obszaru roboczego", 505 "sidebar.openWorkspaceDrawer": "Otwórz edytor obszaru roboczego",
506 "sidebar.settings": "Ustawienia", 506 "sidebar.settings": "Ustawienia",
507 "sidebar.unmuteApp": "Włącz powiadomienia i dźwięki", 507 "sidebar.unmuteApp": "Włącz powiadomienia i dźwięki",
@@ -518,18 +518,18 @@
518 "signup.submit.label": "Stwórz konto", 518 "signup.submit.label": "Stwórz konto",
519 "subscription.bestValue": "Best value", 519 "subscription.bestValue": "Best value",
520 "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial", 520 "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
521 "subscription.cta.allOptions": "See all options", 521 "subscription.cta.allOptions": "Zobacz wszystkie opcje",
522 "subscription.cta.choosePlan": "Wybierz swój plan", 522 "subscription.cta.choosePlan": "Wybierz swój plan",
523 "subscription.includedProFeatures": "The Ferdi Professional Plan includes:", 523 "subscription.includedProFeatures": "Plan Ferdi Professional zawiera:",
524 "subscription.interval.per": "per {interval}", 524 "subscription.interval.per": "co {interval}",
525 "subscription.interval.perMonth": "per month", 525 "subscription.interval.perMonth": "co miesiÄ…c",
526 "subscription.interval.perMonthPerUser": "per month & user", 526 "subscription.interval.perMonthPerUser": "co miesiąc za 1 użytkownika",
527 "subscription.planItem.upgradeAccount": "Ulepsz konto", 527 "subscription.planItem.upgradeAccount": "Ulepsz konto",
528 "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:", 528 "subscription.teaser.includedFeatures": "PÅ‚atne plany Ferdi zawierajÄ…:",
529 "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!", 529 "subscription.teaser.intro": "Ferdi 5 zawiera szeroką gamę nowych funkcji pomagających polepszyć Twoją codzienną komunikację - baterie w zestawie. Sprawdź nasze nowe plany i dowiedz się, który najbardziej Ci odpowiada!",
530 "subscriptionPopup.buttonCancel": "Anuluj", 530 "subscriptionPopup.buttonCancel": "Anuluj",
531 "subscriptionPopup.buttonDone": "Zrobione", 531 "subscriptionPopup.buttonDone": "Zrobione",
532 "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?", 532 "tabs.item.confirmDeleteService": "Czy na pewno chcesz usunąć usługę {serviceName}?",
533 "tabs.item.deleteService": "Usuń usługę", 533 "tabs.item.deleteService": "Usuń usługę",
534 "tabs.item.disableAudio": "Wyłącz dźwięk", 534 "tabs.item.disableAudio": "Wyłącz dźwięk",
535 "tabs.item.disableNotifications": "Wyłącz powiadomienia", 535 "tabs.item.disableNotifications": "Wyłącz powiadomienia",
@@ -545,7 +545,7 @@
545 "validation.required": "Pole {field} jest wymagane", 545 "validation.required": "Pole {field} jest wymagane",
546 "validation.url": "Pole {field} nie jest poprawnym ciÄ…giem URL.", 546 "validation.url": "Pole {field} nie jest poprawnym ciÄ…giem URL.",
547 "webControls.back": "Wstecz", 547 "webControls.back": "Wstecz",
548 "webControls.forward": "Forward", 548 "webControls.forward": "Prześlij dalej",
549 "webControls.goHome": "Strona główna", 549 "webControls.goHome": "Strona główna",
550 "webControls.openInBrowser": "Otwórz w przeglądarce", 550 "webControls.openInBrowser": "Otwórz w przeglądarce",
551 "webControls.reload": "Odśwież", 551 "webControls.reload": "Odśwież",
diff --git a/src/i18n/messages/src/features/publishDebugInfo/Component.json b/src/i18n/messages/src/features/publishDebugInfo/Component.json
index 25048ace6..4d07a4794 100644
--- a/src/i18n/messages/src/features/publishDebugInfo/Component.json
+++ b/src/i18n/messages/src/features/publishDebugInfo/Component.json
@@ -4,11 +4,11 @@
4 "defaultMessage": "!!!Publish debug information", 4 "defaultMessage": "!!!Publish debug information",
5 "file": "src/features/publishDebugInfo/Component.js", 5 "file": "src/features/publishDebugInfo/Component.js",
6 "start": { 6 "start": {
7 "line": 17, 7 "line": 19,
8 "column": 9 8 "column": 9
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 20, 11 "line": 22,
12 "column": 3 12 "column": 3
13 } 13 }
14 }, 14 },
@@ -17,11 +17,11 @@
17 "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service", 17 "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
18 "file": "src/features/publishDebugInfo/Component.js", 18 "file": "src/features/publishDebugInfo/Component.js",
19 "start": { 19 "start": {
20 "line": 21, 20 "line": 23,
21 "column": 8 21 "column": 8
22 }, 22 },
23 "end": { 23 "end": {
24 "line": 24, 24 "line": 26,
25 "column": 3 25 "column": 3
26 } 26 }
27 }, 27 },
@@ -30,11 +30,11 @@
30 "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.", 30 "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
31 "file": "src/features/publishDebugInfo/Component.js", 31 "file": "src/features/publishDebugInfo/Component.js",
32 "start": { 32 "start": {
33 "line": 25, 33 "line": 27,
34 "column": 9 34 "column": 9
35 }, 35 },
36 "end": { 36 "end": {
37 "line": 28, 37 "line": 30,
38 "column": 3 38 "column": 3
39 } 39 }
40 }, 40 },
@@ -43,11 +43,11 @@
43 "defaultMessage": "!!!Privacy policy", 43 "defaultMessage": "!!!Privacy policy",
44 "file": "src/features/publishDebugInfo/Component.js", 44 "file": "src/features/publishDebugInfo/Component.js",
45 "start": { 45 "start": {
46 "line": 29, 46 "line": 31,
47 "column": 11 47 "column": 11
48 }, 48 },
49 "end": { 49 "end": {
50 "line": 32, 50 "line": 34,
51 "column": 3 51 "column": 3
52 } 52 }
53 }, 53 },
@@ -56,11 +56,11 @@
56 "defaultMessage": "!!!Terms of service", 56 "defaultMessage": "!!!Terms of service",
57 "file": "src/features/publishDebugInfo/Component.js", 57 "file": "src/features/publishDebugInfo/Component.js",
58 "start": { 58 "start": {
59 "line": 33, 59 "line": 35,
60 "column": 9 60 "column": 9
61 }, 61 },
62 "end": { 62 "end": {
63 "line": 36, 63 "line": 38,
64 "column": 3 64 "column": 3
65 } 65 }
66 }, 66 },
@@ -69,11 +69,11 @@
69 "defaultMessage": "!!!Accept and publish", 69 "defaultMessage": "!!!Accept and publish",
70 "file": "src/features/publishDebugInfo/Component.js", 70 "file": "src/features/publishDebugInfo/Component.js",
71 "start": { 71 "start": {
72 "line": 37, 72 "line": 39,
73 "column": 11 73 "column": 11
74 }, 74 },
75 "end": { 75 "end": {
76 "line": 40, 76 "line": 42,
77 "column": 3 77 "column": 3
78 } 78 }
79 }, 79 },
@@ -82,11 +82,11 @@
82 "defaultMessage": "!!!Your debug log was published and is now availible at", 82 "defaultMessage": "!!!Your debug log was published and is now availible at",
83 "file": "src/features/publishDebugInfo/Component.js", 83 "file": "src/features/publishDebugInfo/Component.js",
84 "start": { 84 "start": {
85 "line": 41, 85 "line": 43,
86 "column": 13 86 "column": 13
87 }, 87 },
88 "end": { 88 "end": {
89 "line": 44, 89 "line": 46,
90 "column": 3 90 "column": 3
91 } 91 }
92 } 92 }
diff --git a/src/internal-server b/src/internal-server
Subproject b8e39c293c4d58c42f3cddafbd0125fcba5e933 Subproject e4fc9c6c3666eadc26a472b9b1c2a701dd3464b
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index 11eaec306..781cd0895 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -1,9 +1,8 @@
1import os from 'os';
2import semver from 'semver'; 1import semver from 'semver';
3import { TouchBar, getCurrentWindow } from '@electron/remote'; 2import { TouchBar, getCurrentWindow } from '@electron/remote';
4import { autorun } from 'mobx'; 3import { autorun } from 'mobx';
5 4
6import { isMac } from '../environment'; 5import { isMac, osRelease } from '../environment';
7 6
8export default class FranzTouchBar { 7export default class FranzTouchBar {
9 constructor(stores, actions) { 8 constructor(stores, actions) {
@@ -13,7 +12,7 @@ export default class FranzTouchBar {
13 // Temporary fix for https://github.com/electron/electron/issues/10442 12 // Temporary fix for https://github.com/electron/electron/issues/10442
14 // TODO: remove when we upgrade to electron 1.8.2 or later 13 // TODO: remove when we upgrade to electron 1.8.2 or later
15 try { 14 try {
16 if (isMac && semver.gt(os.release(), '16.6.0')) { 15 if (isMac && semver.gt(osRelease, '16.6.0')) {
17 this.build = autorun(this._build.bind(this)); 16 this.build = autorun(this._build.bind(this));
18 } 17 }
19 } catch (err) { 18 } catch (err) {
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index a20eeb087..4db056f26 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -24,8 +24,6 @@ export default class Recipe {
24 24
25 hasTeamId = false; 25 hasTeamId = false;
26 26
27 hasPredefinedUrl = false;
28
29 hasCustomUrl = false; 27 hasCustomUrl = false;
30 28
31 hasHostedOption = false; 29 hasHostedOption = false;
@@ -73,7 +71,6 @@ export default class Recipe {
73 this.hasIndirectMessages = data.config.hasIndirectMessages || this.hasIndirectMessages; 71 this.hasIndirectMessages = data.config.hasIndirectMessages || this.hasIndirectMessages;
74 this.hasNotificationSound = data.config.hasNotificationSound || this.hasNotificationSound; 72 this.hasNotificationSound = data.config.hasNotificationSound || this.hasNotificationSound;
75 this.hasTeamId = data.config.hasTeamId || this.hasTeamId; 73 this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
76 this.hasPredefinedUrl = data.config.hasPredefinedUrl || this.hasPredefinedUrl;
77 this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl; 74 this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
78 this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption; 75 this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
79 76
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index f1d08e306..6f91d4ed0 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -5,7 +5,7 @@ import {
5 observable, 5 observable,
6} from 'mobx'; 6} from 'mobx';
7 7
8import defaultUserAgent, { isChromeless } from '../helpers/userAgent-helpers'; 8import defaultUserAgent from '../helpers/userAgent-helpers';
9 9
10const debug = require('debug')('Ferdi:UserAgent'); 10const debug = require('debug')('Ferdi:UserAgent');
11 11
@@ -76,7 +76,7 @@ export default class UserAgent {
76 } 76 }
77 77
78 @action _handleNavigate(url, forwardingHack = false) { 78 @action _handleNavigate(url, forwardingHack = false) {
79 if (isChromeless(url)) { 79 if (url.startsWith('https://accounts.google.com')) {
80 if (!this.chromelessUserAgent) { 80 if (!this.chromelessUserAgent) {
81 debug('Setting user agent to chromeless for url', url); 81 debug('Setting user agent to chromeless for url', url);
82 this.chromelessUserAgent = true; 82 this.chromelessUserAgent = true;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index bbcf78a43..ac6ca6d2d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -7,7 +7,6 @@ import moment from 'moment';
7import AutoLaunch from 'auto-launch'; 7import AutoLaunch from 'auto-launch';
8import ms from 'ms'; 8import ms from 'ms';
9import { URL } from 'url'; 9import { URL } from 'url';
10import os from 'os';
11import path from 'path'; 10import path from 'path';
12import { readJsonSync } from 'fs-extra'; 11import { readJsonSync } from 'fs-extra';
13 12
@@ -15,7 +14,7 @@ import Store from './lib/Store';
15import Request from './lib/Request'; 14import Request from './lib/Request';
16import { CHECK_INTERVAL } from '../config'; 15import { CHECK_INTERVAL } from '../config';
17import { 16import {
18 DEFAULT_APP_SETTINGS, isMac, ferdiVersion, electronVersion, 17 DEFAULT_APP_SETTINGS, isMac, ferdiVersion, electronVersion, osRelease,
19} from '../environment'; 18} from '../environment';
20import locales from '../i18n/translations'; 19import locales from '../i18n/translations';
21import { onVisibilityChange } from '../helpers/visibility-helper'; 20import { onVisibilityChange } from '../helpers/visibility-helper';
@@ -261,7 +260,7 @@ export default class AppStore extends Store {
261 return { 260 return {
262 host: { 261 host: {
263 platform: process.platform, 262 platform: process.platform,
264 release: os.release(), 263 release: osRelease,
265 screens: screen.getAllDisplays(), 264 screens: screen.getAllDisplays(),
266 }, 265 },
267 ferdi: { 266 ferdi: {
diff --git a/src/styles/toggle.scss b/src/styles/toggle.scss
index 52675ceed..5cd9e4526 100644
--- a/src/styles/toggle.scss
+++ b/src/styles/toggle.scss
@@ -1,3 +1,5 @@
1@use "sass:math";
2
1@import './config.scss'; 3@import './config.scss';
2 4
3$toggle-size: 14px; 5$toggle-size: 14px;
@@ -6,11 +8,11 @@ $toggle-button-size: 22px;
6 8
7.theme__dark .franz-form .franz-form__toggle-wrapper .franz-form__toggle { 9.theme__dark .franz-form .franz-form__toggle-wrapper .franz-form__toggle {
8 background: $dark-theme-gray; 10 background: $dark-theme-gray;
9 border-radius: $toggle-size / 2; 11 border-radius: math.div($toggle-size, 2);
10 12
11 .franz-form__toggle-button { 13 .franz-form__toggle-button {
12 background: $dark-theme-gray-lighter; 14 background: $dark-theme-gray-lighter;
13 box-shadow: 0 1px 4px rgba($dark-theme-black, .3); 15 box-shadow: 0 1px 4px rgba($dark-theme-black, 0.3);
14 } 16 }
15} 17}
16 18
@@ -18,7 +20,9 @@ $toggle-button-size: 22px;
18 display: flex; 20 display: flex;
19 flex-direction: row; 21 flex-direction: row;
20 22
21 .franz-form__label { margin-left: 20px; } 23 .franz-form__label {
24 margin-left: 20px;
25 }
22 26
23 .franz-form__toggle { 27 .franz-form__toggle {
24 background: $theme-gray-lighter; 28 background: $theme-gray-lighter;
@@ -30,12 +34,12 @@ $toggle-button-size: 22px;
30 .franz-form__toggle-button { 34 .franz-form__toggle-button {
31 background: $theme-gray-light; 35 background: $theme-gray-light;
32 border-radius: 100%; 36 border-radius: 100%;
33 box-shadow: 0 1px 4px rgba(0, 0, 0, .3); 37 box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
34 height: $toggle-size - 2; 38 height: $toggle-size - 2;
35 left: 1px; 39 left: 1px;
36 top: 1px; 40 top: 1px;
37 position: absolute; 41 position: absolute;
38 transition: all .5s; 42 transition: all 0.5s;
39 width: $toggle-size - 2; 43 width: $toggle-size - 2;
40 } 44 }
41 45
@@ -44,6 +48,8 @@ $toggle-button-size: 22px;
44 left: $toggle-width - $toggle-size - 3; 48 left: $toggle-width - $toggle-size - 3;
45 } 49 }
46 50
47 input { display: none; } 51 input {
52 display: none;
53 }
48 } 54 }
49} 55}
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index b5793a5f1..b8fe7dc52 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -1,5 +1,5 @@
1const { ipcRenderer } = require('electron'); 1import { ipcRenderer } from 'electron';
2const fs = require('fs-extra'); 2import { pathExistsSync, readFile } from 'fs-extra';
3 3
4const debug = require('debug')('Ferdi:Plugin:RecipeWebview'); 4const debug = require('debug')('Ferdi:Plugin:RecipeWebview');
5 5
@@ -73,8 +73,8 @@ class RecipeWebview {
73 */ 73 */
74 injectCSS(...files) { 74 injectCSS(...files) {
75 files.forEach(async (file) => { 75 files.forEach(async (file) => {
76 if (fs.pathExistsSync(file)) { 76 if (pathExistsSync(file)) {
77 const data = await fs.readFile(file, 'utf8'); 77 const data = await readFile(file, 'utf8');
78 const styles = document.createElement('style'); 78 const styles = document.createElement('style');
79 styles.innerHTML = data; 79 styles.innerHTML = data;
80 80
@@ -107,4 +107,4 @@ class RecipeWebview {
107 } 107 }
108} 108}
109 109
110module.exports = RecipeWebview; 110export default RecipeWebview;
diff --git a/src/webview/zoom.js b/src/webview/zoom.js
index 99c647036..3ad88916e 100644
--- a/src/webview/zoom.js
+++ b/src/webview/zoom.js
@@ -1,4 +1,4 @@
1const electron = require('electron'); 1import electron from 'electron';
2 2
3const { ipcRenderer, webFrame } = electron; 3const { ipcRenderer, webFrame } = electron;
4 4
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-09 05:01:52 +0000