mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-02-03 20:51:07 -05:00
28e0af23fa
Some checks are pending
/ release (push) Waiting to run
testing-integration / test-unit (push) Waiting to run
testing-integration / test-sqlite (push) Waiting to run
testing-integration / test-mariadb (v10.6) (push) Waiting to run
testing-integration / test-mariadb (v11.8) (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
- Replace the [Monaco Editor](https://microsoft.github.io/monaco-editor/) with [CodeMirror 6](https://codemirror.net/). This editor is used to facilitate the 'Add file' and 'Edit file' functionality. - Rationale: - Monaco editor is a great and powerful editor, however for Forgejo's purpose it acts more like a small IDE than a code editor and is doing too much. In my limited user research the usage of editing files via the web UI is largely for small changes that does not need the features that Monaco editor provides. - Monaco editor has no mobile support, Codemirror is very usable on mobile. - Monaco editor pulls in large dependencies (for language support) and by replacing it with Codemirror the amount of time that webpack needs to build the frontend is reduced by 50% (~30s -> ~15s). - The binary of Forgejo (build with `bindata` tag) is reduced by 2MiB. - Codemirror is much more lightweight and should be more usable on less powerful hardware, most notably the lazy loading is much faster as codemirror uses less javascript. - Because Codemirror is modular it is much easier to change the behavior of the code editor if we wish to. - Drawbacks: - Codemirror is quite modular and as seen in `package.json` and in `codeeditor.ts` we have to supply a lot more of its features to have feature parity with Monaco editor. - Monaco editor has great integrated language support (features that an lsp would provide), Codemirror only has such language support to an extend. - Monaco editor has its famous command palette (known by many as its also available in VSCode), this is not available in code mirror. - Good to note: - All features that was added on top of the monaco editor (such as dynamically changing language support depending on the filename) still works and the theme is based on the VSCode colors which largely resembles the monaco editor. - The code editor is still lazy-loaded (this is painfully clear by reading how imports are passed around in `codeeditor.ts`). - This change was privately tested by a few people, a few bugs were found (and fixed) but no major drawbacks were noted for their usage of the web editor. - There's a "search" button in the top bar, so that search can be used on mobile. It is otherwise only accessible via <kbd>Ctrl</kbd>+<kbd>f</kbd>. Co-authored-by: Beowulf <beowulf@beocode.eu> Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10559 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: Beowulf <beowulf@beocode.eu>
67 lines
3.5 KiB
TypeScript
67 lines
3.5 KiB
TypeScript
// @watch start
|
|
// templates/repo/diff/**
|
|
// web_src/css/features/imagediff.css
|
|
// web_src/css/modules/tab.css
|
|
// web_src/js/modules/tab.ts
|
|
// @watch end
|
|
|
|
import {expect} from '@playwright/test';
|
|
import {test, dynamic_id} from './utils_e2e.ts';
|
|
import {screenshot} from './shared/screenshots.ts';
|
|
|
|
test.use({user: 'user2'});
|
|
|
|
test('Repository image diff', async ({page}) => {
|
|
// Generate a temporary SVG and edit it.
|
|
let response = await page.goto('/user2/repo1/_new/master', {waitUntil: 'domcontentloaded'});
|
|
expect(response?.status()).toBe(200);
|
|
|
|
const filename = `${dynamic_id()}.svg`;
|
|
|
|
await page.getByPlaceholder('Name your file…').fill(filename);
|
|
await page.locator('.cm-content').click();
|
|
await page.keyboard.type('<svg version="1.1" width="300" height="200" xmlns="http://www.w3.org/2000/svg"><circle cx="150" cy="100" r="80" fill="green" /></svg>\n');
|
|
|
|
await page.locator('.quick-pull-choice input[value="direct"]').click();
|
|
await page.getByRole('button', {name: 'Commit changes'}).click();
|
|
|
|
response = await page.goto(`/user2/repo1/_edit/master/${filename}`, {waitUntil: 'domcontentloaded'});
|
|
expect(response?.status()).toBe(200);
|
|
|
|
await page.locator('.cm-content').click();
|
|
await page.keyboard.press('Meta+KeyA');
|
|
await page.keyboard.type('<svg version="1.1" width="300" height="200" xmlns="http://www.w3.org/2000/svg"><circle cx="150" cy="100" r="80" fill="red" /></svg>\n');
|
|
|
|
await page.locator('.quick-pull-choice input[value="direct"]').click();
|
|
await page.getByRole('button', {name: 'Commit changes'}).click();
|
|
|
|
// Go to the commit page, where a image diff is shown.
|
|
await page.locator('.commit-summary a.default-link').click();
|
|
|
|
// Exhaustively test tabs works as expected
|
|
await expect(page.locator('.item[data-tab="diff-side-by-side-1"]')).toContainClass('active');
|
|
await expect(page.locator('.item[data-tab="diff-swipe-1"]')).not.toContainClass('active');
|
|
await expect(page.locator('.item[data-tab="diff-overlay-1"]')).not.toContainClass('active');
|
|
await expect(page.locator('.tab[data-tab="diff-side-by-side-1"]')).toBeVisible();
|
|
await expect(page.locator('.tab[data-tab="diff-swipe-1"]')).toBeHidden();
|
|
await expect(page.locator('.tab[data-tab="diff-overlay-1"]')).toBeHidden();
|
|
await screenshot(page, page.locator('#diff-container'));
|
|
|
|
await page.getByText('Swipe').click();
|
|
await expect(page.locator('.item[data-tab="diff-side-by-side-1"]')).not.toContainClass('active');
|
|
await expect(page.locator('.item[data-tab="diff-swipe-1"]')).toContainClass('active');
|
|
await expect(page.locator('.item[data-tab="diff-overlay-1"]')).not.toContainClass('active');
|
|
await expect(page.locator('.tab[data-tab="diff-side-by-side-1"]')).toBeHidden();
|
|
await expect(page.locator('.tab[data-tab="diff-swipe-1"]')).toBeVisible();
|
|
await expect(page.locator('.tab[data-tab="diff-overlay-1"]')).toBeHidden();
|
|
await screenshot(page, page.locator('#diff-container'));
|
|
|
|
await page.getByText('Overlay').click();
|
|
await expect(page.locator('.item[data-tab="diff-side-by-side-1"]')).not.toContainClass('active');
|
|
await expect(page.locator('.item[data-tab="diff-swipe-1"]')).not.toContainClass('active');
|
|
await expect(page.locator('.item[data-tab="diff-overlay-1"]')).toContainClass('active');
|
|
await expect(page.locator('.tab[data-tab="diff-side-by-side-1"]')).toBeHidden();
|
|
await expect(page.locator('.tab[data-tab="diff-swipe-1"]')).toBeHidden();
|
|
await expect(page.locator('.tab[data-tab="diff-overlay-1"]')).toBeVisible();
|
|
await screenshot(page, page.locator('#diff-container'));
|
|
});
|