Compare commits
No commits in common. "master" and "1.4.0" have entirely different histories.
|
@ -64,7 +64,7 @@ function scopeCss(css = '', hash) {
|
||||||
if (last.startsWith(':')) {
|
if (last.startsWith(':')) {
|
||||||
output = parseVDeep(last, output, true)
|
output = parseVDeep(last, output, true)
|
||||||
} else {
|
} else {
|
||||||
output = `${last}[data-${hash}] ${output}`
|
output = `${last} ${output}`
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (last.includes(':')) {
|
if (last.includes(':')) {
|
||||||
|
@ -241,8 +241,6 @@ export function parseJs(
|
||||||
` stylesheet.textContent = ${tmp};\n` +
|
` stylesheet.textContent = ${tmp};\n` +
|
||||||
` document.head.appendChild(stylesheet);\n` +
|
` document.head.appendChild(stylesheet);\n` +
|
||||||
`}\n`
|
`}\n`
|
||||||
|
|
||||||
return `let ${tmp};\n!(async function(){\n ${tmp} = await __fite_import('${name}', import.meta.url);\n})()`
|
|
||||||
} else {
|
} else {
|
||||||
// CSSStyleSheet.replaceSync 需要FF v101, Safari 16.4才支持
|
// CSSStyleSheet.replaceSync 需要FF v101, Safari 16.4才支持
|
||||||
fixedStyle +=
|
fixedStyle +=
|
||||||
|
@ -253,9 +251,8 @@ export function parseJs(
|
||||||
` __sheets__.push(stylesheet);\n` +
|
` __sheets__.push(stylesheet);\n` +
|
||||||
` document.adoptedStyleSheets = __sheets__;\n` +
|
` document.adoptedStyleSheets = __sheets__;\n` +
|
||||||
`}\n`
|
`}\n`
|
||||||
|
|
||||||
return `const ${tmp} = await __fite_import('${name}', import.meta.url)`
|
|
||||||
}
|
}
|
||||||
|
return `const ${tmp} = await __fite_import('${name}', import.meta.url)`
|
||||||
} else {
|
} else {
|
||||||
if (name.startsWith('@/')) {
|
if (name.startsWith('@/')) {
|
||||||
name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
|
name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
|
||||||
|
|
14
lib/dev.js
14
lib/dev.js
|
@ -179,10 +179,7 @@ export default async function createServer(root = '', conf = {}) {
|
||||||
currentPage,
|
currentPage,
|
||||||
IS_ENTRY: true,
|
IS_ENTRY: true,
|
||||||
DEPLOY_PATH,
|
DEPLOY_PATH,
|
||||||
LEGACY_MODE,
|
LEGACY_MODE
|
||||||
isCustomElement,
|
|
||||||
plugin,
|
|
||||||
define
|
|
||||||
},
|
},
|
||||||
page.entry
|
page.entry
|
||||||
)
|
)
|
||||||
|
@ -273,12 +270,10 @@ export default async function createServer(root = '', conf = {}) {
|
||||||
break
|
break
|
||||||
|
|
||||||
case 'js':
|
case 'js':
|
||||||
case 'wasm':
|
|
||||||
{
|
{
|
||||||
let rpath = pathname.replace('@/', '')
|
let rpath = pathname.replace('@/', '')
|
||||||
let file
|
let file
|
||||||
let isJson = false
|
let isJson = false
|
||||||
let isWasm = rpath.endsWith('.wasm')
|
|
||||||
|
|
||||||
if (rpath.endsWith('json.js')) {
|
if (rpath.endsWith('json.js')) {
|
||||||
isJson = true
|
isJson = true
|
||||||
|
@ -314,8 +309,6 @@ export default async function createServer(root = '', conf = {}) {
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log('%s 语法错误: %s', rpath, red(err.message))
|
console.log('%s 语法错误: %s', rpath, red(err.message))
|
||||||
}
|
}
|
||||||
} else if (isWasm) {
|
|
||||||
//
|
|
||||||
} else {
|
} else {
|
||||||
code = parseJs(
|
code = parseJs(
|
||||||
code + '',
|
code + '',
|
||||||
|
@ -324,10 +317,7 @@ export default async function createServer(root = '', conf = {}) {
|
||||||
IS_MPA,
|
IS_MPA,
|
||||||
currentPage,
|
currentPage,
|
||||||
DEPLOY_PATH,
|
DEPLOY_PATH,
|
||||||
LEGACY_MODE,
|
LEGACY_MODE
|
||||||
isCustomElement,
|
|
||||||
plugin,
|
|
||||||
define
|
|
||||||
},
|
},
|
||||||
file
|
file
|
||||||
)
|
)
|
||||||
|
|
|
@ -52,12 +52,7 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
|
||||||
)
|
)
|
||||||
const INJECT_SCSS = readFile(conf.inject?.scss)
|
const INJECT_SCSS = readFile(conf.inject?.scss)
|
||||||
const LEGACY_MODE = !!conf.legacy
|
const LEGACY_MODE = !!conf.legacy
|
||||||
const {
|
const { ABS_CONFIG_FILEPATH, compileOptions = {}, define = {} } = conf
|
||||||
ABS_CONFIG_FILEPATH,
|
|
||||||
compileOptions = {},
|
|
||||||
define = {},
|
|
||||||
plugin = []
|
|
||||||
} = conf
|
|
||||||
const { isCustomElement = defaultCustomElement } = compileOptions
|
const { isCustomElement = defaultCustomElement } = compileOptions
|
||||||
|
|
||||||
conf.inject = conf.inject || { scss: '' }
|
conf.inject = conf.inject || { scss: '' }
|
||||||
|
@ -208,8 +203,6 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
|
||||||
doJob()
|
doJob()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
options.plugin = plugin
|
|
||||||
options.isCustomElement = isCustomElement
|
|
||||||
compileFiles(currentPage, page, list, options, {
|
compileFiles(currentPage, page, list, options, {
|
||||||
verbose,
|
verbose,
|
||||||
dist,
|
dist,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "fite",
|
"name": "fite",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "1.4.4",
|
"version": "1.4.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
"fite": "index.js"
|
"fite": "index.js"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue