Merge branch 'trunk' of https://github.com/woocommerce/woocommerce into add/plugin-upload-test-functionality
This commit is contained in:
Greg
commit
e7d3a65752
|
|
@ -1,3 +1,4 @@
|
|||
module.exports = {
|
||||
root: true,
|
||||
extends: [ 'plugin:@woocommerce/eslint-plugin/recommended' ],
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,6 +13,15 @@ project.properties
|
|||
*.sublime-workspace
|
||||
.sublimelinterrc
|
||||
|
||||
# Grunt
|
||||
none
|
||||
|
||||
# Sass
|
||||
.sass-cache/
|
||||
|
||||
# Logs
|
||||
logs/
|
||||
|
||||
# Eslint Cache
|
||||
.eslintcache
|
||||
|
||||
|
|
@ -47,6 +56,17 @@ package-lock.json
|
|||
.wp-env.override.json
|
||||
|
||||
# Unit tests
|
||||
/tmp
|
||||
packages/js/e2e-environment/config/default.json
|
||||
packages/js/e2e-environment/docker/wp-cli/initialize.sh
|
||||
tmp/
|
||||
|
||||
# Composer
|
||||
vendor/
|
||||
bin/composer/**/vendor/
|
||||
lib/vendor/
|
||||
contributors.md
|
||||
contributors.html
|
||||
|
||||
# Yarn
|
||||
yarn.lock
|
||||
|
||||
# Editors
|
||||
nbproject/private/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"extends": "stylelint-config-wordpress",
|
||||
"extends": "@wordpress/stylelint-config",
|
||||
}
|
||||
|
|
|
|||
10
package.json
10
package.json
|
|
@ -18,12 +18,12 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@automattic/nx-composer": "^0.1.0",
|
||||
"@nrwl/cli": "latest",
|
||||
"@nrwl/linter": "^13.1.4",
|
||||
"@nrwl/cli": "^13.3.4",
|
||||
"@nrwl/linter": "^13.3.4",
|
||||
"@nrwl/devkit": "^13.1.4",
|
||||
"@nrwl/tao": "latest",
|
||||
"@nrwl/web": "^13.1.4",
|
||||
"@nrwl/workspace": "latest",
|
||||
"@nrwl/tao": "13.3.4",
|
||||
"@nrwl/web": "^13.3.4",
|
||||
"@nrwl/workspace": "^13.3.4",
|
||||
"@types/node": "14.14.33",
|
||||
"@woocommerce/eslint-plugin": "^1.3.0",
|
||||
"@wordpress/prettier-config": "^1.1.1",
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
# Editors
|
||||
/nbproject/private/
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
config/default.json
|
||||
docker/wp-cli/initialize.sh
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
"@slack/web-api": "^6.1.0",
|
||||
"@woocommerce/api": "^0.2.0",
|
||||
"@wordpress/e2e-test-utils": "^4.16.1",
|
||||
"@wordpress/jest-preset-default": "^6.4.0",
|
||||
"@wordpress/jest-preset-default": "^7.1.3",
|
||||
"app-root-path": "^3.0.0",
|
||||
"commander": "4.1.1",
|
||||
"jest": "^25.1.0",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/** @format */
|
||||
|
||||
module.exports = {
|
||||
root: true,
|
||||
env: {
|
||||
browser: true,
|
||||
es6: true,
|
||||
|
|
|
|||
|
|
@ -1,12 +1,3 @@
|
|||
# Editors
|
||||
/nbproject/private/
|
||||
|
||||
# Grunt
|
||||
none
|
||||
|
||||
# Sass
|
||||
.sass-cache/
|
||||
|
||||
# All CSS
|
||||
/assets/css/**
|
||||
/assets/css/*.css
|
||||
|
|
@ -23,7 +14,6 @@ tests/cli/composer.json
|
|||
tests/cli/vendor
|
||||
|
||||
# Unit tests
|
||||
/tmp
|
||||
/tests/bin/tmp
|
||||
/tests/e2e/config/local-*.json
|
||||
/tests/e2e/config/local.json
|
||||
|
|
@ -32,22 +22,6 @@ tests/cli/vendor
|
|||
/tests/e2e/screenshots
|
||||
/tests/e2e/plugins
|
||||
|
||||
# Logs
|
||||
/logs
|
||||
|
||||
# TypeScript files
|
||||
tsconfig.tsbuildinfo
|
||||
|
||||
# Composer
|
||||
/vendor/
|
||||
/bin/composer/**/vendor/
|
||||
/lib/vendor/
|
||||
contributors.md
|
||||
contributors.html
|
||||
|
||||
# Yarn
|
||||
yarn.lock
|
||||
|
||||
# Packages
|
||||
/packages/*
|
||||
!/packages/README.md
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"pelago/emogrifier": "3.1.0",
|
||||
"psr/container": "1.0.0",
|
||||
"woocommerce/action-scheduler": "3.4.0",
|
||||
"woocommerce/woocommerce-admin": "2.9.4",
|
||||
"woocommerce/woocommerce-admin": "3.0.0-rc.1",
|
||||
"woocommerce/woocommerce-blocks": "6.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "d12a5b11e3d6dc2ac228efa1cd5efadc",
|
||||
"content-hash": "c4f41955bfde1a0a4e2d6d7428b8ee58",
|
||||
"packages": [
|
||||
{
|
||||
"name": "automattic/jetpack-autoloader",
|
||||
|
|
@ -543,16 +543,16 @@
|
|||
},
|
||||
{
|
||||
"name": "woocommerce/woocommerce-admin",
|
||||
"version": "2.9.4",
|
||||
"version": "3.0.0-rc.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/woocommerce/woocommerce-admin.git",
|
||||
"reference": "0cc85981f2def42e604118c7f5032e2750056763"
|
||||
"reference": "7c0cdd01ae98be058d684dd19023b0f40094cb63"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/0cc85981f2def42e604118c7f5032e2750056763",
|
||||
"reference": "0cc85981f2def42e604118c7f5032e2750056763",
|
||||
"url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/7c0cdd01ae98be058d684dd19023b0f40094cb63",
|
||||
"reference": "7c0cdd01ae98be058d684dd19023b0f40094cb63",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -608,9 +608,9 @@
|
|||
"homepage": "https://github.com/woocommerce/woocommerce-admin",
|
||||
"support": {
|
||||
"issues": "https://github.com/woocommerce/woocommerce-admin/issues",
|
||||
"source": "https://github.com/woocommerce/woocommerce-admin/tree/v2.9.4"
|
||||
"source": "https://github.com/woocommerce/woocommerce-admin/tree/v3.0.0-rc.1"
|
||||
},
|
||||
"time": "2021-12-15T14:33:43+00:00"
|
||||
"time": "2021-12-14T23:55:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "woocommerce/woocommerce-blocks",
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"extends": "stylelint-config-wordpress",
|
||||
"extends": "@wordpress/stylelint-config",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module.exports = function ( grunt ) {
|
||||
'use strict';
|
||||
var sass = require( 'node-sass' );
|
||||
var sass = require( 'sass' );
|
||||
|
||||
grunt.initConfig( {
|
||||
// Setting folder templates.
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"private": true,
|
||||
"main": "Gruntfile.js",
|
||||
"devDependencies": {
|
||||
"@wordpress/stylelint-config": "19.1.0",
|
||||
"autoprefixer": "9.8.6",
|
||||
"browserslist": "4.14.5",
|
||||
"caniuse-lite": "1.0.30001146",
|
||||
|
|
@ -24,8 +25,7 @@
|
|||
"grunt-sass": "3.1.0",
|
||||
"grunt-stylelint": "0.16.0",
|
||||
"gruntify-eslint": "5.0.0",
|
||||
"node-sass": "6.0.1",
|
||||
"stylelint": "13.8.0",
|
||||
"stylelint-config-wordpress": "17.0.0"
|
||||
"sass": "^1.45.0",
|
||||
"stylelint": "13.8.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
"devDependencies": {
|
||||
"@babel/cli": "7.12.8",
|
||||
"@babel/core": "7.12.9",
|
||||
"@babel/polyfill": "7.12.1",
|
||||
"babel-eslint": "10.1.0",
|
||||
"@babel/preset-env": "7.12.7",
|
||||
"@babel/register": "7.12.1",
|
||||
"@typescript-eslint/eslint-plugin": "3.10.1",
|
||||
|
|
@ -48,8 +48,8 @@
|
|||
"@wordpress/babel-plugin-import-jsx-pragma": "1.1.3",
|
||||
"@wordpress/babel-preset-default": "3.0.2",
|
||||
"@wordpress/eslint-plugin": "7.3.0",
|
||||
"@wordpress/stylelint-config": "19.1.0",
|
||||
"autoprefixer": "9.8.6",
|
||||
"babel-eslint": "10.1.0",
|
||||
"chai": "4.2.0",
|
||||
"chai-as-promised": "7.1.1",
|
||||
"config": "3.3.3",
|
||||
|
|
@ -64,18 +64,16 @@
|
|||
"jest": "^25.1.0",
|
||||
"lint-staged": "9.5.0",
|
||||
"mocha": "7.2.0",
|
||||
"node-sass": "6.0.1",
|
||||
"prettier": "npm:wp-prettier@2.0.5",
|
||||
"stylelint": "^13.8.0",
|
||||
"stylelint-config-wordpress": "17.0.0",
|
||||
"typescript": "3.9.7",
|
||||
"webpack": "4.44.2",
|
||||
"webpack-cli": "3.3.12",
|
||||
"wp-textdomain": "1.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^12.20.1",
|
||||
"npm": "^6.14.6"
|
||||
"node": "^16.13.1",
|
||||
"npm": "^8.1.2"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
|
|
|
|||
2776
pnpm-lock.yaml
2776
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue