Skip to content

Fix/mfsu relative entry #9800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2022
Merged

Conversation

mysteryven
Copy link
Contributor

@mysteryven mysteryven commented Nov 17, 2022

fix: #9799

改动点:

  1. 支持了相对路径
  2. 支持优先进行【文件+后缀名】的匹配

不确定点:

测试用例用到的文件放在了 packages/mfsu/fixtures,但是这样只能在 packages/mfsu/ 而不能在根目录运行测试用例:

 tryEntryResolve('./fixtures/entry/index.js', process.cwd())

为了兼容在项目根目录和 mfsu 目录运行测试用例,更改为:

 const normalizedRoot = path.join(__dirname, '../../')
 tryEntryResolve('./fixtures/entry/index.js', normalizedRoot)

不确定有没有其他好的方法,临时创建文件会不会更好一点。

@vercel
Copy link

vercel bot commented Nov 17, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Updated
umi ⬜️ Ignored (Inspect) Dec 2, 2022 at 8:43AM (UTC)

@codecov
Copy link

codecov bot commented Nov 17, 2022

Codecov Report

Base: 29.47% // Head: 30.26% // Increases project coverage by +0.78% 🎉

Coverage data is based on head (899aa04) compared to base (e5748d9).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9800      +/-   ##
==========================================
+ Coverage   29.47%   30.26%   +0.78%     
==========================================
  Files         429      429              
  Lines       12251    12260       +9     
  Branches     2934     2934              
==========================================
+ Hits         3611     3710      +99     
+ Misses       8080     7993      -87     
+ Partials      560      557       -3     
Impacted Files Coverage Δ
packages/mfsu/src/mfsu/mfsu.ts 53.48% <100.00%> (+39.45%) ⬆️
packages/mfsu/src/utils/webpackUtils.ts 100.00% <100.00%> (ø)
packages/mfsu/src/depBuilder/depBuilder.ts 10.65% <0.00%> (+3.27%) ⬆️
packages/mfsu/src/webpackPlugins/buildDepPlugin.ts 29.41% <0.00%> (+11.76%) ⬆️
packages/mfsu/src/depInfo.ts 27.50% <0.00%> (+17.50%) ⬆️
packages/mfsu/src/mfsu/strategyCompileTime.ts 28.00% <0.00%> (+18.00%) ⬆️
packages/mfsu/src/utils/makeArray.ts 100.00% <0.00%> (+50.00%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@fz6m
Copy link
Contributor

fz6m commented Nov 17, 2022

basedir 不一致的问题可以用固定的 context 解。

@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch 2 times, most recently from 0eff04f to 2099c91 Compare November 18, 2022 05:36
@mysteryven mysteryven closed this Nov 18, 2022
@mysteryven mysteryven reopened this Nov 18, 2022
@fz6m
Copy link
Contributor

fz6m commented Nov 20, 2022

修理一下 ci

@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch 4 times, most recently from 2005eff to 97e5911 Compare November 20, 2022 13:20
@mysteryven
Copy link
Contributor Author

修理一下 ci

修复好了

@fz6m fz6m requested a review from stormslowly November 21, 2022 12:36
@stormslowly
Copy link
Member

stormslowly commented Nov 22, 2022

@mysteryven 如果能再加个 e2e 测试就更完美了 [暗中观察]

ref: https://github.com/umijs/umi/blob/master/.github/workflows/e2e-mfsu.yml

@mysteryven
Copy link
Contributor Author

https://github.com/umijs/umi/blob/master/.github/workflows/e2e-mfsu.yml

没问题,我补充一下 ~

@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch 8 times, most recently from e6c2015 to 8f9bc56 Compare November 23, 2022 05:51
@mysteryven
Copy link
Contributor Author

mysteryven commented Nov 23, 2022

已经加好了呢,修改点如下:

  1. 在 CI 增加了两个测试 mfsu 独立使用的任务(使用/不使用 ESBuild)
  2. 考虑测试场景可能会让原来的 mf-independent 例子变复杂,增加一个单独的项目测试 e2e

PS: 昨天我的电脑更新了 pnpm (7.17.0)版本,和 CI 使用的版本不同,导致两者生成的 lock 文件格式和不一致,所以一直提示失败。下面对 pnpm 的 7.3.0 和 7.17.0 进行 diff:

# filename: pnpmlock.yaml

  packages/renderer-vue:
    specifiers:
      '@babel/runtime': 7.18.9
+      vue: '>=3.2.31'
+      vue-router: '>=4.0.12'
    dependencies:
      '@babel/runtime': 7.18.9
+     vue: 3.2.36
+     vue-router: 4.0.15_vue@3.2.36

vuevue-router 都是 peerDependices:

filename: packages/renderer-vue/package.json

  "dependencies": {
    "@babel/runtime": "7.18.9"
  },
  "peerDependencies": {
    "vue": ">=3.2.31",
    "vue-router": ">=4.0.12"
  },

解决方案:

  1. 删除 pnpm 和它的缓存,参考 uninstall
  2. 安装旧的 pnpm 版本,参考 Installing a specific version

@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch from 8f9bc56 to 4245c25 Compare November 23, 2022 06:20
@sorrycc
Copy link
Member

sorrycc commented Nov 24, 2022

pnpm-lock.yaml 冲突了,需要 merge master 解下冲突。

@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch from 4245c25 to 0625c76 Compare November 24, 2022 07:45
@fz6m
Copy link
Contributor

fz6m commented Nov 24, 2022

pnpm 版本问题可以再提一个 PR ,改下 package.json#packageManager ,刷下 lock 文件,我们都用最新版本就行。

@mysteryven
Copy link
Contributor Author

pnpm-lock.yaml 冲突了,需要 merge master 解下冲突。

已解决 ~

@sorrycc
Copy link
Member

sorrycc commented Dec 2, 2022

抱歉,又冲突了,需要再 merge 下 master。

@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch from e65b0fb to 3337f99 Compare December 2, 2022 08:35
test(mfsu): init e2e test

* chore(mfsu): update lock file
@mysteryven mysteryven force-pushed the fix/mfsu-relative-entry branch from 3337f99 to 899aa04 Compare December 2, 2022 08:43
@mysteryven
Copy link
Contributor Author

抱歉,又冲突了,需要再 merge 下 master。

已经解决了,但是今天的 CI 好像有点慢。

@sorrycc sorrycc merged commit e661765 into umijs:master Dec 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] 开启 MFSU 后,不支持相对路径格式的 entry
5 participants