summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Kangas <gabek@real-ity.com>2023-07-22 21:32:15 -0700
committerGitHub <noreply@github.com>2023-07-22 21:32:15 -0700
commit57c8e2a40ab894ce69f8e848e2406d3f382cc6f9 (patch)
treeb453ce2e26dd9fa57f6cdeebd3f3c006baa6a6c8
parent9b24376e0cf0c1a34b3d17286b335f027b8ad2ab (diff)
parent22773185cca68291000f42bece52b2a52ede0266 (diff)
Merge branch 'develop' into renovate/stylelint-15.x-lockfilerenovate/stylelint-15.x-lockfile
-rwxr-xr-xbuild/web/bundleWeb.sh17
-rw-r--r--web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.pngbin90593 -> 91400 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.pngbin73404 -> 71961 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.pngbin118175 -> 116379 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.pngbin86990 -> 88585 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.pngbin47530 -> 47077 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.pngbin171842 -> 175072 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.pngbin130020 -> 129866 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.pngbin191355 -> 188371 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.pngbin92812 -> 92806 bytes
-rw-r--r--web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.pngbin184696 -> 195373 bytes
-rw-r--r--web/package-lock.json14
-rw-r--r--web/package.json2
13 files changed, 10 insertions, 23 deletions
diff --git a/build/web/bundleWeb.sh b/build/web/bundleWeb.sh
index eba409f20..d1e07d97a 100755
--- a/build/web/bundleWeb.sh
+++ b/build/web/bundleWeb.sh
@@ -5,26 +5,13 @@ set -o errexit
set -o nounset
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
cd "$(git rev-parse --show-toplevel)"
cd web
-if [ ! "$OFFLINE" ]
-then
- echo "Installing npm modules for the owncast web..."
- npm --silent install 2>/dev/null
-fi
+echo "Installing npm modules for the owncast web..."
+npm --silent install 2>/dev/null
echo "Building owncast web..."
rm -rf .next
diff --git a/web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.png b/web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.png
index 4db3d9a6a..ce55911b7 100644
--- a/web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.png
+++ b/web/.storybook/story-assets/screenshots/android-10.0-android-browser-samsung-galaxy-s20-ultra-landscape-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.png b/web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.png
index e18940802..0cacdcd77 100644
--- a/web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.png
+++ b/web/.storybook/story-assets/screenshots/android-13.0-android-browser-google-pixel-7-pro-portrait-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.png b/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.png
index f65ce05cf..ff917e07c 100644
--- a/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.png
+++ b/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-landscape-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.png b/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.png
index 983b32a70..2b534b421 100644
--- a/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.png
+++ b/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-ipad-pro-11-2022-portrait-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.png b/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.png
index b580335b3..aa78af5e7 100644
--- a/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.png
+++ b/web/.storybook/story-assets/screenshots/ios-16-mobile-safari-iphone-14-pro-portrait-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.png b/web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.png
index 8e339305c..9b1e9b3de 100644
--- a/web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.png
+++ b/web/.storybook/story-assets/screenshots/os-x-ventura-chrome-desktop-default-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.png b/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.png
index a3115558c..18129066c 100644
--- a/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.png
+++ b/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-offline.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.png b/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.png
index 262840831..21b32c8d1 100644
--- a/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.png
+++ b/web/.storybook/story-assets/screenshots/os-x-ventura-safari-desktop-default-online.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.png b/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.png
index 7db35f86b..2e18f5fd9 100644
--- a/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.png
+++ b/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-offline.png
Binary files differ
diff --git a/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.png b/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.png
index f87c5eb6c..e4cdd1276 100644
--- a/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.png
+++ b/web/.storybook/story-assets/screenshots/windows-11-chrome-desktop-default-online.png
Binary files differ
diff --git a/web/package-lock.json b/web/package-lock.json
index f60654116..f5e82d3d6 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -109,7 +109,7 @@
"npm": "^9.4.0",
"postcss": "^8.4.24",
"prettier": "2.8.8",
- "sass": "1.63.6",
+ "sass": "1.64.0",
"sass-loader": "13.3.2",
"sb": "6.5.16",
"storybook-addon-designs": "6.3.1",
@@ -40290,9 +40290,9 @@
}
},
"node_modules/sass": {
- "version": "1.63.6",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz",
- "integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==",
+ "version": "1.64.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
+ "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
"devOptional": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -76063,9 +76063,9 @@
}
},
"sass": {
- "version": "1.63.6",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz",
- "integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==",
+ "version": "1.64.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
+ "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
"devOptional": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
diff --git a/web/package.json b/web/package.json
index bc190b855..ca428643d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -114,7 +114,7 @@
"npm": "^9.4.0",
"postcss": "^8.4.24",
"prettier": "2.8.8",
- "sass": "1.63.6",
+ "sass": "1.64.0",
"sass-loader": "13.3.2",
"sb": "6.5.16",
"storybook-addon-designs": "6.3.1",