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

feat: transform require to import statements in esModule #54

Merged
merged 1 commit into from
Jan 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/assemble.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,25 @@ function inlineStyle (name, style, config) {
return output
}

function inlineTemplate (render, config) {
const lines = render.code.split('\n')
let i = 0
while (lines[i].startsWith('import ')) {
i += 1
}

const imports = lines.slice(0, i).join('\n')
const code = lines.slice(i).join('\n')

return (
`\n/* template */\n` +
imports + '\n' +
`var __vue_template__ = (function () {\n${pad(
code.replace(EXPORT_REGEX, 'return ').trim()
)}})()\n`
)
}

const Source = struct({
script: {
id: struct.union(['string?', 'null']),
Expand Down Expand Up @@ -184,11 +203,7 @@ module.exports = function assemble (source, filename, config) {

// <template>
if (typeof render.code === 'string') {
output +=
`\n/* template */\n` +
`var __vue_template__ = (function () {\n${pad(
render.code.replace(EXPORT_REGEX, 'return ').trim()
)}})()\n`
output += inlineTemplate(render, config)
} else {
output += importStatement(render.id, {
esModule: config.esModule,
Expand Down
16 changes: 16 additions & 0 deletions src/template-compiler/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,22 @@ module.exports = function compileTemplate (template, filename, config) {
output.code += `\nmodule.exports = ${__exports__}`
} else {
output.code += `\nexport default ${__exports__}`

// remove all require statements
const imports = []
output.code = output.code.replace(/\brequire\("([^"]+)"\)/g, (_, name) => {
let index = imports.indexOf(name)
if (index === -1) {
index = imports.length
imports.push(name)
}
const ref = `__vue_template_import_${index}__`

return ref
})
output.code =
imports.map((name, i) => `import __vue_template_import_${i}__ from '${name}'`).join('\n') +
'\n\n' + output.code
}

return output
Expand Down