Skip to content

Move "diff" from external to core/utils #18961

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.

Sign up for GitHub

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 2 commits into from
Apr 8, 2025
Merged

Move "diff" from external to core/utils #18961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
194b255
move diff from external to core utils
madsrasmussen Apr 7, 2025
794c99c
Delete package-lock.json
madsrasmussen Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions src/Umbraco.Web.UI.Client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
"./workspace": "./dist-cms/packages/core/workspace/index.js",
"./external/backend-api": "./dist-cms/external/backend-api/index.js",
"./external/base64-js": "./dist-cms/external/base64-js/index.js",
"./external/diff": "./dist-cms/external/diff/index.js",
"./external/dompurify": "./dist-cms/external/dompurify/index.js",
"./external/lit": "./dist-cms/external/lit/index.js",
"./external/marked": "./dist-cms/external/marked/index.js",
Expand Down Expand Up @@ -214,10 +213,8 @@
"@tiptap/extension-underline": "2.11.5",
"@tiptap/pm": "2.11.5",
"@tiptap/starter-kit": "2.11.5",
"@types/diff": "^7.0.1",
"@umbraco-ui/uui": "^1.13.0",
"@umbraco-ui/uui-css": "^1.13.0",
"diff": "^7.0.0",
"dompurify": "^3.2.4",
"element-internals-polyfill": "^1.3.13",
"lit": "^3.2.1",
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Web.UI.Client/src/external/diff/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/Umbraco.Web.UI.Client/src/packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"build": "vite build"
},
"dependencies": {
"@types/diff": "^7.0.1",
"diff": "^7.0.0",
"uuid": "^11.0.5"
}
}
7 changes: 7 additions & 0 deletions src/Umbraco.Web.UI.Client/src/packages/core/utils/diff/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { diffWords } from 'diff';
import type { Change } from 'diff';

type UmbDiffChange = Change;

export { diffWords };
export type { UmbDiffChange };
3 changes: 2 additions & 1 deletion src/Umbraco.Web.UI.Client/src/packages/core/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
export * from './bytes/bytes.function.js';
export * from './debounce/debounce.function.js';
export * from './deprecation/index.js';
export * from './diff/index.js';
export * from './direction/index.js';
export * from './download/blob-download.function.js';
export * from './get-guid-from-udi.function.js';
Expand All @@ -25,5 +27,4 @@ export * from './sanitize/sanitize-html.function.js';
export * from './selection-manager/selection.manager.js';
export * from './state-manager/index.js';
export * from './string/index.js';
export * from './deprecation/index.js';
export type * from './type/index.js';
6 changes: 3 additions & 3 deletions ...o.Web.UI.Client/src/packages/documents/documents/rollback/modal/rollback-modal.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { UmbRollbackRepository } from '../repository/rollback.repository.js';
import { UmbDocumentDetailRepository } from '../../repository/index.js';
import type { UmbDocumentDetailModel } from '../../types.js';
import type { UmbRollbackModalData, UmbRollbackModalValue } from './types.js';
import { diffWords, type Change } from '@umbraco-cms/backoffice/external/diff';
import { diffWords, type UmbDiffChange } from '@umbraco-cms/backoffice/utils';
import { css, customElement, html, nothing, repeat, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
Expand Down Expand Up @@ -53,7 +53,7 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
_availableVariants: Option[] = [];

@state()
_diffs: Array<{ alias: string; diff: Change[] }> = [];
_diffs: Array<{ alias: string; diff: UmbDiffChange[] }> = [];

#rollbackRepository = new UmbRollbackRepository(this);
#userItemRepository = new UmbUserItemRepository(this);
Expand Down Expand Up @@ -321,7 +321,7 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
throw new Error('Current name is not set');
}

const diffs: Array<{ alias: string; diff: Change[] }> = [];
const diffs: Array<{ alias: string; diff: UmbDiffChange[] }> = [];

const nameDiff = diffWords(currentName, this._selectedVersion.name);
diffs.push({ alias: 'name', diff: nameDiff });
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Web.UI.Client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
"@umbraco-cms/backoffice/workspace": ["./src/packages/core/workspace/index.ts"],
"@umbraco-cms/backoffice/external/backend-api": ["./src/external/backend-api/index.ts"],
"@umbraco-cms/backoffice/external/base64-js": ["./src/external/base64-js/index.ts"],
"@umbraco-cms/backoffice/external/diff": ["./src/external/diff/index.ts"],
"@umbraco-cms/backoffice/external/dompurify": ["./src/external/dompurify/index.ts"],
"@umbraco-cms/backoffice/external/lit": ["./src/external/lit/index.ts"],
"@umbraco-cms/backoffice/external/marked": ["./src/external/marked/index.ts"],
Expand Down