BUGFIX: Move resource logic to server

Classes/Controller/BackendServiceController.php

@@ -31,6 +31,7 @@
 use Neos\Flow\Persistence\Exception\IllegalObjectTypeException;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
 use Neos\Flow\Property\PropertyMapper;
+use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Neos\Domain\Service\ContentContextFactory;
 use Neos\Neos\Domain\Service\ContentDimensionPresetSourceInterface;
 use Neos\Neos\Service\PublishingService;
@@ -157,6 +158,12 @@ class BackendServiceController extends ActionController
      */
     protected $nodeUriPathSegmentGenerator;
 
+    /**
+     * @Flow\Inject
+     * @var ResourceManager
+     */
+    protected $resourceManager;
+
     /**
      * Set the controller context on the feedback collection after the controller
      * has been initialized
@@ -563,4 +570,10 @@ public function generateUriPathSegmentAction(NodeInterface $contextNode, string
         $slug = $this->nodeUriPathSegmentGenerator->generateUriPathSegment($contextNode, $text);
         $this->view->assign('value', $slug);
     }
+
+    public function redirectToResourceUriAction(string $resourcePath): void
+    {
+        $target = $this->resourceManager->getPublicPackageResourceUriByPath($resourcePath);
+        $this->redirectToUri($target, 0, 301);
+    }
 }

Configuration/Routes.Service.yaml

@@ -92,3 +92,11 @@
     '@controller': 'BackendService'
     '@action': 'generateUriPathSegment'
   httpMethods: ['POST']
+
+-
+  name: 'Redirect to resource uri'
+  uriPattern: 'redirect-resource-uri'
+  defaults:
+    '@controller': 'BackendService'
+    '@action': 'redirectToResourceUri'
+  httpMethods: ['GET']

Resources/Private/Fusion/Backend/Root.fusion

@@ -134,6 +134,9 @@ backend = Neos.Fusion:Template {
                 generateUriPathSegment = Neos.Fusion:UriBuilder {
                     action = 'generateUriPathSegment'
                 }
+                redirectToResourceUri = Neos.Fusion:UriBuilder {
+                    action = 'redirectToResourceUri'
+                }
                 getWorkspaceInfo = Neos.Fusion:UriBuilder {
                     action = 'getWorkspaceInfo'
                 }

packages/neos-ui-backend-connector/src/Endpoints/index.ts

@@ -20,6 +20,7 @@ export interface Routes {
             generateUriPathSegment: string;
             getWorkspaceInfo: string;
             getAdditionalNodeMetadata: string;
+            redirectToResourceUri: string;
         };
     };
     core: {

packages/neos-ui/src/Containers/Root.js

@@ -26,7 +26,11 @@ class Root extends PureComponent {
 
         const containerRegistry = globalRegistry.get('containers');
         const App = containerRegistry.get('App');
-        const createFromResourcePath = (path) => '/_Resources/Static/Packages/' + path.substr(11);
+        const createFromResourcePath = (resourcePath) => {
+            const redirectToResourceUri = new URL(routes.ui.service.redirectToResourceUri);
+            redirectToResourceUri.searchParams.set('resourcePath', resourcePath);
+            return redirectToResourceUri.toString();
+        };
 
         return (
             <ErrorBoundary i18nRegistry={globalRegistry.get('i18n')}>

packages/react-ui-components/src/Icon/resourceIcon.tsx

@@ -25,16 +25,30 @@ class ResourceIcon extends PureComponent<ResourceIconProps> {
     public render(): JSX.Element | null {
         const {padded, theme, label, icon, className, color, size} = this.props;
 
-        if (!icon?.startsWith('resource://')) {
-            return null;
-        }
+
 
         if (!this.context) {
             console.error('ResourceIconContext missing! Cannot resolve uri: ', icon);
             return null;
         }
 
-        const iconResourcePath = this.context.createFromResourcePath(icon);
+        const regex = /^resource:\/\/([^\\/]+)\/(.*)/;
+
+        const matches = icon?.match(regex);
+
+        if (!matches) {
+            return null;
+        }
+        const [_, packageName, rawPath] = matches;
+
+        let publicPath = rawPath;
+        if (!rawPath.startsWith('Public/')) {
+            publicPath = `Public/${rawPath}`;
+        }
+
+        const resourcePath = `resource://${packageName}/${publicPath}`;
+
+        const iconResourcePath = this.context.createFromResourcePath(resourcePath);
         const classNames = mergeClassNames(
             theme!.icon,
             className,