From 1193f4e0b194b5498c3d416f2c7de38192314b9e Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 17 Mar 2021 18:25:04 +0100 Subject: [PATCH] Updated the loader which now uses webpack assets --- file.ts | 2 +- loader/app/css/loader.scss | 16 +- loader/app/css/overlay.scss | 16 +- {shared/img/loader => loader/images}/bowl.png | Bin .../images}/halloween-initial-sequence.gif | Bin .../images}/halloween-loop.gif | Bin .../images}/initial-sequence-uncompressed.gif | Bin .../images}/initial-sequence.gif | Bin .../images}/initial-sequence.png | Bin .../img => loader/images}/loading_error.svg | 0 .../images}/loading_error_right.svg | 0 loader/images/script.svg | 66 ++ loader/{app => }/images/steam.png | Bin {shared/img/loader => loader/images}/text.png | Bin loader/index.ejs | 24 +- package-lock.json | 812 +++++------------- package.json | 4 +- webpack.config.ts | 28 +- 18 files changed, 345 insertions(+), 623 deletions(-) rename {shared/img/loader => loader/images}/bowl.png (100%) rename {shared/img/loader => loader/images}/halloween-initial-sequence.gif (100%) rename {shared/img/loader => loader/images}/halloween-loop.gif (100%) rename {shared/img/loader => loader/images}/initial-sequence-uncompressed.gif (100%) rename {shared/img/loader => loader/images}/initial-sequence.gif (100%) rename {shared/img/loader => loader/images}/initial-sequence.png (100%) rename {shared/img => loader/images}/loading_error.svg (100%) rename {shared/img => loader/images}/loading_error_right.svg (100%) create mode 100644 loader/images/script.svg rename loader/{app => }/images/steam.png (100%) rename {shared/img/loader => loader/images}/text.png (100%) diff --git a/file.ts b/file.ts index f8eb49d8..ff084d0e 100644 --- a/file.ts +++ b/file.ts @@ -32,7 +32,7 @@ type ProjectResource = { const APP_FILE_LIST_SHARED_SOURCE: ProjectResource[] = [ { /* javascript files as manifest.json */ "type": "js", - "search-pattern": /.*\.(js|json|svg|png|css|html)$/, + "search-pattern": /.*\.(js|json|svg|png|css)$/, "build-target": "dev|rel", "path": "js/", diff --git a/loader/app/css/loader.scss b/loader/app/css/loader.scss index af9eabd8..82a8c2d1 100644 --- a/loader/app/css/loader.scss +++ b/loader/app/css/loader.scss @@ -81,7 +81,7 @@ width: 249px; height: 125px; - background: url("../images/steam.png") 0 0; + background: url("../../images/steam.png") 0 0; animation: sprite-steam 2.5s steps(50) forwards infinite; } @@ -160,19 +160,19 @@ } } -@keyframes loader-initial-sequence { +@keyframes :global(loader-initial-sequence) { to { display: none; } } -@keyframes sprite-steam { +@keyframes :global(sprite-steam) { to { background-position: 0 -6250px; } } -@keyframes swipe-out-bowl { +@keyframes :global(swipe-out-bowl) { from { transform: translate3d(0, 0, 0); } @@ -188,7 +188,7 @@ } } -@keyframes swipe-out-text { +@keyframes :global(swipe-out-text) { from { transform: translate3d(0, 0, 0); } @@ -204,19 +204,19 @@ } } -@keyframes animation-nothing { +@keyframes :global(animation-nothing) { to { background-position: 0 -6250px; } } -@keyframes overlay-fade { +@keyframes :global(overlay-fade) { to { opacity: 0; } } -@keyframes loader-setup-timeout { +@keyframes :global(loader-setup-timeout) { to { opacity: 1; } diff --git a/loader/app/css/overlay.scss b/loader/app/css/overlay.scss index be486a87..bcc8c3dc 100644 --- a/loader/app/css/overlay.scss +++ b/loader/app/css/overlay.scss @@ -30,8 +30,17 @@ } } + #overlay-no-js { + display: block; + color: #999; + + svg { + fill: #999; + } + } + #critical-load { - img { + .img { height: 12em } @@ -45,6 +54,11 @@ margin-top: .5em } } + + svg { + max-height: 100%; + max-width: 100%; + } } diff --git a/shared/img/loader/bowl.png b/loader/images/bowl.png similarity index 100% rename from shared/img/loader/bowl.png rename to loader/images/bowl.png diff --git a/shared/img/loader/halloween-initial-sequence.gif b/loader/images/halloween-initial-sequence.gif similarity index 100% rename from shared/img/loader/halloween-initial-sequence.gif rename to loader/images/halloween-initial-sequence.gif diff --git a/shared/img/loader/halloween-loop.gif b/loader/images/halloween-loop.gif similarity index 100% rename from shared/img/loader/halloween-loop.gif rename to loader/images/halloween-loop.gif diff --git a/shared/img/loader/initial-sequence-uncompressed.gif b/loader/images/initial-sequence-uncompressed.gif similarity index 100% rename from shared/img/loader/initial-sequence-uncompressed.gif rename to loader/images/initial-sequence-uncompressed.gif diff --git a/shared/img/loader/initial-sequence.gif b/loader/images/initial-sequence.gif similarity index 100% rename from shared/img/loader/initial-sequence.gif rename to loader/images/initial-sequence.gif diff --git a/shared/img/loader/initial-sequence.png b/loader/images/initial-sequence.png similarity index 100% rename from shared/img/loader/initial-sequence.png rename to loader/images/initial-sequence.png diff --git a/shared/img/loading_error.svg b/loader/images/loading_error.svg similarity index 100% rename from shared/img/loading_error.svg rename to loader/images/loading_error.svg diff --git a/shared/img/loading_error_right.svg b/loader/images/loading_error_right.svg similarity index 100% rename from shared/img/loading_error_right.svg rename to loader/images/loading_error_right.svg diff --git a/loader/images/script.svg b/loader/images/script.svg new file mode 100644 index 00000000..ea32f4c0 --- /dev/null +++ b/loader/images/script.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/loader/app/images/steam.png b/loader/images/steam.png similarity index 100% rename from loader/app/images/steam.png rename to loader/images/steam.png diff --git a/shared/img/loader/text.png b/loader/images/text.png similarity index 100% rename from shared/img/loader/text.png rename to loader/images/text.png diff --git a/loader/index.ejs b/loader/index.ejs index aa2289e0..5ed5eca3 100644 --- a/loader/index.ejs +++ b/loader/index.ejs @@ -40,10 +40,10 @@ gtag('config', 'UA-113151733-4'); - - + "> + "> <% /* We don't preload the bowl since it's only a div background */ %> - + "> <%= htmlWebpackPlugin.tags.headTags %> @@ -52,7 +52,9 @@