WebAsset more assets

joomla · Sep 27, 2018 · 2602592 · 2602592
1 parent ebd0ef8
commit 2602592
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 2 deletions.
diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json
@@ -370,7 +370,13 @@
           "dist/css-vars-ponyfill.js": "js/css-vars-ponyfill.js",
           "dist/css-vars-ponyfill.min.js": "js/css-vars-ponyfill.min.js",
           "dist/css-vars-ponyfill.min.js.map": "js/css-vars-ponyfill.min.js.map"
-        }
+        },
+        "provideAssets": [
+          {
+            "name": null,
+            "js": ["css-vars-ponyfill.min.js"]
+          }
+        ]
       },
       "chosen-js": {
         "name": "chosen",

diff --git a/build/media/legacy/joomla.asset.json b/build/media/legacy/joomla.asset.json
@@ -0,0 +1,18 @@
+{
+  "name": "joomla",
+  "version": "4.0.0",
+  "description": "Joomla CMS",
+  "license": "GPL-2.0+",
+  "assets": {
+    "bootstrap-init": {
+      "name": "bootstrap-init",
+      "dependencies": [
+        "core",
+        "bootstrap.js"
+      ],
+      "js": [
+        "legacy/bootstrap-init.min.js"
+      ]
+    }
+  }
+}
diff --git a/build/media_src/system/joomla.asset.json b/build/media_src/system/joomla.asset.json
@@ -0,0 +1,50 @@
+{
+  "name": "joomla",
+  "version": "4.0.0",
+  "description": "Joomla CMS",
+  "license": "GPL-2.0+",
+  "assets": {
+    "core": {
+      "name": "core",
+      "js": [
+        "system/core.min.js"
+      ]
+    },
+    "keepalive": {
+      "name": "keepalive",
+      "dependencies": [
+        "core"
+      ],
+      "js": [
+        "system/keepalive.min.js"
+      ]
+    },
+    "multiselect": {
+      "name": "multiselect",
+      "dependencies": [
+        "core"
+      ],
+      "js": [
+        "system/multiselect.min.js"
+      ]
+    },
+    "searchtools": {
+      "name": "searchtools",
+      "dependencies": [
+        "core"
+      ],
+      "js": [
+        "system/searchtools.min.js"
+      ]
+    },
+    "showon": {
+      "name": "showon",
+      "dependencies": [
+        "core"
+      ],
+      "js": [
+        "system/showon.min.js"
+      ]
+    }
+  }
+}
diff --git a/libraries/src/WebAsset/WebAssetRegistry.php b/libraries/src/WebAsset/WebAssetRegistry.php
@@ -347,7 +347,7 @@ public function attach(Document $doc)
 
 				unset($attr['__pathOrigin'], $attr['__isExternal']);
 
-				$doc->addScript($path, ['version' => $version], $attr);
+				$doc->addStyleSheet($path, ['version' => $version], $attr);
 			}
 
 			// Add Scripts of the asset
@@ -600,4 +600,26 @@ protected function parseRegistryFile($path)
 			$this->addAsset($assetItem);
 		}
 	}
+
+	/**
+	 * Dump available assets to simple array, with some basic info
+	 *
+	 * @return  @array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function debugAssets()
+	{
+		$assets = $this->assets;
+		$result = [];
+
+		foreach ($assets as $asset) {
+			$result[$asset->getName()] = [
+				'deps'  => implode(', ', $asset->getDependencies()),
+				'state' => $asset->getState(),
+			];
+		}
+
+		return $result;
+	}
 }