Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit 2babec6

Browse files
committed
Revert "fix: use local runtime helpers for externalising vue-runtime-helpers"
This reverts commit 3b0b4de.
1 parent 0db705f commit 2babec6

File tree

8 files changed

+243
-459
lines changed

8 files changed

+243
-459
lines changed

package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
"test": "jest"
4343
},
4444
"files": [
45-
"dist/",
46-
"runtime/"
45+
"dist/"
4746
],
4847
"dependencies": {
4948
"@vue/component-compiler": "^4.1.0",
@@ -54,19 +53,19 @@
5453
"querystring": "^0.2.0",
5554
"rollup-pluginutils": "^2.4.1",
5655
"source-map": "0.7.3",
57-
"vue-runtime-helpers": "^1.1.2"
56+
"vue-runtime-helpers": "^1.1.1"
5857
},
5958
"devDependencies": {
60-
"@babel/core": "^7.6.4",
61-
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
62-
"@babel/plugin-transform-runtime": "^7.6.2",
63-
"@babel/preset-env": "^7.6.2",
64-
"@babel/runtime": "^7.6.2",
59+
"@babel/core": "^7.0.0-beta.46",
60+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.46",
61+
"@babel/plugin-transform-runtime": "^7.0.0-beta.46",
62+
"@babel/preset-env": "^7.0.0-beta.46",
63+
"@babel/runtime": "^7.0.0-beta.46",
6564
"@types/debug": "^0.0.31",
6665
"@types/jest": "^23.3.12",
6766
"@types/node": "^10.12.18",
6867
"@types/puppeteer": "^1.3.1",
69-
"@znck/promised": "^1.0.4",
68+
"@znck/promised": "^1.0.0",
7069
"babel-core": "7.0.0-bridge.0",
7170
"babel-jest": "^23.6.0",
7271
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
@@ -78,7 +77,7 @@
7877
"pug": "^2.0.3",
7978
"puppeteer": "^1.4.0",
8079
"rollup": "^1.1.0",
81-
"rollup-plugin-babel": "^4.3.3",
80+
"rollup-plugin-babel": "^4.0.0-beta.4",
8281
"rollup-plugin-commonjs": "^9.1.3",
8382
"rollup-plugin-css-only": "^0.4.0",
8483
"rollup-plugin-md": "^0.0.7",

runtime/browser.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

runtime/normalize.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

runtime/server.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

runtime/shadow.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/index.ts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
DescriptorCompileResult
1717
} from '@vue/component-compiler'
1818
import MagicString from 'magic-string'
19-
import { Plugin } from 'rollup'
19+
import { Plugin, RawSourceMap } from 'rollup'
2020
import * as path from 'path'
2121
import { parse, SFCDescriptor, SFCBlock } from '@vue/component-compiler-utils'
2222
import debug from 'debug'
@@ -175,13 +175,16 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
175175
d(`Build target: ${process.env.VUE_ENV || 'browser'}`)
176176

177177
if (!opts.normalizer)
178-
opts.normalizer = '~' + require.resolve('../runtime/normalize')
178+
opts.normalizer = '~' + 'vue-runtime-helpers/dist/normalize-component.mjs'
179179
if (!opts.styleInjector)
180-
opts.styleInjector = '~' + require.resolve('../runtime/browser')
180+
opts.styleInjector =
181+
'~' + 'vue-runtime-helpers/dist/inject-style/browser.mjs'
181182
if (!opts.styleInjectorSSR)
182-
opts.styleInjectorSSR = '~' + require.resolve('../runtime/server')
183+
opts.styleInjectorSSR =
184+
'~' + 'vue-runtime-helpers/dist/inject-style/server.mjs'
183185
if (!opts.styleInjectorShadow)
184-
opts.styleInjectorShadow = '~' + require.resolve('../runtime/shadow')
186+
opts.styleInjectorShadow =
187+
'~' + 'vue-runtime-helpers/dist/inject-style/shadow.mjs'
185188

186189
createVuePartRequest.defaultLang = {
187190
...createVuePartRequest.defaultLang,
@@ -269,10 +272,12 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
269272

270273
resolveId(id, importer) {
271274
const request = id
272-
273-
if (!importer) return
275+
if (id.startsWith('vue-runtime-helpers/')) {
276+
id = require.resolve(id)
277+
dR(`form: ${request} \nto: ${id}\n`)
278+
return id
279+
}
274280
if (!isVuePartRequest(id)) return
275-
276281
id = path.resolve(path.dirname(importer), id)
277282
const ref = parseVuePartRequest(id)
278283

@@ -304,7 +309,7 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
304309
'code' in element
305310
? ((element as any).code as string) // .code is set when extract styles is used. { css: false }
306311
: element.content
307-
let map = element.map as any
312+
let map = element.map as RawSourceMap
308313

309314
if (request.meta.type === 'styles') {
310315
code = prependStyle(id, request.meta.lang, code, map).code

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
"declaration": true,
1111
"allowJs": false,
1212
"allowSyntheticDefaultImports": true,
13-
"esModuleInterop": true,
1413
"noUnusedLocals": true,
1514
"strictNullChecks": true,
1615
"noImplicitAny": true,
1716
"removeComments": false,
1817
"lib": ["es2015", "es6", "es7", "dom"]
1918
},
20-
"include": ["src", "typings", "runtime.js"],
19+
"include": ["src", "typings"],
2120
"exclude": ["node_modules"]
2221
}

0 commit comments

Comments
 (0)