From 70410cbc33720b74d3c17c080b961e3c16972690 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 21:47:22 +1000 Subject: [PATCH 1/9] Make tslint a dev dependency --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 567d675..fd09f55 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,12 @@ }, "homepage": "https://github.com/bang88/typescript-react-intl#readme", "dependencies": { - "tslint": "^5.9.1", "typescript": "^2.6.2" }, "devDependencies": { "@types/react": "^15.0.27", "@types/react-intl": "^2.2.9", - "ava": "^0.19.1" + "ava": "^0.19.1", + "tslint": "^5.9.1" } } From 695f42bfc4c875a6a9d767cf4c2d9ee5b66a81e3 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 22:50:28 +1000 Subject: [PATCH 2/9] Add 'prettier' format check to build --- .prettierrc | 2 ++ .travis.yml | 4 +++- package.json | 8 +++++++- yarn.lock | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..a936d30 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,2 @@ +trailingComma: all +arrowParens: always diff --git a/.travis.yml b/.travis.yml index d128bec..3ebf7d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ +cache: yarn language: node_js node_js: - "6" - \ No newline at end of file +script: + - "yarn build-ci" \ No newline at end of file diff --git a/package.json b/package.json index fd09f55..a3da958 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,13 @@ "description": "Extracts string messages from TypeScript React components or ts files that use React Intl.", "main": "lib/index.js", "scripts": { + "build": "tsc && yarn run format:auto && yarn run _test", + "build-ci": "tsc && yarn run format:check && yarn run _test", + "format:auto": "prettier --config .prettierrc *.ts --write", + "format:check": "prettier --config .prettierrc *.ts --list-different", "start": "tsc -w", - "test": "tsc && tslint -c tslint.json '*.ts' && ava --verbose" + "test": "tsc && yarn run _test && echo Please run 'yarn build' before you commit", + "_test": "tslint -c tslint.json '*.ts' && ava --verbose" }, "repository": { "type": "git", @@ -30,6 +35,7 @@ "@types/react": "^15.0.27", "@types/react-intl": "^2.2.9", "ava": "^0.19.1", + "prettier": "1.10.2", "tslint": "^5.9.1" } } diff --git a/yarn.lock b/yarn.lock index 63c6301..efa59b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2258,6 +2258,10 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" +prettier@1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" + pretty-format@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84" From aefb27cae9d5c4fb1caf1fe93488fb071e8020fe Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 23:02:38 +1000 Subject: [PATCH 3/9] Format before transpiling --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a3da958..97f1dc7 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Extracts string messages from TypeScript React components or ts files that use React Intl.", "main": "lib/index.js", "scripts": { - "build": "tsc && yarn run format:auto && yarn run _test", + "build": "yarn run format:auto && tsc && yarn run _test", "build-ci": "tsc && yarn run format:check && yarn run _test", "format:auto": "prettier --config .prettierrc *.ts --write", "format:check": "prettier --config .prettierrc *.ts --list-different", From 222c7390f9a3096497b023025f9aa327290d158d Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 23:03:44 +1000 Subject: [PATCH 4/9] Reformat using 'prettier' --- index.ts | 43 +++++++++++++++++++++++++++++-------------- lib/index.js | 6 +++--- lib/index.js.map | 2 +- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/index.ts b/index.ts index 6d55190..1a12006 100644 --- a/index.ts +++ b/index.ts @@ -1,6 +1,9 @@ import ts = require("typescript"); -function isMethodCall(el: ts.Declaration, methodName: string): el is ts.VariableDeclaration { +function isMethodCall( + el: ts.Declaration, + methodName: string, +): el is ts.VariableDeclaration { return ( ts.isVariableDeclaration(el) && el.initializer && @@ -31,7 +34,9 @@ type ElementName = "FormattedMessage"; type MethodName = "defineMessages" | "formatMessage"; type MessageExtracter = (obj: ts.ObjectLiteralExpression) => Message[]; -function extractMessagesForDefineMessages(objLiteral: ts.ObjectLiteralExpression): Message[] { +function extractMessagesForDefineMessages( + objLiteral: ts.ObjectLiteralExpression, +): Message[] { const messages: Message[] = []; objLiteral.properties.forEach((p) => { const message: Message = {}; @@ -43,7 +48,10 @@ function extractMessagesForDefineMessages(objLiteral: ts.ObjectLiteralExpression p.initializer.properties.forEach((ip) => { if (ts.isIdentifier(ip.name) || ts.isLiteralExpression(ip.name)) { const name = ip.name.text; - if (ts.isPropertyAssignment(ip) && ts.isStringLiteral(ip.initializer)) { + if ( + ts.isPropertyAssignment(ip) && + ts.isStringLiteral(ip.initializer) + ) { message[name] = ip.initializer.text; } } @@ -54,7 +62,9 @@ function extractMessagesForDefineMessages(objLiteral: ts.ObjectLiteralExpression return messages; } -function extractMessagesForFormatMessage(objLiteral: ts.ObjectLiteralExpression): Message[] { +function extractMessagesForFormatMessage( + objLiteral: ts.ObjectLiteralExpression, +): Message[] { const message: Message = {}; objLiteral.properties.forEach((p) => { if ( @@ -62,13 +72,16 @@ function extractMessagesForFormatMessage(objLiteral: ts.ObjectLiteralExpression) (ts.isIdentifier(p.name) || ts.isLiteralExpression(p.name)) && ts.isStringLiteral(p.initializer) ) { - message[p.name.text] = p.initializer.text; - } - }); + message[p.name.text] = p.initializer.text; + } + }); return [message]; } -function extractMessagesForNode(node: ts.Node, extractMessages: MessageExtracter): Message[] { +function extractMessagesForNode( + node: ts.Node, + extractMessages: MessageExtracter, +): Message[] { const res: Message[] = []; function find(n: ts.Node): Message[] { if (ts.isObjectLiteralExpression(n)) { @@ -81,7 +94,10 @@ function extractMessagesForNode(node: ts.Node, extractMessages: MessageExtracter return res; } -function forAllVarDecls(node: ts.Node, cb: (decl: ts.VariableDeclaration) => void) { +function forAllVarDecls( + node: ts.Node, + cb: (decl: ts.VariableDeclaration) => void, +) { if (ts.isVariableDeclaration(node)) { cb(node); } else { @@ -96,10 +112,7 @@ function findJsxOpeningLikeElementsWithName( const messages: ts.JsxOpeningLikeElement[] = []; function findJsxElement(n: ts.Node): undefined { // Is this a JsxElement with an identifier name? - if ( - ts.isJsxOpeningLikeElement(n) && - ts.isIdentifier(n.tagName) - ) { + if (ts.isJsxOpeningLikeElement(n) && ts.isIdentifier(n.tagName)) { // Does the tag name match what we're looking for? const childTagName = n.tagName; if (childTagName.text === tagName) { @@ -177,7 +190,9 @@ function main(contents: string): {}[] { // found nothing // tslint:disable-next-line:no-any const a = attr as any; // TODO find correct types to avoid "any" - if (!a.name || !a.initializer) { return; } + if (!a.name || !a.initializer) { + return; + } msg[a.name.text] = a.initializer.text || a.initializer.expression.text; }); diff --git a/lib/index.js b/lib/index.js index 6e85a7a..7a99116 100644 --- a/lib/index.js +++ b/lib/index.js @@ -27,7 +27,8 @@ function extractMessagesForDefineMessages(objLiteral) { p.initializer.properties.forEach(function (ip) { if (ts.isIdentifier(ip.name) || ts.isLiteralExpression(ip.name)) { var name_1 = ip.name.text; - if (ts.isPropertyAssignment(ip) && ts.isStringLiteral(ip.initializer)) { + if (ts.isPropertyAssignment(ip) && + ts.isStringLiteral(ip.initializer)) { message[name_1] = ip.initializer.text; } } @@ -72,8 +73,7 @@ function forAllVarDecls(node, cb) { function findJsxOpeningLikeElementsWithName(node, tagName) { var messages = []; function findJsxElement(n) { - if (ts.isJsxOpeningLikeElement(n) && - ts.isIdentifier(n.tagName)) { + if (ts.isJsxOpeningLikeElement(n) && ts.isIdentifier(n.tagName)) { var childTagName = n.tagName; if (childTagName.text === tagName) { messages.push(n); diff --git a/lib/index.js.map b/lib/index.js.map index b2de06b..16c6269 100644 --- a/lib/index.js.map +++ b/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"} \ No newline at end of file From d2c4b38a44603f065cb67c6780691a2b73f7421f Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 23:08:11 +1000 Subject: [PATCH 5/9] Add comment to .prettierrc --- .prettierrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierrc b/.prettierrc index a936d30..d453023 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,2 +1,3 @@ +# Bring 'prettier' in line with tslint options: trailingComma: all arrowParens: always From e26154139f51da4eb35a4dd805b788d9a33abe17 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 23:38:29 +1000 Subject: [PATCH 6/9] Check for modified files in Travis --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ebf7d5..6c0308c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,9 @@ language: node_js node_js: - "6" script: - - "yarn build-ci" \ No newline at end of file + - yarn build-ci + # Ideally we wouldn't commit transpiled .js or .js.map files, but for now: + - if ! git diff --exit-code --name-only HEAD; then + echo "Changed files detected (listed above). Please run 'yarn build' before you commit."; + exit 1; + fi From aadf56aa079f82388c5536c87cdb339fbc9e9017 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 23:47:45 +1000 Subject: [PATCH 7/9] Change index.ts without changing index.js.map --- index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/index.ts b/index.ts index 1a12006..cc2eecc 100644 --- a/index.ts +++ b/index.ts @@ -150,7 +150,6 @@ function findMethodCallsWithName( /** * Parse tsx files - * * @export * @param {string} contents * @returns {array} From 648d34563fc2b4b0420fc012b711f6513cb3cd88 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Sun, 14 Jan 2018 23:52:09 +1000 Subject: [PATCH 8/9] Update index.js.map to match index.ts --- lib/index.js.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/index.js.map b/lib/index.js.map index 16c6269..96dfea0 100644 --- a/lib/index.js.map +++ b/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 5ecf83925d41410f736f094220ec78a22bb008f6 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Mon, 15 Jan 2018 00:39:10 +1000 Subject: [PATCH 9/9] Disable tslint formatting rules --- package.json | 3 ++- tslint.json | 3 ++- yarn.lock | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 97f1dc7..17afc2a 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "@types/react-intl": "^2.2.9", "ava": "^0.19.1", "prettier": "1.10.2", - "tslint": "^5.9.1" + "tslint": "^5.9.1", + "tslint-config-prettier": "^1.6.0" } } diff --git a/tslint.json b/tslint.json index 9414a58..2a79bbc 100644 --- a/tslint.json +++ b/tslint.json @@ -1,7 +1,8 @@ { "defaultSeverity": "error", "extends": [ - "tslint:recommended" + "tslint:recommended", + "tslint-config-prettier" ], "jsRules": {}, "rules": { diff --git a/yarn.lock b/yarn.lock index efa59b6..778f625 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2778,6 +2778,10 @@ tslib@^1.8.0, tslib@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslint-config-prettier@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.6.0.tgz#fec1ee8fb07e8f033c63fed6b135af997f31962a" + tslint@^5.9.1: version "5.9.1" resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae"