Skip to content
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions apps/e2e/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand Down
4 changes: 2 additions & 2 deletions apps/encore/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand Down
4 changes: 2 additions & 2 deletions src/Autocomplete/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
2 changes: 1 addition & 1 deletion src/Autocomplete/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Chartjs/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Cropperjs/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Dropzone/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Icons/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/LiveComponent/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Map/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Map/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/Map/src/Bridge/Google/assets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/Map/src/Bridge/Leaflet/assets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions src/Notify/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/React/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
2 changes: 1 addition & 1 deletion src/React/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/StimulusBundle/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Svelte/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
2 changes: 1 addition & 1 deletion src/Svelte/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/Toolkit/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Toolkit/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Translator/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/Turbo/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
4 changes: 2 additions & 2 deletions src/TwigComponent/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
2 changes: 1 addition & 1 deletion src/TwigComponent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/Vue/.symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
branches: ["2.x"]
maintained_branches: ["2.x"]
branches: ["2.x", "3.x"]
maintained_branches: ["3.x"]
doc_dir: "doc"
2 changes: 1 addition & 1 deletion src/Vue/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ux.symfony.com/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
2 changes: 1 addition & 1 deletion ux.symfony.com/src/Twig/Components/Code/CodeBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading