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>
This commit is contained in:
Ron Rennick
GitHub
parent
6f73f67630
commit
a16f11ad6e
|
|
@ -106,7 +106,7 @@
|
||||||
- team: rubik
|
- team: rubik
|
||||||
- team: woo-fse
|
- team: woo-fse
|
||||||
|
|
||||||
"plugins/woocommerce-admin/**/*":
|
"plugins/woocommerce/client/admin/**/*":
|
||||||
- team: woo-fse
|
- team: woo-fse
|
||||||
- team: ghidorah
|
- team: ghidorah
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ jobs:
|
||||||
BROWSERSLIST_IGNORE_OLD_DATA: true
|
BROWSERSLIST_IGNORE_OLD_DATA: true
|
||||||
with:
|
with:
|
||||||
repo-token: '${{ secrets.GITHUB_TOKEN }}'
|
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'
|
install-script: 'pnpm install --filter="@woocommerce/plugin-woocommerce..." --frozen-lockfile --config.dedupe-peer-dependents=false --ignore-scripts'
|
||||||
build-script: '--filter="@woocommerce/plugin-woocommerce" build'
|
build-script: '--filter="@woocommerce/plugin-woocommerce" build'
|
||||||
clean-script: '--if-present clean:build'
|
clean-script: '--if-present clean:build'
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ jobs:
|
||||||
GIT_CLONE_PROTECTION_ACTIVE: false
|
GIT_CLONE_PROTECTION_ACTIVE: false
|
||||||
run: |
|
run: |
|
||||||
HEAD_REF=$(git rev-parse HEAD)
|
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)
|
version=$(pnpm analyzer major-minor "$HEAD_REF" "plugins/woocommerce/woocommerce.php" | tail -n 1)
|
||||||
pnpm analyzer "$HEAD_REF" $version -o "github" -e $exclude
|
pnpm analyzer "$HEAD_REF" $version -o "github" -e $exclude
|
||||||
- uses: 'actions/github-script@v6'
|
- uses: 'actions/github-script@v6'
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ on:
|
||||||
paths:
|
paths:
|
||||||
- 'packages/**'
|
- 'packages/**'
|
||||||
- 'plugins/woocommerce/**'
|
- 'plugins/woocommerce/**'
|
||||||
- 'plugins/woocommerce-admin/**'
|
|
||||||
|
|
||||||
permissions: {}
|
permissions: {}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
Significance: patch
|
||||||
|
Type: dev
|
||||||
|
|
||||||
|
update path to admin package
|
||||||
|
|
@ -26,7 +26,7 @@ module.exports = {
|
||||||
),
|
),
|
||||||
'~/(.*)': path.resolve(
|
'~/(.*)': path.resolve(
|
||||||
__dirname,
|
__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)$':
|
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
|
||||||
path.resolve( __dirname, 'build/mocks/static' ),
|
path.resolve( __dirname, 'build/mocks/static' ),
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
Significance: minor
|
|
||||||
Type: tweak
|
|
||||||
|
|
||||||
CYS: Update copy
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
Significance: patch
|
|
||||||
Type: dev
|
|
||||||
Comment: Only a change to development tooling.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
Significance: patch
|
|
||||||
Type: update
|
|
||||||
|
|
||||||
Comment: Fix comment typos across various files.
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
Significance: patch
|
|
||||||
Type: dev
|
|
||||||
|
|
||||||
Bumped explat-client and explat-client-react-helper versions
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
Significance: patch
|
|
||||||
Type: fix
|
|
||||||
|
|
||||||
Do not sanitize HTML for WooCommerce Subscriptions column in Settings > Payments > Payment Methods table.
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
Significance: patch
|
|
||||||
Type: fix
|
|
||||||
|
|
||||||
Add composer.json for live build
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
Significance: minor
|
|
||||||
Type: update
|
|
||||||
|
|
||||||
Remove deprecated use of position for Dropdown component, using popoverProps.placement instead.
|
|
||||||
|
|
@ -25,3 +25,5 @@
|
||||||
/includes/gateways/**
|
/includes/gateways/**
|
||||||
/tests/e2e/**
|
/tests/e2e/**
|
||||||
/vendor/**
|
/vendor/**
|
||||||
|
|
||||||
|
/client/admin/**
|
||||||
|
|
@ -24,7 +24,6 @@ tests/cli/vendor
|
||||||
# Packages
|
# Packages
|
||||||
/packages/*
|
/packages/*
|
||||||
!/packages/README.md
|
!/packages/README.md
|
||||||
!/packages/woocommerce-admin/woocommerce-admin.php
|
|
||||||
|
|
||||||
# Language files
|
# Language files
|
||||||
i18n/languages/woocommerce.pot
|
i18n/languages/woocommerce.pot
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ pnpm --filter=@woocommerce/classic-assets build
|
||||||
pnpm --filter=@woocommerce/classic-assets lint
|
pnpm --filter=@woocommerce/classic-assets lint
|
||||||
```
|
```
|
||||||
|
|
||||||
### `plugins/woocommerce-admin`
|
### `plugins/woocommerce/client/admin`
|
||||||
|
|
||||||
This directory contains the React-based admin interface.
|
This directory contains the React-based admin interface.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
Significance: patch
|
||||||
|
Type: dev
|
||||||
|
|
||||||
|
Comment: move plugins/woocommerce-admin to plugins/woocommerce/client/admin
|
||||||
|
|
@ -47,7 +47,7 @@ module.exports = {
|
||||||
node: {},
|
node: {},
|
||||||
webpack: {},
|
webpack: {},
|
||||||
typescript: {
|
typescript: {
|
||||||
project: [ 'plugins/woocommerce-admin/tsconfig.json' ],
|
project: [ 'plugins/woocommerce/client/admin/tsconfig.json' ],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue