From 78c71543be0a0f22ac5a305fdd236919856b6b0a Mon Sep 17 00:00:00 2001 From: edvardchen <> Date: Thu, 20 Jun 2019 14:56:33 +0800 Subject: [PATCH 1/3] chore: fix audit warning --- package-lock.json | 39 ++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06a7210..3c4b4cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1728,9 +1728,9 @@ "dev": true }, "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -1942,9 +1942,9 @@ } }, "mocha": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.1.tgz", - "integrity": "sha512-ayfr68s4kyDnCU0hjkTk5Z8J8dqr1iPUuVjmd+dLFgaGKOPlgx1XrOGn5k3H1LlXNnLBb8voZMYMKxchiA4Ujg==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz", + "integrity": "sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==", "dev": true, "requires": { "ansi-colors": "3.2.3", @@ -1956,12 +1956,12 @@ "glob": "7.1.3", "growl": "1.10.5", "he": "1.2.0", - "js-yaml": "3.13.0", + "js-yaml": "3.13.1", "log-symbols": "2.2.0", "minimatch": "3.0.4", "mkdirp": "0.5.1", "ms": "2.1.1", - "node-environment-flags": "1.0.4", + "node-environment-flags": "1.0.5", "object.assign": "4.1.0", "strip-json-comments": "2.0.1", "supports-color": "6.0.0", @@ -2067,12 +2067,21 @@ "dev": true }, "node-environment-flags": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz", - "integrity": "sha512-M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", + "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", "dev": true, "requires": { - "object.getownpropertydescriptors": "^2.0.3" + "object.getownpropertydescriptors": "^2.0.3", + "semver": "^5.7.0" + }, + "dependencies": { + "semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "dev": true + } } }, "normalize-package-data": { @@ -3152,9 +3161,9 @@ } }, "yargs-parser": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz", - "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/package.json b/package.json index 767cfe1..9d095f3 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "babel-eslint": "^10.0.1", "eslint": "^5.16.0", "husky": "^1.3.1", - "mocha": "^6.1.1", + "mocha": "^6.1.4", "vue-eslint-parser": "^6.0.3" }, "engines": { From 73060389f6b3a5dbad921f3aa9f6b43fb7db9b58 Mon Sep 17 00:00:00 2001 From: edvardchen <> Date: Thu, 20 Jun 2019 15:09:06 +0800 Subject: [PATCH 2/3] feat: skip checking import(...) --- lib/rules/no-literal-string.js | 3 +++ tests/lib/rules/no-literal-string.js | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/rules/no-literal-string.js b/lib/rules/no-literal-string.js index 1067258..8703e8e 100644 --- a/lib/rules/no-literal-string.js +++ b/lib/rules/no-literal-string.js @@ -109,6 +109,9 @@ module.exports = { while (temp && LOOK_UP_LIMIT > 0) { LOOK_UP_LIMIT--; if (temp.type === 'CallExpression') { + // import(...) is valid + if (temp.callee.type === 'Import') return; + if (isValidFunctionCall(temp)) return; break; } diff --git a/tests/lib/rules/no-literal-string.js b/tests/lib/rules/no-literal-string.js index 1c2c2c8..b250197 100644 --- a/tests/lib/rules/no-literal-string.js +++ b/tests/lib/rules/no-literal-string.js @@ -28,6 +28,7 @@ var ruleTester = new RuleTester({ }); ruleTester.run('no-literal-string', rule, { valid: [ + { code: 'import("hello")' }, { code: 'import name from "hello";' }, { code: 'require("hello");' }, { code: 'const a = require(["hello"]);' }, From 10016baf8c851e398b098837b65e841c8ebadcb3 Mon Sep 17 00:00:00 2001 From: edvardchen <> Date: Thu, 20 Jun 2019 15:11:06 +0800 Subject: [PATCH 3/3] chore(release): 1.2.0 --- CHANGELOG.md | 11 ++++++++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9939b0e..8ab99af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,16 @@ -# Change Log +# Changelog All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.2.0](https://github.com/edvardchen/eslint-plugin-i18next/compare/v1.1.3...v1.2.0) (2019-06-20) + + +### Features + +* skip checking import(...) ([7306038](https://github.com/edvardchen/eslint-plugin-i18next/commit/7306038)) + + + ## [1.1.3](https://github.com/edvardchen/eslint-plugin-i18next/compare/v1.1.2...v1.1.3) (2019-04-08) diff --git a/package-lock.json b/package-lock.json index 3c4b4cf..6532873 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "eslint-plugin-i18next", - "version": "1.1.3", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d095f3..0fccead 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eslint-plugin-i18next", - "version": "1.1.3", + "version": "1.2.0", "description": "ESLint plugin for i18n", "keywords": [ "eslint",