Browse Source

Merge branch 'develop' into renovate/stylelint-15.x-lockfile

renovate/stylelint-15.x-lockfile
Gabe Kangas 2 years ago committed by GitHub
parent
commit
57c8e2a40a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      build/web/bundleWeb.sh
  2. BIN
      web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.png
  3. BIN
      web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.png
  4. BIN
      web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.png
  5. BIN
      web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.png
  6. BIN
      web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.png
  7. BIN
      web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.png
  8. BIN
      web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.png
  9. BIN
      web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.png
  10. BIN
      web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.png
  11. BIN
      web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.png
  12. 14
      web/package-lock.json
  13. 2
      web/package.json

17
build/web/bundleWeb.sh

@ -5,26 +5,13 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
OFFLINE=0
while [[ $# -gt 0 ]]; do
case $1 in
--offline)
OFFLINE=1
;;
esac
shift
done
# Change to the root directory of the repository # Change to the root directory of the repository
cd "$(git rev-parse --show-toplevel)" cd "$(git rev-parse --show-toplevel)"
cd web cd web
if [ ! "$OFFLINE" ] echo "Installing npm modules for the owncast web..."
then npm --silent install 2>/dev/null
echo "Installing npm modules for the owncast web..."
npm --silent install 2>/dev/null
fi
echo "Building owncast web..." echo "Building owncast web..."
rm -rf .next rm -rf .next

BIN
web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 89 KiB

BIN
web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 70 KiB

BIN
web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 114 KiB

BIN
web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 86 KiB

BIN
web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 171 KiB

BIN
web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 127 KiB

BIN
web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 184 KiB

BIN
web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 91 KiB

BIN
web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 191 KiB

14
web/package-lock.json generated

@ -109,7 +109,7 @@
"npm": "^9.4.0", "npm": "^9.4.0",
"postcss": "^8.4.24", "postcss": "^8.4.24",
"prettier": "2.8.8", "prettier": "2.8.8",
"sass": "1.63.6", "sass": "1.64.0",
"sass-loader": "13.3.2", "sass-loader": "13.3.2",
"sb": "6.5.16", "sb": "6.5.16",
"storybook-addon-designs": "6.3.1", "storybook-addon-designs": "6.3.1",
@ -40290,9 +40290,9 @@
} }
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.63.6", "version": "1.64.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
"integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==", "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
"devOptional": true, "devOptional": true,
"dependencies": { "dependencies": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
@ -76063,9 +76063,9 @@
} }
}, },
"sass": { "sass": {
"version": "1.63.6", "version": "1.64.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
"integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==", "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
"devOptional": true, "devOptional": true,
"requires": { "requires": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",

2
web/package.json

@ -114,7 +114,7 @@
"npm": "^9.4.0", "npm": "^9.4.0",
"postcss": "^8.4.24", "postcss": "^8.4.24",
"prettier": "2.8.8", "prettier": "2.8.8",
"sass": "1.63.6", "sass": "1.64.0",
"sass-loader": "13.3.2", "sass-loader": "13.3.2",
"sb": "6.5.16", "sb": "6.5.16",
"storybook-addon-designs": "6.3.1", "storybook-addon-designs": "6.3.1",

Loading…
Cancel
Save