Merge pull request #29 from adrexia/feature/vendor

FIX: Move module to vendor directory
benmanu · Jun 25, 2018 · b1e6cf1 · b1e6cf1
2 parents c233f44 + 58c699b
commit b1e6cf1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/code/controllers/StyleGuideController.php b/code/controllers/StyleGuideController.php
@@ -130,8 +130,8 @@ public function setService($name, $paths = null) {
     public function setRequirements() {
 
         // styleguide requirements
-        Requirements::css(STYLEGUIDE_BASE . '/dist/css/screen.css');
-        Requirements::javascript(STYLEGUIDE_BASE . '/dist/js/core.js');
+        Requirements::css( 'benmanu/silverstripe-styleguide: dist/css/screen.css');
+        Requirements::javascript('benmanu/silverstripe-styleguide: dist/js/core.js');
         Requirements::javascript($this->config()->prettify_url);
 
         // theme requirements

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "benmanu/silverstripe-styleguide",
     "description": "Generates a styleguide for a SilverStripe theme",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "homepage": "https://github.com/benmanu/silverstripe-styleguide",
     "keywords": ["silverstripe", "styleguide", "kss"],
     "support": {
@@ -14,14 +14,17 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "4.x-dev",
+        "silverstripe/framework": "^4",
         "symfony/finder": "~2.8",
         "erusev/parsedown": "1.6.0"
     },
     "require-dev": {
         "phpunit/PHPUnit": "~3.7@stable"
     },
     "extra": {
-        "installer-name": "styleguide"
+        "installer-name": "styleguide",
+        "expose": [
+            "dist"
+        ]
     }
 }