Allow asset installation without requiring npm

yiisoft · Nov 2, 2020 · 0b47468 · 0b47468
1 parent 4c9eaa3
commit 0b47468
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,6 +68,7 @@ jobs:
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             php${{ matrix.php }}-composer-
+
       - name: Install dependencies with composer php 7.4
         if: matrix.php == '7.4'
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi

diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -45,6 +45,7 @@ jobs:
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             php${{ matrix.php }}-composer-
+
       - name: Install dependencies with composer
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -42,6 +42,7 @@ jobs:
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             php${{ matrix.php }}-composer-
+
       - name: Install dependencies with composer
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

diff --git a/composer.json b/composer.json
@@ -20,7 +20,10 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.4|^8.0",
-        "foxy/foxy": "^1.1@dev",
+        "npm-asset/vizuaalog--bulmajs": "^0.11.0",
+        "npm-asset/bulma": "^0.9.1",
+        "npm-asset/bulma-helpers": "^0.3.12",
+        "oomphinc/composer-installers-extender": "^2.0.0",
         "yiisoft/assets": "@dev",
         "yiisoft/arrays": "@dev",
         "yiisoft/html": "@dev",
@@ -45,9 +48,23 @@
     "extra": {
         "branch-alias": {
             "dev-master": "1.0.x-dev"
+        },
+        "installer-types": [
+            "npm-asset"
+        ],
+        "installer-paths": {
+            "./node_modules/{$name}": [
+                "type:npm-asset"
+            ]
         }
     },
     "config": {
         "sort-packages": true
-    }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ]
 }
diff --git a/package.json b/package.json
diff --git a/src/Asset/BulmaAsset.php b/src/Asset/BulmaAsset.php
@@ -10,15 +10,15 @@ final class BulmaAsset extends AssetBundle
 {
     public ?string $basePath = '@assets';
     public ?string $baseUrl = '@assetsUrl';
-    public ?string $sourcePath = '@npm/bulma/css';
+    public ?string $sourcePath = '@npm/bulma/';
 
     public array $css = [
-        'bulma.css',
+        'css/bulma.css',
     ];
 
     public array $publishOptions = [
         'only' => [
-            'bulma.css',
+            'css/bulma.css',
         ],
     ];
 }
diff --git a/src/Asset/BulmaJsAsset.php b/src/Asset/BulmaJsAsset.php
@@ -10,7 +10,7 @@ final class BulmaJsAsset extends AssetBundle
 {
     public ?string $basePath = '@assets';
     public ?string $baseUrl = '@assetsUrl';
-    public ?string $sourcePath = '@npm/@vizuaalog/bulmajs';
+    public ?string $sourcePath = '@npm/vizuaalog--bulmajs';
 
     public array $js = [
         'dist/bulma.js',

diff --git a/src/Asset/FilePluginAsset.php b/src/Asset/FilePluginAsset.php
@@ -10,7 +10,7 @@ final class FilePluginAsset extends AssetBundle
 {
     public ?string $basePath = '@assets';
     public ?string $baseUrl = '@assetsUrl';
-    public ?string $sourcePath = '@npm/@vizuaalog/bulmajs';
+    public ?string $sourcePath = '@npm/vizuaalog--bulmajs';
 
     public array $js = [
         'dist/file.js',

diff --git a/src/Asset/MessagePluginAsset.php b/src/Asset/MessagePluginAsset.php
@@ -10,7 +10,7 @@ final class MessagePluginAsset extends AssetBundle
 {
     public ?string $basePath = '@assets';
     public ?string $baseUrl = '@assetsUrl';
-    public ?string $sourcePath = '@npm/@vizuaalog/bulmajs';
+    public ?string $sourcePath = '@npm/vizuaalog--bulmajs';
 
     public array $js = [
         'dist/message.js',