Breaking: require Node.js 6+, upgrade acorn-jsx@4.1.1 (fixes #345) (#371

) * Breaking: upgrade acorn-jsx@4.1.1 (fixes #345) * Fix: Literal => JSXText * fix regex value * fix regex value (+1 squashed commit) Squashed commits: [46261f6] fix regexp on node 9 * Build: add node 8, 9 * Breaking: drop supporting node 4. * require node>6.0.0 * remove node 4, 5 * use conditionalRegex * fix misspelling
eslint · Mar 23, 2018 · 0df063f · 0df063f
1 parent 0252144
commit 0df063f
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language: node_js
 sudo: false
 node_js:
-    - "0.10"
-    - "0.12"
-    - 4
-    - 5
     - 6
     - 7
+    - 8
+    - 9
 after_success:
     - npm run coveralls
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "espree.js"
   ],
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=6.0.0"
   },
   "repository": "eslint/espree",
   "bugs": {
@@ -19,7 +19,7 @@
   "license": "BSD-2-Clause",
   "dependencies": {
     "acorn": "^5.5.1",
-    "acorn-jsx": "^3.0.0"
+    "acorn-jsx": "^4.1.1"
   },
   "devDependencies": {
     "browserify": "^7.0.0",

diff --git a/tests/fixtures/ecma-features/jsx/embedded-invalid-js-identifier.result.js b/tests/fixtures/ecma-features/jsx/embedded-invalid-js-identifier.result.js
@@ -177,7 +177,7 @@ module.exports = {
                         "children": []
                     },
                     {
-                        "type": "Literal",
+                        "type": "JSXText",
                         "loc": {
                             "start": {
                                 "line": 1,

diff --git a/tests/fixtures/ecma-features/jsx/embedded-tags.result.js b/tests/fixtures/ecma-features/jsx/embedded-tags.result.js
@@ -279,7 +279,7 @@ module.exports = {
                                 },
                                 "children": [
                                     {
-                                        "type": "Literal",
+                                        "type": "JSXText",
                                         "loc": {
                                             "start": {
                                                 "line": 1,

diff --git a/tests/fixtures/ecma-features/jsx/multiple-blank-spaces.result.js b/tests/fixtures/ecma-features/jsx/multiple-blank-spaces.result.js
@@ -121,7 +121,7 @@ module.exports = {
                 },
                 "children": [
                     {
-                        "type": "Literal",
+                        "type": "JSXText",
                         "loc": {
                             "start": {
                                 "line": 1,

diff --git a/tests/fixtures/ecma-features/jsx/namespaced-attribute-and-value-inserted.result.js b/tests/fixtures/ecma-features/jsx/namespaced-attribute-and-value-inserted.result.js
@@ -211,7 +211,7 @@ module.exports = {
                 },
                 "children": [
                     {
-                        "type": "Literal",
+                        "type": "JSXText",
                         "loc": {
                             "start": {
                                 "line": 1,
@@ -265,7 +265,7 @@ module.exports = {
                         }
                     },
                     {
-                        "type": "Literal",
+                        "type": "JSXText",
                         "loc": {
                             "start": {
                                 "line": 1,

diff --git a/tests/fixtures/ecma-features/jsx/template-strings-in-jsx-complex.result.js b/tests/fixtures/ecma-features/jsx/template-strings-in-jsx-complex.result.js
@@ -445,7 +445,7 @@ module.exports = {
                                                             },
                                                             "children": [
                                                                 {
-                                                                    "type": "Literal",
+                                                                    "type": "JSXText",
                                                                     "loc": {
                                                                         "start": {
                                                                             "line": 6,
@@ -727,7 +727,7 @@ module.exports = {
                                                                     "children": []
                                                                 },
                                                                 {
-                                                                    "type": "Literal",
+                                                                    "type": "JSXText",
                                                                     "loc": {
                                                                         "start": {
                                                                             "line": 7,
@@ -1009,7 +1009,7 @@ module.exports = {
                                                                     "children": []
                                                                 },
                                                                 {
-                                                                    "type": "Literal",
+                                                                    "type": "JSXText",
                                                                     "loc": {
                                                                         "start": {
                                                                             "line": 8,

diff --git a/tests/fixtures/ecma-features/jsx/test-content.result.js b/tests/fixtures/ecma-features/jsx/test-content.result.js
@@ -121,7 +121,7 @@ module.exports = {
                 },
                 "children": [
                     {
-                        "type": "Literal",
+                        "type": "JSXText",
                         "loc": {
                             "start": {
                                 "line": 1,

diff --git a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-simple.result.js b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-simple.result.js
@@ -1,4 +1,4 @@
-var conditionalRegex = require("../../../../lib/conditional-regex-value");
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
 
 module.exports = {
     "type": "Program",

diff --git a/tests/fixtures/ecma-version/6/regexYFlag/regexp-y-simple.result.js b/tests/fixtures/ecma-version/6/regexYFlag/regexp-y-simple.result.js
@@ -1,4 +1,4 @@
-var conditionalRegex = require("../../../../lib/conditional-regex-value");
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
 
 module.exports = {
     "type": "Program",

diff --git a/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-negative-1.result.js b/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-negative-1.result.js
@@ -1,3 +1,5 @@
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
+
 module.exports = {
     "type": "Program",
     "loc": {
@@ -31,7 +33,7 @@ module.exports = {
                 0,
                 8
             ],
-            "expression": {
+            "expression": conditionalRegex({
                 "type": "Literal",
                 "loc": {
                     "start": {
@@ -47,13 +49,12 @@ module.exports = {
                     0,
                     8
                 ],
-                "value": null,
                 "raw": "/(?<!a)/",
                 "regex": {
                     "pattern": "(?<!a)",
                     "flags": ""
                 }
-            }
+            })
         }
     ],
     "sourceType": "script",
@@ -81,4 +82,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-negative-2.result.js b/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-negative-2.result.js
@@ -1,3 +1,5 @@
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
+
 module.exports = {
     "type": "Program",
     "loc": {
@@ -31,7 +33,7 @@ module.exports = {
                 0,
                 9
             ],
-            "expression": {
+            "expression": conditionalRegex({
                 "type": "Literal",
                 "loc": {
                     "start": {
@@ -47,13 +49,12 @@ module.exports = {
                     0,
                     9
                 ],
-                "value": null,
                 "raw": "/(?<!a)/u",
                 "regex": {
                     "pattern": "(?<!a)",
                     "flags": "u"
                 }
-            }
+            })
         }
     ],
     "sourceType": "script",
@@ -81,4 +82,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-positive-1.result.js b/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-positive-1.result.js
@@ -1,3 +1,5 @@
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
+
 module.exports = {
     "type": "Program",
     "loc": {
@@ -31,7 +33,7 @@ module.exports = {
                 0,
                 8
             ],
-            "expression": {
+            "expression": conditionalRegex({
                 "type": "Literal",
                 "loc": {
                     "start": {
@@ -47,13 +49,12 @@ module.exports = {
                     0,
                     8
                 ],
-                "value": null,
                 "raw": "/(?<=a)/",
                 "regex": {
                     "pattern": "(?<=a)",
                     "flags": ""
                 }
-            }
+            })
         }
     ],
     "sourceType": "script",
@@ -81,4 +82,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-positive-2.result.js b/tests/fixtures/ecma-version/9/regexp-lookbehind-assertion/valid-positive-2.result.js
@@ -1,3 +1,5 @@
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
+
 module.exports = {
     "type": "Program",
     "loc": {
@@ -31,7 +33,7 @@ module.exports = {
                 0,
                 9
             ],
-            "expression": {
+            "expression": conditionalRegex({
                 "type": "Literal",
                 "loc": {
                     "start": {
@@ -47,13 +49,12 @@ module.exports = {
                     0,
                     9
                 ],
-                "value": null,
                 "raw": "/(?<=a)/u",
                 "regex": {
                     "pattern": "(?<=a)",
                     "flags": "u"
                 }
-            }
+            })
         }
     ],
     "sourceType": "script",

diff --git a/tests/fixtures/ecma-version/9/regexp-s-flag/s-flag.result.js b/tests/fixtures/ecma-version/9/regexp-s-flag/s-flag.result.js
@@ -1,3 +1,5 @@
+const conditionalRegex = require("../../../../lib/conditional-regex-value");
+
 module.exports = {
     "type": "Program",
     "loc": {
@@ -31,7 +33,7 @@ module.exports = {
                 0,
                 4
             ],
-            "expression": {
+            "expression": conditionalRegex({
                 "type": "Literal",
                 "loc": {
                     "start": {
@@ -47,13 +49,12 @@ module.exports = {
                     0,
                     4
                 ],
-                "value": null,
                 "raw": "/./s",
                 "regex": {
                     "pattern": ".",
                     "flags": "s"
                 }
-            }
+            })
         }
     ],
     "sourceType": "script",