Skip to content

Commit 92016d8

Browse files
BB-25335: Create a dump of OroCommerce 6.0 default theme to reuse it in 6.1 (#40659)
--------- Co-authored-by: OleksandrProtsiuk <[email protected]>
1 parent 02c21e6 commit 92016d8

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

backend/setup/upgrade-source-code.rst

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
:title: Upgrade Source Code to OroCommerce v6.0
1+
:title: Upgrade Source Code to OroCommerce v6.1
22

33
.. index::
44
single: Upgrade
55

66
.. _upgrade-to-6:
77

8-
Upgrade the Source Code to v6.0
8+
Upgrade the Source Code to v6.1
99
===============================
1010

11-
This guide covers the complete process of upgrading your codebase to OroCommerce v6.0, including dependency updates and code migration.
11+
This guide covers the complete process of upgrading your codebase to OroCommerce v6.1, including dependency updates and code migration.
1212

1313
.. tip:: If you are looking for instructions on upgrading the entire OroCommerce application rather than just the source code, please refer to our guide on :ref:`Upgrading the Application to the Next Version <upgrade-application>`.
1414

@@ -17,7 +17,7 @@ Upgrade Sequence for Earlier Versions
1717
-------------------------------------
1818

1919
For users operating on versions of OroCommerce earlier than 5.1,
20-
it is recommended to bypass upgrading to 5.1 and instead upgrade directly to version 6.0.
20+
it is recommended to bypass upgrading to 5.1 and instead upgrade directly to version 6.1.
2121

2222
Preserve Old Custom Theme
2323
-------------------------
@@ -84,6 +84,18 @@ Update the theme.yml file of the custom theme.
8484
The resolve_extra_paths option in the generated code
8585
requires the "@oroinc/oro-webpack-config-builder" node module upgrade to version "6.0.0-dev002" or later. Therefore, this code is not currently compatible with the old version but will work after upgrading the project to v6.
8686

87+
As a final step of the old custom theme preservation, use the following command to update dumped yaml files automatically:
88+
89+
.. code-block:: none
90+
91+
php bin/upgrade-toolkit yml:fix --source=Path/To/Preserved/Theme/Resources
92+
93+
.. tip:: The command is a part of the ``oro/upgrade-toolkit`` package.
94+
95+
.. code-block:: none
96+
97+
composer require oro/upgrade-toolkit:dev-master --dev
98+
8799
88100
Upgrade Application Level Assets (without the src/ folder)
89101
----------------------------------------------------------
@@ -174,7 +186,7 @@ Overview & Estimates
174186

175187
You can use the ``oro/upgrade-toolkit`` package to automatically migrate a significant portion of the PHP code.
176188

177-
It is important to note that the tool handles most PHP changes but does not upgrade YAML, Twig, JS, or SCSS.
189+
It is important to note that the tool handles most PHP changes but does not upgrade Twig, JS, or SCSS.
178190
However, you can skip the frontend assets upgrade if you've used the theme dump as described earlier.
179191
Back-office customization and changes to YAML files should be processed manually.
180192

@@ -229,7 +241,7 @@ Regular Expressions in PhpStorm
229241
Regular expression replacements may process some changes not covered by the oro/upgrade toolkit.
230242
The most convenient tool for running them is PhpStorm. It is advisable to use them in case-sensitive mode.
231243

232-
Below is the list of regular expressions you can use during the upgrade from 5.1 to 6.0:
244+
Below is the list of regular expressions you can use during the upgrade from 5.1 to 6.1:
233245

234246
+-------------------------------------------------------------------------------------------------------------+
235247
| Short bundle alias references are not working after the Doctrine upgrade |
@@ -277,7 +289,7 @@ Run required |automated tests| to ensure that the upgraded code still works prop
277289
Next Steps
278290
----------
279291

280-
Once the source code is upgraded, the next step is to upgrade the Oro application to v6.0 For comprehensive instructions on this process, please refer to the :ref:`Upgrading the Application to the Next Version <upgrade-application>` documentation.
292+
Once the source code is upgraded, the next step is to upgrade the Oro application to v6.1 For comprehensive instructions on this process, please refer to the :ref:`Upgrading the Application to the Next Version <upgrade-application>` documentation.
281293

282294

283295

backend/setup/upgrade-to-new-version.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Upgrade the Application to the Next Version
1111

1212
This guide explains how to upgrade Oro application to the next version in a development environment.
1313

14-
.. tip:: If you are looking for specific instructions on upgrading the source code itself, please refer to our detailed guide on :ref:`Upgrading the Source Code to v6.0 <upgrade-to-6>`.
14+
.. tip:: If you are looking for specific instructions on upgrading the source code itself, please refer to our detailed guide on :ref:`Upgrading the Source Code to v6.1 <upgrade-to-6>`.
1515

1616
An absolute path to the directory where an application is installed will be used in the guide and will
1717
be referred to as **<application-root-folder>** further in this topic.

0 commit comments

Comments
 (0)