diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee1082ca035..28e6e67c6f5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -186,7 +186,7 @@ docker run --rm -it -e DOCS_DIR='/docs' -v ${PWD}:/docs oskarstark/doctor-rst - ## Useful commands -To keep your fork up-to-date with the upstream repository and `2.x` branch: +To keep your fork up-to-date with the upstream repository and `3.x` branch: ```shell $ git checkout 3.x && \ git fetch upstream && \ diff --git a/apps/e2e/.env b/apps/e2e/.env index c5badfcd659..dff49d02897 100644 --- a/apps/e2e/.env +++ b/apps/e2e/.env @@ -30,14 +30,14 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db" ###< doctrine/doctrine-bundle ### ###> symfony/ux-google-map ### -# Options available at https://github.com/symfony/ux/blob/2.x/src/Map/src/Bridge/Google/README.md +# Options available at https://github.com/symfony/ux/blob/3.x/src/Map/src/Bridge/Google/README.md # GOOGLE_MAPS_API_KEY="# Get your API key at https://developers.google.com/maps/documentation/javascript/get-api-key" #UX_MAP_DSN=google://%env(GOOGLE_MAPS_API_KEY)%@default ###< symfony/ux-google-map ### ###> symfony/ux-leaflet-map ### -# Options available at https://github.com/symfony/ux/blob/2.x/src/Map/src/Bridge/Leaflet/README.md +# Options available at https://github.com/symfony/ux/blob/3.x/src/Map/src/Bridge/Leaflet/README.md # UX_MAP_DSN=leaflet://default ###< symfony/ux-leaflet-map ### diff --git a/apps/encore/.env b/apps/encore/.env index 73aad5b416c..900e55a9500 100644 --- a/apps/encore/.env +++ b/apps/encore/.env @@ -20,14 +20,14 @@ APP_SECRET= ###< symfony/framework-bundle ### ###> symfony/ux-google-map ### -# Options available at https://github.com/symfony/ux/blob/2.x/src/Map/src/Bridge/Google/README.md +# Options available at https://github.com/symfony/ux/blob/3.x/src/Map/src/Bridge/Google/README.md # GOOGLE_MAPS_API_KEY="# Get your API key at https://developers.google.com/maps/documentation/javascript/get-api-key" UX_MAP_DSN=google://%env(GOOGLE_MAPS_API_KEY)%@default ###< symfony/ux-google-map ### ###> symfony/ux-leaflet-map ### -# Options available at https://github.com/symfony/ux/blob/2.x/src/Map/src/Bridge/Leaflet/README.md +# Options available at https://github.com/symfony/ux/blob/3.x/src/Map/src/Bridge/Leaflet/README.md # UX_MAP_DSN=leaflet://default ###< symfony/ux-leaflet-map ### diff --git a/src/Autocomplete/.symfony.bundle.yaml b/src/Autocomplete/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Autocomplete/.symfony.bundle.yaml +++ b/src/Autocomplete/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Autocomplete/doc/index.rst b/src/Autocomplete/doc/index.rst index 972479d7fe3..32aaf8ee579 100644 --- a/src/Autocomplete/doc/index.rst +++ b/src/Autocomplete/doc/index.rst @@ -753,7 +753,7 @@ the Symfony framework: https://symfony.com/doc/current/contributing/code/bc.html .. _`Tom Select`: https://tom-select.js.org/ .. _StimulusBundle configured in your app: https://symfony.com/bundles/StimulusBundle/current/index.html .. _`Tom Select Options`: https://tom-select.js.org/docs/#general-configuration -.. _`controller.ts`: https://github.com/symfony/ux/blob/2.x/src/Autocomplete/assets/src/controller.ts +.. _`controller.ts`: https://github.com/symfony/ux/blob/3.x/src/Autocomplete/assets/src/controller.ts .. _`Tom Select Render Templates`: https://tom-select.js.org/docs/#render-templates .. _`Tom Select Option Group`: https://tom-select.js.org/examples/optgroups/ .. _`Symfony Form`: https://symfony.com/doc/current/forms.html diff --git a/src/Chartjs/.symfony.bundle.yaml b/src/Chartjs/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Chartjs/.symfony.bundle.yaml +++ b/src/Chartjs/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Cropperjs/.symfony.bundle.yaml b/src/Cropperjs/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Cropperjs/.symfony.bundle.yaml +++ b/src/Cropperjs/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Dropzone/.symfony.bundle.yaml b/src/Dropzone/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Dropzone/.symfony.bundle.yaml +++ b/src/Dropzone/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Icons/.symfony.bundle.yaml b/src/Icons/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Icons/.symfony.bundle.yaml +++ b/src/Icons/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/LiveComponent/.symfony.bundle.yaml b/src/LiveComponent/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/LiveComponent/.symfony.bundle.yaml +++ b/src/LiveComponent/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Map/.symfony.bundle.yaml b/src/Map/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Map/.symfony.bundle.yaml +++ b/src/Map/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Map/doc/index.rst b/src/Map/doc/index.rst index 56afd3315ca..fff690b9667 100644 --- a/src/Map/doc/index.rst +++ b/src/Map/doc/index.rst @@ -899,7 +899,7 @@ https://symfony.com/doc/current/contributing/code/bc.html .. _`the Symfony UX initiative`: https://ux.symfony.com/ .. _`Google Maps`: https://github.com/symfony/ux-google-map .. _`Leaflet`: https://github.com/symfony/ux-leaflet-map -.. _`Symfony UX Map Google Maps bridge docs`: https://github.com/symfony/ux/blob/2.x/src/Map/src/Bridge/Google/README.md -.. _`Symfony UX Map Leaflet bridge docs`: https://github.com/symfony/ux/blob/2.x/src/Map/src/Bridge/Leaflet/README.md +.. _`Symfony UX Map Google Maps bridge docs`: https://github.com/symfony/ux/blob/3.x/src/Map/src/Bridge/Google/README.md +.. _`Symfony UX Map Leaflet bridge docs`: https://github.com/symfony/ux/blob/3.x/src/Map/src/Bridge/Leaflet/README.md .. _`Twig Component`: https://symfony.com/bundles/ux-twig-component/current/index.html .. _`Live Actions`: https://symfony.com/bundles/ux-live-component/current/index.html#actions diff --git a/src/Map/src/Bridge/Google/assets/README.md b/src/Map/src/Bridge/Google/assets/README.md index 77ba3335843..4e33921a17b 100644 --- a/src/Map/src/Bridge/Google/assets/README.md +++ b/src/Map/src/Bridge/Google/assets/README.md @@ -18,7 +18,7 @@ npm add @symfony/ux-google-map@2.23.0 ## Resources -- [Documentation](https://github.com/symfony/ux/tree/2.x/src/Map/src/Bridge/Google) +- [Documentation](https://github.com/symfony/ux/tree/3.x/src/Map/src/Bridge/Google) - [Report issues](https://github.com/symfony/ux/issues) and [send Pull Requests](https://github.com/symfony/ux/pulls) in the [main Symfony UX repository](https://github.com/symfony/ux) diff --git a/src/Map/src/Bridge/Leaflet/assets/README.md b/src/Map/src/Bridge/Leaflet/assets/README.md index 3f1d7abcbd3..e3386f1f36f 100644 --- a/src/Map/src/Bridge/Leaflet/assets/README.md +++ b/src/Map/src/Bridge/Leaflet/assets/README.md @@ -18,7 +18,7 @@ npm add @symfony/ux-leaflet-map@2.23.0 ## Resources -- [Documentation](https://github.com/symfony/ux/tree/2.x/src/Map/src/Bridge/Google) +- [Documentation](https://github.com/symfony/ux/tree/3.x/src/Map/src/Bridge/Google) - [Report issues](https://github.com/symfony/ux/issues) and [send Pull Requests](https://github.com/symfony/ux/pulls) in the [main Symfony UX repository](https://github.com/symfony/ux) diff --git a/src/Notify/.symfony.bundle.yaml b/src/Notify/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Notify/.symfony.bundle.yaml +++ b/src/Notify/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/React/.symfony.bundle.yaml b/src/React/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/React/.symfony.bundle.yaml +++ b/src/React/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/React/doc/index.rst b/src/React/doc/index.rst index 0faa32c46ff..0b4304c770c 100644 --- a/src/React/doc/index.rst +++ b/src/React/doc/index.rst @@ -134,7 +134,7 @@ requires some extra steps. #. Compile your ``.jsx`` files to pure JavaScript files. This can be done by installing Babel and the ``@babel/preset-react`` preset. Example: - https://github.com/symfony/ux/blob/2.x/ux.symfony.com/assets/react/build/package.json + https://github.com/symfony/ux/blob/3.x/ux.symfony.com/assets/react/build/package.json #. Point this library at the "built" controllers directory that contains the final JavaScript files: diff --git a/src/StimulusBundle/.symfony.bundle.yaml b/src/StimulusBundle/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/StimulusBundle/.symfony.bundle.yaml +++ b/src/StimulusBundle/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Svelte/.symfony.bundle.yaml b/src/Svelte/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Svelte/.symfony.bundle.yaml +++ b/src/Svelte/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Svelte/doc/index.rst b/src/Svelte/doc/index.rst index c03790c8d87..56f73f971be 100644 --- a/src/Svelte/doc/index.rst +++ b/src/Svelte/doc/index.rst @@ -125,7 +125,7 @@ AssetMapper requires some extra steps. #. Compile your ``.svelte`` files to pure JavaScript files. This can be done by using the ``svelte/compiler`` library, but is a bit of a non-standard process. - For an example, see https://github.com/symfony/ux/blob/2.x/ux.symfony.com/assets/svelte/build/build.js. + For an example, see https://github.com/symfony/ux/blob/3.x/ux.symfony.com/assets/svelte/build/build.js. #. Point this library at the "built" controllers directory that contains the final JavaScript files: diff --git a/src/Toolkit/.symfony.bundle.yaml b/src/Toolkit/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Toolkit/.symfony.bundle.yaml +++ b/src/Toolkit/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Toolkit/CONTRIBUTING.md b/src/Toolkit/CONTRIBUTING.md index c31cf6da913..64e753807ad 100644 --- a/src/Toolkit/CONTRIBUTING.md +++ b/src/Toolkit/CONTRIBUTING.md @@ -4,7 +4,7 @@ Due to its nature, the Symfony UX Toolkit requires a specific setup to develop a ## Setting up the development environment -First, ensure you have followed the [Symfony UX's Contribution Guide](https://github.com/symfony/ux/blob/2.x/CONTRIBUTING.md) to set up your fork of the main repository, install dependencies, etc. +First, ensure you have followed the [Symfony UX's Contribution Guide](https://github.com/symfony/ux/blob/3.x/CONTRIBUTING.md) to set up your fork of the main repository, install dependencies, etc. Then, install the UX Toolkit dependencies: ```shell @@ -14,7 +14,7 @@ composer install ## Previewing kits -Currently, kits can only be previewed through the Symfony UX Website. Installation instructions can be found in the [Symfony UX Website's `README.md`](https://github.com/symfony/ux/tree/2.x/ux.symfony.com). +Currently, kits can only be previewed through the Symfony UX Website. Installation instructions can be found in the [Symfony UX Website's `README.md`](https://github.com/symfony/ux/tree/3.x/ux.symfony.com). Then, run the following commands from the `ux.symfony.com/` directory: ```shell diff --git a/src/Translator/.symfony.bundle.yaml b/src/Translator/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Translator/.symfony.bundle.yaml +++ b/src/Translator/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Turbo/.symfony.bundle.yaml b/src/Turbo/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Turbo/.symfony.bundle.yaml +++ b/src/Turbo/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/TwigComponent/.symfony.bundle.yaml b/src/TwigComponent/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/TwigComponent/.symfony.bundle.yaml +++ b/src/TwigComponent/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/TwigComponent/README.md b/src/TwigComponent/README.md index 0ee4e1dbbca..5b4c16743fa 100644 --- a/src/TwigComponent/README.md +++ b/src/TwigComponent/README.md @@ -5,7 +5,7 @@ it easier to render and reuse small template "units" - like an "alert", markup for a modal, or a category sidebar. A very simple example would be a reusable alert component: -![Example of the AlertComponent](https://github.com/symfony/ux/blob/2.x/src/TwigComponent/alert-example.png?raw=true) +![Example of the AlertComponent](https://github.com/symfony/ux/blob/3.x/src/TwigComponent/alert-example.png?raw=true) **This repository is a READ-ONLY sub-tree split**. See https://github.com/symfony/ux to create issues or submit pull requests. diff --git a/src/Vue/.symfony.bundle.yaml b/src/Vue/.symfony.bundle.yaml index 6d9a74acb76..8b3b75aac4c 100644 --- a/src/Vue/.symfony.bundle.yaml +++ b/src/Vue/.symfony.bundle.yaml @@ -1,3 +1,3 @@ -branches: ["2.x"] -maintained_branches: ["2.x"] +branches: ["2.x", "3.x"] +maintained_branches: ["3.x"] doc_dir: "doc" diff --git a/src/Vue/doc/index.rst b/src/Vue/doc/index.rst index acf87e28dab..6e9bbb2e9b1 100644 --- a/src/Vue/doc/index.rst +++ b/src/Vue/doc/index.rst @@ -174,7 +174,7 @@ Webpack Encore or Vite. This means that the ``.vue`` file format cannot be used with AssetMapper. If you *do* still want to use Vue with AssetMapper, you can do so by avoiding -the ``.vue`` file format. For example, https://github.com/symfony/ux/blob/2.x/ux.symfony.com/assets/vue/controllers/PackageSearch.js. +the ``.vue`` file format. For example, https://github.com/symfony/ux/blob/3.x/ux.symfony.com/assets/vue/controllers/PackageSearch.js. Backward Compatibility promise ------------------------------ diff --git a/ux.symfony.com/.env b/ux.symfony.com/.env index 8a83fbb0582..4c38424e93e 100644 --- a/ux.symfony.com/.env +++ b/ux.symfony.com/.env @@ -43,7 +43,7 @@ MERCURE_DSN=mercure://default ###< symfony/mercure-notifier ### ###> symfony/ux-leaflet-map ### -# Options available at https://github.com/symfony/symfony-ux/blob/2.x/src/Map/src/Bridge/Leaflet/README.md +# Options available at https://github.com/symfony/symfony-ux/blob/3.x/src/Map/src/Bridge/Leaflet/README.md # UX_MAP_DSN=leaflet://default ###< symfony/ux-leaflet-map ### diff --git a/ux.symfony.com/src/Twig/Components/Code/CodeBlock.php b/ux.symfony.com/src/Twig/Components/Code/CodeBlock.php index ec4db5ed134..154b031a459 100644 --- a/ux.symfony.com/src/Twig/Components/Code/CodeBlock.php +++ b/ux.symfony.com/src/Twig/Components/Code/CodeBlock.php @@ -150,7 +150,7 @@ public function getClassString(): string public function getGithubLink(): string { - return \sprintf('https://github.com/symfony/ux/blob/2.x/ux.symfony.com/%s', $this->filename); + return \sprintf('https://github.com/symfony/ux/blob/3.x/ux.symfony.com/%s', $this->filename); } public function getLanguage(): string