Minor fixes

diff --git a/app/javascript/themes/win95/theme.yml b/app/javascript/themes/win95/theme.yml
index 43af381989f927178d5b8644143ad42148a9c008..c4ac8aa55fa064e7746e86d1084f530c87e099c6 100644 (file)
--- a/app/javascript/themes/win95/theme.yml
+++ b/app/javascript/themes/win95/theme.yml
@@ -13,11 +13,6 @@ pack:
     stylesheet: true
   #  All unspecified packs will inherit from glitch.
 
-#  By default, the glitch preloads will also be used here. You can
-#  disable them by setting `preload` to `null`.
-
-#      preload:
-
 #  The `fallback` parameter tells us to use glitch files for everything
 #  we haven't specified.
 fallback: glitch

diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 3960167bf88ee46162a43675d1fa530741b91103..93567051466259605d3b7a61cd09fbc7ef108ba6 100644 (file)
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -4,8 +4,7 @@
     %meta{ charset: 'utf-8' }/
     %meta{ name: 'robots', content: 'noindex' }/
 
-    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
-    = javascript_pack_tag 'embed', integrity: true, crossorigin: 'anonymous'
+    = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = render partial: 'layouts/theme', object: @core
     = render partial: 'layouts/theme', object: @theme

diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 9514bc547acc87c8c973ff64b50ea14b284dfb3d..f8741c5d86b44221c93aaeafcc6a37f30c9c1119 100644 (file)
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -28,7 +28,7 @@ for (let i = 0; i < themeFiles.length; i++) {
   if (!data.pack_directory) {
     data.pack_directory = dirname(themeFile);
   }
-  if (data.pack) {
+  if (data.pack && typeof data.pack == 'object') {
     themes[data.name] = data;
   }
 }