From e746f677aab903772a8768f242b6a0bdfe86aaeb Mon Sep 17 00:00:00 2001 From: Severin Hauser Date: Wed, 15 Mar 2023 13:35:10 +0100 Subject: [PATCH] chore: change package structure for vendormodule type --- {css => client/css}/TreeView.css | 0 {javascript => client/javascript}/TreeView.js | 0 {javascript => client/javascript}/lang/de.js | 0 {javascript => client/javascript}/lang/en.js | 0 composer.json | 21 ++++++++----------- resources/.htaccess | 11 ---------- resources/.method | 1 - .../silverstripe/framework/client/images | 1 - .../silverstripe/framework/client/styles | 1 - .../framework/src/Dev/Install/client | 1 - .../silverstripe-gridfieldextensions/css | 1 - .../javascript | 1 - src/TreeView.php | 17 +++------------ 13 files changed, 12 insertions(+), 43 deletions(-) rename {css => client/css}/TreeView.css (100%) rename {javascript => client/javascript}/TreeView.js (100%) rename {javascript => client/javascript}/lang/de.js (100%) rename {javascript => client/javascript}/lang/en.js (100%) delete mode 100644 resources/.htaccess delete mode 100644 resources/.method delete mode 120000 resources/silverstripe/framework/client/images delete mode 120000 resources/silverstripe/framework/client/styles delete mode 120000 resources/silverstripe/framework/src/Dev/Install/client delete mode 120000 resources/symbiote/silverstripe-gridfieldextensions/css delete mode 120000 resources/symbiote/silverstripe-gridfieldextensions/javascript diff --git a/css/TreeView.css b/client/css/TreeView.css similarity index 100% rename from css/TreeView.css rename to client/css/TreeView.css diff --git a/javascript/TreeView.js b/client/javascript/TreeView.js similarity index 100% rename from javascript/TreeView.js rename to client/javascript/TreeView.js diff --git a/javascript/lang/de.js b/client/javascript/lang/de.js similarity index 100% rename from javascript/lang/de.js rename to client/javascript/lang/de.js diff --git a/javascript/lang/en.js b/client/javascript/lang/en.js similarity index 100% rename from javascript/lang/en.js rename to client/javascript/lang/en.js diff --git a/composer.json b/composer.json index 7296965..cdc1384 100755 --- 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 deleted file mode 100644 index ad0b01d..0000000 --- a/resources/.htaccess +++ /dev/null @@ -1,11 +0,0 @@ -# Block .method file - - Order Allow,Deny - Deny from all - - -# Block 404s - - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule .* - [R=404,L] - diff --git a/resources/.method b/resources/.method deleted file mode 100644 index 4d18c3e..0000000 --- a/resources/.method +++ /dev/null @@ -1 +0,0 @@ -auto \ No newline at end of file diff --git a/resources/silverstripe/framework/client/images b/resources/silverstripe/framework/client/images deleted file mode 120000 index e06f810..0000000 --- a/resources/silverstripe/framework/client/images +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/silverstripe/framework/client/images \ No newline at end of file diff --git a/resources/silverstripe/framework/client/styles b/resources/silverstripe/framework/client/styles deleted file mode 120000 index 8ecbb77..0000000 --- a/resources/silverstripe/framework/client/styles +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/silverstripe/framework/client/styles \ No newline at end of file diff --git a/resources/silverstripe/framework/src/Dev/Install/client b/resources/silverstripe/framework/src/Dev/Install/client deleted file mode 120000 index 66216fe..0000000 --- a/resources/silverstripe/framework/src/Dev/Install/client +++ /dev/null @@ -1 +0,0 @@ -../../../../../../vendor/silverstripe/framework/src/Dev/Install/client \ No newline at end of file diff --git a/resources/symbiote/silverstripe-gridfieldextensions/css b/resources/symbiote/silverstripe-gridfieldextensions/css deleted file mode 120000 index 0c11010..0000000 --- a/resources/symbiote/silverstripe-gridfieldextensions/css +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/symbiote/silverstripe-gridfieldextensions/css \ No newline at end of file diff --git a/resources/symbiote/silverstripe-gridfieldextensions/javascript b/resources/symbiote/silverstripe-gridfieldextensions/javascript deleted file mode 120000 index 66f251e..0000000 --- a/resources/symbiote/silverstripe-gridfieldextensions/javascript +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/symbiote/silverstripe-gridfieldextensions/javascript \ No newline at end of file diff --git a/src/TreeView.php b/src/TreeView.php index 74b1ee8..b6b70fc 100644 --- a/src/TreeView.php +++ b/src/TreeView.php @@ -600,16 +600,6 @@ 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 @@ -617,10 +607,9 @@ public static function getModuleDir() */ 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);