chore: change package structure for vendormodule type

flxlabs · Mar 15, 2023 · e746f67 · e746f67
1 parent 9b23081
commit e746f67
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 43 deletions.
diff --git a/css/TreeView.css → client/css/TreeView.css b/css/TreeView.css → client/css/TreeView.css
diff --git a/javascript/TreeView.js → client/javascript/TreeView.js b/javascript/TreeView.js → client/javascript/TreeView.js
diff --git a/javascript/lang/de.js → client/javascript/lang/de.js b/javascript/lang/de.js → client/javascript/lang/de.js
diff --git a/javascript/lang/en.js → client/javascript/lang/en.js b/javascript/lang/en.js → client/javascript/lang/en.js
diff --git a/composer.json b/composer.json
@@ -1,8 +1,7 @@
 {
 	"name": "flxlabs/silverstripe-pagesections",
-	"version": "0.1.2",
 	"description": "Adds configurable page sections and elements to your SilverStripe project.",
-	"type": "silverstripe-module",
+	"type": "silverstripe-vendormodule",
 	"homepage": "http://github.com/flxlabs/silverstripe-pagesections",
 	"keywords": [
 		"silverstripe",
@@ -21,21 +20,19 @@
 	"support": {
 		"issues": "http://github.com/flxlabs/silverstripe-pagesections/issues"
 	},
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "https://github.com/flxlabs/silverstripe-gridfield-betterbuttons"
-		}
-	],
 	"require": {
 		"silverstripe/framework": "^4.3.0",
-		"symbiote/silverstripe-gridfieldextensions": "^3"
+		"symbiote/silverstripe-gridfieldextensions": "^3",
+		"silverstripe/vendor-plugin": "^1.0"
+	},
+	"autoload": {
+		"psr-4": {
+			"FlxLabs\\PageSections\\": "src/"
+		}
 	},
 	"extra": {
-		"installer-name": "pagesections",
 		"expose": [
-			"css",
-			"javascript"
+			"client"
 		]
 	}
 }
diff --git a/resources/.htaccess b/resources/.htaccess
diff --git a/resources/.method b/resources/.method
diff --git a/resources/silverstripe/framework/client/images b/resources/silverstripe/framework/client/images
diff --git a/resources/silverstripe/framework/client/styles b/resources/silverstripe/framework/client/styles
diff --git a/resources/silverstripe/framework/src/Dev/Install/client b/resources/silverstripe/framework/src/Dev/Install/client
diff --git a/resources/symbiote/silverstripe-gridfieldextensions/css b/resources/symbiote/silverstripe-gridfieldextensions/css
diff --git a/resources/symbiote/silverstripe-gridfieldextensions/javascript b/resources/symbiote/silverstripe-gridfieldextensions/javascript
diff --git a/src/TreeView.php b/src/TreeView.php
@@ -600,27 +600,16 @@ public function getSortField()
         return $this->sortField;
     }
 
-    /**
-     * Gets the directory name of this module
-     *
-     * @return string
-     */
-    public static function getModuleDir()
-    {
-        return basename(dirname(__DIR__));
-    }
-
     /**
      * Renders this TreeView as an HTML tag
      * @param array $properties The additional properties for the TreeView
      * @return string
      */
     public function FieldHolder($properties = array())
     {
-        $moduleDir = self::getModuleDir();
-        Requirements::css($moduleDir . "/css/TreeView.css");
-        Requirements::javascript($moduleDir . "/javascript/TreeView.js");
-        Requirements::add_i18n_javascript($moduleDir . '/javascript/lang', false, true);
+        Requirements::css("flxlabs/silverstripe-pagesections:client/css/TreeView.css");
+        Requirements::javascript("flxlabs/silverstripe-pagesections:client/javascript/TreeView.js");
+        Requirements::add_i18n_javascript('flxlabs/silverstripe-pagesections:client/javascript/lang', false, true);
 
         // Ensure $id doesn't contain only numeric characters
         $sessionId = 'ps_tv_' . substr(md5(serialize($this->opens)), 0, 8);