mm_statics 1.6.9 → 1.7.1

package/index.js

@@ -35,6 +35,8 @@ class Static {
     gzip: false,
     // 静态文件根目录
     root: './static',
+    // 路由路径
+    path: '/',
     // 是否编译Vue文件为JS
     compile_vue: true,
     // 是否编译Markdown文件为HTML
@@ -42,7 +44,7 @@ class Static {
     // 编译Markdown文件时，是否添加引入css和js文件
     markdown_link: ['/css/common.css', '/css/markdown.css', '/js/markdown.js'],
     // 需要转换的静态文件路径前缀
-    path: '/src',
+    src_path: '/src',
     // 需要转换的静态文件扩展名
     files: ['.js', '.vue', '.html'],
     // 是否转换ES6模块为AMD模块
@@ -614,7 +616,7 @@ Static.prototype._handleCache = async function (url, ctx) {
 Static.prototype._handleFileCompile = async function (path) {
   if (this.config.compile_md && path.extname() === '.md') {
     return await this._runMarkdown(path);
-  } else if (!path.startsWith(this.config.path)) return null;
+  } else if (!path.startsWith(this.config.src_path)) return null;
 
   let file_type = this._getType(path);
   let { compile_vue, convert_amd } = this.config;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_statics",
-    "version": "1.6.9",
+    "version": "1.7.1",
     "description": "这是超级美眉statics函数模块，用于web服务端statics缓存",
     "main": "index.js",
     "scripts": {

package/vue_compiler.js

@@ -77,10 +77,6 @@ class VueSFCCompiler {
     // 检查是否已经使用了 defineComponent
     const hasDefineComponent = result.content.includes('defineComponent');
 
-    // 检查是否已经导入了 defineComponent
-    const hasDefineComponentImport = result.content.includes('import { defineComponent }') ||
-      result.content.includes('import defineComponent');
-
     // 移除 export default，改为赋值给 __script 变量
     let scriptContent = result.content || '';
     if (scriptContent.includes('export default')) {
@@ -141,28 +137,30 @@ class VueSFCCompiler {
     let styleCode = '';
     for (let i = 0; i < descriptor.styles.length; i++) {
       const style = descriptor.styles[i];
-      const result = await compileStyleAsync({
-        source: style.content,
-        filename,
-        id: style.scoped ? `data-v-${descriptor.id}` : undefined,
-        scoped: style.scoped,
-        isProd: this.options.isProduction
-      });
-
-      if (result.errors.length) {
-        console.warn(`Style compile warning: ${result.errors[0]}`);
-        continue;
-      }
-
-      // 对于 scoped 样式，添加 scopeId 到组件
-      if (style.scoped) {
+      
+      // 对于 global 样式，直接使用原始内容，不进行 scoped 编译
+      if (!style.scoped) {
         styleCode += `
-// Scoped styles for ${descriptor.id}
-const __style_${i} = \`${result.code.replace(/`/g, '\\`')}\`;
+// Global styles
+const __style_${i} = \`${style.content.replace(/`/g, '\\`')}\`;
 `;
       } else {
+        // 对于 scoped 样式，使用 Vue 的编译逻辑
+        const result = await compileStyleAsync({
+          source: style.content,
+          filename,
+          id: `data-v-${descriptor.id}`,
+          scoped: true,
+          isProd: this.options.isProduction
+        });
+
+        if (result.errors.length) {
+          console.warn(`Style compile warning: ${result.errors[0]}`);
+          continue;
+        }
+
         styleCode += `
-// Global styles
+// Scoped styles for ${descriptor.id}
 const __style_${i} = \`${result.code.replace(/`/g, '\\`')}\`;
 `;
       }
@@ -223,7 +221,9 @@ function injectStyles() {
   // 创建 style 元素
   const styleEl = document.createElement('style');
   styleEl.id = styleId;
-  styleEl.textContent = __style_0;
+  
+  // 根据是否有 scoped 样式来决定注入的样式内容
+  ${hasScopedStyle ? 'styleEl.textContent = __style_0;' : 'styleEl.textContent = __style_0;'}
   
   // 插入到 head
   document.head.appendChild(styleEl);