Turbo mercure package abandoned

Author: weaverryan

src/Turbo/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 2.6.1
+
+-   The `symfony/ux-turbo-mercure` package was abandoned and moved into this package.
+    If you were previously using `symfony/ux-turbo-mercure`, you can remove it
+    and only install mecure-bundle:
+
+    ```
+    composer require symfony/mercure-bundle
+    composer remove symfony/ux-turbo-mercure
+    ```
+
+    After upgrading this package to 2.6.1, you should have a new entry in
+    `assets/controllers.json` called `mercure-turbo-stream`. Change
+    `enabled: false` to `enabled: true`.
+
 ## 2.6.0
 
 -   [BC BREAK] The `assets/` directory was moved from `Resources/assets/` to `assets/`. Make

src/Turbo/src/Bridge/Mercure/assets/dist/turbo_stream_controller.js renamed to src/Turbo/assets/dist/turbo_stream_controller.js

@@ -11,6 +11,11 @@
                 "webpackMode": "eager",
                 "fetch": "eager",
                 "enabled": true
+            },
+            "mercure-turbo-stream": {
+                "main": "dist/turbo_stream_controller.js",
+                "fetch": "eager",
+                "enabled": false
             }
         }
     },
@@ -20,6 +25,7 @@
     },
     "devDependencies": {
         "@hotwired/turbo": "^7.1.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "jest-canvas-mock": "^2.3.0"
     }
 }

src/Turbo/assets/package.json

@@ -16,7 +16,7 @@ import TurboStreamController from '../src/turbo_stream_controller';
 
 const startStimulus = () => {
     const application = Application.start();
-    application.register('symfony--ux-turbo-mercure--turbo-stream', TurboStreamController);
+    application.register('symfony--ux-turbo--mercure-turbo-stream', TurboStreamController);
 };
 
 /* eslint-disable no-undef */
@@ -31,7 +31,7 @@ describe('TurboStreamController', () => {
         }));
 
         container = mountDOM(
-            '<div data-testid="turbo-stream-mercure" data-controller="symfony--ux-turbo-mercure--turbo-stream" data-symfony--ux-turbo-mercure--turbo-stream-hub-value="https://example.com/.well-known/mercure" data-symfony--ux-turbo-mercure--turbo-stream-topic-value="foo"></div>'
+            '<div data-testid="turbo-stream-mercure" data-controller="symfony--ux-turbo--mercure-turbo-stream" data-symfony--ux-turbo--mercure-turbo-stream-hub-value="https://example.com/.well-known/mercure" data-symfony--ux-turbo--mercure-turbo-stream-topic-value="foo"></div>'
         );
     });
 
@@ -44,7 +44,7 @@ describe('TurboStreamController', () => {
 
         // smoke test
         expect(getByTestId(container, 'turbo-stream-mercure')).toHaveAttribute(
-            'data-symfony--ux-turbo-mercure--turbo-stream-topic-value',
+            'data-symfony--ux-turbo--mercure-turbo-stream-topic-value',
             'foo'
         );
     });

src/Turbo/src/Bridge/Mercure/assets/src/turbo_stream_controller.ts renamed to src/Turbo/assets/src/turbo_stream_controller.ts

@@ -24,8 +24,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Symfony\\UX\\Turbo\\": "src/",
-            "Symfony\\UX\\Turbo\\Bridge\\Mercure\\": "src/Bridge/Mercure/src"
+            "Symfony\\UX\\Turbo\\": "src/"
         }
     },
     "autoload-dev": {

src/Turbo/src/Bridge/Mercure/assets/test/turbo_stream_controller.test.ts renamed to src/Turbo/assets/test/turbo_stream_controller.test.ts

@@ -383,9 +383,19 @@ Start by installing `the Mercure support`_ on your project:
 
 .. code-block:: terminal
 
-    $ composer require symfony/ux-turbo-mercure
-    $ yarn install --force
-    $ yarn encore dev
+    $ composer require symfony/mercure-bundle
+
+Then, enable the "mercure stream" controller in ``assets/controllers.json``:
+
+.. code-block:: diff
+
+    "@symfony/ux-turbo": {
+        "mercure-turbo-stream": {
+    +         "enabled": true,
+    -         "enabled": false,
+            "fetch": "lazy"
+        }
+    },
 
 The easiest way to have a working development (and production-ready)
 environment is to use `Symfony Docker`_, which comes with