Merge pull request #119 from Kerrick/upgrade-acorn

Upgrade acorn to v5.x
ef4 · Jun 29, 2017 · ee8f7fa · ee8f7fa
2 parents e249253 + 0dd24b8
commit ee8f7fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/stubs.js b/lib/stubs.js
@@ -67,7 +67,7 @@ function importsFor(src, fullPath) {
   var result = tryCatch(parseEs5, src);
   // If a syntax error is thrown, we assume this is because src is es6 code.
   if (result instanceof Error) {
-    result = tryCatch(parseEs6, src);
+    result = tryCatch(parseEs8, src);
   }
 
   // If result is still an error, there must have been a parse error
@@ -96,7 +96,9 @@ function head(array) {
 function parseEs5(src) {
   var imports = {};
 
-  var ast = acorn.parse(src);
+  var ast = acorn.parse(src, {
+    ecmaVersion: 5
+  });
 
   forEachNode(ast, function(entry) {
     if (entry.type === 'CallExpression' && entry.callee.name === 'define') {
@@ -112,11 +114,11 @@ function parseEs5(src) {
   return imports;
 }
 
-function parseEs6(src) {
+function parseEs8(src) {
   var imports = {};
 
   var ast = acorn.parse(src, {
-    ecmaVersion: 6,
+    ecmaVersion: 8,
     sourceType: 'module'
   });
 

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "sinon-chai": "^2.6.0"
   },
   "dependencies": {
-    "acorn": "^2.6.4",
+    "acorn": "^5.0.3",
     "broccoli-caching-writer": "^3.0.3",
     "broccoli-kitchen-sink-helpers": "^0.3.1",
     "broccoli-merge-trees": "^1.1.2",