Skip to content

Codemirror version changed to 6.0.2#25358

Merged
maliming merged 4 commits into
rel-10.5from
issue-codemirror
Jun 2, 2026
Merged

Codemirror version changed to 6.0.2#25358
maliming merged 4 commits into
rel-10.5from
issue-codemirror

Conversation

@gizemfirat

@gizemfirat gizemfirat commented May 4, 2026

Copy link
Copy Markdown
Contributor

FIX volosoft/volo#20960

-> codemirror version changed to 6.0.2
cmscode

-> codemirror version changed to 6.0.2
@gizemfirat gizemfirat added this to the 10.4-final milestone May 4, 2026
@gizemfirat gizemfirat self-assigned this May 4, 2026
@CLAassistant

CLAassistant commented May 4, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@gizemfirat gizemfirat marked this pull request as ready for review May 14, 2026 06:53
Copilot AI review requested due to automatic review settings May 14, 2026 06:53

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the @abp/codemirror npm pack to use CodeMirror 6 (targeting codemirror@6.0.2) while keeping existing ABP/CMS Kit integrations working via a small window.CodeMirror.fromTextArea(...) compatibility wrapper and updated static resource mappings.

Changes:

  • Switch @abp/codemirror from CodeMirror 5 assets to a bundled CodeMirror 6 IIFE and add ABP-specific styling (abp-codemirror).
  • Add a compatibility fromTextArea adapter and minimal “mode loaded” stubs for css/javascript.
  • Update ABP resource mappings to serve assets from @abp/codemirror/src/* instead of codemirror v5 folder structure.

Reviewed changes

Copilot reviewed 7 out of 8 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
npm/packs/codemirror/src/mode/javascript/javascript.js Adds a lightweight “mode loaded” marker for javascript/js.
npm/packs/codemirror/src/mode/css/css.js Adds a lightweight “mode loaded” marker for css.
npm/packs/codemirror/src/codemirror.css Introduces ABP wrapper styling for CodeMirror 6.
npm/packs/codemirror/scripts/entry.js Implements window.CodeMirror.fromTextArea compatibility adapter on top of CodeMirror 6.
npm/packs/codemirror/scripts/build.js Adds an esbuild bundling step to generate src/codemirror.js.
npm/packs/codemirror/package.json Updates dependencies to CodeMirror 6 + adds build tooling.
npm/packs/codemirror/abp.resourcemapping.js Repoints ABP resource mappings to the pack’s own src outputs.

"@abp/core": "~10.3.0",
"codemirror": "^5.65.1"
"@codemirror/lang-css": "^6.0.0",
"@codemirror/lang-javascript": "^6.0.0",
Comment thread npm/packs/codemirror/scripts/build.js Outdated
target: ['es2019'],
sourcemap: false,
minify: false,
legalComments: 'none'
Comment on lines +61 to +64
function createState(textarea, options) {
const extensions = [
basicSetup,
EditorView.updateListener.of(update => {
Comment on lines +24 to +25
.abp-codemirror .cm-focused {
outline: none;
@gizemfirat gizemfirat requested a review from maliming May 14, 2026 08:27
@ebicoglu ebicoglu modified the milestones: 10.4-final, 10.5-preview May 14, 2026
Add @codemirror/state and @codemirror/view dependencies, update build config, introduce a minimal/basic setup toggle, and improve focus styling.

- package.json: include @codemirror/state and @codemirror/view required by new imports.
- scripts/build.js: change esbuild legalComments from 'none' to 'eof' to keep trailing license comments.
- scripts/entry.js: import minimalSetup and factory getEditorSetup(options) to use minimalSetup by default and basicSetup only when lineNumbers === true; integrates this into editor state creation.
- src/codemirror.css: fix closing brace and add :focus-within styles to apply a Bootstrap-like focus ring.

These changes reduce default editor surface (no line numbers unless requested), add required runtime deps, and improve accessibility/focus visuals.
@gizemfirat gizemfirat removed the request for review from yagmurcelk May 22, 2026 07:27
@skoc10 skoc10 changed the base branch from dev to rel-10.5 June 2, 2026 09:46
@maliming maliming merged commit d3e82f7 into rel-10.5 Jun 2, 2026
1 check passed
@maliming maliming deleted the issue-codemirror branch June 2, 2026 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants