Skip to content

Commit

Permalink
Merge pull request #18 from heyday/feature/tidy-composer-json
Browse files Browse the repository at this point in the history
Tidy composer.json
  • Loading branch information
Harry Green authored Mar 9, 2021
2 parents 1a10ecc + acf3533 commit 52640f7
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 36 deletions.
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# For more information about the properties used in this file,
# please see the EditorConfig documentation:
# http://editorconfig.org

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,json}]
indent_size = 2

[composer.json]
indent_size = 4
3 changes: 0 additions & 3 deletions _config.php
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
<?php

define('COLORPALETTE_PATH', __DIR__);
define('COLORPALETTE_DIR', 'vendor/heyday/' .basename(__DIR__));
61 changes: 28 additions & 33 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
{
"name": "heyday/silverstripe-colorpalette",
"type": "silverstripe-vendormodule",
"extra": {
"expose": [
"css"
]
},
"description": "A color palette picker for SilverStripe CMS",
"license": "MIT",
"authors": [
{
"name": "Cam Spiers",
"email": "[email protected]"
},
{
"name": "Kyle Beattie",
"email": "[email protected]"
}
],
"require": {
"composer/installers": "*",
"silverstripe/framework": "^4.0",
"silverstripe/vendor-plugin": "^1"
},
"autoload": {
"psr-4": {
"Heyday\\ColorPalette\\": "src/"
"name": "heyday/silverstripe-colorpalette",
"type": "silverstripe-vendormodule",
"description": "A color palette picker for SilverStripe CMS",
"license": "MIT",
"authors": [
{
"name": "Cam Spiers",
"email": "[email protected]"
},
{
"name": "Kyle Beattie",
"email": "[email protected]"
}
],
"require": {
"composer/installers": "*",
"silverstripe/framework": "^4.0",
"silverstripe/vendor-plugin": "^1"
},
"autoload": {
"psr-4": {
"Heyday\\ColorPalette\\": "src/"
}
},
"extra": {
"expose": [
"css"
]
}
},
"extra": {
"expose": [
"css"
]
}
}

0 comments on commit 52640f7

Please sign in to comment.