From eb9d699ce9ff2cfb246d4ab2b8a6a4e246888db3 Mon Sep 17 00:00:00 2001 From: Sven SAULEAU Date: Sat, 25 Feb 2017 18:19:29 +0100 Subject: [PATCH 1/3] style: [skip ci] lint code snippets in md (#5379) --- README.md | 4 ++-- .../README.md | 10 +++++++--- .../README.md | 10 +++++++--- .../babel-plugin-transform-es2015-for-of/README.md | 8 ++++++-- .../README.md | 10 +++++++--- .../babel-plugin-transform-es2015-spread/README.md | 10 +++++++--- .../README.md | 10 +++++++--- .../README.md | 4 +++- packages/babel-plugin-transform-react-jsx/README.md | 11 ++++++++--- packages/babel-plugin-transform-runtime/README.md | 10 +++++++--- .../babel-plugin-transform-strict-mode/README.md | 10 +++++++--- packages/babel-preset-latest/README.md | 4 ++-- packages/babel-register/README.md | 2 +- packages/babel-template/README.md | 12 ++++++------ 14 files changed, 77 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 21a845d354..b8fe9840ef 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,13 @@ When your supported environments don't support certain features natively, it wil ```js // ES2015 arrow function -[1,2,3].map(n => n + 1); +[1, 2, 3].map((n) => n + 1); ``` **Out** ```js -[1,2,3].map(function(n) { +[1, 2, 3].map(function(n) { return n + 1; }); ``` diff --git a/packages/babel-plugin-transform-async-to-module-method/README.md b/packages/babel-plugin-transform-async-to-module-method/README.md index 268271a163..116da364f5 100644 --- a/packages/babel-plugin-transform-async-to-module-method/README.md +++ b/packages/babel-plugin-transform-async-to-module-method/README.md @@ -34,13 +34,17 @@ npm install --save-dev babel-plugin-transform-async-to-module-method **.babelrc** -```js -// without options +Without options: + +```json { "plugins": ["transform-async-to-module-method"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-async-to-module-method", { diff --git a/packages/babel-plugin-transform-es2015-computed-properties/README.md b/packages/babel-plugin-transform-es2015-computed-properties/README.md index 573996ff5b..4a7c74d026 100644 --- a/packages/babel-plugin-transform-es2015-computed-properties/README.md +++ b/packages/babel-plugin-transform-es2015-computed-properties/README.md @@ -57,13 +57,17 @@ npm install --save-dev babel-plugin-transform-es2015-computed-properties **.babelrc** -```js -// without options +Without options: + +```json { "plugins": ["transform-es2015-computed-properties"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-es2015-computed-properties", { diff --git a/packages/babel-plugin-transform-es2015-for-of/README.md b/packages/babel-plugin-transform-es2015-for-of/README.md index 7aff9a00f2..3e9efe20d9 100644 --- a/packages/babel-plugin-transform-es2015-for-of/README.md +++ b/packages/babel-plugin-transform-es2015-for-of/README.md @@ -49,13 +49,17 @@ npm install --save-dev babel-plugin-transform-es2015-for-of **.babelrc** +Without options: + ```js -// without options { "plugins": ["transform-es2015-for-of"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-es2015-for-of", { diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/README.md b/packages/babel-plugin-transform-es2015-modules-systemjs/README.md index ca205005d9..554421de63 100644 --- a/packages/babel-plugin-transform-es2015-modules-systemjs/README.md +++ b/packages/babel-plugin-transform-es2015-modules-systemjs/README.md @@ -35,13 +35,17 @@ npm install --save-dev babel-plugin-transform-es2015-modules-systemjs **.babelrc** -```javascript -// without options +Without options: + +```json { "plugins": ["transform-es2015-modules-systemjs"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-es2015-modules-systemjs", { diff --git a/packages/babel-plugin-transform-es2015-spread/README.md b/packages/babel-plugin-transform-es2015-spread/README.md index af75353e36..e33a1db7cf 100644 --- a/packages/babel-plugin-transform-es2015-spread/README.md +++ b/packages/babel-plugin-transform-es2015-spread/README.md @@ -48,13 +48,17 @@ npm install --save-dev babel-plugin-transform-es2015-spread **.babelrc** -```js -// without options +Without options: + +```json { "plugins": ["transform-es2015-spread"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-es2015-spread", { diff --git a/packages/babel-plugin-transform-es2015-template-literals/README.md b/packages/babel-plugin-transform-es2015-template-literals/README.md index fd0f57bf18..477b11cce6 100644 --- a/packages/babel-plugin-transform-es2015-template-literals/README.md +++ b/packages/babel-plugin-transform-es2015-template-literals/README.md @@ -28,13 +28,17 @@ npm install --save-dev babel-plugin-transform-es2015-template-literals **.babelrc** -```js -// without options +Without options: + +```json { "plugins": ["transform-es2015-template-literals"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-es2015-template-literals", { diff --git a/packages/babel-plugin-transform-object-rest-spread/README.md b/packages/babel-plugin-transform-object-rest-spread/README.md index b8f365d7af..61c3debfff 100644 --- a/packages/babel-plugin-transform-object-rest-spread/README.md +++ b/packages/babel-plugin-transform-object-rest-spread/README.md @@ -41,13 +41,15 @@ This plugin will use babel's `extends` helper, which will polyfill `Object.assig * `useBuiltIns` - Do not use Babel's helper's and just transform to use the built-in method (Disabled by default). -```js +```json { "plugins": [ ["transform-object-rest-spread", { "useBuiltIns": true }] ] } +``` +```js // source z = { x, ...y }; // compiled diff --git a/packages/babel-plugin-transform-react-jsx/README.md b/packages/babel-plugin-transform-react-jsx/README.md index 44a20066dd..128536db1e 100644 --- a/packages/babel-plugin-transform-react-jsx/README.md +++ b/packages/babel-plugin-transform-react-jsx/README.md @@ -64,12 +64,17 @@ npm install --save-dev babel-plugin-transform-react-jsx **.babelrc** -```js -// without options +Without options: + +```json { "plugins": ["transform-react-jsx"] } -// with options +``` + +With options: + +```json { "plugins": [ ["transform-react-jsx", { diff --git a/packages/babel-plugin-transform-runtime/README.md b/packages/babel-plugin-transform-runtime/README.md index ff42d7e9af..011a3eab10 100644 --- a/packages/babel-plugin-transform-runtime/README.md +++ b/packages/babel-plugin-transform-runtime/README.md @@ -40,13 +40,17 @@ The transformation plugin is typically used only in development, but the runtime Add the following line to your `.babelrc` file: -```js -// without options +Without options: + +```json { "plugins": ["transform-runtime"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-runtime", { diff --git a/packages/babel-plugin-transform-strict-mode/README.md b/packages/babel-plugin-transform-strict-mode/README.md index d6c258d300..08c5afe405 100644 --- a/packages/babel-plugin-transform-strict-mode/README.md +++ b/packages/babel-plugin-transform-strict-mode/README.md @@ -34,13 +34,17 @@ npm install --save-dev babel-plugin-transform-strict-mode **.babelrc** -```js -// without options +Without options: + +```json { "plugins": ["transform-strict-mode"] } +``` -// with options +With options: + +```json { "plugins": [ ["transform-strict-mode", { diff --git a/packages/babel-preset-latest/README.md b/packages/babel-preset-latest/README.md index 056d95645d..ec4e16769d 100644 --- a/packages/babel-preset-latest/README.md +++ b/packages/babel-preset-latest/README.md @@ -42,7 +42,7 @@ require("babel-core").transform("code", { Toggles including plugins from the [es2015 preset](https://babeljs.io/docs/plugins/preset-es2015/). -```js +```json { "presets": [ ["latest", { @@ -54,7 +54,7 @@ Toggles including plugins from the [es2015 preset](https://babeljs.io/docs/plugi You can also pass options down to the `es2015` preset. -```js +```json { "presets": [ ["latest", { diff --git a/packages/babel-register/README.md b/packages/babel-register/README.md index 2f05d6a7f7..6a4682b568 100644 --- a/packages/babel-register/README.md +++ b/packages/babel-register/README.md @@ -53,7 +53,7 @@ require("babel-register")({ // Ignore can also be specified as a function. ignore: function(filename) { - if (filename === '/path/to/es6-file.js') { + if (filename === "/path/to/es6-file.js") { return false; } else { return true; diff --git a/packages/babel-template/README.md b/packages/babel-template/README.md index 9eeb0adf3f..c73507af59 100644 --- a/packages/babel-template/README.md +++ b/packages/babel-template/README.md @@ -13,24 +13,24 @@ npm install --save-dev babel-template ## Usage ```js -import template from 'babel-template'; -import generate from 'babel-generator'; -import * as t from 'babel-types'; +import template from "babel-template"; +import generate from "babel-generator"; +import * as t from "babel-types"; const buildRequire = template(` var IMPORT_NAME = require(SOURCE); `); const ast = buildRequire({ - IMPORT_NAME: t.identifier('myModule'), - SOURCE: t.stringLiteral('my-module') + IMPORT_NAME: t.identifier("myModule"), + SOURCE: t.stringLiteral("my-module") }); console.log(generate(ast).code); ``` ```js -var myModule = require('my-module'); +const myModule = require("my-module"); ``` ## API From 01918c68c196b2dd3ab54a20e2598271041fe50a Mon Sep 17 00:00:00 2001 From: Alex Kuzmenko Date: Sat, 25 Feb 2017 20:26:29 +0200 Subject: [PATCH 2/3] Improve babel-generator's code coverage (#5338) --- packages/babel-generator/src/generators/modules.js | 6 ------ .../test/fixtures/types/DoExpression/actual.js | 7 +++++++ .../test/fixtures/types/DoExpression/expected.js | 7 +++++++ .../test/fixtures/types/LogicalExpression/actual.js | 2 ++ .../test/fixtures/types/LogicalExpression/expected.js | 2 ++ 5 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 packages/babel-generator/test/fixtures/types/DoExpression/actual.js create mode 100644 packages/babel-generator/test/fixtures/types/DoExpression/expected.js create mode 100644 packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js create mode 100644 packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js diff --git a/packages/babel-generator/src/generators/modules.js b/packages/babel-generator/src/generators/modules.js index 71ffe6e9c3..3d6fbae1e2 100644 --- a/packages/babel-generator/src/generators/modules.js +++ b/packages/babel-generator/src/generators/modules.js @@ -45,12 +45,6 @@ export function ExportAllDeclaration(node: Object) { this.word("export"); this.space(); this.token("*"); - if (node.exported) { - this.space(); - this.word("as"); - this.space(); - this.print(node.exported, node); - } this.space(); this.word("from"); this.space(); diff --git a/packages/babel-generator/test/fixtures/types/DoExpression/actual.js b/packages/babel-generator/test/fixtures/types/DoExpression/actual.js new file mode 100644 index 0000000000..d6ec00f889 --- /dev/null +++ b/packages/babel-generator/test/fixtures/types/DoExpression/actual.js @@ -0,0 +1,7 @@ +let a = do { + if (x > 10) { + 'big'; + } else { + 'small'; + } +}; diff --git a/packages/babel-generator/test/fixtures/types/DoExpression/expected.js b/packages/babel-generator/test/fixtures/types/DoExpression/expected.js new file mode 100644 index 0000000000..d6ec00f889 --- /dev/null +++ b/packages/babel-generator/test/fixtures/types/DoExpression/expected.js @@ -0,0 +1,7 @@ +let a = do { + if (x > 10) { + 'big'; + } else { + 'small'; + } +}; diff --git a/packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js b/packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js new file mode 100644 index 0000000000..5df2b0728d --- /dev/null +++ b/packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js @@ -0,0 +1,2 @@ +foo ||bar; +(x => x)|| bar; diff --git a/packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js b/packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js new file mode 100644 index 0000000000..91f0b20ce2 --- /dev/null +++ b/packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js @@ -0,0 +1,2 @@ +foo || bar; +(x => x) || bar; From 6529cb5f01306ab89e9bfb325b6f5eaaf962785e Mon Sep 17 00:00:00 2001 From: Henry Zhu Date: Sat, 25 Feb 2017 18:39:18 -0500 Subject: [PATCH 3/3] babel-generator: add another do test --- .../babel-generator/test/fixtures/types/DoExpression/actual.js | 2 ++ .../test/fixtures/types/DoExpression/expected.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/babel-generator/test/fixtures/types/DoExpression/actual.js b/packages/babel-generator/test/fixtures/types/DoExpression/actual.js index d6ec00f889..944d0559dd 100644 --- a/packages/babel-generator/test/fixtures/types/DoExpression/actual.js +++ b/packages/babel-generator/test/fixtures/types/DoExpression/actual.js @@ -1,3 +1,5 @@ +(do {}); + let a = do { if (x > 10) { 'big'; diff --git a/packages/babel-generator/test/fixtures/types/DoExpression/expected.js b/packages/babel-generator/test/fixtures/types/DoExpression/expected.js index d6ec00f889..944d0559dd 100644 --- a/packages/babel-generator/test/fixtures/types/DoExpression/expected.js +++ b/packages/babel-generator/test/fixtures/types/DoExpression/expected.js @@ -1,3 +1,5 @@ +(do {}); + let a = do { if (x > 10) { 'big';