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

@@ -19,7 +19,6 @@ 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 ABS_CONFIG_FILEPATH = PROTOCOL + CONFIG_FILE
 
 let args = process.argv.slice(2)
 let mode = args.shift() || 'prod'
@@ -41,9 +40,8 @@ switch (mode) {
   case 'dev':
     process.env.NODE_ENV = 'development'
 
-    import(ABS_CONFIG_FILEPATH)
+    import(PROTOCOL + CONFIG_FILE)
       .then(function (conf) {
-        conf.default.ABS_CONFIG_FILEPATH = ABS_CONFIG_FILEPATH
         createServer(WORK_SPACE, conf.default)
       })
       .catch(err => {
@@ -54,14 +52,13 @@ switch (mode) {
   case 'build':
     process.env.NODE_ENV = 'production'
 
-    import(ABS_CONFIG_FILEPATH)
+    import(PROTOCOL + CONFIG_FILE)
       .then(function (conf) {
         let dist = conf.buildDir || 'dist'
         if (clean && fs.isdir(dist)) {
           console.log('清除dist目录...')
           fs.rm(dist)
         }
-        conf.default.ABS_CONFIG_FILEPATH = ABS_CONFIG_FILEPATH
         compile(WORK_SPACE, dist, conf.default, verbose)
       })
       .catch(err => {

lib/compile-vue.js

@@ -18,8 +18,7 @@ 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'
 
@@ -27,10 +26,6 @@ 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)
@@ -64,7 +59,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(':')) {
@@ -115,9 +110,8 @@ 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, LEGACY_MODE } = {},
-  filename,
+  filename
-  linePatch = 1
 ) {
   let fixedStyle = ''
   let ASSETS_DIR = '/@/'
@@ -131,21 +125,16 @@ export function parseJs(
     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('%s: %s', red('Uncaught SyntaxError'), red(err.text))
-    // 将上下文几行都打印出来
-    for (let i = err.location.line - 3; i <= err.location.line + 1; i++) {
     console.log(
       '  @ line %d: %s',
-        i + linePatch,
+      err.location.line,
-        err.location.line === i + 1 ? red(lines[i]) : lines[i]
+      cyan(err.location.lineText)
     )
-    }
     console.log(
       '  @ %s:%d:%d',
       blue(filename),
-      err.location.line + linePatch - 1,
+      err.location.line,
       err.location.column
     )
   }
@@ -154,7 +143,7 @@ export function parseJs(
     .replace(/\r\n/g, '\n')
     .replace(/process\.env\.NODE_ENV/g, `'${process.env.NODE_ENV}'`)
     .replace(
-      /(import|export) ([^'"]*?) from (["'])(.*?)\3/g,
+      /(import|export) ([\w\W]*?) from (["'])(.*?)\3/g,
       function (m, t, alias, q, name) {
         if (name.startsWith('@/')) {
           name = name.replace('@/', urlJoin(DEPLOY_PATH, ASSETS_DIR))
@@ -191,19 +180,9 @@ export function parseJs(
         if (isBuild) {
           name = name.replace(/\.vue$/, '.js')
         }
-        if (alias.trim() === '*') {
+        return `import ${alias} from '${name}'${
-          return `${t} ${alias} from '${name}'`
+          t === 'export' ? `\nexport ${alias}` : ''
-        }
+        }`
-        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) {
@@ -213,9 +192,6 @@ export function parseJs(
       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) {
@@ -231,30 +207,19 @@ export function parseJs(
         let _name = name.replace(/\\/g, '/').replace('@/', '')
         let tmp = `style_${uuid()}`
 
-        // 因为esm语法的变更, 原先的 import xx from xx assets {type: css} 变为了 with
-        // 而这个语法的变化, 构建工具无法做版本判断, 故, 统一降级到fetch()加载
         if (LEGACY_MODE) {
-          fixedStyle +=
+          fixedStyle += `${tmp}.then(r => {
-            `{\n` +
+  let stylesheet = document.createElement('style')
-            `  let stylesheet = document.createElement('style');\n` +
+  stylesheet.setAttribute('name', '${_name}')
-            `  stylesheet.setAttribute('name', '${_name}');\n` +
+  stylesheet.textContent = r
-            `  stylesheet.textContent = ${tmp};\n` +
+  document.head.appendChild(stylesheet)
-            `  document.head.appendChild(stylesheet);\n` +
+})
-            `}\n`
+`
-
+          return `const ${tmp} = window.fetch('${name}').then(r => r.text())`
-          return `let ${tmp};\n!(async function(){\n  ${tmp} = await __fite_import('${name}', import.meta.url);\n})()`
         } else {
-          // CSSStyleSheet.replaceSync 需要FF v101, Safari 16.4才支持
+          fixedStyle += `${tmp}.path = '${_name}'\n__sheets__.push(${tmp})\n`
-          fixedStyle +=
-            `{\n` +
-            `  let stylesheet = new CSSStyleSheet();\n` +
-            `  stylesheet.path = '${_name}';\n` +
-            `  stylesheet.replaceSync(${tmp} );\n` +
-            `  __sheets__.push(stylesheet);\n` +
-            `  document.adoptedStyleSheets = __sheets__;\n` +
-            `}\n`
 
-          return `const ${tmp} = await __fite_import('${name}', import.meta.url)`
+          return `import ${tmp} from '${name}' assert { type: 'css' }`
         }
       } else {
         if (name.startsWith('@/')) {
@@ -290,10 +255,6 @@ export function parseJs(
       }
     })
 
-  for (let key in define) {
-    code = code.replaceAll(key, define[key])
-  }
-
   if (fixedStyle) {
     code += '\n\n' + (IS_ENTRY ? SHEETS_DEF : '') + fixedStyle
 
@@ -310,7 +271,7 @@ export function parseJs(
  * @param file <String> 文件路径
  * @return <String> 返回转换后的js代码
  */
-export async function compileVue(file, imports, options = {}) {
+export function compileVue(file, imports, options = {}) {
   // 修正那反人类的windows路径
   let filename = file.slice(options.SOURCE_DIR.length).replace(/\\/g, '/')
   let code = (fs.cat(file) || '').toString().replace(/\r\n/g, '\n')
@@ -322,7 +283,6 @@ export async function compileVue(file, imports, options = {}) {
   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
@@ -340,15 +300,10 @@ export async function compileVue(file, imports, options = {}) {
       } else {
         css = compileScss(it[1], options.INJECT_SCSS)
       }
-
       return css
     })
     .join(' ')
 
-  for (let fn of options.plugin) {
-    scss = await fn('css', scss)
-  }
-
   js = js ? js[1] : 'export default {}'
 
   try {
@@ -362,8 +317,8 @@ export async function compileVue(file, imports, options = {}) {
       isCustomElement
     }).code.replace('export function render', 'function render')
   } catch (err) {
-    let lines = html[1].split('\n')
+    let tmp = html[1].split('\n')
-    let line = lines[err.loc?.start.line - 1]
+    let line = tmp[err.loc.start.line - 1]
 
     console.log('%s: %s', red('SyntaxError'), red(err.message))
     console.log(
@@ -404,7 +359,7 @@ function render(_ctx, _cache) {
     CACHE[file] = { changed: false, js, html }
   }
 
-  output += parseJs(js, imports, options, file, linePatch).replace(
+  output += parseJs(js, imports, options, file).replace(
     'export default {',
     `\n${
       options.LEGACY_MODE ? '' : SHEETS_DEF
@@ -425,13 +380,13 @@ function render(_ctx, _cache) {
 `
     } else {
       output += `
-{
+  {
     let stylesheet = new CSSStyleSheet()
     stylesheet.path = '${filename}'
     stylesheet.replaceSync(\`${scss}\`)
     __sheets__.push(stylesheet)
-}
+  }
-document.adoptedStyleSheets = __sheets__
+  document.adoptedStyleSheets = __sheets__
 `
     }
   }
@@ -446,15 +401,23 @@ document.adoptedStyleSheets = __sheets__
 /**
  * 解析模板html
  */
-export function parseHtml(html, { page, imports, entry, LEGACY_MODE }) {
+export function parseHtml(
+  html,
+  { page, imports, entry, LEGACY_MODE, session }
+) {
   return html
     .replace(/\r\n/g, '\n')
     .replace(
       '</head>',
       `${
         process.env.NODE_ENV === 'development'
-          ? `  <script>${minify(createHmrScript(LEGACY_MODE))}</script>\n`
+          ? `  <script>${Es.transformSync(
-          : `  <script>${minify(LEGACY_POLYFILL)}</script>\n`
+              createHmrScript(LEGACY_MODE, session),
+              {
+                minify: true
+              }
+            ).code.trim()}</script>\n`
+          : ''
       }</head>`
     )
     .replace('{{title}}', page.title || '')

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

@@ -18,33 +18,3 @@ 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 absPath = relPath.split('/').slice(0, -1).join('/')
-    let req
-    if(url.startsWith('./') || url.startsWith('../')) {
-      url = join(absPath, url)
-    }
-    return window.fetch(url).then(r =>  r.text())
-  }
-})()`

lib/dev.js

@@ -7,7 +7,7 @@ import socket from './ws.js'
 import chokidar from 'chokidar'
 import { red } from 'kolorist'
 
-import { friendlyErrors, defaultCustomElement, gzip } from './utils.js'
+import { friendlyErrors, isCustomElement, md5, gzip } from './utils.js'
 
 import { compileScss, parseJs, compileVue, parseHtml } from './compile-vue.js'
 
@@ -33,8 +33,6 @@ export default async function createServer(root = '', conf = {}) {
   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']
@@ -43,10 +41,6 @@ export default async function createServer(root = '', conf = {}) {
     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)
 
@@ -74,7 +68,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)
@@ -152,10 +146,9 @@ export default async function createServer(root = '', conf = {}) {
         res.setHeader('content-type', MIME_TYPES.html)
         res.writeHead(200, USE_HTTPS ? void 0 : 'OK')
         res.end(
-          '<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><ul>' +
-            '<div>注意: 你看到这个页面, 仅在开发时可见。<br>仅为了方便开发多页应用时访问自己想要修改的页面, 而不需要手动输入地址。</div><ol>' +
             indexPage +
-            '</ol>'
+            '</ul>'
         )
       } else {
         res.setHeader('accept-ranges', 'bytes')
@@ -171,31 +164,20 @@ 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,
-                conf.imports,
-                {
                 IS_MPA,
                 currentPage,
                 IS_ENTRY: true,
                 DEPLOY_PATH,
-                  LEGACY_MODE,
+                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
+                LEGACY_MODE,
+                session: md5(page.entry)
               })
             }
 
@@ -223,7 +205,7 @@ export default async function createServer(root = '', conf = {}) {
                 return
               }
 
-              code = await compileVue(file, conf.imports, {
+              code = compileVue(file, conf.imports, {
                 IS_MPA,
                 currentPage,
                 SOURCE_DIR,
@@ -231,15 +213,9 @@ export default async function createServer(root = '', conf = {}) {
                 DEPLOY_PATH,
                 INJECT_SCSS,
                 LEGACY_MODE,
-                isCustomElement,
+                isCustomElement: conf.isCustomElement || isCustomElement
-                plugin,
-                define
               })
 
-              for (let fn of plugin) {
-                code = await fn('js', code)
-              }
-
               res.setHeader('content-type', MIME_TYPES.js)
             }
             break
@@ -265,25 +241,14 @@ export default async function createServer(root = '', conf = {}) {
                 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 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个值相等, 避免出现目录名和页面名字相同时走错逻辑
@@ -299,43 +264,20 @@ 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.end('')
                 return
               }
-              if (isJson) {
+              code = parseJs(code + '', conf.imports, {
-                try {
-                  code =
-                    'export default ' + JSON.stringify(JSON.parse(code + ''))
-                } catch (err) {
-                  console.log('%s 语法错误: %s', rpath, red(err.message))
-                }
-              } else if (isWasm) {
-                //
-              } else {
-                code = parseJs(
-                  code + '',
-                  conf.imports,
-                  {
                 IS_MPA,
                 currentPage,
                 DEPLOY_PATH,
-                    LEGACY_MODE,
+                LEGACY_MODE
-                    isCustomElement,
+              })
-                    plugin,
+              res.setHeader('content-type', MIME_TYPES.js)
-                    define
-                  },
-                  file
-                )
-                for (let fn of plugin) {
-                  code = await fn('js', code)
-                }
-              }
-              res.setHeader('content-type', MIME_TYPES[ext])
             }
 
             break
@@ -414,7 +356,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)
 
@@ -434,9 +376,6 @@ export default async function createServer(root = '', conf = {}) {
                     } 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,7 +385,7 @@ 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,
@@ -454,9 +393,7 @@ export default async function createServer(root = '', conf = {}) {
                       DEPLOY_PATH,
                       INJECT_SCSS,
                       LEGACY_MODE,
-                      isCustomElement,
+                      isCustomElement: conf.isCustomElement || isCustomElement
-                      plugin,
-                      define
                     })
                     let tmp = CACHE[filePath]
                     if (tmp.changed) {

lib/prod.js

@@ -1,79 +1,33 @@
-import { join, dirname, parse, normalize } from 'node:path'
+import { join, dirname, parse } from 'node:path'
-import { Worker, parentPort } from 'node:worker_threads'
-import os from 'node:os'
 import fs from 'iofs'
-
+import Es from 'esbuild'
-import { compileFiles } from './compile.js'
+import { compileScss, parseJs, compileVue, parseHtml } from './compile-vue.js'
-import { defaultCustomElement } from './utils.js'
+import { isCustomElement } from './utils.js'
 
 const IS_WIN = process.platform === 'win32'
 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 = Object.keys(conf.pages).map(it =>
-  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 list = new Map()
+  let list = {}
-  let options = {
-    IS_MPA,
-    SOURCE_DIR,
-    DEPLOY_PATH,
-    INJECT_SCSS,
-    LEGACY_MODE,
-    ABS_CONFIG_FILEPATH,
-    define
-  }
 
   fs.ls(SOURCE_DIR, true).forEach(path => {
     if (fs.isdir(path)) {
@@ -82,43 +36,109 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
 
     let name = path.slice(SOURCE_DIR.length + 1)
     let it = {
+      path,
       name,
       ext: parse(name).ext
     }
-    if (it.ext) {
+    if (it.ext !== '') {
       if (IS_MPA && it.name.startsWith(PREFIX)) {
         if (PAGES_PREFIX.some(it => it.startsWith(it.name))) {
-          list.set(path, it)
+          return (list[path] = it)
-        }
-        return
-      }
-
-      if (path === conf.inject.scss) {
-        return
-      }
-      list.set(path, it)
-    }
-  })
-
-  // 创建线程池
-  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++) {
-      WORKER_POOL.add(
-        new Worker(join(__dirname, './thread.js'), {
-          workerData: {
-            options,
-            verbose,
-            dist,
-            imports: conf.imports
-          }
-        })
-      )
-    }
         } else {
-    options.isCustomElement = isCustomElement
+          return
+        }
+      }
+
+      if (it.path === conf.inject.scss) {
+        return
+      }
+
+      list[path] = it
+    }
+  })
+
+  let compileFiles = function (currentPage, page, files) {
+    let options = {
+      IS_MPA,
+      currentPage,
+      SOURCE_DIR,
+      DEPLOY_PATH,
+      INJECT_SCSS,
+      LEGACY_MODE,
+      isCustomElement: conf.isCustomElement || isCustomElement
+    }
+
+    for (let k in files) {
+      let it = files[k]
+      // 入口文件, 特殊处理
+      if (page && it.path === page.entry) {
+        let entry = fs.cat(page.entry).toString()
+
+        entry = parseJs(entry, conf.imports, { ...options, IS_ENTRY: true })
+
+        let code = parseHtml(template, {
+          page,
+          imports: conf.imports,
+          entry,
+          LEGACY_MODE
+        })
+
+        fs.echo(code, join(dist, `${currentPage}.html`))
+        continue
+      }
+
+      verbose && console.log('  解析 %s ...', it.name)
+
+      let pageDir = IS_MPA && currentPage ? `pages/${currentPage}` : ''
+
+      switch (it.ext) {
+        case '.vue':
+          {
+            let code = compileVue(it.path, conf.imports, options)
+
+            Es.transform(code, { minify: true }).then(r => {
+              fs.echo(
+                r.code,
+                join(dist, 'assets/', pageDir, it.name.replace(/\.vue$/, '.js'))
+              )
+            })
+          }
+          break
+
+        case '.js':
+          {
+            let code = fs.cat(it.path)
+
+            code = parseJs(code + '', conf.imports, options)
+
+            Es.transform(code, { minify: true }).then(r => {
+              fs.echo(r.code, join(dist, 'assets/', pageDir, it.name))
+            })
+          }
+          break
+
+        case '.scss':
+        case '.css':
+          {
+            let target = join(
+              dist,
+              'assets/',
+              it.name.replace(/\.scss$/, '.css')
+            )
+            if (it.ext === '.css') {
+              fs.cp(it.path, target)
+            } else {
+              let code = compileScss(it.path)
+              fs.echo(code, target)
+            }
+          }
+          break
+
+        default:
+          fs.cp(it.path, join(dist, it.name))
+          break
+      }
+    }
   }
 
   // 优先处理静态目录, 之后的源码目录中, 以便如果有产生相同的文件名, 则覆盖静态目录中的文件
@@ -127,21 +147,25 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
     fs.ls(PUBLIC_DIR, true).forEach(it => {
       let ext = parse(it).ext
 
-      if (ext && fs.isfile(it)) {
+      if (ext === '') {
+        return
+      }
+
+      if (fs.isfile(it)) {
         let name = it.slice(PUBLIC_DIR.length + 1)
         verbose && console.log('  复制 %s ...', name)
         fs.cp(it, join(dist, name))
       }
     })
   }
+  console.log('')
 
-  if (IS_MPA) {
+  for (let currentPage in conf.pages) {
-    for (let currentPage of PAGES_KEYS) {
     let page = conf.pages[currentPage]
     let dir = dirname(page.entry)
-      let files = new Map()
+    let files = list
-      let chunk = new Map()
+    if (IS_MPA) {
-
+      files = {}
       fs.ls(dir, true).forEach(path => {
         if (fs.isdir(path)) {
           return
@@ -154,68 +178,17 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
           return
         }
 
-        list.delete(path)
+        delete list[path]
-        files.set(path, { name, ext })
+        files[path] = { name, path, ext }
-      })
-
-      if (THREADS_NUM > 0) {
-        chunk.set(currentPage, { page, files })
-        JOBS_QUEUE.push(chunk)
-        doJob()
-      } else {
-        console.log(`正在生成 ${currentPage}.html ...`)
-        compileFiles(currentPage, page, files, options, {
-          verbose,
-          dist,
-          imports: conf.imports
       })
     }
+    console.log('正在生成 %s ...', `${currentPage}.html`)
+    compileFiles(currentPage, page, files)
   }
 
-    // 公共依赖
+  if (IS_MPA) {
-    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, {
+    compileFiles('', null, list)
-        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
-      })
-    }
   }
 
   process.on('exit', _ => {

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

@@ -7,8 +7,8 @@
 import { createHash, randomUUID } from 'node:crypto'
 import { join } from 'node:path'
 import { gzipSync } from 'node:zlib'
+import { Worker } from 'node:worker_threads'
 import { red, cyan, blue } from 'kolorist'
-import { LEGACY_POLYFILL } from './constants.js'
 
 // 修正路径合并 避免在windows下被转义
 export function urlJoin(...args) {
@@ -40,7 +40,7 @@ export function friendlyErrors(pathname, 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}\`)
+    var ws = new WebSocket(\`ws\${location.protocol === 'https:' ? 's' : ''}://\${location.host}/ws-fite-hmr?session=${session}\`)
   
     ws.addEventListener('open', function (r) {
       if(vue_live_hmr.closed){
@@ -52,9 +52,6 @@ export function createHmrScript(legacy, session = '') {
   
     ws.addEventListener('close', function(){
       vue_live_hmr.closed = true
-      if (localStorage.getItem(location.pathname) === '1') {
-        return
-      }
       setTimeout(vue_live_hmr, 2000)
     })
     
@@ -94,12 +91,23 @@ export function createHmrScript(legacy, session = '') {
           break
       }
     })
-    ${LEGACY_POLYFILL}
   })()
   `
 }
 
-// 默认的 web components 判断
+export function isCustomElement(tag) {
-export function defaultCustomElement(tag) {
   return tag.startsWith('wc-')
 }
+
+export function startWorker(file) {
+  return new Promise((resolve, reject) => {
+    let worker = new Worker(file)
+    worker.on('message', resolve)
+    worker.on('error', reject)
+    worker.on('exit', code => {
+      if (code !== 0) {
+        reject(new Error(`Worker stopped with exit code ${code}`))
+      }
+    })
+  })
+}

lib/ws.js

@@ -15,11 +15,7 @@ class WebSocket {
       conn.on('connection', (client, req) => {
         let params = new URLSearchParams(req.url.slice(req.url.indexOf('?')))
         let session = params.get('session')
-        let lock = +params.get('lock')
 
-        if (lock === 1) {
-          client.close()
-        } else {
         this.#clients.set(session, client)
 
         client.once('close', _ => {
@@ -30,14 +26,13 @@ class WebSocket {
           let msg = this.#queue.shift()
           this.send(msg)
         }
-        }
       })
     }
   }
 
   send(msg = {}) {
     if (this.#clients.size) {
-      for (let [key, client] of this.#clients) {
+      for (let [key, client] of this.#clients.entries()) {
         client.send(JSON.stringify(msg))
       }
     } else {

package.json

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