fix: use local runtime helpers for externalising vue-runtime-helpers

Author: znck

package.json

@@ -42,7 +42,8 @@
     "test": "jest"
   },
   "files": [
-    "dist/"
+    "dist/",
+    "runtime/"
   ],
   "dependencies": {
     "@vue/component-compiler": "^4.1.0",
@@ -53,19 +54,19 @@
     "querystring": "^0.2.0",
     "rollup-pluginutils": "^2.4.1",
     "source-map": "0.7.3",
-    "vue-runtime-helpers": "^1.1.1"
+    "vue-runtime-helpers": "^1.1.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.46",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.46",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.46",
-    "@babel/preset-env": "^7.0.0-beta.46",
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/core": "^7.6.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
+    "@babel/plugin-transform-runtime": "^7.6.2",
+    "@babel/preset-env": "^7.6.2",
+    "@babel/runtime": "^7.6.2",
     "@types/debug": "^0.0.31",
     "@types/jest": "^23.3.12",
     "@types/node": "^10.12.18",
     "@types/puppeteer": "^1.3.1",
-    "@znck/promised": "^1.0.0",
+    "@znck/promised": "^1.0.4",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.6.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
@@ -77,7 +78,7 @@
     "pug": "^2.0.3",
     "puppeteer": "^1.4.0",
     "rollup": "^1.1.0",
-    "rollup-plugin-babel": "^4.0.0-beta.4",
+    "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-css-only": "^0.4.0",
     "rollup-plugin-md": "^0.0.7",

runtime/browser.js

@@ -0,0 +1,3 @@
+import { createInjector } from 'vue-runtime-helpers'
+
+export default createInjector

runtime/normalize.js

@@ -0,0 +1,3 @@
+import { normalizeComponent } from 'vue-runtime-helpers'
+
+export default normalizeComponent

runtime/server.js

@@ -0,0 +1,3 @@
+import { createInjectorSSR } from 'vue-runtime-helpers'
+
+export default createInjectorSSR

runtime/shadow.js

@@ -0,0 +1,3 @@
+import { createInjectorShadow } from 'vue-runtime-helpers'
+
+export default createInjectorShadow

src/index.ts

@@ -16,7 +16,7 @@ import {
   DescriptorCompileResult
 } from '@vue/component-compiler'
 import MagicString from 'magic-string'
-import { Plugin, RawSourceMap } from 'rollup'
+import { Plugin } from 'rollup'
 import * as path from 'path'
 import { parse, SFCDescriptor, SFCBlock } from '@vue/component-compiler-utils'
 import debug from 'debug'
@@ -175,16 +175,13 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
   d(`Build target: ${process.env.VUE_ENV || 'browser'}`)
 
   if (!opts.normalizer)
-    opts.normalizer = '~' + 'vue-runtime-helpers/dist/normalize-component.mjs'
+    opts.normalizer = '~' + require.resolve('../runtime/normalize')
   if (!opts.styleInjector)
-    opts.styleInjector =
-      '~' + 'vue-runtime-helpers/dist/inject-style/browser.mjs'
+    opts.styleInjector = '~' + require.resolve('../runtime/browser')
   if (!opts.styleInjectorSSR)
-    opts.styleInjectorSSR =
-      '~' + 'vue-runtime-helpers/dist/inject-style/server.mjs'
+    opts.styleInjectorSSR = '~' + require.resolve('../runtime/server')
   if (!opts.styleInjectorShadow)
-    opts.styleInjectorShadow =
-      '~' + 'vue-runtime-helpers/dist/inject-style/shadow.mjs'
+    opts.styleInjectorShadow = '~' + require.resolve('../runtime/shadow')
 
   createVuePartRequest.defaultLang = {
     ...createVuePartRequest.defaultLang,
@@ -272,12 +269,10 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
 
     resolveId(id, importer) {
       const request = id
-      if (id.startsWith('vue-runtime-helpers/')) {
-        id = require.resolve(id)
-        dR(`form: ${request} \nto: ${id}\n`)
-        return id
-      }
+      
+      if (!importer) return 
       if (!isVuePartRequest(id)) return
+      
       id = path.resolve(path.dirname(importer), id)
       const ref = parseVuePartRequest(id)
 
@@ -309,7 +304,7 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
         'code' in element
           ? ((element as any).code as string) // .code is set when extract styles is used. { css: false }
           : element.content
-      let map = element.map as RawSourceMap
+      let map = element.map as any
 
       if (request.meta.type === 'styles') {
         code = prependStyle(id, request.meta.lang, code, map).code

tsconfig.json

@@ -10,12 +10,13 @@
     "declaration": true,
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
     "noUnusedLocals": true,
     "strictNullChecks": true,
     "noImplicitAny": true,
     "removeComments": false,
     "lib": ["es2015", "es6", "es7", "dom"]
   },
-  "include": ["src", "typings"],
+  "include": ["src", "typings", "runtime.js"],
   "exclude": ["node_modules"]
 }