Skip to content
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.

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

CKEditor5 upgrade #1416

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
625cce2
[EPAD8-1932] Updating ckeditor_iframe module to support ckeditor5. Re…
carsoncho Jul 11, 2024
2e517ea
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Jul 11, 2024
08620f2
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Jul 25, 2024
570b0c3
Adjusting some settings to make Filtered format work as intended.
carsoncho Jul 25, 2024
4ff879e
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Jul 25, 2024
b43149e
Re-enabling USWDS ckeditor integration module. Adding USWDS table sup…
carsoncho Jul 25, 2024
cd06ae3
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Jul 25, 2024
86aa6e3
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Jul 26, 2024
2d139e8
Fixing issue with Anchor Link module where dependency package was inc…
carsoncho Jul 26, 2024
51ef618
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Jul 26, 2024
71c350b
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Aug 16, 2024
76e41a3
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Aug 23, 2024
6f121b8
EPAD8-2508: Add patch to fix media embed in CKEditor 5
dcmouyard Aug 23, 2024
efbcb55
EPAD8-2508: Update local dev settings
dcmouyard Aug 23, 2024
59602ea
[EPAD8-2523] Adjusting logic to make the custom linkit plugin for web…
carsoncho Aug 23, 2024
3067ea5
[TCWS19-2523] Removing debugging placeholder.
carsoncho Aug 23, 2024
79e6a55
[EPAD8-2523] Minor adjustmnet to ensure the default url input is disp…
carsoncho Aug 23, 2024
e407326
[EPAD8-2523] Adding patch for editor_advanced_link.
carsoncho Aug 23, 2024
5d67111
EPAD8-2508: Fix image alignment in CKEditor 5
dcmouyard Aug 26, 2024
0f30925
Merge pull request #1455 from USEPA/EPAD8-2508-image-alignment
carsoncho Aug 26, 2024
fbd6790
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Aug 28, 2024
ec4c1c5
Removing patch that's no longer needed for anchor_link.
carsoncho Aug 28, 2024
f60999b
Merge branch 'FEATURE-ckeditor5-upgrade' of github.com:USEPA/webcms i…
carsoncho Aug 28, 2024
35cf624
Enabling USWDS table settings for filtered html editor.
carsoncho Aug 28, 2024
df6cc10
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 7, 2024
ea470bf
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 17, 2024
066a1ab
Upgrading paragraph_entity_embed module and removing patches that are…
carsoncho Sep 17, 2024
c4d3e69
Adding updated composer.patches.
carsoncho Sep 17, 2024
e6ebc86
Disabling uswds ckeditor integration module.
carsoncho Sep 17, 2024
9e18aba
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 17, 2024
ad99fad
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 18, 2024
d9ad9b0
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 19, 2024
70158d6
[EPAD8-2571] Adding new custom patch for adding openerParameters to t…
carsoncho Sep 19, 2024
b07a6d6
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 19, 2024
d424c94
Merge pull request #1502 from USEPA/EPAD8-2571-update-paragraphs_enti…
carsoncho Sep 19, 2024
e7f1d98
[EPAD8-2523] Refactoring the web area linkit plugin slightly to ensur…
carsoncho Sep 19, 2024
2586598
[EPAD8-2523] Adjusting weights of filters to match expectations.
carsoncho Sep 19, 2024
ce68963
Merge branch 'main' of github.com:USEPA/webcms into FEATURE-ckeditor5…
carsoncho Sep 20, 2024
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
52 changes: 19 additions & 33 deletions services/drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"drupal/admin_toolbar": "^3.3",
"drupal/allowed_formats": "^2.0",
"drupal/anchor": "^1.0",
"drupal/anchor_link": "3.0.x-dev",
"drupal/anchor_link": "~3.0",
"drupal/auto_entitylabel": "^3.0",
"drupal/autologout": "^2.0",
"drupal/autosave_form": "^1.3",
Expand All @@ -180,7 +180,7 @@
"drupal/ckeditor5_dev": "^1.0",
"drupal/ckeditor5_fullscreen": "^1.0@beta",
"drupal/ckeditor_abbreviation": "^4.0@alpha",
"drupal/ckeditor_iframe": "^2.",
"drupal/ckeditor_iframe": "^3.0@beta",
"drupal/ckeditor_resize": "^1.3",
"drupal/ckeditor_specialchars": "^1.2",
"drupal/cloudfront_cache_path_invalidate": "^3.0",
Expand Down Expand Up @@ -214,6 +214,7 @@
"drupal/environment_indicator": "4.0.10",
"drupal/facets": "^2.0",
"drupal/facets_pretty_paths": "^1.4",
"drupal/fakeobjects": "^1.2",
"drupal/fast_404": "^3.2",
"drupal/field_group": "^3.0",
"drupal/filter_html_plus": "^2.0",
Expand Down Expand Up @@ -257,7 +258,7 @@
"drupal/native_lazy_loading": "^1.1@RC",
"drupal/page_manager": "^4.0@RC",
"drupal/paragraphs": "^1.9",
"drupal/paragraphs_entity_embed": "2.x-dev",
"drupal/paragraphs_entity_embed": "^3.0.1",
"drupal/pathauto": "^1.4",
"drupal/pathologic": "^2.0@alpha",
"drupal/queue_ui": "^3.1",
Expand Down Expand Up @@ -313,6 +314,7 @@
"liuggio/statsd-php-client": "^1.0",
"mglaman/composer-drupal-lenient": "^1.0",
"nodespark/des-connector": "dev-php-update#d699e59 as 7.x-dev",
"oomphinc/composer-installers-extender": "^2.0",
"popperjs/popperjs": "^2.11",
"ruflin/elastica": "7.x-dev#72a4598544e3f99b5dd8cacb05d009ee75c2a701 as dev-master",
"sabre/vobject": "^4.0",
Expand Down Expand Up @@ -357,14 +359,17 @@
"drupal/core-project-message": true,
"mglaman/composer-drupal-lenient": true,
"drupal/core-vendor-hardening": true,
"php-http/discovery": true
"php-http/discovery": true,
"oomphinc/composer-installers-extender": true
}
},
"autoload": {
"classmap": [
"scripts/composer/ScriptHandler.php"
],
"files": ["load.environment.php"]
"files": [
"load.environment.php"
]
},
"scripts": {
"install-codestandards": [
Expand Down Expand Up @@ -395,30 +400,14 @@
},
"patches-file": "composer.patches.json",
"installer-paths": {
"web/core": [
"type:drupal-core"
],
"web/libraries/{$name}": [
"type:drupal-library"
],
"web/modules/contrib/{$name}": [
"type:drupal-module"
],
"web/profiles/contrib/{$name}": [
"type:drupal-profile"
],
"web/themes/contrib/{$name}": [
"type:drupal-theme"
],
"drush/Commands/contrib/{$name}": [
"type:drupal-drush"
],
"web/modules/custom/{$name}": [
"type:drupal-custom-module"
],
"web/themes/custom/{$name}": [
"type:drupal-custom-theme"
]
"web/core": ["type:drupal-core"],
"web/modules/contrib/{$name}": ["type:drupal-module"],
"web/profiles/contrib/{$name}": ["type:drupal-profile"],
"web/themes/contrib/{$name}": ["type:drupal-theme"],
"drush/Commands/contrib/{$name}": ["type:drupal-drush"],
"web/modules/custom/{$name}": ["type:drupal-custom-module"],
"web/themes/custom/{$name}": ["type:drupal-custom-theme"],
"web/libraries/{$name}": ["type:drupal-library"]
},
"drupal-scaffold": {
"locations": {
Expand All @@ -429,10 +418,7 @@
}
},
"merge-plugin": {
"include": [
"web/modules/contrib/webform/composer.libraries.json",
"web/modules/contrib/anchor_link/composer.libraries.json"
]
"include": ["web/modules/contrib/webform/composer.libraries.json", "web/modules/contrib/anchor_link/composer.libraries.json"]
},
"drupal-lenient": {
"allowed-list": ["drupal/address_formatter", "drupal/ckeditor_specialchars", "drupal/entitygroupfield", "drupal/group_outsider_in", "drupal/hierarchical_term_formatter", "drupal/redirect_metrics", "drupal/role_expose", "drupal/show_email", "drupal/address_formatter"]
Expand Down
Loading