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

TASK: Upgrade to FontAwesome 6.5.2 #3801

Merged
merged 9 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Resources/Private/Translations/es/Main.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@
</trans-unit>
<trans-unit id="copyNodeTypeNameToClipboard" xml:space="preserve">
<source>Copy node type to clipboard</source>
<target state="translated">Copiar tipo de nodo al portapapeles</target>
<target state="translated">Copiar el tipo de nodo al portapapeles</target>
</trans-unit>
<trans-unit id="collapseAll" xml:space="preserve">
<source>Collapse All</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ test('Check the nodetype help in create dialog', async t => {

subSection('Open context help and check for Markdown rendering');
await t
.click(ReactSelector('NodeTypeItem').withProps({nodeType: {label: 'Headline_Test'}}).find('button svg[data-icon="question-circle"]'))
.click(ReactSelector('NodeTypeItem').withProps({nodeType: {label: 'Headline_Test'}}).find('button svg[data-icon="circle-question"]'))
.expect(ReactSelector('ReactMarkdown').find('strong').withText('test').exists).ok('Bold test from Markdown has been rendered');
});

Expand Down
2 changes: 0 additions & 2 deletions Tests/IntegrationTests/TestDistribution/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
},
"extra": {
"patches": {
"neos/neos-development-collection": {
}
}
},
"require-dev": {
Expand Down
2 changes: 2 additions & 0 deletions Tests/IntegrationTests/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ for fixture in Packages/Application/Neos.Neos.Ui/Tests/IntegrationTests/Fixtures
# TODO: optimize this
composer reinstall neos/test-nodetypes
composer reinstall neos/test-site
# make sure neos is installed even if patching led to the removal (bug)
composer update neos/neos-development-collection
./flow flow:cache:flush --force
./flow flow:cache:warmup
./flow configuration:show --path Neos.ContentRepository.contentDimensions
Expand Down
1 change: 1 addition & 0 deletions packages/debug-reason-for-rendering/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/debug-reason-for-rendering",
"version": "",
"description": "React Performance Optimization Utility - Why does a component re-render?",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
1 change: 1 addition & 0 deletions packages/jest-preset-neos-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/jest-preset-neos-ui",
"version": "",
"description": "The jest preset for all packages of the neos-ui mono-repo.",
"main": "jest-preset.json",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ts-interfaces/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@neos-project/neos-ts-interfaces",
"version": "",
"description": "Neos domain-related TypeScript interfaces",
"private": true,
"main": "src/index.ts",
"devDependencies": {
"@neos-project/jest-preset-neos-ui": "workspace:*",
"@neos-project/neos-ui-build": "workspace:*",
"typescript": "^4.6.4"
},
"license": "GNU GPLv3"
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-backend-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-backend-connector",
"version": "",
"description": "Endoints and fetch cals to the Neos CMS backend",
"private": true,
"main": "./src/index.ts",
Expand Down
5 changes: 0 additions & 5 deletions packages/neos-ui-build/package.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/neos-ui-ckeditor5-bindings/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-ckeditor5-bindings",
"version": "",
"description": "Prepare CKEditor5 for the Neos CMS UI",
"private": true,
"main": "./src/manifest.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-constants/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-constants",
"version": "",
"description": "Container package to store Neos CMS UI constants",
"private": true,
"main": "./src/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-containers/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-containers",
"version": "",
"description": "Smart components for Neos CMS UI.",
"private": true,
"main": "./src/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-contentrepository/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-contentrepository",
"version": "",
"description": "Bindings for the Neos ContentRepository",
"private": true,
"main": "./src/manifest.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-decorators/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-decorators",
"version": "",
"description": "Decorators for Neos CMS UI.",
"private": true,
"main": "./src/index.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-editors/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-editors",
"version": "",
"description": "Neos CMS UI Editors for use in the inspector.",
"main": "src/manifest.js",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-extensibility-webpack-adapter",
"version": "",
"description": "Minimal configuration, highly opinionated Webpack 4 + Babel plugin build stack for the Neos CMS UI",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-extensibility/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-extensibility",
"version": "",
"description": "Core of the extensibility mechanisms for the Neos UI",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-guest-frame/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-guest-frame",
"version": "",
"description": "Guest frame initialization bindings",
"private": true,
"main": "./src/manifest.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-i18n/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-i18n",
"version": "",
"description": "I18n utilities and components for Neos CMS UI.",
"private": true,
"main": "./src/index.tsx",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-inspector/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-inspector",
"version": "",
"description": "Components for integrating views and editors into the Neos CMS UI inspector.",
"private": true,
"main": "./src/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-redux-store/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-redux-store",
"version": "",
"description": "Redux store implementation for the Neos CMS UI",
"private": true,
"main": "./src/index.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-sagas/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-sagas",
"version": "",
"description": "Redux Sagas implementation for the Neos CMS UI",
"private": true,
"main": "src/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-validators/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-validators",
"version": "",
"description": "Validators for Neos CMS UI.",
"private": true,
"main": "./src/index.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/neos-ui-views/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui-views",
"version": "",
"description": "Neos CMS UI Views for use in the inspector.",
"main": "./src/index.js",
"private": true,
Expand Down
9 changes: 5 additions & 4 deletions packages/neos-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/neos-ui",
"version": "",
"description": "Neos CMS UI written in ReactJS and a ton of other fun technology.",
"private": true,
"devDependencies": {
Expand All @@ -11,10 +12,10 @@
},
"dependencies": {
"@ckeditor/ckeditor5-highlight": "16.0.0",
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-regular-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@friendsofreactjs/react-css-themr": "~4.2.0",
"@neos-project/neos-ts-interfaces": "workspace:*",
"@neos-project/neos-ui-backend-connector": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
position: absolute;
left: var(--spacing-Full);
height: var(--spacing-GoldenUnit);
width: 1em;
}

.wrapper {
Expand Down
1 change: 1 addition & 0 deletions packages/positional-array-sorter/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/positional-array-sorter",
"version": "",
"description": "Flexible array sorter that sorts an array according to a 'position' meta data.",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
1 change: 1 addition & 0 deletions packages/react-proptypes/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/react-proptypes",
"version": "",
"description": "Neos CMS specific proptypes for react",
"private": true,
"main": "./src/index.js",
Expand Down
11 changes: 6 additions & 5 deletions packages/react-ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/react-ui-components",
"version": "",
"description": "The UI components which power the Neos backend application.",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down Expand Up @@ -33,18 +34,18 @@
"example": "cd example && yarn esbuild test.jsx --outdir=dist --bundle --sourcemap=linked --loader:.woff2=file"
},
"peerDependencies": {
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-regular-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@friendsofreactjs/react-css-themr": "~4.2.0",
"notosans-fontface": "^1.3.0",
"prop-types": "^15.5.10",
"react": "^16.12.0",
"react-dom": "^16.0.0"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/react-fontawesome": "^0.1.14",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"classnames": "^2.2.3",
"hoist-non-react-statics": "^3.3.1",
"lodash.assign": "^4.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,13 @@

exports[`<FontAwesomeIcon/> should render correctly. 1`] = `
<FontAwesomeIcon
border={false}
className="iconClassName fooIconClassName"
fixedWidth={false}
flip={null}
icon={
Array [
"fas",
"fooIconClassName",
]
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size="sm"
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
/>
`;
2 changes: 1 addition & 1 deletion packages/react-ui-components/src/Icon/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export interface IconTheme {
readonly 'icon--color-primaryBlue': string;
}

export interface IconProps extends Omit<FontAwesomeIconProps, 'icon'> {
export interface IconProps extends Omit<FontAwesomeIconProps, 'icon' | 'ref'> {
/**
* We use the react component FortAwesome provides to render icons.
* we will pass down all props to the component via {...rest} to expose it's api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@
.selectBoxHeaderWithSearchInput__icon {
composes: reset from '../reset.module.css';
height: var(--spacing-GoldenUnit);
width: 1em;
}
1 change: 1 addition & 0 deletions packages/utils-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/utils-helpers",
"version": "",
"description": "Helper functions for Neos CMS UI.",
"private": true,
"main": "./src/index.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/utils-logger/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/utils-logger",
"version": "",
"description": "Logger implementation for Neos CMS UI.",
"private": true,
"main": "./src/index.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/utils-redux/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@neos-project/utils-redux",
"version": "",
"description": "Neos CMS UI Redux Helper utilitites",
"private": true,
"main": "./src/index.ts",
Expand Down
Loading
Loading