From a15bd9ea950f8c034035d2fe3dee1cdfbff69fc0 Mon Sep 17 00:00:00 2001 From: yutent Date: Fri, 1 Mar 2024 18:39:39 +0800 Subject: [PATCH] =?UTF-8?q?esm=E5=A2=9E=E5=8A=A0=E5=AF=B9json=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=94=AF=E6=8C=81;=E4=BC=98=E5=8C=96legacy?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/compile-vue.js | 33 ++++++++++++++++++++++++--------- lib/compile.js | 10 ++++++++++ lib/constants.js | 31 +++++++++++++++++++++++++++++++ lib/dev.js | 27 +++++++++++++++------------ lib/utils.js | 4 +++- package.json | 2 +- 6 files changed, 84 insertions(+), 23 deletions(-) diff --git a/lib/compile-vue.js b/lib/compile-vue.js index c44ab68..0247722 100644 --- a/lib/compile-vue.js +++ b/lib/compile-vue.js @@ -18,7 +18,8 @@ import { CSS_SHEET_EXP, V_DEEP, PERCENT_EXP, - SHEETS_DEF + SHEETS_DEF, + LEGACY_POLYFILL } from './constants.js' import { createHmrScript, md5, uuid, urlJoin } from './utils.js' @@ -26,6 +27,10 @@ const OPTIONS = { style: 'compressed' } +function minify(code) { + return Es.transformSync(code, { minify: true }).code.trim() +} + // 处理css中的 :deep() function parseVDeep(curr, val, scoped) { let res = V_DEEP.exec(curr) @@ -149,11 +154,12 @@ export function parseJs( .replace(/\r\n/g, '\n') .replace(/process\.env\.NODE_ENV/g, `'${process.env.NODE_ENV}'`) .replace( - /(import|export) ([\w\W]*?) from (["'])(.*?)\3/g, + /(import|export) ([^'"]*?) from (["'])(.*?)\3/g, function (m, t, alias, q, name) { if (name.startsWith('@/')) { name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR)) } + let isJson = name.endsWith('.json') if (!imports[name]) { if (name.startsWith('./') || name.startsWith('../')) { @@ -173,6 +179,7 @@ export function parseJs( if ( !name.endsWith('.js') && + !isJson && !name.endsWith('.mjs') && !name.endsWith('.vue') ) { @@ -190,13 +197,20 @@ export function parseJs( return `${t} ${alias} from '${name}'` } let _alias = alias + let _import = '' if (alias.includes('* as')) { _alias = ' default ' + alias.replace('* as', '').trim() } - return `import ${alias} from '${name}'${ - t === 'export' ? `\nexport ${_alias}` : '' - }` + if (LEGACY_MODE && isJson) { + _import = `const ${alias} = await __fite_import('${name}', import.meta.url)` + } else { + _import = `import ${alias} from '${name}'${ + isJson ? ' assert { type: "json" }' : '' + }` + } + _import += t === 'export' ? `\nexport ${_alias}` : '' + return _import } ) .replace(/import\((['"])(.*?)\1\)/g, function (m, q, name) { @@ -229,7 +243,7 @@ export function parseJs( document.head.appendChild(stylesheet) }) ` - return `const ${tmp} = window.fetch('${name}').then(r => r.text())` + return `const ${tmp} = __fite_import('${name}', import.meta.url)` } else { fixedStyle += `${tmp}.path = '${_name}'\n__sheets__.push(${tmp})\n` @@ -258,6 +272,7 @@ export function parseJs( if ( !name.endsWith('.js') && + !name.endsWith('.json') && !name.endsWith('.mjs') && !name.endsWith('.vue') ) { @@ -423,9 +438,9 @@ export function parseHtml(html, { page, imports, entry, LEGACY_MODE }) { '', `${ process.env.NODE_ENV === 'development' - ? ` \n` + ? ` \n` + : LEGACY_MODE + ? ` \n` : '' }` ) diff --git a/lib/compile.js b/lib/compile.js index f982d35..a0f0dd0 100644 --- a/lib/compile.js +++ b/lib/compile.js @@ -67,6 +67,16 @@ export async function compileFiles( } break + case '.json': + { + let code = fs.cat(path) + + code = JSON.stringify(JSON.parse(code + '')) + + fs.echo(code, join(dist, 'assets/', pageDir, it.name)) + } + break + case '.scss': case '.css': { diff --git a/lib/constants.js b/lib/constants.js index 35a6a4b..95ad83b 100644 --- a/lib/constants.js +++ b/lib/constants.js @@ -18,3 +18,34 @@ export const COMMON_HEADERS = { export const SHEETS_DEF = 'const __sheets__ = [...document.adoptedStyleSheets];\n' + +export const LEGACY_POLYFILL = `!(function(){ + function join(p1, p2) { + let tmp1 = p1.split('/') + let tmp2 = p2.split('/') + if (tmp1.at(-1) === '') { + tmp1.pop() + } + while (tmp2.length) { + let tmp = tmp2.shift() + if (tmp === '.' || tmp === '') { + continue + } else if (tmp === '..') { + tmp1.pop() + } else { + tmp1.push(tmp) + } + } + return tmp1.join('/') + } + + window.__fite_import = function(url,relPath){ + let isJson = url.endsWith('.json') + let absPath = relPath.split('/').slice(0, -1).join('/') + let req + if(url.startsWith('./') || url.startsWith('../')) { + url = join(absPath, url) + } + return window.fetch(url).then(r => isJson ? r.json() : r.text()) + } +})()` diff --git a/lib/dev.js b/lib/dev.js index 7a27de4..0af595d 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -255,6 +255,7 @@ export default async function createServer(root = '', conf = {}) { } break + case 'json': case 'js': { let rpath = pathname.replace('@/', '') @@ -282,18 +283,20 @@ export default async function createServer(root = '', conf = {}) { res.end('') return } - code = parseJs( - code + '', - conf.imports, - { - IS_MPA, - currentPage, - DEPLOY_PATH, - LEGACY_MODE - }, - file - ) - res.setHeader('content-type', MIME_TYPES.js) + if (ext === 'js') { + code = parseJs( + code + '', + conf.imports, + { + IS_MPA, + currentPage, + DEPLOY_PATH, + LEGACY_MODE + }, + file + ) + } + res.setHeader('content-type', MIME_TYPES[ext]) } break diff --git a/lib/utils.js b/lib/utils.js index 34645ab..433a44d 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -8,6 +8,7 @@ import { createHash, randomUUID } from 'node:crypto' import { join } from 'node:path' import { gzipSync } from 'node:zlib' import { red, cyan, blue } from 'kolorist' +import { LEGACY_POLYFILL } from './constants.js' // 修正路径合并 避免在windows下被转义 export function urlJoin(...args) { @@ -39,7 +40,7 @@ export function friendlyErrors(pathname, ext = '') { export function createHmrScript(legacy, session = '') { return ` !(function vue_live_hmr(){ - var ws = new WebSocket(\`ws\${location.protocol === 'https:' ? 's' : ''}://\${location.host}/ws-fite-hmr?session=\${btoa(location.pathname).replace(/[=\+\/]/g, '')}&lock=\${localStorage.getItem(location.pathname) || 0}\`) + let ws = new WebSocket(\`ws\${location.protocol === 'https:' ? 's' : ''}://\${location.host}/ws-fite-hmr?session=\${btoa(location.pathname).replace(/[=\+\/]/g, '')}&lock=\${localStorage.getItem(location.pathname) || 0}\`) ws.addEventListener('open', function (r) { if(vue_live_hmr.closed){ @@ -93,6 +94,7 @@ export function createHmrScript(legacy, session = '') { break } }) + ${LEGACY_POLYFILL} })() ` } diff --git a/package.json b/package.json index 7cba294..4e2b002 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fite", "type": "module", - "version": "1.2.0", + "version": "1.3.0", "bin": { "fite": "index.js" },