From 542fe8912365b75c2abe7b78ad208d6a02bee1cd Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Sat, 15 Nov 2014 11:23:16 +1100 Subject: [PATCH] fix up tests to work with new member expression keyword generator --- lib/6to5/transformation/transformers/react.js | 11 +---------- .../classes/accessing-super-class/expected.js | 2 +- .../misc/_member-expression-keywords/expected.js | 2 ++ .../misc/_property-literals/actual.js | 4 ++-- .../misc/_property-literals/expected.js | 6 ++++-- .../modules-amd/exports-default/expected.js | 16 ++++++++-------- .../modules-amd/exports-default/untitled | 0 .../modules-amd/exports-from/expected.js | 6 +++--- .../modules-amd/exports-named/expected.js | 6 +++--- .../modules-amd/imports-default/expected.js | 6 +++--- .../modules-amd/imports-mixing/expected.js | 4 ++-- .../modules-amd/overview/expected.js | 4 ++-- .../modules-common/exports-default/expected.js | 16 ++++++++-------- .../modules-common/exports-from/expected.js | 6 +++--- .../modules-common/exports-named/expected.js | 6 +++--- .../modules-common/imports-default/expected.js | 4 ++-- .../modules-common/imports-mixing/expected.js | 2 +- .../modules-common/overview/expected.js | 4 ++-- .../modules-umd/exports-default/expected.js | 16 ++++++++-------- .../modules-umd/exports-from/expected.js | 4 ++-- .../modules-umd/exports-named/expected.js | 6 +++--- .../modules-umd/imports-default/expected.js | 6 +++--- .../modules-umd/imports-mixing/expected.js | 4 ++-- .../modules-umd/overview/expected.js | 4 ++-- 24 files changed, 70 insertions(+), 75 deletions(-) create mode 100644 test/fixtures/transformation/modules-amd/exports-default/untitled diff --git a/lib/6to5/transformation/transformers/react.js b/lib/6to5/transformation/transformers/react.js index 094dbf4a0b..32a1d4ee15 100644 --- a/lib/6to5/transformation/transformers/react.js +++ b/lib/6to5/transformation/transformers/react.js @@ -110,18 +110,9 @@ exports.XJSElement = { if (t.isLiteral(child)) { var lines = child.value.split(/\r\n|\n|\r/); - var lastNonEmptyLine = 0; - - _.each(lines, function (line, i) { - if (line.match(/[^ \t]/)) { - lastNonEmptyLine = i; - } - }); - _.each(lines, function (line, i) { var isFirstLine = i === 0; var isLastLine = i === lines.length - 1; - var isLastNonEmptyLine = i === lastNonEmptyLine; // replace rendered whitespace tabs with spaces var trimmedLine = line.replace(/\t/g, ' '); @@ -136,7 +127,7 @@ exports.XJSElement = { trimmedLine = trimmedLine.replace(/[ ]+$/, ''); } - if (trimmedLine || isLastNonEmptyLine) { + if (trimmedLine) { callExpr.arguments.push(t.literal(trimmedLine)); } }); diff --git a/test/fixtures/transformation/classes/accessing-super-class/expected.js b/test/fixtures/transformation/classes/accessing-super-class/expected.js index 158cc49593..401097c903 100644 --- a/test/fixtures/transformation/classes/accessing-super-class/expected.js +++ b/test/fixtures/transformation/classes/accessing-super-class/expected.js @@ -19,7 +19,7 @@ var _extends = function (child, parent) { var Test = (function (Foo) { var Test = function Test() { - woops.super.test(); + woops["super"].test(); Foo.call(this); Foo.prototype.test.call(this); foob(Foo); diff --git a/test/fixtures/transformation/misc/_member-expression-keywords/expected.js b/test/fixtures/transformation/misc/_member-expression-keywords/expected.js index 055db55491..e603ba03f8 100644 --- a/test/fixtures/transformation/misc/_member-expression-keywords/expected.js +++ b/test/fixtures/transformation/misc/_member-expression-keywords/expected.js @@ -1,3 +1,5 @@ +"use strict"; + test["catch"]; test["catch"]["foo"]; test["catch"]; diff --git a/test/fixtures/transformation/misc/_property-literals/actual.js b/test/fixtures/transformation/misc/_property-literals/actual.js index a8581cb2fd..c531023c19 100644 --- a/test/fixtures/transformation/misc/_property-literals/actual.js +++ b/test/fixtures/transformation/misc/_property-literals/actual.js @@ -1,6 +1,6 @@ -{ +var obj = { "test": "foob", "!@#$": "foob", "33rd": "foob", fooBar: "foob" -} +}; diff --git a/test/fixtures/transformation/misc/_property-literals/expected.js b/test/fixtures/transformation/misc/_property-literals/expected.js index 41d50f2ce2..3c68a81f12 100644 --- a/test/fixtures/transformation/misc/_property-literals/expected.js +++ b/test/fixtures/transformation/misc/_property-literals/expected.js @@ -1,6 +1,8 @@ -{ +"use strict"; + +var obj = { test: "foob", "!@#$": "foob", "33rd": "foob", fooBar: "foob" -} +}; diff --git a/test/fixtures/transformation/modules-amd/exports-default/expected.js b/test/fixtures/transformation/modules-amd/exports-default/expected.js index 48f834e265..9d46b7b13b 100644 --- a/test/fixtures/transformation/modules-amd/exports-default/expected.js +++ b/test/fixtures/transformation/modules-amd/exports-default/expected.js @@ -1,15 +1,15 @@ define(["exports"], function (exports) { "use strict"; - exports.default = 42; - exports.default = {}; - exports.default = []; - exports.default = foo; - exports.default = function () {}; - exports.default = function () {}; + exports["default"] = 42; + exports["default"] = {}; + exports["default"] = []; + exports["default"] = foo; + exports["default"] = function () {}; + exports["default"] = function () {}; function foo() {} - exports.default = foo; + exports["default"] = foo; var Foo = function Foo() {}; - exports.default = Foo; + exports["default"] = Foo; }); diff --git a/test/fixtures/transformation/modules-amd/exports-default/untitled b/test/fixtures/transformation/modules-amd/exports-default/untitled new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/transformation/modules-amd/exports-from/expected.js b/test/fixtures/transformation/modules-amd/exports-from/expected.js index a53ede7919..04d83b65ca 100644 --- a/test/fixtures/transformation/modules-amd/exports-from/expected.js +++ b/test/fixtures/transformation/modules-amd/exports-from/expected.js @@ -11,7 +11,7 @@ define(["exports", "foo"], function (exports, _foo) { exports.foo = _foo.foo; exports.bar = _foo.bar; exports.bar = _foo.foo; - exports.default = _foo.foo; - exports.default = _foo.foo; + exports["default"] = _foo.foo; + exports["default"] = _foo.foo; exports.bar = _foo.bar; -}); \ No newline at end of file +}); diff --git a/test/fixtures/transformation/modules-amd/exports-named/expected.js b/test/fixtures/transformation/modules-amd/exports-named/expected.js index f4b7c61175..e07a20d178 100644 --- a/test/fixtures/transformation/modules-amd/exports-named/expected.js +++ b/test/fixtures/transformation/modules-amd/exports-named/expected.js @@ -5,7 +5,7 @@ define(["exports"], function (exports) { exports.foo = foo; exports.bar = bar; exports.bar = foo; - exports.default = foo; - exports.default = foo; + exports["default"] = foo; + exports["default"] = foo; exports.bar = bar; -}); \ No newline at end of file +}); diff --git a/test/fixtures/transformation/modules-amd/imports-default/expected.js b/test/fixtures/transformation/modules-amd/imports-default/expected.js index 629617760f..e13da123e2 100644 --- a/test/fixtures/transformation/modules-amd/imports-default/expected.js +++ b/test/fixtures/transformation/modules-amd/imports-default/expected.js @@ -1,6 +1,6 @@ define(["exports", "foo"], function (exports, _foo) { "use strict"; - var foo = _foo.default; - var foo = _foo.default; -}); \ No newline at end of file + var foo = _foo["default"]; + var foo = _foo["default"]; +}); diff --git a/test/fixtures/transformation/modules-amd/imports-mixing/expected.js b/test/fixtures/transformation/modules-amd/imports-mixing/expected.js index 1c10b7815a..5ff7a48899 100644 --- a/test/fixtures/transformation/modules-amd/imports-mixing/expected.js +++ b/test/fixtures/transformation/modules-amd/imports-mixing/expected.js @@ -1,6 +1,6 @@ define(["exports", "foo"], function (exports, _foo) { "use strict"; - var foo = _foo.default; + var foo = _foo["default"]; var xyz = _foo.baz; -}); \ No newline at end of file +}); diff --git a/test/fixtures/transformation/modules-amd/overview/expected.js b/test/fixtures/transformation/modules-amd/overview/expected.js index d1d75bff1a..5fc0d32601 100644 --- a/test/fixtures/transformation/modules-amd/overview/expected.js +++ b/test/fixtures/transformation/modules-amd/overview/expected.js @@ -1,12 +1,12 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) { "use strict"; - var foo = _foo.default; + var foo = _foo["default"]; var foo = _foo; var bar = _foo.bar; var bar = _foo.foo; exports.test = test; var test = exports.test = 5; - exports.default = test; + exports["default"] = test; }); diff --git a/test/fixtures/transformation/modules-common/exports-default/expected.js b/test/fixtures/transformation/modules-common/exports-default/expected.js index a5bcc21f03..9a3b8194a0 100644 --- a/test/fixtures/transformation/modules-common/exports-default/expected.js +++ b/test/fixtures/transformation/modules-common/exports-default/expected.js @@ -1,13 +1,13 @@ "use strict"; -exports.default = 42; -exports.default = {}; -exports.default = []; -exports.default = foo; -exports.default = function () {}; -exports.default = function () {}; +exports["default"] = 42; +exports["default"] = {}; +exports["default"] = []; +exports["default"] = foo; +exports["default"] = function () {}; +exports["default"] = function () {}; function foo() {} -exports.default = foo; +exports["default"] = foo; var Foo = function Foo() {}; -exports.default = Foo; +exports["default"] = Foo; diff --git a/test/fixtures/transformation/modules-common/exports-from/expected.js b/test/fixtures/transformation/modules-common/exports-from/expected.js index 72c66ea2b0..feaeac94ee 100644 --- a/test/fixtures/transformation/modules-common/exports-from/expected.js +++ b/test/fixtures/transformation/modules-common/exports-from/expected.js @@ -10,6 +10,6 @@ exports.foo = require("foo").foo; exports.foo = require("foo").foo; exports.bar = require("foo").bar; exports.bar = require("foo").foo; -exports.default = require("foo").foo; -exports.default = require("foo").foo; -exports.bar = require("foo").bar; \ No newline at end of file +exports["default"] = require("foo").foo; +exports["default"] = require("foo").foo; +exports.bar = require("foo").bar; diff --git a/test/fixtures/transformation/modules-common/exports-named/expected.js b/test/fixtures/transformation/modules-common/exports-named/expected.js index cbd0686693..ce378a6fb0 100644 --- a/test/fixtures/transformation/modules-common/exports-named/expected.js +++ b/test/fixtures/transformation/modules-common/exports-named/expected.js @@ -4,6 +4,6 @@ exports.foo = foo; exports.foo = foo; exports.bar = bar; exports.bar = foo; -exports.default = foo; -exports.default = foo; -exports.bar = bar; \ No newline at end of file +exports["default"] = foo; +exports["default"] = foo; +exports.bar = bar; diff --git a/test/fixtures/transformation/modules-common/imports-default/expected.js b/test/fixtures/transformation/modules-common/imports-default/expected.js index b91e38f915..32db9b239c 100644 --- a/test/fixtures/transformation/modules-common/imports-default/expected.js +++ b/test/fixtures/transformation/modules-common/imports-default/expected.js @@ -1,4 +1,4 @@ "use strict"; -var foo = require("foo").default; -var foo = require("foo").default; \ No newline at end of file +var foo = require("foo")["default"]; +var foo = require("foo")["default"]; diff --git a/test/fixtures/transformation/modules-common/imports-mixing/expected.js b/test/fixtures/transformation/modules-common/imports-mixing/expected.js index 1bdc443e8f..57bcfd38fc 100644 --- a/test/fixtures/transformation/modules-common/imports-mixing/expected.js +++ b/test/fixtures/transformation/modules-common/imports-mixing/expected.js @@ -1,4 +1,4 @@ "use strict"; -var foo = require("foo").default; +var foo = require("foo")["default"]; var xyz = require("foo").baz; diff --git a/test/fixtures/transformation/modules-common/overview/expected.js b/test/fixtures/transformation/modules-common/overview/expected.js index d69bba69fd..614b23e905 100644 --- a/test/fixtures/transformation/modules-common/overview/expected.js +++ b/test/fixtures/transformation/modules-common/overview/expected.js @@ -6,7 +6,7 @@ require("foo-bar"); require("./directory/foo-bar"); -var foo = require("foo").default; +var foo = require("foo")["default"]; var foo = require("foo"); var bar = require("foo").bar; @@ -14,4 +14,4 @@ var bar = require("foo").foo; exports.test = test; var test = exports.test = 5; -exports.default = test; +exports["default"] = test; diff --git a/test/fixtures/transformation/modules-umd/exports-default/expected.js b/test/fixtures/transformation/modules-umd/exports-default/expected.js index 7fc8a6a267..6bf0a88c3f 100644 --- a/test/fixtures/transformation/modules-umd/exports-default/expected.js +++ b/test/fixtures/transformation/modules-umd/exports-default/expected.js @@ -7,15 +7,15 @@ })(function (exports) { "use strict"; - exports.default = 42; - exports.default = {}; - exports.default = []; - exports.default = foo; - exports.default = function () {}; - exports.default = function () {}; + exports["default"] = 42; + exports["default"] = {}; + exports["default"] = []; + exports["default"] = foo; + exports["default"] = function () {}; + exports["default"] = function () {}; function foo() {} - exports.default = foo; + exports["default"] = foo; var Foo = function Foo() {}; - exports.default = Foo; + exports["default"] = Foo; }); diff --git a/test/fixtures/transformation/modules-umd/exports-from/expected.js b/test/fixtures/transformation/modules-umd/exports-from/expected.js index af9fc6b90c..c4015dbf8f 100644 --- a/test/fixtures/transformation/modules-umd/exports-from/expected.js +++ b/test/fixtures/transformation/modules-umd/exports-from/expected.js @@ -17,7 +17,7 @@ exports.foo = _foo.foo; exports.bar = _foo.bar; exports.bar = _foo.foo; - exports.default = _foo.foo; - exports.default = _foo.foo; + exports["default"] = _foo.foo; + exports["default"] = _foo.foo; exports.bar = _foo.bar; }); diff --git a/test/fixtures/transformation/modules-umd/exports-named/expected.js b/test/fixtures/transformation/modules-umd/exports-named/expected.js index b44a502794..ae16b5380b 100644 --- a/test/fixtures/transformation/modules-umd/exports-named/expected.js +++ b/test/fixtures/transformation/modules-umd/exports-named/expected.js @@ -11,7 +11,7 @@ exports.foo = foo; exports.bar = bar; exports.bar = foo; - exports.default = foo; - exports.default = foo; + exports["default"] = foo; + exports["default"] = foo; exports.bar = bar; -}); \ No newline at end of file +}); diff --git a/test/fixtures/transformation/modules-umd/imports-default/expected.js b/test/fixtures/transformation/modules-umd/imports-default/expected.js index 7937c70061..10ec822646 100644 --- a/test/fixtures/transformation/modules-umd/imports-default/expected.js +++ b/test/fixtures/transformation/modules-umd/imports-default/expected.js @@ -7,6 +7,6 @@ })(function (exports, _foo) { "use strict"; - var foo = _foo.default; - var foo = _foo.default; -}); \ No newline at end of file + var foo = _foo["default"]; + var foo = _foo["default"]; +}); diff --git a/test/fixtures/transformation/modules-umd/imports-mixing/expected.js b/test/fixtures/transformation/modules-umd/imports-mixing/expected.js index 42e39a9022..35f4b65e7f 100644 --- a/test/fixtures/transformation/modules-umd/imports-mixing/expected.js +++ b/test/fixtures/transformation/modules-umd/imports-mixing/expected.js @@ -7,6 +7,6 @@ })(function (exports, _foo) { "use strict"; - var foo = _foo.default; + var foo = _foo["default"]; var xyz = _foo.baz; -}); \ No newline at end of file +}); diff --git a/test/fixtures/transformation/modules-umd/overview/expected.js b/test/fixtures/transformation/modules-umd/overview/expected.js index 55d4266b45..6a6a53fdc5 100644 --- a/test/fixtures/transformation/modules-umd/overview/expected.js +++ b/test/fixtures/transformation/modules-umd/overview/expected.js @@ -7,12 +7,12 @@ })(function (exports, _foo, _fooBar, _directoryFooBar) { "use strict"; - var foo = _foo.default; + var foo = _foo["default"]; var foo = _foo; var bar = _foo.bar; var bar = _foo.foo; exports.test = test; var test = exports.test = 5; - exports.default = test; + exports["default"] = test; });