From 0831f9c5bc4ac14d70698dcedec85f3015d3fd38 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 4 Jul 2017 18:38:09 +0200
Subject: [PATCH] Use es6-promise instead

---
 lib/app/index.js |  2 +-
 package.json     |  2 +-
 yarn.lock        | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 8cbe67c97d..2d78288b7a 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import 'core-js/fn/promise'
+import 'es6-promise/auto'
 import Vue from 'vue'
 import Meta from 'vue-meta'
 import { createRouter } from './router.js'
diff --git a/package.json b/package.json
index 507a90ff1c..5285e81346 100644
--- a/package.json
+++ b/package.json
@@ -77,9 +77,9 @@
     "clone": "^2.1.1",
     "compression": "^1.6.2",
     "connect": "^3.6.2",
-    "core-js": "^2.4.1",
     "css-loader": "^0.28.4",
     "debug": "^2.6.8",
+    "es6-promise": "^4.1.1",
     "etag": "^1.8.0",
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.11.2",
diff --git a/yarn.lock b/yarn.lock
index 3d2cb3b248..557677c584 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1939,7 +1939,7 @@ core-assert@^0.2.0:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
-core-js@^2.0.0, core-js@^2.4.0, core-js@^2.4.1:
+core-js@^2.0.0, core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
@@ -2529,6 +2529,10 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-promise@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -3491,11 +3495,11 @@ hullabaloo-config-manager@^1.1.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13, iconv-lite@~0.4.13:
+iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.17:
+iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"