Issue #2380389 by webflo, Mile23, davidwbarratt, timmillwood, hussain…

…web, tstoeckler, bojanz, yched, MKorostoff, alexpott, webchick: Use a single vendor directory in the root

.eslintignore

@@ -1,6 +1,6 @@
 core/assets/vendor/**/*
 core/modules/locale/tests/locale_test.js
-core/vendor/**/*
+vendor/**/*
 sites/**/files/**/*
 libraries/**/*
 sites/**/libraries/**/*

.gitattributes

@@ -51,3 +51,4 @@
 *.png     -text diff
 *.phar    -text diff
 *.exe     -text diff
+*.ttf     -text diff

autoload.php

@@ -4,16 +4,11 @@
  * @file
  * Includes the autoloader created by Composer.
  *
- * This file can be edited to change the autoloader if you are managing a
- * project's dependencies using Composer. If Drupal code requires the
- * autoloader, it should always be loaded using this file so that projects
- * using Composer continue to work.
- *
  * @see composer.json
  * @see index.php
  * @see core/install.php
  * @see core/rebuild.php
  * @see core/modules/statistics/statistics.php
  */
 
-return require __DIR__ . '/core/vendor/autoload.php';
+return require __DIR__ . '/vendor/autoload.php';

composer.json

@@ -5,6 +5,9 @@
   "license": "GPL-2.0+",
   "require": {
     "composer/installers": "^1.0.21",
+    "wikimedia/composer-merge-plugin": "^1.3.0"
+  },
+  "replace": {
     "drupal/core": "~8.0"
   },
   "minimum-stability": "dev",
@@ -15,8 +18,25 @@
   },
   "extra": {
     "_readme": [
-      "By default Drupal loads the autoloader from ./core/vendor/autoload.php.",
+      "By default Drupal loads the autoloader from ./vendor/autoload.php.",
       "To change the autoloader you can edit ./autoload.php."
-    ]
+    ],
+    "merge-plugin": {
+      "include": [
+        "core/composer.json"
+      ],
+      "recurse": false,
+      "replace": false,
+      "merge-extra": false
+    }
+  },
+  "autoload": {
+    "psr-4": {
+      "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
+    }
+  },
+  "scripts": {
+    "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
+    "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
   }
 }