Skip to content

Commit d373852

Browse files
authored
Merge pull request #67 from Sebobo/bugfix/ckeditor-44-compatibility
BUGFIX: CKEditor 44 compatibility
2 parents 3e8088c + b09663f commit d373852

24 files changed

+3300
-8013
lines changed

.eslintrc.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-node@v3
1616
with:
17-
node-version: '16'
17+
node-version: '22'
1818
cache: 'yarn'
1919

2020
- name: Install dependencies
2121
run: yarn
2222

23+
- name: Install dependencies
24+
run: yarn lint
25+
2326
- name: Build the plugin
2427
run: yarn build

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
22

.yarn/releases/yarn-3.3.0.cjs

Lines changed: 0 additions & 807 deletions
This file was deleted.

.yarn/releases/yarn-4.9.2.cjs

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
compressionLevel: mixed
2+
13
enableGlobalCache: true
4+
25
nodeLinker: node-modules
6+
37
pnpMode: loose
4-
yarnPath: .yarn/releases/yarn-3.3.0.cjs
8+
9+
yarnPath: .yarn/releases/yarn-4.9.2.cjs
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
const esbuild = require('esbuild');
2+
const extensibilityMap = require('@neos-project/neos-ui-extensibility/extensibilityMap.json');
3+
const isWatch = process.argv.includes('--watch');
4+
5+
/** @type {import("esbuild").BuildOptions} */
6+
const options = {
7+
logLevel: 'info',
8+
bundle: true,
9+
minify: !isWatch,
10+
target: 'es2020',
11+
entryPoints: { Plugin: 'src/index.js' },
12+
loader: {
13+
'.js': 'tsx',
14+
},
15+
alias: extensibilityMap,
16+
outdir: '../../../Public/HyphensEditor',
17+
};
18+
19+
if (isWatch) {
20+
esbuild.context(options).then((ctx) => ctx.watch());
21+
} else {
22+
esbuild.build(options);
23+
}

Resources/Private/Scripts/HyphensEditor/package.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
"name": "hyphens-editor",
33
"version": "1.0.0",
44
"scripts": {
5-
"build": "NODE_ENV=production neos-react-scripts build",
6-
"watch": "neos-react-scripts watch"
5+
"build": "node esbuild.js",
6+
"watch": "node esbuild.js --watch"
77
},
88
"devDependencies": {
9-
"@neos-project/neos-ui-extensibility": "^8.3.0",
10-
"@neos-project/neos-ui-extensibility-webpack-adapter": "^8.3.0",
11-
"@neos-project/react-ui-components": "^8.3.0"
12-
},
13-
"neos": {
14-
"buildTargetDirectory": "../../../Public/HyphensEditor"
9+
"@neos-project/neos-ui-extensibility": "^8.3.14",
10+
"@neos-project/react-ui-components": "^8.3.14",
11+
"esbuild": "~0.25.8"
1512
}
1613
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
export default function NbspCommand(editor) {
22
return {
33
execute: () => {
4-
editor.model.change(writer => {
4+
editor.model.change((writer) => {
55
const insertPosition = editor.model.document.selection.getFirstPosition();
66
writer.insertText('\u00A0', insertPosition);
77
});
8-
}
8+
},
99
};
1010
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
export default function ShyCommand(editor) {
22
return {
33
execute: () => {
4-
editor.model.change(writer => {
4+
editor.model.change((writer) => {
55
const insertPosition = editor.model.document.selection.getFirstPosition();
66
writer.insertText('\u00AD', insertPosition);
77
});
8-
}
8+
},
99
};
1010
}

0 commit comments

Comments
 (0)