1.4.4:修复样式scoped的范围

Reviewed-on: #9

index.js

@@ -19,6 +19,7 @@ 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'
@@ -40,8 +41,9 @@ switch (mode) {
   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,13 +54,14 @@ switch (mode) {
   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)) {
           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,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)
@@ -59,7 +64,7 @@ function scopeCss(css = '', hash) {
               if (last.startsWith(':')) {
                 output = parseVDeep(last, output, true)
               } else {
-                output = `${last} ${output}`
+                output = `${last}[data-${hash}] ${output}`
               }
             } else {
               if (last.includes(':')) {
@@ -110,7 +115,7 @@ export function compileScss(file, inject = '') {
 export function parseJs(
   code = '',
   imports,
-  { IS_MPA, currentPage, IS_ENTRY, DEPLOY_PATH, LEGACY_MODE } = {},
+  { IS_MPA, currentPage, IS_ENTRY, DEPLOY_PATH, LEGACY_MODE, define } = {},
   filename,
   linePatch = 1
 ) {
@@ -149,7 +154,7 @@ 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))
@@ -190,13 +195,15 @@ 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}'${
+        _import = `import ${alias} from '${name}'`
-          t === 'export' ? `\nexport ${_alias}` : ''
+        _import += t === 'export' ? `\nexport ${_alias}` : ''
-        }`
+
+        return _import
       }
     )
     .replace(/import\((['"])(.*?)\1\)/g, function (m, q, name) {
@@ -206,6 +213,9 @@ 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) {
@@ -221,19 +231,30 @@ 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 += `${tmp}.then(r => {
+          fixedStyle +=
-  let stylesheet = document.createElement('style')
+            `{\n` +
-  stylesheet.setAttribute('name', '${_name}')
+            `  let stylesheet = document.createElement('style');\n` +
-  stylesheet.textContent = r
+            `  stylesheet.setAttribute('name', '${_name}');\n` +
-  document.head.appendChild(stylesheet)
+            `  stylesheet.textContent = ${tmp};\n` +
-})
+            `  document.head.appendChild(stylesheet);\n` +
-`
+            `}\n`
-          return `const ${tmp} = window.fetch('${name}').then(r => r.text())`
-        } else {
-          fixedStyle += `${tmp}.path = '${_name}'\n__sheets__.push(${tmp})\n`
 
-          return `import ${tmp} from '${name}' assert { type: 'css' }`
+          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 +=
+            `{\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)`
         }
       } else {
         if (name.startsWith('@/')) {
@@ -269,6 +290,10 @@ export function parseJs(
       }
     })
 
+  for (let key in define) {
+    code = code.replaceAll(key, define[key])
+  }
+
   if (fixedStyle) {
     code += '\n\n' + (IS_ENTRY ? SHEETS_DEF : '') + fixedStyle
 
@@ -285,7 +310,7 @@ export function parseJs(
  * @param file <String> 文件路径
  * @return <String> 返回转换后的js代码
  */
-export function compileVue(file, imports, options = {}) {
+export async 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')
@@ -315,10 +340,15 @@ export 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 {
@@ -395,13 +425,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__
 `
     }
   }
@@ -423,10 +453,8 @@ export function parseHtml(html, { page, imports, entry, LEGACY_MODE }) {
       '</head>',
       `${
         process.env.NODE_ENV === 'development'
-          ? `  <script>${Es.transformSync(createHmrScript(LEGACY_MODE), {
+          ? `  <script>${minify(createHmrScript(LEGACY_MODE))}</script>\n`
-              minify: true
+          : `  <script>${minify(LEGACY_POLYFILL)}</script>\n`
-            }).code.trim()}</script>\n`
-          : ''
       }</head>`
     )
     .replace('{{title}}', page.title || '')

lib/compile.js

@@ -44,11 +44,14 @@ export async function compileFiles(
     switch (it.ext) {
       case '.vue':
         {
-          let code = compileVue(path, imports, options)
+          let code = await compileVue(path, imports, options)
 
-          await Es.transform(code, { minify: true }).then(r => {
+          await Es.transform(code, { minify: true }).then(async ({ code }) => {
+            for (let fn of options.plugin) {
+              code = await fn('js', code)
+            }
             fs.echo(
-              r.code,
+              code,
               join(dist, 'assets/', pageDir, it.name.replace(/\.vue$/, '.js'))
             )
           })
@@ -61,11 +64,25 @@ export async function compileFiles(
 
           code = parseJs(code + '', imports, options)
 
-          await Es.transform(code, { minify: true }).then(r => {
+          await Es.transform(code, { minify: true }).then(async ({ code }) => {
-            fs.echo(r.code, join(dist, 'assets/', pageDir, it.name))
+            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':
@@ -80,6 +97,9 @@ export async function compileFiles(
             fs.cp(path, target)
           } else {
             let code = compileScss(path)
+            for (let fn of options.plugin) {
+              code = await fn('css', code)
+            }
             fs.echo(code, target)
           }
         }

lib/constants.js

@@ -18,3 +18,33 @@ 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

@@ -34,6 +34,7 @@ export default async function createServer(root = '', conf = {}) {
   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']
@@ -73,7 +74,7 @@ export default async function createServer(root = '', conf = {}) {
     currentPage = ''
 
   server
-    .on('request', function (req, res) {
+    .on('request', async function (req, res) {
       let prefix = DEPLOY_PATH ? DEPLOY_PATH.replace(/\/$/, '') : ''
       let url =
         prefix && req.url.startsWith(prefix)
@@ -178,11 +179,18 @@ export default async function createServer(root = '', conf = {}) {
                   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,
@@ -215,7 +223,7 @@ export default async function createServer(root = '', conf = {}) {
                 return
               }
 
-              code = compileVue(file, conf.imports, {
+              code = await compileVue(file, conf.imports, {
                 IS_MPA,
                 currentPage,
                 SOURCE_DIR,
@@ -223,9 +231,15 @@ export default async function createServer(root = '', conf = {}) {
                 DEPLOY_PATH,
                 INJECT_SCSS,
                 LEGACY_MODE,
-                isCustomElement
+                isCustomElement,
+                plugin,
+                define
               })
 
+              for (let fn of plugin) {
+                code = await fn('js', code)
+              }
+
               res.setHeader('content-type', MIME_TYPES.js)
             }
             break
@@ -251,14 +265,25 @@ 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个值相等, 避免出现目录名和页面名字相同时走错逻辑
@@ -282,6 +307,16 @@ export default async function createServer(root = '', conf = {}) {
                 res.end('')
                 return
               }
+              if (isJson) {
+                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,
@@ -289,11 +324,18 @@ export default async function createServer(root = '', conf = {}) {
                     IS_MPA,
                     currentPage,
                     DEPLOY_PATH,
-                  LEGACY_MODE
+                    LEGACY_MODE,
+                    isCustomElement,
+                    plugin,
+                    define
                   },
                   file
                 )
-              res.setHeader('content-type', MIME_TYPES.js)
+                for (let fn of plugin) {
+                  code = await fn('js', code)
+                }
+              }
+              res.setHeader('content-type', MIME_TYPES[ext])
             }
 
             break
@@ -372,7 +414,7 @@ export default async function createServer(root = '', conf = {}) {
       )
       chokidar
         .watch([SOURCE_DIR, PUBLIC_DIR, join(root, './index.html')])
-        .on('all', (act, filePath) => {
+        .on('all', async (act, filePath) => {
           if (ready) {
             let file = filePath.slice(SOURCE_DIR.length)
 
@@ -392,6 +434,9 @@ 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 }
@@ -401,7 +446,7 @@ export default async function createServer(root = '', conf = {}) {
 
                 case 'vue':
                   {
-                    let content = compileVue(filePath, conf.imports, {
+                    let content = await compileVue(filePath, conf.imports, {
                       IS_MPA,
                       currentPage,
                       SOURCE_DIR,
@@ -409,7 +454,9 @@ export default async function createServer(root = '', conf = {}) {
                       DEPLOY_PATH,
                       INJECT_SCSS,
                       LEGACY_MODE,
-                      isCustomElement
+                      isCustomElement,
+                      plugin,
+                      define
                     })
                     let tmp = CACHE[filePath]
                     if (tmp.changed) {

lib/prod.js

@@ -52,7 +52,13 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
   )
   const INJECT_SCSS = readFile(conf.inject?.scss)
   const LEGACY_MODE = !!conf.legacy
-  const { isCustomElement } = conf.compileOptions || {}
+  const {
+    ABS_CONFIG_FILEPATH,
+    compileOptions = {},
+    define = {},
+    plugin = []
+  } = conf
+  const { isCustomElement = defaultCustomElement } = compileOptions
 
   conf.inject = conf.inject || { scss: '' }
 
@@ -65,13 +71,8 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
     DEPLOY_PATH,
     INJECT_SCSS,
     LEGACY_MODE,
-    // 线程通讯无法传递函数类型, 需要转为字符串, 之后再转回来
+    ABS_CONFIG_FILEPATH,
-    isCustomElement:
+    define
-      THREADS_NUM > 0
-        ? isCustomElement
-          ? isCustomElement.toString()
-          : null
-        : isCustomElement || defaultCustomElement
   }
 
   fs.ls(SOURCE_DIR, true).forEach(path => {
@@ -101,7 +102,10 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
 
   // 创建线程池
   if (THREADS_NUM > 0 && (IS_MPA || list.size > THREADS_NUM * 10)) {
-    for (let i = 0; i < THREADS_NUM; i++) {
+    // 页面数过少时, 线程数量不能比页面数多
+    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: {
@@ -113,6 +117,8 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
         })
       )
     }
+  } else {
+    options.isCustomElement = isCustomElement
   }
 
   // 优先处理静态目录, 之后的源码目录中, 以便如果有产生相同的文件名, 则覆盖静态目录中的文件
@@ -202,7 +208,8 @@ export default function compile(root = '', dist = '', conf = {}, verbose) {
         doJob()
       }
     } else {
-      options.isCustomElement = isCustomElement || defaultCustomElement
+      options.plugin = plugin
+      options.isCustomElement = isCustomElement
       compileFiles(currentPage, page, list, options, {
         verbose,
         dist,

lib/thread.js

@@ -8,11 +8,17 @@ import { compileFiles } from './compile.js'
 import { defaultCustomElement } from './utils.js'
 
 const { options, verbose, dist, imports } = workerData
+const { ABS_CONFIG_FILEPATH } = options
 
-options.isCustomElement = options.isCustomElement
+const { compileOptions = {}, plugin = [] } = await import(
-  ? Function('return ' + options.isCustomElement)()
+  ABS_CONFIG_FILEPATH
-  : defaultCustomElement
+).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
 
@@ -28,7 +34,7 @@ async function doJob(job) {
     dist,
     imports
   })
-  parentPort.postMessage('ok')
+  parentPort.postMessage(true)
 }
 
 parentPort.on('message', doJob)

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}
   })()
   `
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fite",
   "type": "module",
-  "version": "1.1.12",
+  "version": "1.4.4",
   "bin": {
     "fite": "index.js"
   },