chore: 解决合并冲突

packages/api/CHANGELOG.md

@@ -3,13 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-**Note:** Version bump only for package @morjs/api
-
-
-
-
 
 ## [1.0.69](https://github.com/eleme/morjs/compare/v1.0.68...v1.0.69) (2023-07-17)
 

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/api",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.69",
   "description": "mor runtime api",
   "keywords": [
     "mor"
@@ -37,7 +37,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@morjs/runtime-base": "1.0.102-alpha.0",
+    "@morjs/runtime-base": "1.0.69",
     "tslib": "^2.3.1"
   }
 }

packages/cli/package.json

@@ -33,21 +33,12 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@morjs/plugin-analyzer": "1.0.102-alpha.0",
-    "@morjs/plugin-compiler": "1.0.102-alpha.0",
-    "@morjs/plugin-composer": "1.0.102-alpha.0",
-    "@morjs/plugin-generator": "1.0.102-alpha.0",
-    "@morjs/plugin-mocker": "1.0.102-alpha.0",
-    "@morjs/utils": "1.0.102-alpha.0",
-=======
     "@morjs/plugin-analyzer": "1.0.71",
     "@morjs/plugin-compiler": "1.0.110",
     "@morjs/plugin-composer": "1.0.72",
     "@morjs/plugin-generator": "1.0.71",
     "@morjs/plugin-mocker": "1.0.71",
     "@morjs/utils": "1.0.71",
->>>>>>> e5ab9bcc8519c16d356eb848b1631dc24f24ef43
     "v8-compile-cache": "^2.3.0",
     "youch": "^3.2.2",
     "youch-terminal": "^2.1.5"

packages/core/CHANGELOG.md

@@ -3,27 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **core:** 完善 invokeHook 方法兜底检查，找不到 hook 时打印错误日志，不直接抛错 ([f9f361b](https://github.com/eleme/morjs/commit/f9f361b1f88dee845abb4571d22bf4714e287626))
-* **core:** 修复 invokeHook 参数 hookName 的类型报错 ([#78](https://github.com/eleme/morjs/issues/78)) ([3e1cfcb](https://github.com/eleme/morjs/commit/3e1cfcb8d886f509b567383d84c5b087fb512809))
-* **core:** 修复支付宝 DSL 下 lifetimes 无值可能导致报错的问题 ([#51](https://github.com/eleme/morjs/issues/51)) ([644f9b2](https://github.com/eleme/morjs/commit/644f9b208ca50af5158ac39af9216465d0dda638))
-* **core:** fix wechat npm build support ([32af3e2](https://github.com/eleme/morjs/commit/32af3e2f772909e46e8be84bc4f60820dd00d604))
-* **core:** mixin 数组被转换成了对象 ([#117](https://github.com/eleme/morjs/issues/117)) ([c895e30](https://github.com/eleme/morjs/commit/c895e30b5b8bdddd2eb8ab6b537888b4291738b2))
-
-
-### Features
-
-* **runtime-base:** 新增 hooks 的 pause、resume 方法，用于暂停/恢复部分 hooks 生命周期的执行 ([#77](https://github.com/eleme/morjs/issues/77)) ([aa712eb](https://github.com/eleme/morjs/commit/aa712ebf2603ecd5b1340f77c0d79e2e709476ad))
-* **runtime-mini:** 对齐最新 lifetimes 的官方功能，优先使用官方提供的 lifetimes 方法，兜底使用 mor 的自实现 ([#38](https://github.com/eleme/morjs/issues/38)) ([0044d4a](https://github.com/eleme/morjs/commit/0044d4a8cc86fc619c505f664d098c033fb7d8a7))
-
-
-
-
-
 ## [1.0.86](https://github.com/eleme/morjs/compare/v1.0.85...v1.0.86) (2023-11-07)
 
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/core",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.86",
   "description": "mor runtime core",
   "keywords": [
     "mor",
@@ -38,7 +38,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@morjs/api": "1.0.102-alpha.0",
+    "@morjs/api": "1.0.69",
     "mini-types": "^0.1.7",
     "miniprogram-api-typings": "^3.4.4",
     "tslib": "^2.3.1"

packages/plugin-analyzer/CHANGELOG.md

@@ -3,22 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-**Note:** Version bump only for package @morjs/plugin-analyzer
-
-
-
-
-
 ## [1.0.71](https://github.com/eleme/morjs/compare/v1.0.70...v1.0.71) (2023-07-26)
 
 **Note:** Version bump only for package @morjs/plugin-analyzer
 
 
 
 
-
 ## [1.0.69](https://github.com/eleme/morjs/compare/v1.0.68...v1.0.69) (2023-07-17)
 
 **Note:** Version bump only for package @morjs/plugin-analyzer

packages/plugin-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/plugin-analyzer",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.71",
   "description": "mor analyzer plugin",
   "keywords": [
     "mor",
@@ -32,6 +32,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@morjs/utils": "1.0.102-alpha.0"
+    "@morjs/utils": "1.0.71"
   }
 }

packages/plugin-composer/CHANGELOG.md

@@ -3,24 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **plugin-composer:** 修复不同配置的集成结果文件 compose-results.json 会相互覆盖的问题 ([fb91ac7](https://github.com/eleme/morjs/commit/fb91ac761783df647b31e16e66bb299cde1c641c))
-* **plugin-composer:** 修复监听状态下集成编译可能会错误将当前宿主或分包模块产物进行二次编译的问题 ([0e846c4](https://github.com/eleme/morjs/commit/0e846c4dff0f6bd8a82755306d6344df673548c1))
-
-
-### Features
-
-* **plugin-compiler-bytedance:** 新增抖音分包异步化编译支持 ([#46](https://github.com/eleme/morjs/issues/46)) ([6e2ede2](https://github.com/eleme/morjs/commit/6e2ede2782bdbdc259d81deb603fccabc3f8f136))
-* **plugin-composer:** 完善集成临时文件存储逻辑，基于配置名称区分，避免多配置模式下集成缓存冲突 ([cbefb55](https://github.com/eleme/morjs/commit/cbefb55664c89ea94e8e199aca440a3c885603e2))
-* **plugin-composer:** 优化模块集成脚本变化判断逻辑，避免错误判断导致脚本重复执行 ([b4c08fd](https://github.com/eleme/morjs/commit/b4c08fd149943d432b3cb25323c30f426a1df071))
-* **plugin-composer:** 增加 --target, --compile-type, --output-path 命令行选项支持 ([4fc9e0a](https://github.com/eleme/morjs/commit/4fc9e0aa7fa927066089f2dfaf1d08886f98bdff))
-* **plugin-composer:** 支持在 CI 环境下打印更多的集成信息 ([#91](https://github.com/eleme/morjs/issues/91)) ([9b70c32](https://github.com/eleme/morjs/commit/9b70c32c2621fbe8690d7a306a231d057dd0fb57))
-
-
 
 
 

packages/plugin-composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/plugin-composer",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.72",
   "description": "mor compose plugin",
   "keywords": [
     "mor",
@@ -33,6 +33,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@morjs/utils": "1.0.102-alpha.0"
+    "@morjs/utils": "1.0.71"
   }
 }

packages/plugin-generator/CHANGELOG.md

@@ -3,25 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **plugin-generator:** 替换脚手架生成的 eslint 配置项，防止 eslint-config-prettier 8.0 所有子包收束到 prettier 后的报错 ([#43](https://github.com/eleme/morjs/issues/43)) ([004ce55](https://github.com/eleme/morjs/commit/004ce55b1fad286f83f25521ff0f1ad87000f58e))
-* **plugin-generator:** 修复 create-mor 在当前目录项目初始化完成提示 ([#14](https://github.com/eleme/morjs/issues/14)) ([21c6df3](https://github.com/eleme/morjs/commit/21c6df387414415d7558a9ff2e0a568c5cbc1a19))
-* **plugin-generator:** 修复初始化脚手架时可能缺少 .gitignore 文件的问题 ([d4ae47c](https://github.com/eleme/morjs/commit/d4ae47c111ebb751a986bc0ff05a3a77417ec4ef))
-* **plugin-generator:** 修改 morjs 依赖为 * 以处理无 beta 版本引发的 install 报错 ([#21](https://github.com/eleme/morjs/issues/21)) ([ff997b4](https://github.com/eleme/morjs/commit/ff997b4d68664083add0a66cadc209e669eaf11a))
-
-
-### Features
-
-* **plugin-generator:** 完善生成器使用体验，替换报错为 prompts 选择 ([f3b955a](https://github.com/eleme/morjs/commit/f3b955a688dc2e43228cf9c1bc898a9688bc21b6))
-* **plugin-generator:** 修改模版文件用于支持 isSupportWeb 选项 ([39896d1](https://github.com/eleme/morjs/commit/39896d1ec52f9c97758a2d25fb93ed2ae536668d))
-* **plugin-generator:** 优化生成的项目模板代码，移除无用的换行和空格 ([2e4e6af](https://github.com/eleme/morjs/commit/2e4e6afc84dcfffea69596f2352cc3b9316a2181))
-* **plugin-generator:** create-mor 用户 git 信息改成非必选, 不做输入的校验 ([#15](https://github.com/eleme/morjs/issues/15)) ([fd26ef5](https://github.com/eleme/morjs/commit/fd26ef5ce89f5b70ced1ec6b8980b04008c9992d))
-* **plugin-generator:** create-morjs 项目初始化后根据用户输入更新 package.json 的名称和描述 ([#16](https://github.com/eleme/morjs/issues/16)) ([abc41f6](https://github.com/eleme/morjs/commit/abc41f62c84cf7e7478234d4c23cbf58ae1538b7))
-
 
 
 

packages/plugin-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/plugin-generator",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.71",
   "description": "mor generator plugin",
   "keywords": [
     "mor",
@@ -33,6 +33,6 @@
     "update-package-versions": "node ./updatePackageVersions"
   },
   "dependencies": {
-    "@morjs/utils": "1.0.102-alpha.0"
+    "@morjs/utils": "1.0.71"
   }
 }

packages/plugin-mocker/CHANGELOG.md

@@ -3,14 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **plugin-mocker:** 修复 mock JSAPI 的异步方法获取 ESModule 数据需要使用 .default 的问题 ([#55](https://github.com/eleme/morjs/issues/55)) ([7476a47](https://github.com/eleme/morjs/commit/7476a4769b77f210126a34f826fc4425e047ff1d))
-* **plugin-mocker:** 修复 windows 下 mock 编译报错的问题 ([#50](https://github.com/eleme/morjs/issues/50)) ([6f78eac](https://github.com/eleme/morjs/commit/6f78eacd3dac0ab9168da34cf9f127945a7b671b))
-
 
 
 

packages/plugin-mocker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/plugin-mocker",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.71",
   "description": "mor mock plugin",
   "keywords": [
     "mor",
@@ -32,8 +32,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@morjs/api": "1.0.102-alpha.0",
-    "@morjs/utils": "1.0.102-alpha.0",
+    "@morjs/api": "1.0.69",
+    "@morjs/utils": "1.0.71",
     "tslib": "^2.3.1"
   }
 }

packages/runtime-base/CHANGELOG.md

@@ -3,20 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **runtime-base:** 修复 qq 等端 request 不执行的问题 ([#54](https://github.com/eleme/morjs/issues/54)) ([52fa701](https://github.com/eleme/morjs/commit/52fa7018d1b0a5798eca184cfd866acf9a09c709))
-* **runtime-base:** 修复同步接口抹平结果修改未被正确触发的问题 ([8173706](https://github.com/eleme/morjs/commit/8173706744966929494d85d275cd0032602959d1))
-
-
-### Features
-
-* **runtime-base:** 新增 hooks 的 pause、resume 方法，用于暂停/恢复部分 hooks 生命周期的执行 ([#77](https://github.com/eleme/morjs/issues/77)) ([aa712eb](https://github.com/eleme/morjs/commit/aa712ebf2603ecd5b1340f77c0d79e2e709476ad))
-* **runtime-mini:** 对齐最新 lifetimes 的官方功能，优先使用官方提供的 lifetimes 方法，兜底使用 mor 的自实现 ([#38](https://github.com/eleme/morjs/issues/38)) ([0044d4a](https://github.com/eleme/morjs/commit/0044d4a8cc86fc619c505f664d098c033fb7d8a7))
-
 
 
 

packages/runtime-base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/runtime-base",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.69",
   "description": "mor runtime base",
   "keywords": [
     "mor"

packages/runtime-mini/package.json

@@ -41,7 +41,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@morjs/runtime-base": "1.0.102-alpha.0",
+    "@morjs/runtime-base": "1.0.69",
     "clone-deep": "^4.0.1",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",

packages/takin/CHANGELOG.md

@@ -3,19 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **takin:** 修复敏感日志过滤导致原对象或 Map 被修改的问题 ([f5210ba](https://github.com/eleme/morjs/commit/f5210baa07318d6ea983ddce8f9814b882cb1935))
-
-
-### Features
-
-* **plugin-generator:** 修改模版文件用于支持 isSupportWeb 选项 ([39896d1](https://github.com/eleme/morjs/commit/39896d1ec52f9c97758a2d25fb93ed2ae536668d))
-* **takin:** 优化生成器逻辑增加模版解析对 <%_ 或 _%> 或 -%> 的支持 ([#57](https://github.com/eleme/morjs/issues/57)) ([e82bb63](https://github.com/eleme/morjs/commit/e82bb63c23e27f8094083be6057e724a5fd7c0fa))
-
 
 
 

packages/takin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takin",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.71",
   "description": "Front end engineering base toolchain and scaffold",
   "main": "lib/index.js",
   "scripts": {

packages/utils/CHANGELOG.md

@@ -3,25 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.0.102-alpha.0 (2024-03-13)
-
-
-### Bug Fixes
-
-* **plugin-compiler:** 修复由于 peerDependencies 导致的 webpack 多实例问题 ([#4](https://github.com/eleme/morjs/issues/4)) ([323b70b](https://github.com/eleme/morjs/commit/323b70b7826650fb3f90d2efa88d0215fee62da6))
-* **utils:** 升级 sass 版本为 1.60.0 确保对 node 12 的支持 ([4e3928e](https://github.com/eleme/morjs/commit/4e3928ed2d5a7efb6ba0ef98655c3e4460ecc016))
-
-
-### Features
-
-* **plugin-compiler-bytedance:** 新增抖音分包异步化编译支持 ([#46](https://github.com/eleme/morjs/issues/46)) ([6e2ede2](https://github.com/eleme/morjs/commit/6e2ede2782bdbdc259d81deb603fccabc3f8f136))
-* **plugin-compiler-web:** .json 文件支持条件编译 ([#3](https://github.com/eleme/morjs/issues/3)) ([d717375](https://github.com/eleme/morjs/commit/d717375bbad95413c9a23e639a78ec086d07b6e8))
-* **plugin-compiler:** 完善 setEntrySource 对写入内存文件的逻辑支持 ([3bb4a92](https://github.com/eleme/morjs/commit/3bb4a922cbf7a42a3547d85d07c0304b1c6b4368))
-* **plugin-compiler:** 新增多端组件构建模式支持 ([#75](https://github.com/eleme/morjs/issues/75)) ([3307838](https://github.com/eleme/morjs/commit/3307838d278607d300c390877abe48e40f117acd))
-* **utils:** 全局文件名称常量方法支持配置后缀用于规避文件冲突 ([7d99e50](https://github.com/eleme/morjs/commit/7d99e5097d3a49537e2335c58656c4a1f81d055f))
-* **utils:** 提供通用 execCommands 方法便于执行脚本及错误处理 ([36dfc64](https://github.com/eleme/morjs/commit/36dfc64342f3dff3b240ced7b3f4335c60cd7180))
-* **utils:** 优化全局集成应用信息的名称生成规则 ([fcbc491](https://github.com/eleme/morjs/commit/fcbc491dd7b44178b8c5f9a5f30e00a1d7cf1257))
-
 
 
 

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morjs/utils",
-  "version": "1.0.102-alpha.0",
+  "version": "1.0.71",
   "description": "mor utils",
   "keywords": [
     "mor",
@@ -80,7 +80,7 @@
     "style-loader": "3.3.1",
     "stylus": "0.59.0",
     "stylus-loader": "6.2.0",
-    "takin": "1.0.102-alpha.0",
+    "takin": "1.0.71",
     "terser-webpack-plugin": "5.3.7",
     "typescript": "4.4.4",
     "uglify-js": "3.17.4",