Merge React Admin (#49647)

* moved files

* changed paths

* changelogs

* added eslintignore for admin subfolder as it has its own eslint command

---------

Co-authored-by: rjchow <me@rjchow.com>

.github/project-community-pr-assigner.yml

@@ -106,7 +106,7 @@
   - team: rubik
   - team: woo-fse
 
-"plugins/woocommerce-admin/**/*":
+"plugins/woocommerce/client/admin/**/*":
   - team: woo-fse
   - team: ghidorah
 

.github/workflows/pr-assess-bundle-size.yml

@@ -54,7 +54,7 @@ jobs:
                   BROWSERSLIST_IGNORE_OLD_DATA: true
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
-                  pattern: './{packages/js/!(*e2e*|*internal*|*test*|*plugin*|*create*),plugins/woocommerce-blocks,plugins/woocommerce-admin,plugins/woocommerce/client/legacy}/{build,build-style}/**/*.{js,css}'
+                  pattern: './{packages/js/!(*e2e*|*internal*|*test*|*plugin*|*create*),plugins/woocommerce-blocks,plugins/woocommerce/client/admin,plugins/woocommerce/client/legacy}/{build,build-style}/**/*.{js,css}'
                   install-script: 'pnpm install --filter="@woocommerce/plugin-woocommerce..." --frozen-lockfile --config.dedupe-peer-dependents=false --ignore-scripts'
                   build-script: '--filter="@woocommerce/plugin-woocommerce" build'
                   clean-script: '--if-present clean:build'

.github/workflows/pr-highlight-changes.yml

@@ -27,7 +27,7 @@ jobs:
           GIT_CLONE_PROTECTION_ACTIVE: false
         run: |
           HEAD_REF=$(git rev-parse HEAD)
-          exclude="plugins/woocommerce/tests plugins/woocommerce/templates/templates plugins/woocommerce-admin/tests plugins/woocommerce-blocks/tests"
+          exclude="plugins/woocommerce/tests plugins/woocommerce/templates/templates plugins/woocommerce/client/admin/tests plugins/woocommerce-blocks/tests"
           version=$(pnpm analyzer major-minor "$HEAD_REF" "plugins/woocommerce/woocommerce.php" | tail -n 1)
           pnpm analyzer "$HEAD_REF" $version -o "github" -e $exclude
       - uses: 'actions/github-script@v6'

.github/workflows/pull-request-post-merge-processing.yml

@@ -5,7 +5,6 @@ on:
         paths:
             - 'packages/**'
             - 'plugins/woocommerce/**'
-            - 'plugins/woocommerce-admin/**'
 
 permissions: {}
 

packages/js/internal-js-tests/changelog/dev-merge-admin

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+update path to admin package

packages/js/internal-js-tests/jest-preset.js

@@ -26,7 +26,7 @@ module.exports = {
 		),
 		'~/(.*)': path.resolve(
 			__dirname,
-			'../../../plugins/woocommerce-admin/client/$1'
+			'../../../plugins/woocommerce/client/admin/client/$1'
 		),
 		'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
 			path.resolve( __dirname, 'build/mocks/static' ),

plugins/woocommerce-admin/changelog/42698-cys-update-the-copy-for-the-offline-flow

@@ -1,4 +0,0 @@
-Significance: minor
-Type: tweak
-
-CYS: Update copy

plugins/woocommerce-admin/changelog/42802-fix-watch-build-race-condition

@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Only a change to development tooling.
-
-

plugins/woocommerce-admin/changelog/50047-fix-typos

@@ -1,4 +0,0 @@
-Significance: patch
-Type: update
-
-Comment: Fix comment typos across various files.

plugins/woocommerce-admin/changelog/dev-bump-explat-client-version

@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-
-Bumped explat-client and explat-client-react-helper versions

plugins/woocommerce-admin/changelog/fix-41476-payment-settings-woopayments-promo-subscriptions

@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Do not sanitize HTML for WooCommerce Subscriptions column in Settings > Payments > Payment Methods table.

plugins/woocommerce-admin/changelog/fix-domain-substitution

@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Add composer.json for live build

plugins/woocommerce-admin/changelog/fix-remove_warnings

@@ -1,4 +0,0 @@
-Significance: minor
-Type: update
-
-Remove deprecated use of position for Dropdown component, using popoverProps.placement instead.

plugins/woocommerce/.eslintignore

@@ -25,3 +25,5 @@
 /includes/gateways/**
 /tests/e2e/**
 /vendor/**
+
+/client/admin/** 

plugins/woocommerce/.gitignore

@@ -24,7 +24,6 @@ tests/cli/vendor
 # Packages
 /packages/*
 !/packages/README.md
-!/packages/woocommerce-admin/woocommerce-admin.php
 
 # Language files
 i18n/languages/woocommerce.pot

plugins/woocommerce/README.md

@@ -41,7 +41,7 @@ pnpm --filter=@woocommerce/classic-assets build
 pnpm --filter=@woocommerce/classic-assets lint 
 ```
 
-### `plugins/woocommerce-admin`
+### `plugins/woocommerce/client/admin`
 
 This directory contains the React-based admin interface.
 

plugins/woocommerce/changelog/dev-merge-admin

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Comment: move plugins/woocommerce-admin to plugins/woocommerce/client/admin

plugins/woocommerce/client/admin/.eslintrc.js

@@ -47,7 +47,7 @@ module.exports = {
 			node: {},
 			webpack: {},
 			typescript: {
-				project: [ 'plugins/woocommerce-admin/tsconfig.json' ],
+				project: [ 'plugins/woocommerce/client/admin/tsconfig.json' ],
 			},
 		},
 	},