fix: fix HBuilderX compatibility #33

Xiphin · 2024-05-12T08:08:17Z

Description 描述

最小修改兼容 HBuiderX 运行模式

Linked Issues 关联的 Issues

在 HBuiderX 使用不生效

Additional context 额外上下文

在 HBuilderX 下运行

Summary by CodeRabbit

New Features
- Introduced a configurable path for loading pages from JSON, enhancing flexibility in file management.
Refactor
- Updated logic for determining source mode based on the resolved path, improving the accuracy of mode detection.

coderabbitai · 2024-05-12T08:08:23Z

Walkthrough

The changes introduce enhanced configurability by enabling dynamic specification of the JSON pages path. Users can now define the path using the pagesJsonPath property in the Options interface. This update ensures consistent handling of the path across Context, types, and utils, fostering system flexibility and simplifying maintenance.

Changes

Files	Changes Summary
`src/context.ts`	Updated `loadPagesJson` to use `this.options.pagesJsonPath` for loading JSON pages.
`src/types.ts`	Added `pagesJsonPath` property to the `Options` interface.
`src/utils.ts`	Enhanced `resolveOptions` with `pagesJsonPath` support; improved `getTarget` logic.

🐰✨
In the code woods, a new path unfurls,
pagesJsonPath now, for JSON pearls.
src and utils in harmony align,
Configurable paths, a paradigm.
Files dance, in the winds of change,
A symphony of code, rearrange! 🌟
🐰💻

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between eb9eabc and a3c243b.

Files selected for processing (3)

src/context.ts (2 hunks)
src/types.ts (1 hunks)
src/utils.ts (2 hunks)

Files skipped from review due to trivial changes (1)

src/types.ts

Additional comments not posted (4)

src/utils.ts (2)

14-14: The addition of pagesJsonPath in resolveOptions enhances configuration flexibility and is implemented correctly.

47-50: Refactoring in getTarget to determine isSrcMode based on the resolved path is clear and effective.

src/context.ts (2)

36-36: Using this.options.pagesJsonPath in setupWatcher correctly implements dynamic configuration for the JSON path.

47-47: Dynamically loading pages JSON in transform using this.options.pagesJsonPath enhances the adaptability of the application.

Xiphin · 2024-05-13T13:43:03Z

@KeJunMao 方便看一下么？

ModyQyW · 2024-05-14T09:22:54Z

LGTM

Skiyee

pagesJsonPath 这个属性的有无可能不会产生太大影响
我觉得可以通过判断是否拥有 src目录 来区分所创建项目类型就好了

这是我的看法，看看大佬们怎么说？🧐

同时要谢谢你的PR，解决 HBuilderX 上的问题 ❤

Xiphin · 2024-05-14T10:44:19Z

pagesJsonPath 这个属性的有无可能不会产生太大影响我觉得可以通过判断是否拥有 src目录 来区分所创建项目类型就好了

这是我的看法，看看大佬们怎么说？🧐

同时要谢谢你的PR，解决 HBuilderX 上的问题 ❤

HBuilderX 和 Cli 两种模式下 pages.json 文件所在的路径不一样，之前的代码似乎是写死的，一起看一下

vite-plugin-uni-layouts/src/context.ts

Line 36 in eb9eabc

this.pages = loadPagesJson('src/pages.json', this.options.cwd)

vite-plugin-uni-layouts/src/context.ts

Line 47 in eb9eabc

this.pages = loadPagesJson('src/pages.json', this.options.cwd)

Xiphin · 2024-05-14T10:52:59Z

pagesJsonPath 这个属性的有无可能不会产生太大影响我觉得可以通过判断是否拥有 src目录 来区分所创建项目类型就好了

这是我的看法，看看大佬们怎么说？🧐

同时要谢谢你的PR，解决 HBuilderX 上的问题 ❤

你的意思是定义一个全局 isSrc 模式的判断，对吧？

Skiyee · 2024-05-14T11:11:21Z

你的意思是定义一个全局 isSrc 模式的判断，对吧？

vite-plugin-uni-layouts/src/utils.ts

Lines 48 to 50 in a3c243b

    
           if (resolvePath.startsWith(join(cwd, 'src'))) 
        
             isSrcMode = true 
        
           const relativePath = relative(join(cwd, isSrcMode ? 'src' : ''), resolvePath)

是的，就像你处理这个类似 👆

因为在我看来，判断不同创建项目模式，无非就两种可能，pages.json 在 src 或 根目录 下

Xiphin · 2024-05-14T11:20:06Z

你的意思是定义一个全局 isSrc 模式的判断，对吧？

vite-plugin-uni-layouts/src/utils.ts

Lines 48 to 50 in a3c243b

if (resolvePath.startsWith(join(cwd, 'src')))

isSrcMode = true

const relativePath = relative(join(cwd, isSrcMode ? 'src' : ''), resolvePath)

是的，就像你处理这个类似 👆

因为在我看来，判断不同创建项目模式，无非就两种可能，pages.json 在 src 或 根目录 下

看了一下在 src/context.ts 全局 isSrc 判断貌似找不到合适的位置

你觉得在哪个位置合适？

KeJunMao · 2024-05-14T18:43:19Z

是不是直接检测是否存在就可以，优先 src/pages.json，回退 pages.json，都没有抛出

coderabbitai

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between a3c243b and df27b8e.

Files selected for processing (1)

src/utils.ts (3 hunks)

Files skipped from review as they are similar to previous changes (1)

src/utils.ts

Xiphin · 2024-05-15T02:26:26Z

是不是直接检测是否存在就可以，优先 src/pages.json，回退 pages.json，都没有抛出

调整优化了一下，大家再看一下 (df27b8e)

@Skiyee @KeJunMao

Skiyee · 2024-05-15T06:02:56Z

LGTM ❤

vite-plugin-uni-layouts/src/index.ts

Line 32 in eb9eabc

const filter = createFilter('src/main.(ts|js)')

这一行可能需要改成这样，const filter = createFilter(['main.(ts|js)', 'src/main.(ts|js)'])

coderabbitai

Actionable comments posted: 1

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between df27b8e and 9fde786.

Files selected for processing (2)

src/index.ts (1 hunks)
src/utils.ts (3 hunks)

Files skipped from review as they are similar to previous changes (1)

src/utils.ts

coderabbitai · 2024-05-15T06:47:36Z

src/index.ts

+      const filter = createFilter(['src/main.(ts|js)', 'main.(ts|js)'])
      if (filter(id))
        return ctx.importLayoutComponents(code, id)


Ensure the filter pattern is correct and consistent.

The filter pattern ['src/main.(ts|js)', 'main.(ts|js)'] should be verified to match the intended files. If the project structure varies, consider making this pattern configurable.

- const filter = createFilter(['src/main.(ts|js)', 'main.(ts|js)']) + const filter = createFilter(['src/main.{ts,js}', 'main.{ts,js}'])

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change

const filter = createFilter(['src/main.(ts|js)', 'main.(ts|js)'])

if (filter(id))

return ctx.importLayoutComponents(code, id)

const filter = createFilter(['src/main.{ts,js}', 'main.{ts,js}'])

if (filter(id))

return ctx.importLayoutComponents(code, id)

Xiphin · 2024-05-15T06:50:29Z

@Skiyee 看一下

Skiyee

❤

ModyQyW · 2024-05-17T06:37:27Z

如果没有进一步反馈，我会在2-3天内合并发布。

ModyQyW · 2024-05-19T00:47:05Z

Thank you!

Xiphin added 2 commits May 9, 2024 23:28

chore: add pagesJsonPath option

b45fbf6

chore: add src mode condition

a3c243b

coderabbitai bot reviewed May 12, 2024

View reviewed changes

ModyQyW requested review from KeJunMao, zguolee and Skiyee May 14, 2024 09:23

Skiyee reviewed May 14, 2024

View reviewed changes

coderabbitai bot reviewed May 15, 2024

View reviewed changes

Xiphin added 2 commits May 15, 2024 14:45

chore: optimize pages.json loading issues

3fc4f76

chore: update src/index.ts

9fde786

Xiphin force-pushed the dev branch from df27b8e to 9fde786 Compare May 15, 2024 06:45

coderabbitai bot reviewed May 15, 2024

View reviewed changes

Skiyee approved these changes May 15, 2024

View reviewed changes

KeJunMao approved these changes May 18, 2024

View reviewed changes

zguolee approved these changes May 18, 2024

View reviewed changes

ModyQyW changed the title ~~chore: compatible with HBuilderX~~ fix: fix HBuilderX compatibility May 19, 2024

ModyQyW merged commit 5ef1a82 into uni-helper:main May 19, 2024

Xiphin deleted the dev branch May 21, 2024 06:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: fix HBuilderX compatibility #33

fix: fix HBuilderX compatibility #33

Xiphin commented May 12, 2024 •

edited by coderabbitai bot

coderabbitai bot commented May 12, 2024 •

edited

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

Documentation and Community

coderabbitai bot left a comment

Xiphin commented May 13, 2024

ModyQyW commented May 14, 2024

Skiyee left a comment

Xiphin commented May 14, 2024

Xiphin commented May 14, 2024

Skiyee commented May 14, 2024

Xiphin commented May 14, 2024 •

edited

KeJunMao commented May 14, 2024

coderabbitai bot left a comment

Xiphin commented May 15, 2024

Skiyee commented May 15, 2024 •

edited

coderabbitai bot left a comment

coderabbitai bot May 15, 2024

Xiphin commented May 15, 2024

Skiyee left a comment

ModyQyW commented May 17, 2024

ModyQyW commented May 19, 2024

fix: fix HBuilderX compatibility #33

fix: fix HBuilderX compatibility #33

Conversation

Xiphin commented May 12, 2024 • edited by coderabbitai bot

Description 描述

Linked Issues 关联的 Issues

Additional context 额外上下文

Summary by CodeRabbit

coderabbitai bot commented May 12, 2024 • edited

Walkthrough

Changes

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

coderabbitai bot left a comment

Choose a reason for hiding this comment

Xiphin commented May 13, 2024

ModyQyW commented May 14, 2024

Skiyee left a comment

Choose a reason for hiding this comment

Xiphin commented May 14, 2024

Xiphin commented May 14, 2024

Skiyee commented May 14, 2024

Xiphin commented May 14, 2024 • edited

KeJunMao commented May 14, 2024

coderabbitai bot left a comment

Choose a reason for hiding this comment

Xiphin commented May 15, 2024

Skiyee commented May 15, 2024 • edited

coderabbitai bot left a comment

Choose a reason for hiding this comment

coderabbitai bot May 15, 2024

Choose a reason for hiding this comment

Xiphin commented May 15, 2024

Skiyee left a comment

Choose a reason for hiding this comment

ModyQyW commented May 17, 2024

ModyQyW commented May 19, 2024

Xiphin commented May 12, 2024 •

edited by coderabbitai bot

coderabbitai bot commented May 12, 2024 •

edited

CodeRabbit Configration File (`.coderabbit.yaml`)

Xiphin commented May 14, 2024 •

edited

Skiyee commented May 15, 2024 •

edited