Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-08-25 09:47:48 +02:00
commit c5997e9333
2 changed files with 23 additions and 24 deletions

View File

@ -1,6 +1,6 @@
{
"name": "tabs",
"version": "1.1.9",
"version": "1.1.10",
"description": "Persistent and separate browser tabs in one window.",
"author": {
"name": "Alice Gaudon",
@ -29,12 +29,12 @@
"@babel/core": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@fortawesome/fontawesome-free": "^5.13.0",
"@types/node": "^12.12.48",
"@types/node": "^12.12.54",
"babel-loader": "^8.1.0",
"concurrently": "^5.2.0",
"copy-webpack-plugin": "^6.0.1",
"css-loader": "^4.0.0",
"electron": "^9.0.0",
"electron": "^10.0.0",
"electron-builder": "^22.4.0",
"file-loader": "^6.0.0",
"imagemin": "^7.0.1",
@ -45,7 +45,7 @@
"img-loader": "^3.0.1",
"mini-css-extract-plugin": "^0.10.0",
"node-sass": "^4.14.1",
"sass-loader": "^9.0.2",
"sass-loader": "^10.0.0",
"ts-loader": "^8.0.0",
"typescript": "^4.0.2",
"webpack": "^4.43.0",
@ -99,6 +99,6 @@
}
]
},
"electronVersion": "9.2.1"
"electronVersion": "10.0.0"
}
}

View File

@ -947,7 +947,7 @@
resolved "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==
"@types/node@^12.0.12", "@types/node@^12.12.48":
"@types/node@^12.0.12", "@types/node@^12.12.54":
version "12.12.54"
resolved "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz#a4b58d8df3a4677b6c08bfbc94b7ad7a7a5f82d1"
integrity sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w==
@ -2357,15 +2357,14 @@ crypto-random-string@^2.0.0:
integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
css-loader@^4.0.0:
version "4.2.1"
resolved "https://registry.npmjs.org/css-loader/-/css-loader-4.2.1.tgz#9f48fd7eae1219d629a3f085ba9a9102ca1141a7"
integrity sha512-MoqmF1if7Z0pZIEXA4ZF9PgtCXxWbfzfJM+3p+OYfhcrwcqhaCRb74DSnfzRl7e024xEiCRn5hCvfUbTf2sgFA==
version "4.2.2"
resolved "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz#b668b3488d566dc22ebcf9425c5f254a05808c89"
integrity sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==
dependencies:
camelcase "^6.0.0"
cssesc "^3.0.0"
icss-utils "^4.1.1"
loader-utils "^2.0.0"
normalize-path "^3.0.0"
postcss "^7.0.32"
postcss-modules-extract-imports "^2.0.0"
postcss-modules-local-by-default "^3.0.3"
@ -2774,9 +2773,9 @@ electron-publish@22.8.0:
mime "^2.4.6"
electron-to-chromium@^1.3.523:
version "1.3.540"
resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.540.tgz#4e4c08d8c12bbd32cf090e143c0d546f017f9d43"
integrity sha512-IoGiZb8SMqTtkDYJtP8EtCdvv3VMtd1QoTlypO2RUBxRq/Wk0rU5IzhzhMckPaC9XxDqUvWsL0XKOBhTiYVN3w==
version "1.3.545"
resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.545.tgz#d9add694c78554b8c00bc6e6fc929d5ccd7d1b99"
integrity sha512-+0R/i17u5E1cwF3g0W8Niq3UUKTUMyyT4kLkutZUHG8mDNvFsAckK3HIanzGVtixe3b6rknD8k7gHiR6nKFkgg==
electron-updater@^4.2.4:
version "4.3.4"
@ -2791,10 +2790,10 @@ electron-updater@^4.2.4:
lodash.isequal "^4.5.0"
semver "^7.3.2"
electron@^9.0.0:
version "9.2.1"
resolved "https://registry.npmjs.org/electron/-/electron-9.2.1.tgz#54ef574e1af4ae967b5efa94312f1b6458d44a02"
integrity sha512-ZsetaQjXB8+9/EFW1FnfK4ukpkwXCxMEaiKiUZhZ0ZLFlLnFCpe0Bg4vdDf7e4boWGcnlgN1jAJpBw7w0eXuqA==
electron@^10.0.0:
version "10.0.0"
resolved "https://registry.npmjs.org/electron/-/electron-10.0.0.tgz#4e777612ead76b39bc7241c7749bf6b0ece47889"
integrity sha512-0XX/LqYAHHCSbfLjUk9VRDPOeYjDPEzA9i7F50AqpEpFIWR2bp++0S0beRANUpPdkvtBDp+0R6vHV3iXPvuKyA==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
@ -6234,10 +6233,10 @@ sass-graph@2.2.5:
scss-tokenizer "^0.2.3"
yargs "^13.3.2"
sass-loader@^9.0.2:
version "9.0.3"
resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-9.0.3.tgz#086adcf0bfdcc9d920413e2cdc3ba3321373d547"
integrity sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg==
sass-loader@^10.0.0:
version "10.0.0"
resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.0.tgz#5761534acc9ffb6477ad31067e6f41a1dc35ffe6"
integrity sha512-DEIrVJIXf2P6jtY3fpJu+uWetALCds2PwRA2iwbpzmHvtFmX5j0aX5Uz+YZSeJpjKrpgqWNKngcVxmwVfqxMow==
dependencies:
klona "^1.1.2"
loader-utils "^2.0.0"
@ -7054,9 +7053,9 @@ truncate-utf8-bytes@^1.0.0:
utf8-byte-length "^1.0.1"
ts-loader@^8.0.0:
version "8.0.2"
resolved "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.2.tgz#ee73ca9350f745799396fff8578ba29b1e95616b"
integrity sha512-oYT7wOTUawYXQ8XIDsRhziyW0KUEV38jISYlE+9adP6tDtG+O5GkRe4QKQXrHVH4mJJ88DysvEtvGP65wMLlhg==
version "8.0.3"
resolved "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.3.tgz#56858f4296edf1ed55e01f8520552984d3f0911c"
integrity sha512-wsqfnVdB7xQiqhqbz2ZPLGHLPZbHVV5Qn/MNFZkCFxRU1miDyxKORucDGxKtsQJ63Rfza0udiUxWF5nHY6bpdQ==
dependencies:
chalk "^2.3.0"
enhanced-resolve "^4.0.0"