Merge remote-tracking branch 'origin/8.3' into 9.0

neos · Apr 20, 2024 · 2ef119c · 2ef119c
2 parents a5a4f6b + c6be4fc
commit 2ef119c
Show file tree

Hide file tree

Showing 33 changed files with 107 additions and 107 deletions.
diff --git a/Classes/Domain/Service/StyleAndJavascriptInclusionService.php b/Classes/Domain/Service/StyleAndJavascriptInclusionService.php
@@ -99,15 +99,14 @@ protected function build(array $resourceArrayToSort, \Closure $builderForLine):
                 $hash = substr(md5_file($resourceExpression) ?: '', 0, 8);
                 $resourceExpression = $this->resourceManager->getPublicPackageResourceUriByPath($resourceExpression);
             }
-            $finalUri = $hash ? $resourceExpression . '?' . $hash : $resourceExpression;
+            $finalUri = $hash ? $resourceExpression . (str_contains($resourceExpression, '?') ? '&' : '?') . $hash : $resourceExpression;
             $additionalAttributes = $element['attributes'] ?? [];
 
             // All scripts are deferred by default. This prevents the attribute from
             // being specified redundantly.
             if (isset($additionalAttributes['defer'])) {
                 unset($additionalAttributes['defer']);
             }
-
             $result .= $builderForLine($finalUri, $this->htmlAttributesArrayToString($additionalAttributes));
         }
         return $result;

diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf
@@ -394,6 +394,9 @@
             <trans-unit id="errorBoundary.footer" xml:space="preserve">
                 <source>For more information about the error please refer to the JavaScript console.</source>
             </trans-unit>
+            <trans-unit id="copyNodeTypeNameToClipboard" xml:space="preserve">
+                <source>Copy node type to clipboard</source>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "bugs": "https://github.com/neos/neos-ui/issues",
   "homepage": "https://github.com/neos/neos-ui/blob/master/README.md",
   "license": "GNU GPLv3",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "private": true,
   "resolutions": {
     "moment": "^2.20.1",
@@ -44,6 +44,5 @@
   "jest": {
     "preset": "@neos-project/jest-preset-neos-ui"
   },
-  "packageManager": "[email protected]",
-  "stableVersion": "8.3.4"
+  "packageManager": "[email protected]"
 }
diff --git a/packages/debug-reason-for-rendering/package.json b/packages/debug-reason-for-rendering/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/debug-reason-for-rendering",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "React Performance Optimization Utility - Why does a component re-render?",
   "repository": "neos/neos-ui",
   "bugs": "https://github.com/neos/neos-ui/issues",
@@ -9,6 +9,5 @@
   "license": "MIT",
   "peerDependencies": {
     "react": "^16.12.0"
-  },
-  "stableVersion": "8.3.4"
+  }
 }
diff --git a/packages/jest-preset-neos-ui/package.json b/packages/jest-preset-neos-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/jest-preset-neos-ui",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "The jest preset for all packages of the neos-ui mono-repo.",
   "main": "jest-preset.json",
   "private": true,
@@ -13,6 +13,5 @@
   "peerDependencies": {
     "enzyme": "^3.8.0"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ts-interfaces/package.json b/packages/neos-ts-interfaces/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ts-interfaces",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Neos domain-related TypeScript interfaces",
   "private": true,
   "main": "src/index.ts",
@@ -9,6 +9,5 @@
     "@neos-project/neos-ui-build": "workspace:*",
     "typescript": "^4.6.4"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-backend-connector/package.json b/packages/neos-ui-backend-connector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-backend-connector",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Endoints and fetch cals to the Neos CMS backend",
   "private": true,
   "main": "./src/index.ts",
@@ -12,6 +12,5 @@
     "@neos-project/neos-ts-interfaces": "workspace:*",
     "@neos-project/utils-helpers": "workspace:*"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-build/package.json b/packages/neos-ui-build/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@neos-project/neos-ui-build",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Bob der Baumeister",
-  "private": true,
-  "stableVersion": "8.3.4"
+  "private": true
 }
diff --git a/packages/neos-ui-ckeditor5-bindings/package.json b/packages/neos-ui-ckeditor5-bindings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-ckeditor5-bindings",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Prepare CKEditor5 for the Neos CMS UI",
   "private": true,
   "main": "./src/manifest.js",
@@ -34,6 +34,5 @@
     "react": "^16.12.0",
     "react-redux": "^7.1.3"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-constants/package.json b/packages/neos-ui-constants/package.json
@@ -1,13 +1,12 @@
 {
   "name": "@neos-project/neos-ui-constants",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Container package to store Neos CMS UI constants",
   "private": true,
   "main": "./src/index.js",
   "devDependencies": {
     "@neos-project/jest-preset-neos-ui": "workspace:*",
     "typescript": "^4.6.4"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-containers/package.json b/packages/neos-ui-containers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-containers",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Smart components for Neos CMS UI.",
   "private": true,
   "main": "./src/index.js",
@@ -18,6 +18,5 @@
     "prop-types": "^15.5.10",
     "react": "^16.12.0"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-contentrepository/package.json b/packages/neos-ui-contentrepository/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-contentrepository",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Bindings for the Neos ContentRepository",
   "private": true,
   "main": "./src/manifest.js",
@@ -21,6 +21,5 @@
     "setupFiles": [
       "../jest-preset-neos-ui/src/setupNeosUiHostEnv.js"
     ]
-  },
-  "stableVersion": "8.3.4"
+  }
 }
diff --git a/packages/neos-ui-decorators/package.json b/packages/neos-ui-decorators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-decorators",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Decorators for Neos CMS UI.",
   "private": true,
   "main": "./src/index.ts",
@@ -16,6 +16,5 @@
     "@neos-project/neos-ts-interfaces": "workspace:*",
     "reselect": "^3.0.1"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-editors/package.json b/packages/neos-ui-editors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-editors",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Neos CMS UI Editors for use in the inspector.",
   "main": "src/manifest.js",
   "private": true,
@@ -42,6 +42,5 @@
     "react-redux": "^7.1.3",
     "redux": "^4.0.5"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-extensibility-webpack-adapter/package.json b/packages/neos-ui-extensibility-webpack-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-extensibility-webpack-adapter",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "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",
@@ -36,6 +36,5 @@
       "babel-core": "^6.26.3",
       "typescript": "^4.6.4"
     }
-  },
-  "stableVersion": "8.3.4"
+  }
 }
diff --git a/packages/neos-ui-extensibility/package.json b/packages/neos-ui-extensibility/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-extensibility",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Core of the extensibility mechanisms for the Neos UI",
   "repository": "neos/neos-ui",
   "bugs": "https://github.com/neos/neos-ui/issues",
@@ -22,6 +22,5 @@
   },
   "dependencies": {
     "@neos-project/positional-array-sorter": "workspace:*"
-  },
-  "stableVersion": "8.3.4"
+  }
 }
diff --git a/packages/neos-ui-guest-frame/package.json b/packages/neos-ui-guest-frame/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-guest-frame",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Guest frame initialization bindings",
   "private": true,
   "main": "./src/manifest.js",
@@ -28,6 +28,5 @@
     "react": "^16.12.0",
     "react-redux": "^7.1.3"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-i18n/package.json b/packages/neos-ui-i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-i18n",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "I18n utilities and components for Neos CMS UI.",
   "private": true,
   "main": "./src/index.tsx",
@@ -18,6 +18,5 @@
   "peerDependencies": {
     "react": "^16.12.0"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-inspector/package.json b/packages/neos-ui-inspector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-inspector",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Components for integrating views and editors into the Neos CMS UI inspector.",
   "private": true,
   "main": "./src/index.js",
@@ -19,6 +19,5 @@
     "react": "^16.12.0",
     "react-redux": "^7.1.3"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-redux-store/package.json b/packages/neos-ui-redux-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-redux-store",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Redux store implementation for the Neos CMS UI",
   "private": true,
   "main": "./src/index.ts",
@@ -19,6 +19,5 @@
     "reselect": "^3.0.1",
     "typesafe-actions": "^5.1.0"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-sagas/package.json b/packages/neos-ui-sagas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-sagas",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Redux Sagas implementation for the Neos CMS UI",
   "private": true,
   "main": "src/index.js",
@@ -18,6 +18,5 @@
     "mousetrap": "^1.6.3",
     "redux-saga": "^0.15.0"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-validators/package.json b/packages/neos-ui-validators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-validators",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Validators for Neos CMS UI.",
   "private": true,
   "main": "./src/index.ts",
@@ -18,6 +18,5 @@
   "peerDependencies": {
     "react": "^16.12.0"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }
diff --git a/packages/neos-ui-views/package.json b/packages/neos-ui-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neos-project/neos-ui-views",
-  "version": "9.0.0-beta3",
+  "version": "8.3.7",
   "description": "Neos CMS UI Views for use in the inspector.",
   "main": "./src/index.js",
   "private": true,
@@ -27,6 +27,5 @@
     "react": "^16.12.0",
     "react-redux": "^7.1.3"
   },
-  "license": "GNU GPLv3",
-  "stableVersion": "8.3.4"
+  "license": "GNU GPLv3"
 }