Group all Glass Stage dependencies under the selected layout

frontend/assets.json

@@ -53,11 +53,15 @@
         "/fonts/JetBrainsMono-latin.woff2"
       ]
     },
-    "layout:glass": {
+    "layout:glass-stage": {
       "contract": 1,
       "eager": false,
       "files": [
-        "/theme-glass.css"
+        "/theme-glass.css",
+        "/theme-glass-controls.css",
+        "/glass-controls.js",
+        "/theme-glass-panel.css",
+        "/glass-panel-layout.js"
       ]
     },
     "layout:classic": {
@@ -67,22 +71,6 @@
         "/theme-classic.css"
       ]
     },
-    "layout:glass-controls": {
-      "contract": 1,
-      "eager": false,
-      "files": [
-        "/theme-glass-controls.css",
-        "/glass-controls.js"
-      ]
-    },
-    "layout:glass-panel": {
-      "contract": 1,
-      "eager": false,
-      "files": [
-        "/theme-glass-panel.css",
-        "/glass-panel-layout.js"
-      ]
-    },
     "layout:bento-hub": {
       "contract": 1,
       "eager": false,

frontend/shell-consistency.test.js

@@ -49,3 +49,11 @@ test('assets.json describes the complete existing shell exactly once with eager
     for (const asset of groups[`feature:${name}`].embeddedIn) assert.ok(groups.core.files.includes(asset), `${name} remains in core`);
   }
 });
+
+test('the selected glass-stage layout includes its controls and panel dependencies', () => {
+  const { groups } = JSON.parse(readFileSync(join(__dirname, 'assets.json'), 'utf8'));
+  assert.deepEqual(groups['layout:glass-stage'].files, [
+    '/theme-glass.css', '/theme-glass-controls.css', '/glass-controls.js',
+    '/theme-glass-panel.css', '/glass-panel-layout.js',
+  ]);
+});