diff --git a/Gruntfile.js b/Gruntfile.js index b2c0fdbd37b..00eea59b170 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -201,62 +201,6 @@ module.exports = function( grunt ) { } }, - // Generate POT files. - makepot: { - options: { - type: 'wp-plugin', - domainPath: 'i18n/languages', - potHeaders: { - 'report-msgid-bugs-to': 'https://github.com/woocommerce/woocommerce/issues', - 'language-team': 'LANGUAGE ' - } - }, - dist: { - options: { - potFilename: 'woocommerce.pot', - exclude: [ - 'vendor/.*', - 'tests/.*', - 'tmp/.*' - ] - } - } - }, - - // Check textdomain errors. - checktextdomain: { - options:{ - text_domain: 'woocommerce', - keywords: [ - '__:1,2d', - '_e:1,2d', - '_x:1,2c,3d', - 'esc_html__:1,2d', - 'esc_html_e:1,2d', - 'esc_html_x:1,2c,3d', - 'esc_attr__:1,2d', - 'esc_attr_e:1,2d', - 'esc_attr_x:1,2c,3d', - '_ex:1,2c,3d', - '_n:1,2,4d', - '_nx:1,2,4c,5d', - '_n_noop:1,2,3d', - '_nx_noop:1,2,3c,4d' - ] - }, - files: { - src: [ - '**/*.php', // Include all files - '!node_modules/**', // Exclude node_modules/ - '!tests/**', // Exclude tests/ - '!vendor/**', // Exclude vendor/ - '!tmp/**', // Exclude tmp/ - '!packages/*/vendor/**' // Exclude packages/*/vendor - ], - expand: true - } - }, - // Exec shell commands. shell: { options: { @@ -306,6 +250,7 @@ module.exports = function( grunt ) { } } }, + // PHP Code Sniffer. phpcs: { options: { @@ -346,8 +291,6 @@ module.exports = function( grunt ) { grunt.loadNpmTasks( 'grunt-rtlcss' ); grunt.loadNpmTasks( 'grunt-postcss' ); grunt.loadNpmTasks( 'grunt-stylelint' ); - grunt.loadNpmTasks( 'grunt-wp-i18n' ); - grunt.loadNpmTasks( 'grunt-checktextdomain' ); grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-contrib-uglify' ); grunt.loadNpmTasks( 'grunt-contrib-cssmin' ); @@ -400,11 +343,6 @@ module.exports = function( grunt ) { 'default' ]); - grunt.registerTask( 'i18n', [ - 'checktextdomain', - 'makepot' - ]); - grunt.registerTask( 'e2e-tests', [ 'shell:e2e_tests' ]); diff --git a/package-lock.json b/package-lock.json index 306082a4425..a5c578cba7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9182,34 +9182,6 @@ } } }, - "grunt-checktextdomain": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/grunt-checktextdomain/-/grunt-checktextdomain-1.0.1.tgz", - "integrity": "sha1-slTQHh3pEwBdTbHFMD2QI7mD4Zs=", - "dev": true, - "requires": { - "chalk": "~0.2.1", - "text-table": "~0.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz", - "integrity": "sha1-NZq0sV3NZLptdHNLcsNjYKmvLBk=", - "dev": true - }, - "chalk": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz", - "integrity": "sha1-dhPhV1FFshOGSD9/SFql/6jL0Qw=", - "dev": true, - "requires": { - "ansi-styles": "~0.2.0", - "has-color": "~0.1.0" - } - } - } - }, "grunt-contrib-clean": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.0.tgz", @@ -9730,16 +9702,6 @@ "chalk": "^2.4.2" } }, - "grunt-wp-i18n": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/grunt-wp-i18n/-/grunt-wp-i18n-1.0.3.tgz", - "integrity": "sha512-CJNbEKeBeOSAPeaJ9B8iCgSwtaG63UR9/uT46a4OsIqnFhOJpeAi138JTlvjfIbnDVoBrzvdrKJe1svveLjUtA==", - "dev": true, - "requires": { - "grunt": "^1.0.3", - "node-wp-i18n": "^1.2.2" - } - }, "gzip-size": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", @@ -9800,12 +9762,6 @@ } } }, - "has-color": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", - "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", - "dev": true - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -14080,51 +14036,6 @@ } } }, - "node-wp-i18n": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/node-wp-i18n/-/node-wp-i18n-1.2.3.tgz", - "integrity": "sha512-YMzMcsjXbGYDB9vHyb289CYXAGmXhcNLbeTlOnWgPNkZd9xrovcbRd7cQyKd9BQHOjS7Nw8WCbJ7nvtR7rc0rg==", - "dev": true, - "requires": { - "bluebird": "^3.4.1", - "gettext-parser": "^3.1.0", - "glob": "^7.0.5", - "lodash": "^4.14.2", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "tmp": "^0.0.33" - }, - "dependencies": { - "gettext-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-3.1.1.tgz", - "integrity": "sha512-vNhWcqXEtZPs5Ft1ReA34g7ByWotpcOIeJvXVy2jF3/G2U9v6W0wG4Z4hXzcU8R//jArqkgHcVCGgGqa4vxVlQ==", - "dev": true, - "requires": { - "encoding": "^0.1.12", - "readable-stream": "^3.2.0", - "safe-buffer": "^5.1.2" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "readable-stream": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", - "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", diff --git a/package.json b/package.json index 10999ee293a..2318b2ad736 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "lint:js": "eslint assets/js --ext=js", "test:e2e": "./tests/bin/e2e-test-integration.js", "test:e2e-dev": "./tests/bin/e2e-test-integration.js --dev", - "makepot": "grunt makepot", + "makepot": "composer run-script makepot", "git:update-hooks": "rm -r .git/hooks && mkdir -p .git/hooks && node ./node_modules/husky/husky.js install" }, "devDependencies": { @@ -30,14 +30,13 @@ "chai": "4.2.0", "chai-as-promised": "7.1.1", "commander": "4.1.0", - "eslint-plugin-jest": "23.6.0", "config": "3.2.5", "cross-env": "6.0.3", "eslint": "6.8.0", "eslint-config-wpcalypso": "5.0.0", + "eslint-plugin-jest": "23.6.0", "github-contributors-list": "https://github.com/woocommerce/github-contributors-list/tarball/master", "grunt": "1.0.4", - "grunt-checktextdomain": "1.0.1", "grunt-contrib-clean": "2.0.0", "grunt-contrib-concat": "1.0.1", "grunt-contrib-copy": "1.0.0", @@ -52,7 +51,6 @@ "grunt-sass": "3.1.0", "grunt-shell": "3.0.1", "grunt-stylelint": "0.13.0", - "grunt-wp-i18n": "1.0.3", "husky": "4.2.1", "istanbul": "1.0.0-alpha.2", "jest": "25.1.0",