chore: update to latest apollo

translation-gang · Aug 23, 2018 · 4acf48d · 4acf48d
1 parent f261410
commit 4acf48d
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 116 deletions.
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/git.js b/packages/@vue/cli-ui/apollo-server/connectors/git.js
@@ -2,7 +2,6 @@ const execa = require('execa')
 const path = require('path')
 const fs = require('fs-extra')
 const parseDiff = require('../util/parse-diff')
-const { highlightCode } = require('../util/highlight')
 // Connectors
 const cwd = require('./cwd')
 // Utils
@@ -28,6 +27,8 @@ async function getNewFiles (context) {
 async function getDiffs (context) {
   if (!hasProjectGit(cwd.get())) return []
 
+  const { highlightCode } = require('../util/highlight')
+
   const newFiles = await getNewFiles(context)
   await execa('git', ['add', '-N', '*'], {
     cwd: cwd.get()

diff --git a/packages/@vue/cli-ui/apollo-server/util/highlight.js b/packages/@vue/cli-ui/apollo-server/util/highlight.js
@@ -1,6 +1,8 @@
-const Prism = require('prismjs')
-const loadLanguages = require('prismjs/components/')
-const path = require('path')
+// Prism don't like cjs with EMS package
+// So we use ES modules for the whole file
+import Prism from 'prismjs'
+import loadLanguages from 'prismjs/components/index.js'
+import path from 'path'
 
 loadLanguages()
 
@@ -19,7 +21,7 @@ const languages = [
   { test: /\.yml$/, lang: 'yaml' }
 ]
 
-exports.highlightCode = function (filename, content, lang = null) {
+export function highlightCode (filename, content, lang = null) {
   let language
   if (lang) {
     language = { lang }

diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
@@ -52,7 +52,7 @@
     "semver": "^5.5.0",
     "shortid": "^2.2.11",
     "terminate": "^2.1.0",
-    "vue-cli-plugin-apollo": "^0.14.6",
+    "vue-cli-plugin-apollo": "^0.16.3",
     "watch": "^1.0.2"
   },
   "devDependencies": {

diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
@@ -29,7 +29,6 @@
     "chalk": "^2.4.1",
     "cmd-shim": "^2.0.2",
     "commander": "^2.16.0",
-    "core-js": "^2.5.7",
     "debug": "^3.1.0",
     "deepmerge": "^2.1.1",
     "download-git-repo": "^1.0.2",