didi
diff --git a/‎fe/package.json‎
Lines changed: 1 addition & 0 deletions b/‎fe/package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎fe/packages/compiler/README.md‎
Lines changed: 48 additions & 0 deletions b/‎fe/packages/compiler/README.md‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎fe/packages/compiler/__tests__/global-components-wxs.spec.js‎
Lines changed: 185 additions & 0 deletions b/‎fe/packages/compiler/__tests__/global-components-wxs.spec.js‎
Lines changed: 185 additions & 0 deletions
@@ -26,6 +26,7 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.14.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
     "@eslint/eslintrc": "^3.3.1",
     "@vitest/coverage-v8": "^3.2.3",
     "archiver": "^7.0.1",
 
@@ -98,11 +98,59 @@ dmcc build --no-app-id-dir
 
 ```txt
 app.js, index.js      ->  logic.js     (逻辑文件)
+app.ts, index.ts      ->  logic.js     (TypeScript 逻辑文件)
 index.wxml            ->  view.js      (视图文件)
 app.wxss, index.wxss  ->  style.css    (样式文件)
+app.less, index.less  ->  style.css    (Less 样式文件)
+app.scss, index.scss  ->  style.css    (SCSS 样式文件)
+app.sass, index.sass  ->  style.css    (Sass 样式文件)
 app.json, index.json  ->  config.json  (配置文件)
+miniprogram_npm/      ->  npm包构建   (npm组件支持)
 ```
 
+### TypeScript、Less 和 SCSS 支持
+
+编译器现已支持现代前端开发工具：
+
+- ✅ **TypeScript 支持**: `.ts` 文件自动编译为 JavaScript
+- ✅ **ES6 Import 语句**: 支持相对路径、npm 包和绝对路径导入
+- ✅ **Less 支持**: `.less` 文件编译为 CSS，支持变量、mixin 和嵌套
+- ✅ **SCSS/Sass 支持**: `.scss` 和 `.sass` 文件编译为 CSS
+- ✅ **错误处理**: 编译失败时自动回退，不中断构建流程
+- ✅ **向后兼容**: 完全兼容现有的 `.js` 和 `.wxss` 文件
+
+#### 支持的文件类型
+
+**逻辑文件查找顺序**: `.js` → `.ts`
+**样式文件查找顺序**: `.wxss` → `.ddss` → `.less` → `.scss` → `.sass`
+
+详细使用说明请参考：[TypeScript、Less 和 SCSS 支持文档](./docs/typescript-less-scss-support.md)
+
+### npm 组件支持
+
+编译器现已支持微信小程序的 npm 包功能，遵循微信官方的 npm 支持规范：
+
+- ✅ 支持 `miniprogram_npm` 目录中的组件解析
+- ✅ 按照微信小程序寻址顺序查找组件
+- ✅ 自动构建和复制 npm 包文件
+- ✅ 支持组件依赖关系处理
+- ✅ 缓存机制提升编译性能
+- ✅ 兼容现有的相对路径组件引用
+
+#### npm 组件使用示例
+
+```json
+// pages/index/index.json
+{
+  "usingComponents": {
+    "lib-button": "lib-weapp/button",
+    "custom-component": "./components/custom"
+  }
+}
+```
+
+详细使用说明请参考：[npm 支持文档](./docs/npm-support.md)
+
 ### 编译产物目录结构
 
 编译后，默认会在目标目录生成以小程序 id 命名的文件夹，项目结构如下：
 
@@ -0,0 +1,185 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest'
+import fs from 'node:fs'
+import path from 'node:path'
+import os from 'node:os'
+
+describe('全局组件 wxs 问题修复', () => {
+	let tempDir
+	let originalWorkPath
+	let originalTargetPath
+
+	beforeEach(() => {
+		// 保存原始环境变量
+		originalWorkPath = process.env.WORK_PATH
+		originalTargetPath = process.env.TARGET_PATH
+		
+		// 创建临时测试目录
+		tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'global-wxs-test-'))
+	})
+
+	afterEach(() => {
+		// 恢复原始环境变量
+		if (originalWorkPath) {
+			process.env.WORK_PATH = originalWorkPath
+		} else {
+			delete process.env.WORK_PATH
+		}
+		
+		if (originalTargetPath) {
+			process.env.TARGET_PATH = originalTargetPath
+		} else {
+			delete process.env.TARGET_PATH
+		}
+		
+		// 清理临时目录
+		if (fs.existsSync(tempDir)) {
+			fs.rmSync(tempDir, { recursive: true, force: true })
+		}
+	})
+
+	it('应该在所有使用全局组件的页面中包含 wxs 代码', async () => {
+		// 创建基本的项目结构
+		const appJsonPath = path.join(tempDir, 'app.json')
+		fs.writeFileSync(appJsonPath, JSON.stringify({
+			pages: ['pages/index/index', 'pages/about/about'],
+			usingComponents: {
+				'global-component': './components/global-component/index'
+			}
+		}))
+
+		const projectConfigPath = path.join(tempDir, 'project.config.json')
+		fs.writeFileSync(projectConfigPath, JSON.stringify({
+			appid: 'test-app-id'
+		}))
+
+		// 创建页面配置
+		const indexPageDir = path.join(tempDir, 'pages/index')
+		fs.mkdirSync(indexPageDir, { recursive: true })
+		
+		const indexPageJsonPath = path.join(indexPageDir, 'index.json')
+		fs.writeFileSync(indexPageJsonPath, JSON.stringify({
+			navigationBarTitleText: '首页'
+		}))
+
+		const indexPageWxmlPath = path.join(indexPageDir, 'index.wxml')
+		fs.writeFileSync(indexPageWxmlPath, `
+<view>
+	<global-component />
+</view>
+		`)
+
+		const aboutPageDir = path.join(tempDir, 'pages/about')
+		fs.mkdirSync(aboutPageDir, { recursive: true })
+		
+		const aboutPageJsonPath = path.join(aboutPageDir, 'about.json')
+		fs.writeFileSync(aboutPageJsonPath, JSON.stringify({
+			navigationBarTitleText: '关于'
+		}))
+
+		const aboutPageWxmlPath = path.join(aboutPageDir, 'about.wxml')
+		fs.writeFileSync(aboutPageWxmlPath, `
+<view>
+	<global-component />
+</view>
+		`)
+
+		// 创建全局组件
+		const globalComponentDir = path.join(tempDir, 'components/global-component')
+		fs.mkdirSync(globalComponentDir, { recursive: true })
+		
+		const globalComponentJsonPath = path.join(globalComponentDir, 'index.json')
+		fs.writeFileSync(globalComponentJsonPath, JSON.stringify({
+			component: true
+		}))
+
+		const globalComponentWxmlPath = path.join(globalComponentDir, 'index.wxml')
+		fs.writeFileSync(globalComponentWxmlPath, `
+<wxs module="utils">
+	function formatText(text) {
+		return text + ' from wxs'
+	}
+	module.exports = {
+		formatText: formatText
+	}
+</wxs>
+<view>
+	<text>{{utils.formatText('Hello')}}</text>
+</view>
+		`)
+
+		// 设置环境变量
+		process.env.WORK_PATH = tempDir
+		
+		// 创建输出目录
+		const outputDir = path.join(tempDir, 'dist')
+		fs.mkdirSync(outputDir, { recursive: true })
+		process.env.TARGET_PATH = outputDir
+		
+		// 清理模块缓存
+		const envModulePath = path.resolve(__dirname, '../src/env.js')
+		delete require.cache[envModulePath]
+		
+		// 重新导入并初始化环境
+		const { storeInfo, getPages, getTargetPath } = await import('../src/env.js')
+		
+		// 执行配置收集
+		storeInfo(tempDir)
+		
+		// 获取页面信息
+		const pagesInfo = getPages()
+
+		// 验证全局组件被正确合并到页面配置中
+		expect(pagesInfo.mainPages).toHaveLength(2)
+		expect(pagesInfo.mainPages[0].usingComponents).toHaveProperty('global-component')
+		expect(pagesInfo.mainPages[1].usingComponents).toHaveProperty('global-component')
+
+		// 模拟编译过程
+		const { compileML } = await import('../src/core/view-compiler.js')
+		
+		// 编译页面
+		const progress = { completedTasks: 0 }
+		await compileML(pagesInfo.mainPages, null, progress)
+
+		// 验证编译结果
+		const mainDir = path.join(outputDir, 'main')
+		expect(fs.existsSync(mainDir)).toBe(true)
+
+		const indexOutputPath = path.join(mainDir, 'pages_index_index.js')
+		const aboutOutputPath = path.join(mainDir, 'pages_about_about.js')
+
+		expect(fs.existsSync(indexOutputPath)).toBe(true)
+		expect(fs.existsSync(aboutOutputPath)).toBe(true)
+
+		// 读取编译后的文件内容
+		const indexContent = fs.readFileSync(indexOutputPath, 'utf-8')
+		const aboutContent = fs.readFileSync(aboutOutputPath, 'utf-8')
+
+		// 验证两个页面都包含 wxs 代码的核心功能
+		expect(indexContent).toContain('formatText')
+		expect(aboutContent).toContain('formatText')
+		
+		// 验证两个页面都包含 utils 模块定义
+		expect(indexContent).toContain('"utils"')
+		expect(aboutContent).toContain('"utils"')
+		
+		// 验证两个页面都包含 wxs 模块的完整定义
+		expect(indexContent).toContain('from wxs')
+		expect(aboutContent).toContain('from wxs')
+		
+		// 验证两个页面都包含压缩后的 exports（可能是 t.exports 或 module.exports）
+		expect(indexContent).toMatch(/[t|module]\.exports/)
+		expect(aboutContent).toMatch(/[t|module]\.exports/)
+		
+		// 验证两个页面都包含全局组件的模块定义
+		expect(indexContent).toContain('/components/global-component/index')
+		expect(aboutContent).toContain('/components/global-component/index')
+
+		console.log('✅ 全局组件 wxs 问题修复验证通过')
+		console.log('首页文件大小:', indexContent.length, '字节')
+		console.log('关于页面文件大小:', aboutContent.length, '字节')
+		
+		// 验证两个页面的内容长度相似（都包含了相同的 wxs 代码）
+		const sizeDifference = Math.abs(indexContent.length - aboutContent.length)
+		expect(sizeDifference).toBeLessThan(100) // 允许一些小的差异
+	})
+})