Skip to content

Commit 7fc5e1e

Browse files
rrennickrrennick
committed
fix merge conflicts
2 parents f4c254e + 392d79a commit 7fc5e1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+11492
-591
lines changed

‎.gitignore

+11-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@ Thumbs.db
55
# IDE files
66
.idea
77
.vscode/
8+
project.xml
9+
project.properties
10+
.project
11+
.settings*
12+
*.sublime-project
13+
*.sublime-workspace
14+
.sublimelinterrc
15+
16+
# Eslint Cache
17+
.eslintcache
818

919
# Environment files
1020
wp-cli.local.yml
11-
.wp-env.override.json
1221
yarn-error.log
1322
npm-debug.log
1423
.pnpm-debug.log
@@ -22,6 +31,7 @@ npm-debug.log
2231
build/
2332
build-module/
2433
build-style/
34+
dist/
2535

2636
# Project files
2737
node_modules/
@@ -37,5 +47,3 @@ tsconfig.tsbuildinfo
3747
/tmp
3848
packages/js/e2e-environment/config/default.json
3949
packages/js/e2e-environment/docker/wp-cli/initialize.sh
40-
packages/js/e2e-environment/build/
41-
packages/js/e2e-environment/build-module/

‎changelog.txt

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
== Changelog ==
22

3-
= 5.9.0 beta 2021-10-19 =
3+
= 5.9.0 2021-11-09 =
44

55
**WooCommerce**
66

7+
* Fix - Bug in the handling of remote file names for downloadable files.
8+
* Fix - Remove the absolute path to the currency-info.php from within locale-info.php. #31036
9+
* Fix - wc_get_price_excluding_tax when an order with no customer is passed. #31015
10+
* Fix - Rename transient used to cache data for Featured page of In-App Marketplace. #31002
711
* Fix - Variable product price caching bug with VAT exemption. #30889
812
* Fix - Allow to pass null as the email for billing addresses in REST API. #30850
913
* Fix - Ensure woocommerce_cancel_unpaid_orders event is always re-scheduled. #30830
@@ -13,13 +17,16 @@
1317
* Dev - Add mobile data to WCTracker. #30415
1418
* Tweak - Remove hardcode category banners in Settings > Marketplace and use the WooCommerce.com API instead. #30938
1519
* Tweak - Show a search again message when marketplace results are empty. #30642
20+
* Tweak - Add promoted cards styling to marketplace section. #30861
1621
* Enhancement - Add ratings, reviews and icons into Marketplace's Product Cards. #30840
1722
* Enhancement - Update Storefront banner width and track links in the marketplace page. #30882
1823
* Enhancement - Revamp the WooCommerce Marketplace page. #30900
1924

20-
**WooCommerce Admin - 2.8.0 RC 2**
25+
**WooCommerce Admin - 2.8.0 **
2126

22-
* Add - Store Profiler and Product task - include Subscriptions. #7734
27+
* Fix - Issue where stock activity panel was not rendering correctly. #7817
28+
* Fix - Increase CSS specificity to avoid conflicts and broken panel styling. #7813
29+
* Fix - Updated link to WooCommerce Developers Blog in readme.txt. #7824
2330
* Fix - Fixed navigation menu text color after Gutenberg 11.6.0. #7771
2431
* Fix - Add status param to notes/delete/all REST endpoint, to correctly delete all notes. #7743
2532
* Fix - Allow already installed marketing extensions to be activated. #7740
@@ -29,9 +36,12 @@
2936
* Fix - Fixing an unwanted page refresh when using Woo Navigation. #7615
3037
* Fix - Fix naming of event names and properties. #7677
3138
* Fix - Fix white screen for variation analytic data without a name. #7686
39+
* Add - Store Profiler and Product task - include Subscriptions. #7734
40+
* Update - Update WC pay supported country list for the default free extensions. #7873
3241
* Update - Update back up copy of free extension for Google Listing & Ads plugin. #7798
3342
* Update - Update Eway payment gateway capitalization (was eWAY). #7678
3443
* Update - Enable Square in France. #7679
44+
* Enhancement - Only load tasks during rest api requests. #7856
3545
* Enhancement - Add experiment for promoting WooCommerce Payments in payment methods table. #7666
3646

3747
**WooCommerce Blocks - 6.0.0 & 6.0.1 & 6.0.2 & 6.1.0**

‎nx.json

+24-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
{
2-
"npmScope": "woocommerce",
3-
"affected": {
4-
"defaultBase": "trunk"
5-
},
6-
"implicitDependencies": {
7-
"package.json": {
8-
"dependencies": "*",
9-
"devDependencies": "*"
10-
},
11-
".eslintrc.json": "*"
12-
},
2+
"extends": "@nrwl/workspace/presets/npm.json",
3+
"npmScope": "woocommerce-monorepo",
134
"tasksRunnerOptions": {
145
"default": {
156
"runner": "@nrwl/workspace/tasks-runners/default",
167
"options": {
17-
"cacheableOperations": ["build", "lint", "test", "e2e"]
8+
"cacheableOperations": [
9+
"build",
10+
"test",
11+
"lint",
12+
"package",
13+
"prepare"
14+
]
1815
}
1916
}
2017
},
@@ -24,7 +21,21 @@
2421
"target": "build",
2522
"projects": "dependencies"
2623
}
24+
],
25+
"prepare": [
26+
{
27+
"target": "prepare",
28+
"projects": "dependencies"
29+
}
30+
],
31+
"package": [
32+
{
33+
"target": "package",
34+
"projects": "dependencies"
35+
}
2736
]
2837
},
29-
"projects": {}
38+
"affected": {
39+
"defaultBase": "trunk"
40+
}
3041
}

‎package.json

+43-37
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,45 @@
11
{
2-
"name": "woocommerce-monorepo",
3-
"title": "WooCommerce Monorepo",
4-
"description": "Monorepo for the WooCommerce ecosystem",
5-
"homepage": "https://woocommerce.com/",
6-
"private": true,
7-
"repository": {
8-
"type": "git",
9-
"url": "https://github.com/woocommerce/woocommerce.git"
10-
},
11-
"author": "Automattic",
12-
"license": "GPL-3.0-or-later",
13-
"bugs": {
14-
"url": "https://github.com/woocommerce/woocommerce/issues"
15-
},
16-
"devDependencies": {
17-
"@nrwl/tao": "12.10.0",
18-
"@nrwl/cli": "12.10.0",
19-
"@nrwl/workspace": "12.10.0",
20-
"@types/node": "14.14.33",
21-
"@woocommerce/eslint-plugin": "^1.2.0",
22-
"@wordpress/prettier-config": "^1.0.5",
23-
"chalk": "^4.1.2",
24-
"glob": "^7.2.0",
25-
"jest": "^27.0.6",
26-
"mkdirp": "^1.0.4",
27-
"node-stream-zip": "^1.13.6",
28-
"prettier": "npm:[email protected]",
29-
"request": "^2.88.2",
30-
"typescript": "4.2.4"
31-
},
32-
"dependencies": {
33-
"@babel/core": "7.12.9",
34-
"@wordpress/babel-plugin-import-jsx-pragma": "^3.1.0",
35-
"@wordpress/babel-preset-default": "^6.3.3",
36-
"lodash": "^4.17.21",
37-
"wp-textdomain": "1.0.1"
38-
}
2+
"name": "woocommerce-monorepo",
3+
"title": "WooCommerce Monorepo",
4+
"description": "Monorepo for the WooCommerce ecosystem",
5+
"homepage": "https://woocommerce.com/",
6+
"private": true,
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/woocommerce/woocommerce.git"
10+
},
11+
"author": "Automattic",
12+
"license": "GPL-3.0-or-later",
13+
"bugs": {
14+
"url": "https://github.com/woocommerce/woocommerce/issues"
15+
},
16+
"scripts": {
17+
"preinstall": "npx only-allow pnpm"
18+
},
19+
"devDependencies": {
20+
"@automattic/nx-composer": "^0.1.0",
21+
"@nrwl/cli": "latest",
22+
"@nrwl/linter": "^13.1.3",
23+
"@nrwl/tao": "latest",
24+
"@nrwl/web": "^13.1.3",
25+
"@nrwl/workspace": "latest",
26+
"@types/node": "14.14.33",
27+
"@woocommerce/eslint-plugin": "^1.2.0",
28+
"@wordpress/prettier-config": "^1.0.5",
29+
"chalk": "^4.1.2",
30+
"glob": "^7.2.0",
31+
"jest": "^27.0.6",
32+
"mkdirp": "^1.0.4",
33+
"node-stream-zip": "^1.13.6",
34+
"prettier": "npm:[email protected]",
35+
"request": "^2.88.2",
36+
"typescript": "4.2.4"
37+
},
38+
"dependencies": {
39+
"@babel/core": "7.12.9",
40+
"@wordpress/babel-plugin-import-jsx-pragma": "^3.1.0",
41+
"@wordpress/babel-preset-default": "^6.3.3",
42+
"lodash": "^4.17.21",
43+
"wp-textdomain": "1.0.1"
44+
}
3945
}

‎packages/js/api-core-tests/.gitignore

-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
1-
# Node modules
2-
node_modules/
3-
4-
# Environment
5-
.env
6-
71
# Collection output
82
collection.json

‎packages/js/api-core-tests/project.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"root": "packages/js/api-core-tests/",
3+
"sourceRoot": "packages/js/api-core-tests",
4+
"projectType": "library",
5+
"targets": {
6+
"test": {
7+
"executor": "@nrwl/workspace:run-script",
8+
"options": {
9+
"script": "test"
10+
}
11+
},
12+
"test-hello": {
13+
"executor": "@nrwl/workspace:run-script",
14+
"options": {
15+
"script": "test:hello"
16+
}
17+
},
18+
"make-collection": {
19+
"executor": "@nrwl/workspace:run-script",
20+
"options": {
21+
"script": "make:collection"
22+
}
23+
},
24+
"test-api": {
25+
"executor": "@nrwl/workspace:run-script",
26+
"options": {
27+
"script": "test:api"
28+
}
29+
}
30+
}
31+
}

‎packages/js/api/.eslintrc.js

+10-23
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
33
env: {
4-
'jest/globals': true
4+
'jest/globals': true,
55
},
6-
ignorePatterns: [
7-
'dist/',
8-
'node_modules/'
9-
],
6+
ignorePatterns: [ 'dist/', 'node_modules/' ],
107
rules: {
118
'no-unused-vars': 'off',
129
'no-dupe-class-members': 'off',
1310

1411
'no-useless-constructor': 'off',
1512
'@typescript-eslint/no-useless-constructor': 2,
1613
},
17-
plugins: [
18-
'@typescript-eslint'
19-
],
20-
extends: [
21-
'plugin:@wordpress/eslint-plugin/recommended-with-formatting'
22-
],
14+
plugins: [ '@typescript-eslint/eslint-plugin' ],
15+
extends: [ 'plugin:@wordpress/eslint-plugin/recommended-with-formatting' ],
2316
overrides: [
2417
{
25-
files: [
26-
'**/*.js',
27-
'**/*.ts'
28-
],
18+
files: [ '**/*.js', '**/*.ts' ],
2919
settings: {
3020
jsdoc: {
3121
mode: 'typescript',
3222
},
3323
},
3424
},
3525
{
36-
files: [
37-
'**/*.spec.ts',
38-
'**/*.test.ts'
39-
],
26+
files: [ '**/*.spec.ts', '**/*.test.ts' ],
4027
rules: {
4128
'no-console': 'off',
42-
}
43-
}
44-
]
45-
}
29+
},
30+
},
31+
],
32+
};

‎packages/js/api/.gitignore

-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,2 @@
1-
21
# Editors
3-
project.xml
4-
project.properties
52
/nbproject/private/
6-
.buildpath
7-
.project
8-
.settings*
9-
.idea
10-
.vscode
11-
*.sublime-project
12-
*.sublime-workspace
13-
.sublimelinterrc
14-
15-
# Build Artifacts
16-
/node_modules/
17-
/dist/
18-
tsconfig.tsbuildinfo

0 commit comments

Comments
 (0)