Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from Sebobo/task/update-8-3
TASK: Update build, bump minimum Neos version and resolve plow-js deprecation warning
- Loading branch information
Showing
12 changed files
with
1,350 additions
and
4,641 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| module.exports = { | ||
| root: true, | ||
| parserOptions: { | ||
| sourceType: "module", | ||
| }, | ||
| extends: [ | ||
| "eslint:recommended", | ||
| "plugin:react/recommended", | ||
| "plugin:prettier/recommended", | ||
| ], | ||
| plugins: ["prettier", "react"], | ||
| settings: { | ||
| react: { | ||
| version: "detect", | ||
| }, | ||
| }, | ||
| env: { | ||
| node: true, | ||
| es6: true, | ||
| }, | ||
| rules: { | ||
| "react/prop-types": "off", | ||
| "prettier/prettier": ["error"], | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 14 | ||
| 16 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,16 @@ | ||
| { | ||
| "name": "hyphens-editor", | ||
| "version": "1.0.0", | ||
| "scripts": { | ||
| "build": "NODE_ENV=production neos-react-scripts build", | ||
| "watch": "neos-react-scripts watch" | ||
| }, | ||
| "devDependencies": { | ||
| "@ckeditor/ckeditor5-engine": "^13.1.1", | ||
| "@ckeditor/ckeditor5-widget": "^10.3.1", | ||
| "@neos-project/eslint-config-neos": "^2.6.1", | ||
| "@neos-project/neos-ui-extensibility": "^4.0.0", | ||
| "@neos-project/react-ui-components": "^4.0.0" | ||
| }, | ||
| "neos": { | ||
| "buildTargetDirectory": "../../../Public/HyphensEditor" | ||
| } | ||
| "name": "hyphens-editor", | ||
| "version": "1.0.0", | ||
| "scripts": { | ||
| "build": "NODE_ENV=production neos-react-scripts build", | ||
| "watch": "neos-react-scripts watch" | ||
| }, | ||
| "devDependencies": { | ||
| "@neos-project/neos-ui-extensibility": "^8.3.0", | ||
| "@neos-project/neos-ui-extensibility-webpack-adapter": "^8.3.0", | ||
| "@neos-project/react-ui-components": "^8.3.0" | ||
| }, | ||
| "neos": { | ||
| "buildTargetDirectory": "../../../Public/HyphensEditor" | ||
| } | ||
| } |
14 changes: 6 additions & 8 deletions
14
Resources/Private/Scripts/HyphensEditor/src/manifest.config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,18 @@ | ||
| import {$add, $get} from 'plow-js'; | ||
| import HyphensFactory from "./plugins/hyphens"; | ||
|
|
||
| import HyphensFactory from './plugins/hyphens'; | ||
|
|
||
| const addPlugin = (Plugin, isEnabled) => (ckEditorConfiguration, options) => { | ||
| if (!isEnabled || isEnabled(options.editorOptions, options)) { | ||
| const addPlugin = (Plugin) => (ckEditorConfiguration, options) => { | ||
| if (options.editorOptions.nbsp || options.editorOptions.hyphens) { | ||
| ckEditorConfiguration.plugins = ckEditorConfiguration.plugins || []; | ||
| return $add('plugins', Plugin, ckEditorConfiguration); | ||
| ckEditorConfiguration.plugins.push(Plugin); | ||
| } | ||
| return ckEditorConfiguration; | ||
| }; | ||
|
|
||
| export default (ckEditorRegistry, editorConfig) => { | ||
| const config = ckEditorRegistry.get('config'); | ||
| const config = ckEditorRegistry.get("config"); | ||
|
|
||
| const HyphensPlugin = HyphensFactory(editorConfig); | ||
| config.set('hyphens', addPlugin(HyphensPlugin, $get('hyphens') || $get('nbsp'))); | ||
| config.set("hyphens", addPlugin(HyphensPlugin)); | ||
|
|
||
| return config; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,5 +45,3 @@ | |
| border-right: 0.2ch solid currentColor; | ||
| } | ||
|
|
||
|
|
||
| /*# sourceMappingURL=Plugin.css.map*/ | ||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,30 @@ | ||
| { | ||
| "description": "Shel.Neos:HyphensEditor", | ||
| "license": "GPL-3.0-or-later", | ||
| "version": "1.0.0", | ||
| "private": true, | ||
| "engines": { | ||
| "node": ">=14" | ||
| }, | ||
| "scripts": { | ||
| "build": "yarn workspace hyphens-editor run build", | ||
| "watch": "yarn workspace hyphens-editor run watch" | ||
| }, | ||
| "workspaces": [ | ||
| "Resources/Private/Scripts/*" | ||
| ], | ||
| "packageManager": "yarn@3.3.0" | ||
| "description": "Shel.Neos:HyphensEditor", | ||
| "license": "GPL-3.0-or-later", | ||
| "version": "1.0.0", | ||
| "private": true, | ||
| "engines": { | ||
| "node": ">=16" | ||
| }, | ||
| "scripts": { | ||
| "build": "yarn workspace hyphens-editor run build", | ||
| "watch": "yarn workspace hyphens-editor run watch" | ||
| }, | ||
| "workspaces": [ | ||
| "Resources/Private/Scripts/*" | ||
| ], | ||
| "devDependencies": { | ||
| "eslint": "^7.32.0", | ||
| "eslint-config-prettier": "^7.2.0", | ||
| "eslint-plugin-prettier": "^3.4.1", | ||
| "eslint-plugin-react": "^7.31.10", | ||
| "prettier": "^2.7.1" | ||
| }, | ||
| "packageManager": "yarn@3.3.0", | ||
| "prettier": { | ||
| "printWidth": 120, | ||
| "semi": true, | ||
| "singleQuote": true, | ||
| "tabWidth": 4 | ||
| } | ||
| } |
Oops, something went wrong.