[Forwardport] Resolved : JS files located outside the web/js directory

[hitesh-wagento]

Description

Some JS files are direct children of web rather than web/js. This does not follow instructions from the dev docs thus is confusing.

Fixed Issues (if relevant)

1. JS files located outside the web/js directory #16302: JS files located outside the web/js directory

Expected result

1. JS files to be inside web/js as per the dev docs.

Actual result

1. JS files are direct children of web, this is inconsistent with the dev docs.

Contribution checklist

• Pull request has a meaningful description of its purpose
• All commits are accompanied by meaningful commit messages
• All new or changed code is covered with unit/integration tests (if applicable)
• All automated tests passed successfully (all builds on Travis CI are green)

Original PR

#16582

[magento-engcom-team]

Hi @hitesh-wagento. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

• @magento-engcom-team give me test instance - deploy test instance based on PR changes
• @magento-engcom-team give me {$VERSION} instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

[hitesh-wagento]

Hi @VladimirZaets

As per you comment in #16582 I have created new PR based on 2.3-develop branch.

[ihor-sviziev]

@VladimirZaets @hitesh-wagento what if we will just create map between old and new paths? In this case - this change will be backward compatible, so we can add them even to 2.2.x. Am I wrong?
Example:

var config = {
    map: {
        '*': {
            transparent: 'Magento_Payment/js/transparent',
            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
        }
    }
};

[larsroettig]

@magento-engcom-team give me test instance

[magento-engcom-team]

Hi @larsroettig. Thank you for your request. I'm working on Magento instance for you

[magento-engcom-team]

Hi @larsroettig, here is your new Magento instance.
Admin access: https://pr-16708.engcom.dev.magento.com/admin
Login: admin Password: 123123q

[larsroettig]

Manual Testing

• Create new Produkt Backend
• Checkout Produkt
• Register Account
• Captcha Passoword Forget
• Captcha Register
• Captcha Login
• Order Grid
• Forget Password

Manual Testing looks very good

[hitesh-wagento]

@larsroettig

Any update in this PR ?

Thanks

[ihor-sviziev]

1. Please create PR to 2.2-develop branch first

2. Please implement changes in all requirejs-config.js files that I described in #16708 (comment) (in 2.2-develop PR only)

3. Please create separate commit for separate module in order to have ability apply these changes as described in https://support.magento.com/hc/en-us/articles/360005484154-Create-a-patch-for-a-Magento-2-Composer-installation-from-a-GitHub-commit

[hitesh-wagento]

Hi @ihor-sviziev

Previously I have created PR based to 2.2-develop but @VladimirZaets told me created PR based on 2.3-develop. could you please suggest what can I do ?

#16582 (comment)

---

3. Please create separate commit for separate module in order to have ability apply these changes as described in https://support.magento.com/hc/en-us/articles/360005484154-Create-a-patch-for-a-Magento-2-Composer-installation-from-a-GitHub-commit
   ==> Means do you need to 27 (Specific Module requirejs-config.js or rename files) files commit in one branch but different commit ID ?

[ihor-sviziev]

Hi @hitesh-wagento ,

1. These changes were requested to be done in 2.3-develop because they are not backward compatible. Now I added comment with info how we can make them backward compatible. So let's add backward compatible changes to 2.2-develop,
2. I thought it will be few commits. Let's not split it to commit per module

If you have any questions - feel free to contact me in slack

[ihor-sviziev]

Hi @hitesh-wagento,
We are having discussion about this specific case with @VladimirZaets, so please wait once we will finalize out general vision how it should be done. I will update you after discussion.

[VladimirZaets]

Hi @hitesh-wagento. Please apply the fix provided by @ihor-sviziev to Magento 2.2 release line.
For Magento 2.3 release line your fix is ok and will be processed after PR to Magento 2.2 will be merged.

[hitesh-wagento]

@VladimirZaets Thanks for reply.

[hitesh-wagento]

Hi @VladimirZaets

I have completed all changes 2.2-develop related #16582

Thanks

[ihor-sviziev]

I can't find changes that you did in: https://github.com/magento/magento2/pull/16582/files#diff-ce4bc7c513c965385f8696ebc9545f42
Everything else looks good

[hitesh-wagento]

Hello @ihor-sviziev

I have checked again all module and added send friend module changes.

Thanks

[hitesh-wagento]

@ihor-sviziev

Any update in this PR ?

Thanks

[ihor-sviziev]

Hi @hitesh-wagento,
Looks like we have conflict during merging 2.3-develop and your PR. Probably it caused by moving some files.

Could squash all your changes into single commit and force push your changes or merge 2.3-develop branch?

[hitesh-wagento]

Hello @ihor-sviziev

Could you please share with me steps how to merge all commits in one commit?

Thanks

[ihor-sviziev]

Hi @hitesh-wagento could you just merge 2.3-develop branch from magento/magneto2 repository? It will be much easier

[ihor-sviziev]

This file was removed in efdc2e3#diff-90e2539e902c667160d28b2cb3c56486
No need to create it again.

[hitesh-wagento]

Removed and push again

[magento-engcom-team]

Hi @ihor-sviziev, thank you for the review.
ENGCOM-2895 has been created to process this Pull Request

[magento-engcom-team]

Hi @hitesh-wagento. Thank you for your contribution.
We will aim to release these changes as part of 2.3.0.
Please check the release notes for final confirmation.