Skip to content

WIP: Use Drupal core Scaffold Composer plugin. #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,20 @@

# Ignore node modules
node_modules

# Ignore scaffolding files
.csslintrc
.editorconfig
.eslintignore
.eslintrc.json
.gitattributes
.ht.router.php
.htaccess
INSTALL.txt
README.txt
autoload.php
example.gitignore
index.php
robots.txt
update.php
web.config
22 changes: 13 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"php": ">=7.0.8",
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"drupal-composer/drupal-scaffold": "^2.5",
"drupal/core": "^8.7.0",
"drush/drush": "^9.0.0",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
"vlucas/phpdotenv": "^3.3",
"drupal/config_installer": "~1.7",
"drupal/core-composer-scaffold": "^8.8",
"drupal/core-recommended": "^8.7.0",
"drupal/simplei": "^1.0",
"drupal/warden": "*"
"drupal/warden": "*",
"drush/drush": "^9.0.0",
"vlucas/phpdotenv": "^3.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3"
},
"require-dev": {
"webflo/drupal-core-require-dev": "~8.5",
"drupal/core-dev": "^8.7.0",
"wunderio/code-quality": "^1.0.3",
"zaporylie/composer-drupal-optimizations": "^1.1"
},
Expand All @@ -50,7 +50,6 @@
"files": ["load.environment.php"]
},
"scripts": {
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
"pre-install-cmd": [
"DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
],
Expand All @@ -65,6 +64,11 @@
]
},
"extra": {
"composer-scaffold": {
"locations": {
"web-root": "web/"
}
},
"installer-paths": {
"web/core": ["type:drupal-core"],
"web/libraries/{$name}": ["type:drupal-library"],
Expand Down
1 change: 1 addition & 0 deletions modules/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
README.txt
1 change: 1 addition & 0 deletions phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<exclude-pattern>web/core|web/*/contrib</exclude-pattern>
<exclude-pattern>web/_ping.php</exclude-pattern>
<exclude-pattern>web/autoload.php</exclude-pattern>
<exclude-pattern>/home/circleci/project/autoload.php</exclude-pattern>

<!-- exclude some Drupal files that contain issues -->
<exclude-pattern>web/sites/default/default.settings.php</exclude-pattern>
Expand Down
1 change: 1 addition & 0 deletions profiles/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
README.txt
4 changes: 4 additions & 0 deletions sites/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
README.txt
development.services.yml
example.settings.local.php
example.sites.php
2 changes: 2 additions & 0 deletions sites/default/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
default.services.yml
default.settings.php
1 change: 1 addition & 0 deletions themes/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
README.txt