.prettierrc.yaml

@@ -1,10 +0,0 @@
-jsxBracketSameLine: true
-jsxSingleQuote: true
-semi: false
-singleQuote: true
-printWidth: 80
-useTabs: false
-tabWidth: 2
-trailingComma: none
-bracketSpacing: true
-arrowParens: avoid

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

index.js

@@ -7,7 +7,7 @@
  */
 
 import fs from 'iofs'
-import { join, normalize } from 'node:path'
+import { join, normalize } from 'path'
 import { red, blue } from 'kolorist'
 
 import createServer from './lib/dev.js'
@@ -18,18 +18,14 @@ const IS_WINDOWS = process.platform === 'win32'
 
 const CONFIG_FILE = normalize(join(WORK_SPACE, 'fite.config.js'))
 const PROTOCOL = IS_WINDOWS ? 'file://' : ''
-const NODE_VERSION = process.versions.node.split('.').map(n => +n)
+const NODE_VERSION = +process.versions.node.split('.').slice(0, 2).join('.')
-const ABS_CONFIG_FILEPATH = PROTOCOL + CONFIG_FILE
 
 let args = process.argv.slice(2)
-let mode = args.shift() || 'prod'
-let clean = !args.includes('--no-clean') //
-let verbose = args.includes('--verbose') //
 
-if (NODE_VERSION[0] < 16 || (NODE_VERSION[0] === 16 && NODE_VERSION[1] < 6)) {
+if (NODE_VERSION < 16.6) {
-  console.log(red('Error: 你当前的环境不满足 fite 构建工具的要求'))
+  console.log(red('Error: 你当前的环境不满足 Vue-live 构建工具的要求'))
   console.log(
-    'fite 需要Node.js版本在 %s 以上, \n你当前的Node.js版本为: %s',
+    'Vue-live 需要Node.js版本在 %s 以上, \n你当前的Node.js版本为: %s',
     blue('v16.6.0'),
     red(process.version),
     '\n\n'
@@ -37,13 +33,10 @@ if (NODE_VERSION[0] < 16 || (NODE_VERSION[0] === 16 && NODE_VERSION[1] < 6)) {
   process.exit()
 }
 
-switch (mode) {
+switch (args[0]) {
   case 'dev':
-    process.env.NODE_ENV = 'development'
+    import(PROTOCOL + CONFIG_FILE)
-
-    import(ABS_CONFIG_FILEPATH)
       .then(function (conf) {
-        conf.default.ABS_CONFIG_FILEPATH = ABS_CONFIG_FILEPATH
         createServer(WORK_SPACE, conf.default)
       })
       .catch(err => {
@@ -52,17 +45,14 @@ switch (mode) {
     break
 
   case 'build':
-    process.env.NODE_ENV = 'production'
+    import(PROTOCOL + CONFIG_FILE)
-
-    import(ABS_CONFIG_FILEPATH)
       .then(function (conf) {
         let dist = conf.buildDir || 'dist'
-        if (clean && fs.isdir(dist)) {
+        if (fs.isdir(dist)) {
-          console.log('清除dist目录...')
+          fs.rm(dist, true)
-          fs.rm(dist)
         }
-        conf.default.ABS_CONFIG_FILEPATH = ABS_CONFIG_FILEPATH
+        fs.mkdir(dist)
-        compile(WORK_SPACE, dist, conf.default, verbose)
+        compile(WORK_SPACE, dist, conf.default)
       })
       .catch(err => {
         console.log(err)

lib/compile-vue.js

@@ -6,8 +6,9 @@
 
 import fs from 'iofs'
 import scss from '@bytedo/sass'
+import { createHash } from 'crypto'
 import Es from 'esbuild'
-
+import { join } from 'path'
 import { compile } from '@vue/compiler-dom'
 import { red, cyan, blue } from 'kolorist'
 
@@ -16,22 +17,27 @@ import {
   STYLE_EXP,
   HTML_EXP,
   CSS_SHEET_EXP,
+  HMR_SCRIPT,
   V_DEEP,
-  PERCENT_EXP,
+  PERCENT_EXP
-  SHEETS_DEF,
-  LEGACY_POLYFILL
 } from './constants.js'
-import { createHmrScript, md5, uuid, urlJoin } from './utils.js'
 
 const OPTIONS = {
-  style: 'compressed'
+  indentType: 'space',
+  indentWidth: 2
 }
 
-function minify(code) {
+// 修正路径合并 避免在windows下被转义
-  return Es.transformSync(code, { minify: true }).code.trim()
+function urlJoin(...args) {
+  return join(...args).replace(/\\/g, '/')
+}
+
+function md5(str = '') {
+  let sum = createHash('md5')
+  sum.update(str, 'utf8')
+  return sum.digest('hex').slice(0, 8)
 }
 
-// 处理css中的 :deep()
 function parseVDeep(curr, val, scoped) {
   let res = V_DEEP.exec(curr)
   if (res) {
@@ -42,7 +48,6 @@ function parseVDeep(curr, val, scoped) {
   }
 }
 
-// 处理style中的scoped属性
 function scopeCss(css = '', hash) {
   return css.replace(CSS_SHEET_EXP, (m, selector) => {
     if (!selector.startsWith('@')) {
@@ -64,7 +69,7 @@ function scopeCss(css = '', hash) {
               if (last.startsWith(':')) {
                 output = parseVDeep(last, output, true)
               } else {
-                output = `${last}[data-${hash}] ${output}`
+                output = `${last} ${output}`
               }
             } else {
               if (last.includes(':')) {
@@ -93,16 +98,18 @@ function scopeCss(css = '', hash) {
 /**
  * 编译scss为css
  * @param file <String> 文件路径或scss代码
- * @param inject <String> 要注入的scss代码
+ * @param mini <Boolean> 是否压缩
  */
-export function compileScss(file, inject = '') {
+export function compileScss(file, mini = true) {
+  let style = mini ? 'compressed' : 'expanded'
   try {
     if (fs.isfile(file)) {
-      return scss.compile(file, OPTIONS).css.trim()
+      return scss.compile(file, { style, ...OPTIONS }).css.trim()
     } else {
-      return scss.compileString(inject + file, OPTIONS).css.trim()
+      return scss.compileString(file, { style, ...OPTIONS }).css.trim()
     }
   } catch (err) {
+    console.log('compile scss: ', file)
     console.error(err)
   }
 }
@@ -115,194 +122,134 @@ export function compileScss(file, inject = '') {
 export function parseJs(
   code = '',
   imports,
-  { IS_MPA, currentPage, IS_ENTRY, DEPLOY_PATH, LEGACY_MODE, define } = {},
+  { IS_MPA, currentPage, IS_ENTRY, DEPLOY_PATH } = {},
-  filename,
+  isBuild,
-  linePatch = 1
+  filename
 ) {
-  let fixedStyle = ''
+  let fixedStyle = '\n\n'
   let ASSETS_DIR = '/@/'
-  let isBuild = process.env.NODE_ENV === 'production'
 
   if (isBuild) {
-    ASSETS_DIR = '/assets/'
+    ASSETS_DIR = '/assets/' // + (IS_MPA ? 'pages/' : '')
   }
-
   try {
     code = Es.transformSync(code).code || ''
   } catch (e) {
     let err = e.errors.pop()
-    let lines = code.split('\n')
+    console.log('%s: %s', red('Uncaught SyntaxError'), err.text)
-
+    console.log(
-    console.log('%s: %s', red('Uncaught SyntaxError'), red(err.text))
+      '  @ line %d: %s',
-    // 将上下文几行都打印出来
+      err.location.line,
-    for (let i = err.location.line - 3; i <= err.location.line + 1; i++) {
+      cyan(err.location.lineText)
-      console.log(
+    )
-        '  @ line %d: %s',
-        i + linePatch,
-        err.location.line === i + 1 ? red(lines[i]) : lines[i]
-      )
-    }
     console.log(
       '  @ %s:%d:%d',
       blue(filename),
-      err.location.line + linePatch - 1,
+      err.location.line,
       err.location.column
     )
   }
 
-  code = code
+  return (
-    .replace(/\r\n/g, '\n')
+    code
-    .replace(/process\.env\.NODE_ENV/g, `'${process.env.NODE_ENV}'`)
+      .replace(/\r\n/g, '\n')
-    .replace(
+      .replace(
-      /(import|export) ([^'"]*?) from (["'])(.*?)\3/g,
+        /import ([\w\W]*?) from (["'])(.*?)\2/g,
-      function (m, t, alias, q, name) {
+        function (m, alias, q, name) {
-        if (name.startsWith('@/')) {
+          if (name.startsWith('@/')) {
-          name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
+            name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
-        }
+          }
 
-        if (!imports[name]) {
+          if (!imports[name]) {
-          if (name.startsWith('./') || name.startsWith('../')) {
+            if (name.startsWith('./') || name.startsWith('../')) {
-            if (IS_ENTRY) {
+              if (IS_ENTRY) {
-              if (IS_MPA) {
+                if (IS_MPA) {
-                name = `pages/${currentPage}/` + name
+                  name = `pages/${currentPage}/` + name
+                }
+                name = urlJoin(DEPLOY_PATH, ASSETS_DIR, name)
               }
-              name = urlJoin(DEPLOY_PATH, ASSETS_DIR, name)
+            } else if (
+              name.startsWith('/') &&
+              !name.startsWith('//') &&
+              !name.startsWith(urlJoin(DEPLOY_PATH, ASSETS_DIR))
+            ) {
+              name = name.replace(/^\//, urlJoin(DEPLOY_PATH, ASSETS_DIR))
             }
-          } else if (
-            name.startsWith('/') &&
-            !name.startsWith('//') &&
-            !name.startsWith(urlJoin(DEPLOY_PATH, ASSETS_DIR))
-          ) {
-            name = name.replace(/^\//, urlJoin(DEPLOY_PATH, ASSETS_DIR))
-          }
 
-          if (
+            if (!name.endsWith('.js') && !name.endsWith('.vue')) {
-            !name.endsWith('.js') &&
+              if (name.includes('components')) {
-            !name.endsWith('.mjs') &&
+                name += '.vue'
-            !name.endsWith('.vue')
+              } else {
-          ) {
+                name += '.js'
-            if (name.includes('components')) {
+              }
-              name += '.vue'
-            } else {
-              name += '.js'
             }
           }
+          if (isBuild) {
+            name = name.replace(/\.vue$/, '.js')
+          }
+          return `import ${alias} from '${name}'`
         }
+      )
+      .replace(/import\((['"])(.*?)\1\)/g, function (m, q, name) {
         if (isBuild) {
           name = name.replace(/\.vue$/, '.js')
         }
-        if (alias.trim() === '*') {
-          return `${t} ${alias} from '${name}'`
-        }
-        let _alias = alias
-        let _import = ''
-        if (alias.includes('* as')) {
-          _alias = ' default ' + alias.replace('* as', '').trim()
-        }
-
-        _import = `import ${alias} from '${name}'`
-        _import += t === 'export' ? `\nexport ${_alias}` : ''
-
-        return _import
-      }
-    )
-    .replace(/import\((['"])(.*?)\1\)/g, function (m, q, name) {
-      if (isBuild) {
-        name = name.replace(/\.vue$/, '.js')
-      }
-      if (name.startsWith('@/')) {
-        name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
-      }
-      if (name.endsWith('.json')) {
-        name += '.js'
-      }
-      return `import('${name}')`
-    })
-    .replace(/import (["'])(.*?)\1/g, function (m, q, name) {
-      if (name.endsWith('.css') || name.endsWith('.scss')) {
         if (name.startsWith('@/')) {
           name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
         }
+        return `import('${name}')`
+      })
+      .replace(/import (["'])(.*?)\1/g, function (m, q, name) {
+        if (name.endsWith('.css') || name.endsWith('.scss')) {
+          if (name.startsWith('@/')) {
+            name = name.replace('@/', '/')
+          }
 
-        if (isBuild) {
+          if (isBuild) {
-          name = name.replace(/\.scss/, '.css')
+            name = name.replace(/\.scss/, '.css')
-        }
+          }
-        // 修正那反人类的windows路径
+          let tmp = `style${Date.now()}`
-        let _name = name.replace(/\\/g, '/').replace('@/', '')
+          fixedStyle += `
-        let tmp = `style_${uuid()}`
+          let __sheets__ = [...document.adoptedStyleSheets]
+          __sheets__.push(${tmp})
+          document.adoptedStyleSheets = __sheets__
+          `
 
-        // 因为esm语法的变更, 原先的 import xx from xx assets {type: css} 变为了 with
+          // 修正那反人类的windows路径
-        // 而这个语法的变化, 构建工具无法做版本判断, 故, 统一降级到fetch()加载
+          return `import ${tmp} from '${name}' assert { type: 'css' }\n${tmp}.path = '${name.replace(
-        if (LEGACY_MODE) {
+            /\\/g,
-          fixedStyle +=
+            '/'
-            `{\n` +
+          )}'`
-            `  let stylesheet = document.createElement('style');\n` +
-            `  stylesheet.setAttribute('name', '${_name}');\n` +
-            `  stylesheet.textContent = ${tmp};\n` +
-            `  document.head.appendChild(stylesheet);\n` +
-            `}\n`
-
-          return `let ${tmp};\n!(async function(){\n  ${tmp} = await __fite_import('${name}', import.meta.url);\n})()`
         } else {
-          // CSSStyleSheet.replaceSync 需要FF v101, Safari 16.4才支持
+          if (name.startsWith('@/')) {
-          fixedStyle +=
+            name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
-            `{\n` +
+          }
-            `  let stylesheet = new CSSStyleSheet();\n` +
+          //
-            `  stylesheet.path = '${_name}';\n` +
+          if (!imports[name]) {
-            `  stylesheet.replaceSync(${tmp} );\n` +
+            if (name.startsWith('./') || name.startsWith('../')) {
-            `  __sheets__.push(stylesheet);\n` +
+              if (IS_ENTRY) {
-            `  document.adoptedStyleSheets = __sheets__;\n` +
+                if (IS_MPA) {
-            `}\n`
+                  name = `${currentPage}/` + name
-
+                }
-          return `const ${tmp} = await __fite_import('${name}', import.meta.url)`
+                name = urlJoin(DEPLOY_PATH, ASSETS_DIR, name)
-        }
-      } else {
-        if (name.startsWith('@/')) {
-          name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
-        }
-        //
-        if (!imports[name]) {
-          if (name.startsWith('./') || name.startsWith('../')) {
-            if (IS_ENTRY) {
-              if (IS_MPA) {
-                name = `${currentPage}/` + name
               }
-              name = urlJoin(DEPLOY_PATH, ASSETS_DIR, name)
+            } else if (
+              name.startsWith('/') &&
+              !name.startsWith('//') &&
+              !name.startsWith(urlJoin(DEPLOY_PATH, ASSETS_DIR))
+            ) {
+              name = name.replace(/^\//, urlJoin(DEPLOY_PATH, ASSETS_DIR))
+            }
+
+            if (!name.endsWith('.js') && !name.endsWith('.vue')) {
+              name += '.js'
             }
-          } else if (
-            name.startsWith('/') &&
-            !name.startsWith('//') &&
-            !name.startsWith(urlJoin(DEPLOY_PATH, ASSETS_DIR))
-          ) {
-            name = name.replace(/^\//, urlJoin(DEPLOY_PATH, ASSETS_DIR))
           }
 
-          if (
+          return `import '${name}'`
-            !name.endsWith('.js') &&
-            !name.endsWith('.mjs') &&
-            !name.endsWith('.vue')
-          ) {
-            name += '.js'
-          }
         }
-
+      }) + fixedStyle
-        return `import '${name}'`
+  )
-      }
-    })
-
-  for (let key in define) {
-    code = code.replaceAll(key, define[key])
-  }
-
-  if (fixedStyle) {
-    code += '\n\n' + (IS_ENTRY ? SHEETS_DEF : '') + fixedStyle
-
-    if (IS_ENTRY && !LEGACY_MODE) {
-      code += '\ndocument.adoptedStyleSheets = __sheets__'
-    }
-  }
-
-  return code
 }
 
 /**
@@ -310,19 +257,16 @@ export function parseJs(
  * @param file <String> 文件路径
  * @return <String> 返回转换后的js代码
  */
-export async function compileVue(file, imports, options = {}) {
+export function compileVue(file, imports, options = {}, isBuild) {
-  // 修正那反人类的windows路径
   let filename = file.slice(options.SOURCE_DIR.length).replace(/\\/g, '/')
   let code = (fs.cat(file) || '').toString().replace(/\r\n/g, '\n')
   let CACHE = options.CACHE || {}
-  let { isCustomElement } = options
   let output = '',
     scoped = false
 
   let js = code.match(JS_EXP)
   let scss = [...code.matchAll(STYLE_EXP)]
   let html = code.match(HTML_EXP) || ['', '']
-  let linePatch = code.slice(0, js?.index || 0).split('\n').length // js起始行数修正
 
   let hash = md5(file)
   let scopeId = 'data-' + hash
@@ -331,68 +275,32 @@ export async function compileVue(file, imports, options = {}) {
     .map(it => {
       let css
       if (it.length > 2) {
-        css = compileScss(it[2], options.INJECT_SCSS)
+        css = compileScss(it[2])
 
         if (it[1].includes('scoped')) {
           scoped = true
           css = scopeCss(css, hash)
         }
       } else {
-        css = compileScss(it[1], options.INJECT_SCSS)
+        css = compileScss(it[1])
       }
-
       return css
     })
     .join(' ')
 
-  for (let fn of options.plugin) {
+  js = js ? js[1] : ''
-    scss = await fn('css', scss)
-  }
 
-  js = js ? js[1] : 'export default {}'
+  html = compile(html[1], {
+    mode: 'module',
+    prefixIdentifiers: true,
+    hoistStatic: true,
+    cacheHandlers: true,
+    scopeId: scoped ? scopeId : void 0,
+    sourceMap: false,
+    isCustomElement: tag => tag.startsWith('wc-')
+  }).code.replace('export function render', 'function render')
 
-  try {
+  output += html + '\n\n'
-    html = compile(html[1], {
-      mode: 'module',
-      prefixIdentifiers: true,
-      hoistStatic: true,
-      cacheHandlers: true,
-      scopeId: scoped ? scopeId : void 0,
-      sourceMap: false,
-      isCustomElement
-    }).code.replace('export function render', 'function render')
-  } catch (err) {
-    let lines = html[1].split('\n')
-    let line = lines[err.loc?.start.line - 1]
-
-    console.log('%s: %s', red('SyntaxError'), red(err.message))
-    console.log(
-      '  @ %s%s%s',
-      line.slice(0, err.loc.start.column - 1),
-      red(err.loc.source),
-      line.slice(err.loc.end.column - 1)
-    )
-    console.log(
-      '  @ (%s:%d:%d)\n',
-      file,
-      err.loc.start.line,
-      err.loc.start.column
-    )
-    html = `
-import { openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue"
-
-function render(_ctx, _cache) {
-  return (_openBlock(), _createElementBlock("div", null, "SyntaxError: ${err.message}"))
-}
-    `
-  }
-
-  html = html
-    .replace(/import .* from "vue"/, str => {
-      output += str + '\n'
-      return ''
-    })
-    .trim()
 
   if (CACHE[file]) {
     CACHE[file] = {
@@ -404,36 +312,23 @@ function render(_ctx, _cache) {
     CACHE[file] = { changed: false, js, html }
   }
 
-  output += parseJs(js, imports, options, file, linePatch).replace(
+  output += parseJs(js, imports, options, isBuild, file).replace(
     'export default {',
-    `\n${
+    'const __sfc__ = {\n  render,\n'
-      options.LEGACY_MODE ? '' : SHEETS_DEF
-    }${html}\n\nconst __sfc__ = {\n  render,\n`
   )
 
   if (scss) {
     CACHE[file].css = scss
 
-    if (options.LEGACY_MODE) {
+    // 修正那反人类的windows路径
-      output += `
+    output += `
-{
+let stylesheet = new CSSStyleSheet()
-  let stylesheet = document.createElement('style')
+let __sheets__ = [...document.adoptedStyleSheets]
-  stylesheet.setAttribute('name', '${filename}')
+stylesheet.path = '${filename}'
-  stylesheet.textContent = \`${scss}\`
+stylesheet.replaceSync(\`${scss}\`)
-  document.head.appendChild(stylesheet)
+__sheets__.push(stylesheet)
-}
-`
-    } else {
-      output += `
-{
-  let stylesheet = new CSSStyleSheet()
-  stylesheet.path = '${filename}'
-  stylesheet.replaceSync(\`${scss}\`)
-  __sheets__.push(stylesheet)
-}
 document.adoptedStyleSheets = __sheets__
 `
-    }
   }
   if (scoped) {
     output += `__sfc__.__scopeId = '${scopeId}'\n`
@@ -446,15 +341,19 @@ document.adoptedStyleSheets = __sheets__
 /**
  * 解析模板html
  */
-export function parseHtml(html, { page, imports, entry, LEGACY_MODE }) {
+export function parseHtml(html, { page, imports, entry }, isBuild = false) {
   return html
     .replace(/\r\n/g, '\n')
     .replace(
       '</head>',
-      `${
+      `  <script>window.process = {env: {NODE_ENV: '${
-        process.env.NODE_ENV === 'development'
+        isBuild ? 'production' : 'development'
-          ? `  <script>${minify(createHmrScript(LEGACY_MODE))}</script>\n`
+      }'}}</script>\n${
-          : `  <script>${minify(LEGACY_POLYFILL)}</script>\n`
+        isBuild
+          ? ''
+          : `  <script>${
+              Es.transformSync(HMR_SCRIPT, { minify: true }).code
+            }</script>`
       }</head>`
     )
     .replace('{{title}}', page.title || '')
@@ -465,9 +364,4 @@ export function parseHtml(html, { page, imports, entry, LEGACY_MODE }) {
       '<script src="main.js"></script>',
       `<script type="module">\n${entry}\n</script>`
     )
-    .replace(/\{\{#if(.*?)\}\}([\w\W]*?)\{\{#\/if\}\}/g, (m, c, code) => {
-      let res = Function('return ' + c)()
-      return res ? code : ''
-    })
-    .replace(/process\.env\.NODE_ENV/g, `'${process.env.NODE_ENV}'`)
 }

lib/compile.js

@@ -1,113 +0,0 @@
-/**
- * {}
- * @author yutent<yutent.io@gmail.com>
- * @date 2023/06/14 18:36:15
- */
-
-import { join, dirname, parse, normalize } from 'node:path'
-import fs from 'iofs'
-import Es from 'esbuild'
-import { compileScss, parseJs, compileVue, parseHtml } from './compile-vue.js'
-
-const template = fs.cat(join(process.cwd(), 'index.html')).toString()
-
-export async function compileFiles(
-  currentPage,
-  page,
-  files,
-  options,
-  { verbose, imports, dist } = {}
-) {
-  let pageDir = options.IS_MPA && currentPage ? `pages/${currentPage}` : ''
-  options.currentPage = currentPage
-
-  for (let [path, it] of files) {
-    // 入口文件, 特殊处理
-    if (page && path === page.entry) {
-      let entry = fs.cat(page.entry).toString()
-
-      entry = parseJs(entry, imports, { ...options, IS_ENTRY: true })
-
-      let code = parseHtml(template, {
-        page,
-        imports,
-        entry,
-        LEGACY_MODE: options.LEGACY_MODE
-      })
-
-      fs.echo(code, join(dist, `${currentPage}.html`))
-      continue
-    }
-
-    verbose && console.log('  解析 %s ...', it.name)
-
-    switch (it.ext) {
-      case '.vue':
-        {
-          let code = await compileVue(path, imports, options)
-
-          await Es.transform(code, { minify: true }).then(async ({ code }) => {
-            for (let fn of options.plugin) {
-              code = await fn('js', code)
-            }
-            fs.echo(
-              code,
-              join(dist, 'assets/', pageDir, it.name.replace(/\.vue$/, '.js'))
-            )
-          })
-        }
-        break
-
-      case '.js':
-        {
-          let code = fs.cat(path)
-
-          code = parseJs(code + '', imports, options)
-
-          await Es.transform(code, { minify: true }).then(async ({ code }) => {
-            for (let fn of options.plugin) {
-              code = await fn('js', code)
-            }
-            fs.echo(code, join(dist, 'assets/', pageDir, it.name))
-          })
-        }
-        break
-      // es2024之后esm的语法的assets 变成了with, 对构建工具来说无法适配到具体的浏览器
-      // 故把json文件改成js文件
-      case '.json':
-        {
-          let code = fs.cat(path)
-
-          code = 'export default ' + JSON.stringify(JSON.parse(code + ''))
-
-          fs.echo(code, join(dist, 'assets/', pageDir, it.name + '.js'))
-        }
-        break
-
-      case '.scss':
-      case '.css':
-        {
-          let target = join(
-            dist,
-            'assets/',
-            pageDir,
-            it.name.replace(/\.scss$/, '.css')
-          )
-          if (it.ext === '.css') {
-            fs.cp(path, target)
-          } else {
-            let code = compileScss(path)
-            for (let fn of options.plugin) {
-              code = await fn('css', code)
-            }
-            fs.echo(code, target)
-          }
-        }
-        break
-
-      default:
-        fs.cp(path, join(dist, 'assets/', pageDir, it.name))
-        break
-    }
-  }
-}

lib/constants.js

@@ -4,9 +4,9 @@
  * @date 2022/09/06 11:54:56
  */
 
-export const JS_EXP = /(?<=\n|^)<script[^>]*?>([\w\W]*?)<\/script>/
+export const JS_EXP = /<script[^>]*?>([\w\W]*?)<\/script>/
-export const STYLE_EXP = /(?<=\n|^)<style([^>]*?)>([\w\W]*?)<\/style>/g
+export const STYLE_EXP = /<style([^>]*?)>([\w\W]*?)<\/style>/g
-export const HTML_EXP = /(?<=\n|^)<template[^>]*?>([\w\W]*?)\n<\/template>/
+export const HTML_EXP = /<template[^>]*?>([\w\W]*?)\n<\/template>/
 export const V_DEEP = /:deep\(([^)]*?)\)(.*)/
 
 export const CSS_SHEET_EXP = /([%@\w\.,#\-:>\+\~\|\(\)\[\]"'\=\s]+)\{/g
@@ -16,35 +16,47 @@ export const COMMON_HEADERS = {
   'Cache-Control': 'no-store'
 }
 
-export const SHEETS_DEF =
+export const HMR_SCRIPT = `
-  'const __sheets__ = [...document.adoptedStyleSheets];\n'
+!(function vue_live_hmr(){
+  var ws = new WebSocket(\`ws\${location.protocol === 'https:' ? 's' : ''}://\${location.host}/ws-vue-live\`)
 
-export const LEGACY_POLYFILL = `!(function(){
+  ws.addEventListener('open', function (r) {
-  function join(p1, p2) {
+    if(vue_live_hmr.closed){
-    let tmp1 = p1.split('/')
+      delete vue_live_hmr.closed
-    let tmp2 = p2.split('/')
+      location.reload()
-    if (tmp1.at(-1) === '') {
-      tmp1.pop()
     }
-    while (tmp2.length) {
+    console.log('vue-live hmr ready...')
-      let tmp = tmp2.shift()
+  })
-      if (tmp === '.' || tmp === '') {
+
-        continue
+  ws.addEventListener('close', function(){
-      } else if (tmp === '..') {
+    vue_live_hmr.closed = true
-        tmp1.pop()
+    setTimeout(vue_live_hmr, 2000)
-      } else {
+  })
-        tmp1.push(tmp)
-      }
-    }
-    return tmp1.join('/')
-  }
   
-  window.__fite_import = function(url,relPath){
+  ws.addEventListener('message', function (ev) {
-    let absPath = relPath.split('/').slice(0, -1).join('/')
+    var { action, data } = JSON.parse(ev.data)
-    let req
+  
-    if(url.startsWith('./') || url.startsWith('../')) {
+    switch (action) {
-      url = join(absPath, url)
+      case 'reload':
+        location.reload()
+        break
+  
+      case 'render':
+        {
+          let tmp = [...document.adoptedStyleSheets]
+          for (let i = -1, it; (it = tmp[++i]); ) {
+            if (it.path === data.path) {
+              let stylesheet = new CSSStyleSheet()
+              stylesheet.path = data.path
+              stylesheet.replaceSync(data.content)
+              tmp[i] = stylesheet
+              document.adoptedStyleSheets = tmp
+              break
+            }
+          }
+        }
+        break
     }
-    return window.fetch(url).then(r =>  r.text())
+  })
-  }
+})()
-})()`
+`

lib/dev.js

@@ -1,13 +1,13 @@
-import http from 'node:http'
+import http from 'http'
-import https from 'node:http2'
+import https from 'https'
 import fs from 'iofs'
-import { join, dirname } from 'node:path'
+import { join, resolve, dirname } from 'path'
-import { parse } from 'node:url'
+import { parse } from 'url'
 import socket from './ws.js'
 import chokidar from 'chokidar'
-import { red } from 'kolorist'
+import { red, cyan, blue } from 'kolorist'
 
-import { friendlyErrors, defaultCustomElement, gzip } from './utils.js'
+import { friendlyErrors } from './utils.js'
 
 import { compileScss, parseJs, compileVue, parseHtml } from './compile-vue.js'
 
@@ -15,13 +15,9 @@ import MIME_TYPES from './mime-tpyes.js'
 import { COMMON_HEADERS } from './constants.js'
 
 const noc = Buffer.from('')
-const SERVER_OPTIONS = { allowHTTP1: true }
+const SERVER_OPTIONS = {}
 const CACHE = {} //文件缓存, 用于hmr
 
-function readFile(file) {
-  return (file && fs.cat(file)?.toString()) || ''
-}
-
 export default async function createServer(root = '', conf = {}) {
   const SOURCE_DIR = join(root, 'src')
   const PUBLIC_DIR = join(root, 'public')
@@ -30,22 +26,6 @@ export default async function createServer(root = '', conf = {}) {
   const PORT = conf.devServer.port || 8080
   const USE_HTTPS = conf.devServer.https
   const DOMAIN = conf.devServer.domain || 'localhost'
-  const INJECT_SCSS = readFile(conf.inject?.scss)
-  const LEGACY_MODE = !!conf.legacy
-  const ENABLE_GZIP = !!conf.devServer.gzip
-  const { isCustomElement = defaultCustomElement } = conf.compileOptions || {}
-  const { plugin = [], define = {} } = conf
-
-  if (conf.imports['vue-dev']) {
-    conf.imports.vue = conf.imports['vue-dev']
-  }
-  if (conf.imports['vue-router-dev']) {
-    conf.imports['vue-router'] = conf.imports['vue-router-dev']
-  }
-
-  if (conf.devServer.headers) {
-    Object.assign(COMMON_HEADERS, conf.devServer.headers)
-  }
 
   if (USE_HTTPS) {
     Object.assign(SERVER_OPTIONS, conf.devServer.ssl)
@@ -57,7 +37,7 @@ export default async function createServer(root = '', conf = {}) {
   }
 
   const server = (USE_HTTPS ? https : http)
-    [USE_HTTPS ? 'createSecureServer' : 'createServer'](SERVER_OPTIONS)
+    .createServer(SERVER_OPTIONS)
     .listen(PORT)
 
   const ws = socket(server)
@@ -74,7 +54,7 @@ export default async function createServer(root = '', conf = {}) {
     currentPage = ''
 
   server
-    .on('request', async function (req, res) {
+    .on('request', function (req, res) {
       let prefix = DEPLOY_PATH ? DEPLOY_PATH.replace(/\/$/, '') : ''
       let url =
         prefix && req.url.startsWith(prefix)
@@ -87,7 +67,7 @@ export default async function createServer(root = '', conf = {}) {
 
       if (prefix && req.url === '/') {
         res.setHeader('Location', DEPLOY_PATH)
-        res.writeHead(302, USE_HTTPS ? void 0 : 'Redirect')
+        res.writeHead(302, 'Redirect')
         return res.end('')
       }
 
@@ -112,7 +92,7 @@ export default async function createServer(root = '', conf = {}) {
             pageName = tmp.join('.')
             // 页面不存在时输出404, 避免进程崩溃退出
             if (!conf.pages[pageName]) {
-              res.writeHead(404, USE_HTTPS ? void 0 : 'Not Found')
+              res.writeHead(404, 'Not Found')
               return res.end(`Oops!!! 404 Not Found`)
             }
 
@@ -150,13 +130,8 @@ export default async function createServer(root = '', conf = {}) {
 
       if (isIndex) {
         res.setHeader('content-type', MIME_TYPES.html)
-        res.writeHead(200, USE_HTTPS ? void 0 : 'OK')
+        res.writeHead(200, 'OK')
-        res.end(
+        res.end('<ul>' + indexPage + '</ul>')
-          '<style>body{font:14px/1.5 Arial}ol{display:flex;flex-wrap:wrap;}li{width:30%;}a{color:teal}a:visited{color:orange;}</style>' +
-            '<div>注意: 你看到这个页面, 仅在开发时可见。<br>仅为了方便开发多页应用时访问自己想要修改的页面, 而不需要手动输入地址。</div><ol>' +
-            indexPage +
-            '</ol>'
-        )
       } else {
         res.setHeader('accept-ranges', 'bytes')
 
@@ -171,44 +146,25 @@ export default async function createServer(root = '', conf = {}) {
               let entry = fs.cat(page.entry)?.toString()
               let html = fs.cat(join(process.cwd(), 'index.html')).toString()
 
-              entry = parseJs(
+              entry = parseJs(entry, conf.imports, {
-                entry,
+                IS_MPA,
-                conf.imports,
+                currentPage,
-                {
+                IS_ENTRY: true,
-                  IS_MPA,
+                DEPLOY_PATH
-                  currentPage,
-                  IS_ENTRY: true,
-                  DEPLOY_PATH,
-                  LEGACY_MODE,
-                  isCustomElement,
-                  plugin,
-                  define
-                },
-                page.entry
-              )
-
-              for (let fn of plugin) {
-                entry = await fn('js', entry)
-              }
-
-              code = parseHtml(html, {
-                page,
-                imports: conf.imports,
-                entry,
-                LEGACY_MODE
               })
+
+              code = parseHtml(html, { page, imports: conf.imports, entry })
             }
 
             break
 
           case 'vue':
             {
-              let rpath = pathname.replace('@/', '')
+              let rpath = pathname.replace(/@\//, '')
               let file
 
               if (IS_MPA) {
-                // 判断前后2个值相等, 避免出现目录名和页面名字相同时走错逻辑
+                if (rpath.startsWith(currentPage)) {
-                if (rpath === pathname && rpath.startsWith(currentPage)) {
                   file = join(pagesDir, rpath.slice(currentPage.length))
                 } else {
                   file = join(SOURCE_DIR, rpath)
@@ -218,28 +174,19 @@ export default async function createServer(root = '', conf = {}) {
               }
               if (!fs.isfile(file)) {
                 friendlyErrors(pathname, ext)
-                res.writeHead(404, USE_HTTPS ? void 0 : 'Not Found')
+                res.writeHead(404, 'Not Found')
                 res.end('')
                 return
               }
 
-              code = await compileVue(file, conf.imports, {
+              code = compileVue(file, conf.imports, {
                 IS_MPA,
                 currentPage,
                 SOURCE_DIR,
                 CACHE,
-                DEPLOY_PATH,
+                DEPLOY_PATH
-                INJECT_SCSS,
-                LEGACY_MODE,
-                isCustomElement,
-                plugin,
-                define
               })
 
-              for (let fn of plugin) {
-                code = await fn('js', code)
-              }
-
               res.setHeader('content-type', MIME_TYPES.js)
             }
             break
@@ -247,47 +194,30 @@ export default async function createServer(root = '', conf = {}) {
           case 'scss':
           case 'css':
             {
-              let file = join(SOURCE_DIR, pathname.replace('@/', ''))
+              let file = join(SOURCE_DIR, pathname.replace(/@\//, ''))
               if (!fs.isfile(file)) {
-                file = join(PUBLIC_DIR, pathname.replace('@/', ''))
+                file = join(PUBLIC_DIR, pathname.replace(/@\//, ''))
 
                 if (!fs.isfile(file)) {
                   friendlyErrors(pathname, ext)
-                  res.writeHead(404, USE_HTTPS ? void 0 : 'Not Found')
+                  res.setHeader('content-type', MIME_TYPES.html)
+                  res.writeHead(404, 'Not Found')
                   res.end('')
                   return
                 }
               }
-              if (file === conf.inject?.scss) {
-                console.log(red('设置为注入的样式文件不可被vue/js文件引用\n'))
-                res.writeHead(404, USE_HTTPS ? void 0 : 'Not Found')
-                res.end('')
-                return
-              }
               code = compileScss(file)
-              for (let fn of plugin) {
-                code = await fn('css', code)
-              }
               res.setHeader('content-type', MIME_TYPES.css)
             }
             break
 
           case 'js':
-          case 'wasm':
             {
-              let rpath = pathname.replace('@/', '')
+              let rpath = pathname.replace(/@\//, '')
               let file
-              let isJson = false
-              let isWasm = rpath.endsWith('.wasm')
-
-              if (rpath.endsWith('json.js')) {
-                isJson = true
-                rpath = rpath.slice(0, -3)
-              }
 
               if (IS_MPA) {
-                // 判断前后2个值相等, 避免出现目录名和页面名字相同时走错逻辑
+                if (rpath.startsWith(currentPage)) {
-                if (rpath === pathname && rpath.startsWith(currentPage)) {
                   file = join(pagesDir, rpath.slice(currentPage.length))
                 } else {
                   file = join(SOURCE_DIR, rpath)
@@ -299,43 +229,19 @@ export default async function createServer(root = '', conf = {}) {
               if (fs.isfile(file)) {
                 code = fs.cat(file)
               } else if (fs.isfile(join(PUBLIC_DIR, rpath))) {
-                file = join(PUBLIC_DIR, rpath)
+                code = fs.cat(join(PUBLIC_DIR, rpath))
-                code = fs.cat(file)
               } else {
                 friendlyErrors(rpath, ext)
-                res.writeHead(404, USE_HTTPS ? void 0 : 'Not Found')
+                res.writeHead(404, 'Not Found')
                 res.end('')
                 return
               }
-              if (isJson) {
+              code = parseJs(code + '', conf.imports, {
-                try {
+                IS_MPA,
-                  code =
+                currentPage,
-                    'export default ' + JSON.stringify(JSON.parse(code + ''))
+                DEPLOY_PATH
-                } catch (err) {
+              })
-                  console.log('%s 语法错误: %s', rpath, red(err.message))
+              res.setHeader('content-type', MIME_TYPES.js)
-                }
-              } else if (isWasm) {
-                //
-              } else {
-                code = parseJs(
-                  code + '',
-                  conf.imports,
-                  {
-                    IS_MPA,
-                    currentPage,
-                    DEPLOY_PATH,
-                    LEGACY_MODE,
-                    isCustomElement,
-                    plugin,
-                    define
-                  },
-                  file
-                )
-                for (let fn of plugin) {
-                  code = await fn('js', code)
-                }
-              }
-              res.setHeader('content-type', MIME_TYPES[ext])
             }
 
             break
@@ -368,23 +274,16 @@ export default async function createServer(root = '', conf = {}) {
             }
             if (code === null) {
               friendlyErrors(pathname, ext)
-              res.writeHead(404, USE_HTTPS ? void 0 : 'Not Found')
+              res.writeHead(404, 'Not Found')
               res.end('')
               return
             }
             break
         }
 
-        if (ENABLE_GZIP) {
+        res.setHeader('content-length', Buffer.byteLength(code || noc))
-          code = gzip(code || noc)
+        res.writeHead(200, 'OK')
-          res.setHeader('Content-Encoding', 'gzip')
+        res.end(code || noc)
-        } else {
-          code = code || noc
-        }
-
-        res.setHeader('Content-Length', Buffer.byteLength(code))
-        res.writeHead(200, USE_HTTPS ? void 0 : 'OK')
-        res.end(code)
       }
     })
 
@@ -401,7 +300,7 @@ export default async function createServer(root = '', conf = {}) {
       console.log(
         '  本地: %s://%s:%d%s',
         USE_HTTPS ? 'https' : 'http',
-        USE_HTTPS ? 'localhost' : '127.0.0.1',
+        '127.0.0.1',
         PORT,
         DEPLOY_PATH
       )
@@ -414,7 +313,7 @@ export default async function createServer(root = '', conf = {}) {
       )
       chokidar
         .watch([SOURCE_DIR, PUBLIC_DIR, join(root, './index.html')])
-        .on('all', async (act, filePath) => {
+        .on('all', (act, filePath) => {
           if (ready) {
             let file = filePath.slice(SOURCE_DIR.length)
 
@@ -425,18 +324,7 @@ export default async function createServer(root = '', conf = {}) {
                 case 'css':
                 case 'scss':
                   {
-                    let content = ''
+                    let content = fs.cat(filePath).toString()
-                    if (filePath === conf.inject?.scss) {
-                      return
-                    }
-                    if (ext === 'scss') {
-                      content = compileScss(filePath)
-                    } else {
-                      content = fs.cat(filePath).toString()
-                    }
-                    for (let fn of plugin) {
-                      content = await fn('css', content)
-                    }
                     ws.send({
                       action: 'render',
                       data: { path: file.replace(/\\/g, '/'), content }
@@ -446,17 +334,12 @@ export default async function createServer(root = '', conf = {}) {
 
                 case 'vue':
                   {
-                    let content = await compileVue(filePath, conf.imports, {
+                    let content = compileVue(filePath, conf.imports, {
                       IS_MPA,
                       currentPage,
                       SOURCE_DIR,
                       CACHE,
-                      DEPLOY_PATH,
+                      DEPLOY_PATH
-                      INJECT_SCSS,
-                      LEGACY_MODE,
-                      isCustomElement,
-                      plugin,
-                      define
                     })
                     let tmp = CACHE[filePath]
                     if (tmp.changed) {

lib/prod.js

@@ -1,224 +1,162 @@
-import { join, dirname, parse, normalize } from 'node:path'
-import { Worker, parentPort } from 'node:worker_threads'
-import os from 'node:os'
 import fs from 'iofs'
+import { join, resolve, dirname, parse } from 'path'
+import Es from 'esbuild'
+import { compileScss, parseJs, compileVue, parseHtml } from './compile-vue.js'
 
-import { compileFiles } from './compile.js'
+const noc = Buffer.from('')
-import { defaultCustomElement } from './utils.js'
 
-const IS_WIN = process.platform === 'win32'
+export default function compile(root = '', dist = '', conf = {}) {
-const PREFIX = IS_WIN ? 'pages\\' : 'pages/'
-// 4核(或4线程)以上的CPU, 才开启多线程编译。且线程开销太高, 开太多线程效率反而不高。
-const CPU_CORES = os.cpus().length > 5 ? 6 : os.cpus().length
-const THREADS_NUM = CPU_CORES > 3 ? CPU_CORES - 1 : 0
-const __filename = normalize(import.meta.url.slice(IS_WIN ? 8 : 7))
-const __dirname = dirname(__filename)
-const WORKER_POOL = new Set() // 线程池
-const JOBS_QUEUE = [] // 任务队列
-
-function readFile(file) {
-  return (file && fs.cat(file)?.toString()) || ''
-}
-
-function doJob() {
-  while (JOBS_QUEUE.length && WORKER_POOL.size) {
-    let job = JOBS_QUEUE.shift()
-    let worker = WORKER_POOL.values().next().value
-
-    WORKER_POOL.delete(worker)
-
-    worker.once('message', _ => {
-      if (JOBS_QUEUE.length) {
-        WORKER_POOL.add(worker)
-        doJob()
-      } else {
-        worker.terminate()
-      }
-    })
-
-    worker.postMessage(job)
-  }
-}
-
-export default function compile(root = '', dist = '', conf = {}, verbose) {
   //
   const SOURCE_DIR = join(root, 'src')
   const PUBLIC_DIR = join(root, 'public')
   const DEPLOY_PATH = conf.base || '' // 部署目录, 默认是根目录部署
-  const PAGES_KEYS = Object.keys(conf.pages)
+  const IS_MPA = Object.keys(conf.pages).length > 1
-  const IS_MPA = PAGES_KEYS.length > 1
-  const PAGES_PREFIX = PAGES_KEYS.map(it =>
-    IS_WIN ? `${PREFIX + it}\\` : `${PREFIX + it}/`
-  )
-  const INJECT_SCSS = readFile(conf.inject?.scss)
-  const LEGACY_MODE = !!conf.legacy
-  const {
-    ABS_CONFIG_FILEPATH,
-    compileOptions = {},
-    define = {},
-    plugin = []
-  } = conf
-  const { isCustomElement = defaultCustomElement } = compileOptions
-
-  conf.inject = conf.inject || { scss: '' }
 
   let timeStart = Date.now()
-  let template = fs.cat(join(process.cwd(), 'index.html')).toString()
+  let template = fs.cat(join(process.env.PWD, 'index.html')).toString()
-  let list = new Map()
-  let options = {
-    IS_MPA,
-    SOURCE_DIR,
-    DEPLOY_PATH,
-    INJECT_SCSS,
-    LEGACY_MODE,
-    ABS_CONFIG_FILEPATH,
-    define
-  }
 
-  fs.ls(SOURCE_DIR, true).forEach(path => {
+  let list = fs
-    if (fs.isdir(path)) {
+    .ls(SOURCE_DIR, true)
-      return
+    .map(it => ({
-    }
+      name: it.slice(SOURCE_DIR.length + 1),
+      path: it,
+      ext: parse(it).ext
+    }))
+    .filter(it => fs.isfile(it.path) && it.ext !== '')
 
-    let name = path.slice(SOURCE_DIR.length + 1)
+  let compileFiles = function (currentPage, page, files) {
-    let it = {
+    for (let it of files) {
-      name,
+      // 入口文件, 特殊处理
-      ext: parse(name).ext
+      if (page && it.path === page.entry) {
-    }
+        let entry = fs.cat(page.entry).toString()
-    if (it.ext) {
+
-      if (IS_MPA && it.name.startsWith(PREFIX)) {
+        entry = parseJs(
-        if (PAGES_PREFIX.some(it => it.startsWith(it.name))) {
+          entry,
-          list.set(path, it)
+          conf.imports,
-        }
+          { IS_MPA, currentPage, IS_ENTRY: true, DEPLOY_PATH },
-        return
+          true
+        )
+
+        let code = parseHtml(
+          template,
+          { page, imports: conf.imports, entry },
+          true
+        )
+
+        fs.echo(code, join(dist, `${currentPage}.html`))
+        continue
       }
 
-      if (path === conf.inject.scss) {
+      console.log('  解析 %s ...', it.name)
-        return
-      }
-      list.set(path, it)
-    }
-  })
 
-  // 创建线程池
+      let pageDir = IS_MPA && currentPage ? `pages/${currentPage}` : ''
-  if (THREADS_NUM > 0 && (IS_MPA || list.size > THREADS_NUM * 10)) {
-    // 页面数过少时, 线程数量不能比页面数多
-    let max = Math.min(THREADS_NUM, PAGES_KEYS.length)
 
-    for (let i = 0; i < max; i++) {
+      switch (it.ext) {
-      WORKER_POOL.add(
+        case '.vue':
-        new Worker(join(__dirname, './thread.js'), {
+          {
-          workerData: {
+            let code = compileVue(
-            options,
+              it.path,
-            verbose,
+              conf.imports,
-            dist,
+              { IS_MPA, currentPage, SOURCE_DIR, DEPLOY_PATH },
-            imports: conf.imports
+              true
+            )
+
+            Es.transform(code, { minify: true }).then(r => {
+              fs.echo(
+                r.code,
+                join(dist, 'assets/', pageDir, it.name.replace(/\.vue$/, '.js'))
+              )
+            })
           }
-        })
+          break
-      )
-    }
-  } else {
-    options.isCustomElement = isCustomElement
-  }
 
-  // 优先处理静态目录, 之后的源码目录中, 以便如果有产生相同的文件名, 则覆盖静态目录中的文件
+        case '.js':
-  if (fs.isdir(PUBLIC_DIR)) {
+          {
-    console.log('\n正在处理静态资源 ...')
+            let code = fs.cat(it.path)
-    fs.ls(PUBLIC_DIR, true).forEach(it => {
-      let ext = parse(it).ext
 
-      if (ext && fs.isfile(it)) {
+            code = parseJs(
-        let name = it.slice(PUBLIC_DIR.length + 1)
+              code + '',
-        verbose && console.log('  复制 %s ...', name)
+              conf.imports,
-        fs.cp(it, join(dist, name))
+              { IS_MPA, currentPage, DEPLOY_PATH },
+              true
+            )
+            Es.transform(code, { minify: true }).then(r => {
+              fs.echo(r.code, join(dist, 'assets/', pageDir, it.name))
+            })
+          }
+          break
+
+        case '.scss':
+        case '.css':
+          {
+            let code = compileScss(it.path)
+            if (!it.name.startsWith('assets')) {
+              it.name = 'assets/' + it.name
+            }
+            fs.echo(code, join(dist, it.name.replace(/\.scss$/, '.css')))
+          }
+          break
+
+        default:
+          fs.cp(it.path, join(dist, it.name))
+          break
       }
-    })
+    }
   }
 
-  if (IS_MPA) {
+  for (let currentPage in conf.pages) {
-    for (let currentPage of PAGES_KEYS) {
+    let page = conf.pages[currentPage]
-      let page = conf.pages[currentPage]
+    let dir = dirname(page.entry)
-      let dir = dirname(page.entry)
+    let files = list
-      let files = new Map()
+    if (IS_MPA) {
-      let chunk = new Map()
+      files = []
-
+      fs.ls(dir, true).forEach(it => {
-      fs.ls(dir, true).forEach(path => {
+        if (fs.isdir(it)) {
-        if (fs.isdir(path)) {
           return
         }
-
+        let idx = list.findIndex(_ => _.path === it)
-        let name = path.slice(dir.length + 1)
+        let name = it.slice(dir.length + 1)
         let ext = parse(name).ext
 
         if (ext === '') {
           return
         }
 
-        list.delete(path)
+        list.splice(idx, 1)
-        files.set(path, { name, ext })
-      })
 
-      if (THREADS_NUM > 0) {
+        files.push({
-        chunk.set(currentPage, { page, files })
+          name,
-        JOBS_QUEUE.push(chunk)
+          path: it,
-        doJob()
+          ext
-      } else {
-        console.log(`正在生成 ${currentPage}.html ...`)
-        compileFiles(currentPage, page, files, options, {
-          verbose,
-          dist,
-          imports: conf.imports
         })
-      }
-    }
-
-    // 公共依赖
-    if (THREADS_NUM > 0) {
-      let chunk = new Map()
-      chunk.set('', { page: null, files: list })
-
-      JOBS_QUEUE.push(chunk)
-      doJob()
-    } else {
-      console.log('\n正在解析公共依赖 ...')
-      compileFiles('', null, list, options, {
-        verbose,
-        dist,
-        imports: conf.imports
-      })
-    }
-  } else {
-    // 每个线程处理的文件数
-    let chunkSize = Math.ceil(list.size / THREADS_NUM)
-    let currentPage = PAGES_KEYS[0]
-    let page = conf.pages[currentPage]
-
-    console.log(`正在生成 ${currentPage}.html ...`)
-
-    if (THREADS_NUM > 0 && list.size > THREADS_NUM * 10) {
-      list = [...list]
-      for (let i = 0; i < THREADS_NUM; i++) {
-        let start = i * chunkSize
-        let end = start + chunkSize
-        let chunk = new Map()
-
-        chunk.set(currentPage, { page, files: list.slice(start, end) })
-
-        JOBS_QUEUE.push(chunk)
-        doJob()
-      }
-    } else {
-      options.plugin = plugin
-      options.isCustomElement = isCustomElement
-      compileFiles(currentPage, page, list, options, {
-        verbose,
-        dist,
-        imports: conf.imports
       })
     }
+    console.log('正在生成 %s ...', `${currentPage}.html`)
+    compileFiles(currentPage, page, files)
   }
 
-  process.on('exit', _ => {
+  if (IS_MPA) {
-    console.log('\n页面处理完成, 耗时 %ss\n', (Date.now() - timeStart) / 1000)
+    console.log('\n正在解析公共依赖 ...')
-  })
+    compileFiles('', null, list)
+  }
+
+  //
+  if (fs.isdir(PUBLIC_DIR)) {
+    console.log('\n正在处理静态资源 ...')
+    fs.ls(PUBLIC_DIR, true).forEach(it => {
+      let ext = parse(it).ext
+
+      if (ext === '') {
+        return
+      }
+
+      if (fs.isfile(it)) {
+        let name = it.slice(PUBLIC_DIR.length + 1)
+        console.log('  复制 %s ...', name)
+        fs.cp(it, join(dist, name))
+      }
+    })
+  }
+
+  console.log('\n页面处理完成, 耗时 %ss\n', (Date.now() - timeStart) / 1000)
 }

lib/thread.js

@@ -1,40 +0,0 @@
-/**
- * 子线程
- * @author yutent<yutent.io@gmail.com>
- * @date 2023/06/14 16:15:39
- */
-import { parentPort, workerData } from 'node:worker_threads'
-import { compileFiles } from './compile.js'
-import { defaultCustomElement } from './utils.js'
-
-const { options, verbose, dist, imports } = workerData
-const { ABS_CONFIG_FILEPATH } = options
-
-const { compileOptions = {}, plugin = [] } = await import(
-  ABS_CONFIG_FILEPATH
-).then(r => r.default)
-
-const { isCustomElement = defaultCustomElement } = compileOptions
-options.isCustomElement = isCustomElement
-options.plugin = plugin
-
-//
-async function doJob(job) {
-  let [currentPage, { page, files }] = job.entries().next().value
-
-  options.IS_MPA &&
-    console.log(
-      currentPage
-        ? `正在生成 ${currentPage}.html ...`
-        : '\n正在解析公共依赖 ...'
-    )
-
-  await compileFiles(currentPage, page, files, options, {
-    verbose,
-    dist,
-    imports
-  })
-  parentPort.postMessage(true)
-}
-
-parentPort.on('message', doJob)

lib/utils.js

@@ -1,33 +1,4 @@
-/**
- * {一些工具类函数}
- * @author yutent<yutent.io@gmail.com>
- * @date 2023/05/22 14:52:00
- */
-
-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) {
-  return join(...args).replace(/\\/g, '/')
-}
-
-export function uuid() {
-  return randomUUID().slice(-8)
-}
-
-export function md5(str = '') {
-  let sum = createHash('md5')
-  sum.update(str, 'utf8')
-  return sum.digest('hex').slice(0, 8)
-}
-
-export function gzip(val) {
-  return gzipSync(val)
-}
 
 export function friendlyErrors(pathname, ext = '') {
   console.log(cyan(pathname), red(`not found!!!`))
@@ -36,70 +7,3 @@ export function friendlyErrors(pathname, ext = '') {
     blue(`/index.${ext}`)
   )
 }
-
-export function createHmrScript(legacy, session = '') {
-  return `
-  !(function vue_live_hmr(){
-    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){
-        delete vue_live_hmr.closed
-        location.reload()
-      }
-      console.log('fite hmr ready...')
-    })
-  
-    ws.addEventListener('close', function(){
-      vue_live_hmr.closed = true
-      if (localStorage.getItem(location.pathname) === '1') {
-        return
-      }
-      setTimeout(vue_live_hmr, 2000)
-    })
-    
-    ws.addEventListener('message', function (ev) {
-      var { action, data } = JSON.parse(ev.data)
-    
-      switch (action) {
-        case 'reload':
-          location.reload()
-          break
-    
-        case 'render':
-          {
-            ${
-              legacy
-                ? `
-            let stylesheet = document.head.children.namedItem(data.path)
-            if (stylesheet) {
-              stylesheet.textContent = data.content
-            }
-            `
-                : `
-            let tmp = [...document.adoptedStyleSheets]
-            for (let i = -1, it; (it = tmp[++i]); ) {
-              if (it.path === data.path) {
-                let stylesheet = new CSSStyleSheet()
-                stylesheet.path = data.path
-                stylesheet.replaceSync(data.content)
-                tmp[i] = stylesheet
-                document.adoptedStyleSheets = tmp
-                break
-              }
-            }
-            `
-            }
-          }
-          break
-      }
-    })
-    ${LEGACY_POLYFILL}
-  })()
-  `
-}
-
-// 默认的 web components 判断
-export function defaultCustomElement(tag) {
-  return tag.startsWith('wc-')
-}

lib/ws.js

@@ -6,40 +6,28 @@
 import { WebSocketServer } from 'ws'
 
 class WebSocket {
-  #clients = new Map()
+  #ws = null // ws实例
   #queue = [] // 消息队列
 
   constructor(server) {
     if (server.listening) {
-      let conn = new WebSocketServer({ server, path: '/ws-fite-hmr' })
+      let conn = new WebSocketServer({ server, path: '/ws-vue-live' })
-      conn.on('connection', (client, req) => {
+      conn.on('connection', ws => {
-        let params = new URLSearchParams(req.url.slice(req.url.indexOf('?')))
+        this.#ws = ws
-        let session = params.get('session')
+        // ws.on('message', data => {
-        let lock = +params.get('lock')
+        //   console.log(data + '');
-
+        // })
-        if (lock === 1) {
+        while (this.#queue.length) {
-          client.close()
+          let msg = this.#queue.shift()
-        } else {
+          this.send(msg)
-          this.#clients.set(session, client)
-
-          client.once('close', _ => {
-            this.#clients.delete(session)
-          })
-
-          while (this.#queue.length) {
-            let msg = this.#queue.shift()
-            this.send(msg)
-          }
         }
       })
     }
   }
 
   send(msg = {}) {
-    if (this.#clients.size) {
+    if (this.#ws) {
-      for (let [key, client] of this.#clients) {
+      this.#ws.send(JSON.stringify(msg))
-        client.send(JSON.stringify(msg))
-      }
     } else {
       this.#queue.push(msg)
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fite",
   "type": "module",
-  "version": "1.4.4",
+  "version": "0.7.5",
   "bin": {
     "fite": "index.js"
   },
@@ -19,6 +19,5 @@
   },
   "engines": {
     "node": ">=16.6.0"
-  },
+  }
-  "license": "MIT"
 }