Commit fd204375 authored by catch's avatar catch

Revert "Issue #2912387 by greg.1.anderson, Mixologic, Mile23, alexpott, catch:...

Revert "Issue #2912387 by greg.1.anderson, Mixologic, Mile23, alexpott, catch: Stop using wikimedia/composer-merge-plugin"

This reverts commit 5cd26f24.
parent a7101bf4
......@@ -5,23 +5,10 @@
"license": "GPL-2.0-or-later",
"require": {
"composer/installers": "^1.0.24",
"drupal/core": "self.version"
"wikimedia/composer-merge-plugin": "^1.4"
},
"require-dev": {
"behat/mink": "1.7.x-dev",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "1.3.x-dev",
"composer/composer": "^1.8",
"drupal/coder": "^8.3.2",
"jcalderonzumba/gastonjs": "^1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"mikey179/vfsstream": "^1.2",
"phpunit/phpunit": "^6.5",
"phpspec/prophecy": "^1.7",
"symfony/css-selector": "^3.4.0",
"symfony/phpunit-bridge": "^3.4.3",
"symfony/debug": "^3.4.0",
"justinrainbow/json-schema": "^5.2"
"replace": {
"drupal/core": "^8.8"
},
"minimum-stability": "dev",
"prefer-stable": true,
......@@ -37,8 +24,16 @@
"You can read more about this composer repository at:",
"https://www.drupal.org/node/2718229"
],
"merge-plugin": {
"include": [
"core/composer.json"
],
"recurse": true,
"replace": false,
"merge-extra": false
},
"installer-paths": {
"vendor/drupal/core": ["type:drupal-core"],
"core": ["type:drupal-core"],
"modules/contrib/{$name}": ["type:drupal-module"],
"profiles/contrib/{$name}": ["type:drupal-profile"],
"themes/contrib/{$name}": ["type:drupal-theme"],
......@@ -64,14 +59,6 @@
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "path",
"url": "core"
},
{
"type": "path",
"url": "core/lib/Drupal/Component/Scaffold"
}
]
}
This diff is collapsed.
......@@ -18,7 +18,6 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"php": ">=7.0.8",
"drupal/core-composer-scaffold": "self.version",
"symfony/class-loader": "~3.4.0",
"symfony/console": "~3.4.0",
"symfony/dependency-injection": "~3.4.26",
......@@ -52,6 +51,22 @@
"conflict": {
"drush/drush": "<8.1.10"
},
"require-dev": {
"behat/mink": "1.7.x-dev",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "1.3.x-dev",
"composer/composer": "^1.8",
"drupal/coder": "^8.3.2",
"jcalderonzumba/gastonjs": "^1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"mikey179/vfsstream": "^1.2",
"phpunit/phpunit": "^6.5",
"phpspec/prophecy": "^1.7",
"symfony/css-selector": "^3.4.0",
"symfony/phpunit-bridge": "^3.4.3",
"symfony/debug": "^3.4.0",
"justinrainbow/json-schema": "^5.2"
},
"replace": {
"drupal/action": "self.version",
"drupal/aggregator": "self.version",
......@@ -95,6 +110,7 @@
"drupal/core-proxy-builder": "self.version",
"drupal/core-render": "self.version",
"drupal/core-serialization": "self.version",
"drupal/core-composer-scaffold": "self.version",
"drupal/core-transliteration": "self.version",
"drupal/core-utility": "self.version",
"drupal/core-uuid": "self.version",
......@@ -164,6 +180,39 @@
"drupal/workflows": "self.version",
"drupal/workspaces": "self.version"
},
"extra": {
"merge-plugin": {
"require": [
"core/lib/Drupal/Component/Annotation/composer.json",
"core/lib/Drupal/Component/Assertion/composer.json",
"core/lib/Drupal/Component/Bridge/composer.json",
"core/lib/Drupal/Component/ClassFinder/composer.json",
"core/lib/Drupal/Component/Datetime/composer.json",
"core/lib/Drupal/Component/DependencyInjection/composer.json",
"core/lib/Drupal/Component/Diff/composer.json",
"core/lib/Drupal/Component/Discovery/composer.json",
"core/lib/Drupal/Component/EventDispatcher/composer.json",
"core/lib/Drupal/Component/FileCache/composer.json",
"core/lib/Drupal/Component/FileSystem/composer.json",
"core/lib/Drupal/Component/Gettext/composer.json",
"core/lib/Drupal/Component/Graph/composer.json",
"core/lib/Drupal/Component/HttpFoundation/composer.json",
"core/lib/Drupal/Component/PhpStorage/composer.json",
"core/lib/Drupal/Component/Plugin/composer.json",
"core/lib/Drupal/Component/ProxyBuilder/composer.json",
"core/lib/Drupal/Component/Render/composer.json",
"core/lib/Drupal/Component/Serialization/composer.json",
"core/lib/Drupal/Component/Scaffold/composer.json",
"core/lib/Drupal/Component/Transliteration/composer.json",
"core/lib/Drupal/Component/Utility/composer.json",
"core/lib/Drupal/Component/Uuid/composer.json",
"core/lib/Drupal/Component/Version/composer.json"
],
"recurse": false,
"replace": false,
"merge-extra": false
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
......
......@@ -10,16 +10,13 @@ const collectedFolders = {
Pages: [],
};
const searchDirectory = process.env.DRUPAL_NIGHTWATCH_SEARCH_DIRECTORY || '';
const defaultIgnore = ['vendor/**'];
glob
.sync('**/tests/**/Nightwatch/**/*.js', {
cwd: path.resolve(process.cwd(), `../${searchDirectory}`),
ignore: process.env.DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES
? process.env.DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES.split(',').concat(
defaultIgnore,
)
: defaultIgnore,
? process.env.DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES.split(',')
: [],
})
.forEach(file => {
let m = regex.exec(file);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment