Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit89839f2

Browse files
authored
fix: Transformrequire in render function compiled from<template> (#212)
1 parent534c04b commit89839f2

File tree

9 files changed

+205
-37
lines changed

9 files changed

+205
-37
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ output/
77
logs/
88
*.log
99
npm-debug.log*
10+
docs/changelog.md
1011

1112
# Runtime data
1213
pids

‎package.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,20 @@
1919
},
2020
"standard-version": {
2121
"scripts": {
22-
"postchangelog":"yarn test && yarn docs && git add docs/"
22+
"postchangelog":"yarn test && yarnbuild:docs && git add docs/"
2323
}
2424
},
2525
"scripts": {
2626
"prepublishOnly":"yarn build",
2727
"prebuild":"yarn lint",
2828
"build":"tsc",
29+
"prebuild:docs":"cp CHANGELOG.md docs/changelog.md",
30+
"build:docs":"vuepress build docs/",
31+
"postbuild:docs":"rm docs/changelog.md",
2932
"changelog":"conventional-changelog -p angular -i CHANGELOG.md -s -r 1",
30-
"docs":"typedoc typings src/index.ts && touch docs/.nojekyll",
33+
"predocs":"cp CHANGELOG.md docs/changelog.md",
34+
"docs":"vuepress dev docs/",
35+
"postdocs":"rm docs/CHANGELOG.md",
3136
"lint":"prettier --no-semi --single-quote --write **/*.js **/*.vue !test/target/** !dist/**",
3237
"release":"standard-version -a",
3338
"pretest":"yarn build",
@@ -43,7 +48,6 @@
4348
"@vue/component-compiler-utils":"^1.2.1",
4449
"debug":"^2.6.0",
4550
"hash-sum":"^1.0.2",
46-
"postcss":"^6.0.22",
4751
"querystring":"^0.2.0",
4852
"rollup-pluginutils":"^2.0.1"
4953
},
@@ -52,6 +56,7 @@
5256
"@babel/plugin-proposal-object-rest-spread":"^7.0.0-beta.46",
5357
"@babel/plugin-transform-runtime":"^7.0.0-beta.46",
5458
"@babel/preset-env":"^7.0.0-beta.46",
59+
"@types/debug":"^0.0.30",
5560
"@types/jest":"^22.2.3",
5661
"@types/node":"^10.0.4",
5762
"@types/puppeteer":"^1.3.1",
@@ -62,20 +67,24 @@
6267
"conventional-changelog":"^1.1.24",
6368
"jest":"^22.4.2",
6469
"node-sass":"^4.9.0",
70+
"postcss":"^6.0.22",
71+
"postcss-assets":"^5.0.0",
6572
"prettier":"^1.12.1",
6673
"pug":"^2.0.3",
6774
"puppeteer":"^1.4.0",
6875
"rollup":"^0.58.2",
6976
"rollup-plugin-babel":"^4.0.0-beta.4",
7077
"rollup-plugin-commonjs":"^9.1.3",
7178
"rollup-plugin-css-only":"^0.4.0",
72-
"rollup-plugin-image":"^1.0.2",
7379
"rollup-plugin-md":"^0.0.7",
7480
"rollup-plugin-node-resolve":"^3.3.0",
81+
"rollup-plugin-replace":"^2.0.0",
7582
"rollup-plugin-typescript":"^0.8.1",
83+
"rollup-plugin-url":"^1.4.0",
7684
"ts-jest":"^22.4.5",
7785
"typescript":"^2.8.3",
7886
"vue":"^2.5.16",
87+
"vue-class-component":"^6.2.0",
7988
"vue-template-compiler":"^2.5.16"
8089
},
8190
"peerDependencies": {

‎src/index.ts

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {
33
createVuePartRequest,
44
parseVuePartRequest,
55
resolveVuePart,
6-
isVuePartRequest
6+
isVuePartRequest,
7+
transformRequireToImport
78
}from'./utils'
89
import{
910
createDefaultCompiler,
@@ -13,26 +14,29 @@ import {
1314
TemplateOptions,
1415
StyleCompileResult
1516
}from'@vue/component-compiler'
16-
import{Plugin}from'rollup'
17+
import{Plugin}from'rollup'
1718
import*aspathfrom'path'
18-
import{parse,SFCDescriptor,SFCBlock}from'@vue/component-compiler-utils'
19+
import{parse,SFCDescriptor,SFCBlock}from'@vue/component-compiler-utils'
20+
importdebugfrom'debug'
1921

2022
consthash=require('hash-sum')
23+
constd=debug('rollup-plugin-vue')
24+
const{ version}=require('../package.json')
2125

2226
exportinterfaceVuePluginOptions{
2327
/**
2428
* Include files or directories.
2529
*@default `'.vue'`
2630
*/
27-
include?:Array<string|RegExp>|string|RegExp
31+
include?:Array<string|RegExp>|string|RegExp
2832
/**
2933
* Exclude files or directories.
3034
*@default `undefined`
3135
*/
32-
exclude?:Array<string|RegExp>|string|RegExp
36+
exclude?:Array<string|RegExp>|string|RegExp
3337
/**
3438
* Default language for blocks.
35-
*
39+
*
3640
*@default `{}`
3741
*@example
3842
* ```js
@@ -41,7 +45,7 @@ export interface VuePluginOptions {
4145
*/
4246
defaultLang?:{
4347
[key:string]:string
44-
},
48+
}
4549
/**
4650
* Exclude customBlocks for final build.
4751
*@default `['*']`
@@ -99,7 +103,12 @@ export interface VuePluginOptions {
99103
*/
100104
exportdefaultfunctionVuePlugin(opts:VuePluginOptions={}):Plugin{
101105
constisVue=createVueFilter(opts.include,opts.exclude)
102-
constisProduction=process.env.NODE_ENV==='production'
106+
constisProduction=
107+
process.env.NODE_ENV==='production'||process.env.BUILD==='production'
108+
109+
d('Version '+version)
110+
d(`Build environment:${isProduction ?'production' :'development'}`)
111+
d(`Build target:${process.env.VUE_ENV||'browser'}`)
103112

104113
createVuePartRequest.defaultLang={
105114
...createVuePartRequest.defaultLang,
@@ -121,9 +130,23 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
121130
deleteopts.include
122131
deleteopts.exclude
123132

133+
opts.template={
134+
transformAssetUrls:{
135+
video:['src','poster'],
136+
source:'src',
137+
img:'src',
138+
image:'xlink:href'
139+
},
140+
...opts.template
141+
}asany
142+
if(opts.template&&typeofopts.template.isProduction==='undefined'){
143+
opts.template.isProduction=isProduction
144+
}
124145
constcompiler=createDefaultCompiler(opts)
125146
constdescriptors=newMap<string,SFCDescriptor>()
126147

148+
if(opts.css===false)d('Running in CSS extract mode')
149+
127150
return{
128151
name:'VuePlugin',
129152

@@ -154,7 +177,7 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
154177
constelement=resolveVuePart(descriptors,request)
155178

156179
return'code'inelement
157-
?(elementasany).codeasstring// .code is set when extract styles is used. { css: false }
180+
?((elementasany).codeasstring)// .code is set when extract styles is used. { css: false }
158181
:element.content
159182
},
160183

@@ -186,6 +209,10 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
186209
descriptor.template
187210
)
188211

212+
input.template.code=transformRequireToImport(
213+
input.template.code
214+
)
215+
189216
if(input.template.errors&&input.template.errors.length){
190217
input.template.errors.map((error:Error)=>this.error(error))
191218
}
@@ -197,7 +224,7 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
197224

198225
input.script=descriptor.script
199226
?{
200-
code:`
227+
code:`
201228
export * from '${createVuePartRequest(
202229
filename,
203230
descriptor.script.lang||'js',
@@ -210,13 +237,13 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
210237
)}'
211238
export default script
212239
`
213-
}
214-
:{code:''}
240+
}
241+
:{code:''}
215242

216243
if(shouldExtractCss){
217244
input.styles=input.styles
218245
.map((style:StyleCompileResult,index:number)=>{
219-
(descriptor.styles[index]asany).code=style.code
246+
;(descriptor.styles[index]asany).code=style.code
220247

221248
input.script.code+=
222249
'\n'+
@@ -228,7 +255,7 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
228255
)}'`
229256

230257
if(style.module||descriptor.styles[index].scoped){
231-
return{...style,code:''}
258+
return{...style,code:''}
232259
}
233260
})
234261
.filter(Boolean)
@@ -243,8 +270,8 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
243270
`export * from '${createVuePartRequest(
244271
filename,
245272
block.attrs.lang||
246-
createVuePartRequest.defaultLang[block.type]||
247-
block.type,
273+
createVuePartRequest.defaultLang[block.type]||
274+
block.type,
248275
'customBlocks',
249276
index
250277
)}'`

‎src/utils.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,19 @@ export function resolveVuePart(
123123

124124
returnblock
125125
}
126+
127+
exportfunctiontransformRequireToImport(code:string):string{
128+
constimports:{[key:string]:string}={}
129+
letstrImports=''
130+
131+
code=code.replace(/require\(("(?:[^"\\]|\\.)+"|'(?:[^'\\]|\\.)+')\)/g,(_,name):any=>{
132+
if(!(nameinimports)){
133+
imports[name]=`__$_require_${name.replace(/[^a-z0-9]/g,'_').replace(/_{2,}/g,'_').replace(/^_|_$/g,'')}__`
134+
strImports+='import '+imports[name]+' from '+name+'\n'
135+
}
136+
137+
returnimports[name]
138+
})
139+
140+
returnstrImports+code
141+
}

‎test/assertions.ts

Whitespace-only changes.

‎test/baseline.spec.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
constpuppeteer=require('puppeteer')
22
import*asfsfrom'fs'
33
import*aspathfrom'path'
4+
import*asassertionsfrom'./assertions'
45

56
import{build,open}from"./setup"
67

78
letbrowser=null
89

10+
functiontoCamelCase(name:string) :string{
11+
returnname.replace(/-(.)/g,(_,char)=>char.toUpperCase())
12+
}
13+
914
beforeAll(async()=>{
1015
browser=awaitpuppeteer.launch({
1116
args:['--no-sandbox','--disable-setuid-sandbox'],
@@ -18,14 +23,15 @@ describe('baseline', () => {
1823
.filter((filename:string)=>filename.endsWith('.vue'))
1924
.map((filename:string)=>filename.replace(/\.vue$/i,''))
2025
.forEach(fixture=>{
21-
test(fixture,()=>testRunner(fixture,true))
22-
test(fixture+' (extract css)',()=>testRunner(fixture,false))
26+
constname=toCamelCase(fixture)
27+
test(fixture,()=>testRunner(fixture,true,assertions[name]))
28+
test(fixture+' (extract css)',()=>testRunner(fixture,false,assertions[name]))
2329
})
2430
})
2531

2632
afterAll(async()=>browser&&(awaitbrowser.close()))
2733

28-
asyncfunctiontestRunner(fixture:string,extractCss:boolean):Promise<void>{
34+
asyncfunctiontestRunner(fixture:string,extractCss:boolean,moreAssertions?:Function):Promise<void>{
2935
constfilename=path.join(__dirname,'fixtures',fixture+'.vue')
3036
constcode=awaitbuild(filename,extractCss)
3137
constpage=awaitopen(
@@ -43,5 +49,7 @@ async function testRunner(fixture: string, extractCss: boolean): Promise<void> {
4349
)
4450
).toEqual('rgb(255, 0, 0)')
4551

52+
moreAssertions&&moreAssertions(page)
53+
4654
awaitpage.close()
4755
}

‎test/setup/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {pluginCreateVueApp, plugins} from "./plugins"
88
importpluginVuefrom'../..'
99

1010
constpluginCSS=require('rollup-plugin-css-only')
11+
constassets=require('postcss-assets')
1112

1213
// -- rollup plugin inline file
1314

@@ -18,7 +19,9 @@ export async function build(filename, css = false): Promise<string> {
1819
if(cacheKeyincache)returncache[cacheKey]
1920
letstyle:string|undefined
2021
constinput=filename+'__app.js'
21-
constoptions={defaultLang:{markdown:'pluginMarkdown'},css:css}
22+
constoptions={defaultLang:{markdown:'pluginMarkdown'},css:css,style:{
23+
postcssPlugins:[assets({basePath:'/'})]
24+
}}
2225
constbundle=awaitrollup({
2326
input,
2427
plugins:[

‎test/setup/plugins.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
constpluginBabel=require('rollup-plugin-babel')
22
constpluginNodeResolve=require('rollup-plugin-node-resolve')
33
constpluginCommonJS=require('rollup-plugin-commonjs')
4-
constpluginImage=require('rollup-plugin-image')
4+
constpluginImage=require('rollup-plugin-url')
55
constpluginMarkdown=require('rollup-plugin-md')
66
constpluginTypescript=require('rollup-plugin-typescript')
7+
constpluginReplace=require('rollup-plugin-replace')
78
constpath=require('path')
89

910
exportconstplugins=[
1011
pluginImage(),
1112
pluginMarkdown(),
1213
pluginNodeResolve(),
1314
pluginCommonJS(),
15+
pluginReplace({'process.env.NODE_ENV':'"production"'}),
1416
pluginTypescript({
1517
tsconfig:false,
18+
experimentalDecorators:true,
1619
module:'es2015'
1720
}),
1821
pluginBabel({

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp