Skip to content
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

Revert "chore: enable local worker file in development mode" #4314

Merged
merged 1 commit into from
Jan 13, 2025

Conversation

Ricbet
Copy link
Member

@Ricbet Ricbet commented Jan 13, 2025

This reverts commit 5e82bb2.

Types

Background or solution

Changelog

Summary by CodeRabbit

  • 重构

    • 简化了开发环境下文件服务器和 Monaco 编辑器工作线程的 URL 处理逻辑
    • 移除了特定于开发环境的条件检查
    • 统一了工作线程 URL 的获取方式
  • 性能优化

    • 精简了文件请求和工作线程加载的代码路径

@Ricbet Ricbet requested review from hacke2 and erha19 January 13, 2025 02:51
@Ricbet Ricbet self-assigned this Jan 13, 2025
@Ricbet Ricbet linked an issue Jan 13, 2025 that may be closed by this pull request
Copy link
Contributor

coderabbitai bot commented Jan 13, 2025

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

warning eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning eslint > @humanwhocodes/config-array@0.13.0: Use @eslint/config-array instead
warning eslint > @humanwhocodes/config-array > @humanwhocodes/object-schema@2.0.3: Use @eslint/object-schema instead
warning eslint > file-entry-cache > flat-cache > rimraf@3.0.2: Rimraf versions prior to v4 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob > inflight@1.0.6: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning eslint-import-resolver-typescript > glob@7.2.3: Glob versions prior to v9 are no longer supported
error Couldn't find any versions for "@opensumi/ide-dev-tool" that matches "workspace:*"

概述

演练

这个拉取请求修改了两个文件:express-file-server.contribution.tsmonaco.contribution.ts。主要变更是移除了与开发环境相关的条件块,简化了文件服务和 Monaco 工作器 URL 的处理逻辑。这些更改删除了特定于开发环境的路径和环境检查,使文件处理和工作器 URL 解析逻辑更加统一和直接。

变更

文件 变更摘要
packages/express-file-server/src/node/express-file-server.contribution.ts 移除了针对 /monaco/worker 目录的开发模式特殊处理逻辑
packages/monaco/src/browser/monaco.contribution.ts 简化 getWorker 函数,移除环境检查,直接使用 getWorkerUrl 函数返回的 URL

可能相关的 PR


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1f0f364 and 96fd5f1.

📒 Files selected for processing (2)
  • packages/express-file-server/src/node/express-file-server.contribution.ts (0 hunks)
  • packages/monaco/src/browser/monaco.contribution.ts (1 hunks)
💤 Files with no reviewable changes (1)
  • packages/express-file-server/src/node/express-file-server.contribution.ts
⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: unittest (ubuntu-latest, 18.x, jsdom)
  • GitHub Check: build-windows
  • GitHub Check: unittest (ubuntu-latest, 18.x, node)
  • GitHub Check: build (ubuntu-latest, 20.x)
  • GitHub Check: unittest (macos-latest, 18.x, jsdom)
  • GitHub Check: ubuntu-latest, Node.js 20.x
  • GitHub Check: unittest (macos-latest, 18.x, node)
🔇 Additional comments (2)
packages/monaco/src/browser/monaco.contribution.ts (2)

304-304: 代码变更符合预期!

移除了开发模式下本地 worker 文件的处理逻辑,直接使用 getWorkerUrl 的返回值,这与 PR 的还原目标一致。


Line range hint 305-309: 建议验证 Monaco 版本兼容性

代码使用 type: 'classic' 来创建 worker 是为了解决 Monaco 0.53+ 版本的模块格式不兼容问题。建议验证当前使用的 Monaco 版本,以确保这个解决方案仍然必要。

✅ Verification successful

当前 Monaco 版本确实需要此兼容性处理

代码中使用 type: 'classic' 的解决方案是必要的,因为:

  • 当前使用的 Monaco 版本为 0.53.0-patch.2
  • 此版本确实存在注释中描述的模块格式兼容性问题
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# 检查项目中使用的 Monaco 版本
grep -r "\"@opensumi/monaco-editor-core\":" package.json

Length of output: 56


Script:

#!/bin/bash
# Search for Monaco-related dependencies in all package.json files
fd package.json --type f --exec grep -l "monaco" {} \; | xargs cat

# Look for Monaco version references in code
rg -i "monaco.*version|version.*monaco" --type ts

Length of output: 40067

Finishing Touches

  • 📝 Generate Docstrings (Beta)

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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

Copy link

codecov bot commented Jan 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.20%. Comparing base (1f0f364) to head (96fd5f1).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4314      +/-   ##
==========================================
- Coverage   54.20%   54.20%   -0.01%     
==========================================
  Files        1634     1634              
  Lines       99941    99941              
  Branches    21703    21695       -8     
==========================================
- Hits        54177    54173       -4     
- Misses      38021    38025       +4     
  Partials     7743     7743              
Flag Coverage Δ
jsdom 49.74% <ø> (-0.01%) ⬇️
node 12.24% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@hacke2 hacke2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@hacke2 hacke2 merged commit f6bd660 into main Jan 13, 2025
13 checks passed
@hacke2 hacke2 deleted the chore/revert-local-worker branch January 13, 2025 09:20
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] 开发环境下 editor.worker.bundle.js 资源加载 404 问题
2 participants