Merge remote-tracking branch 'origin/release' into beta

rwjblue · Jan 11, 2018 · fa6b80b · fa6b80b
2 parents 1652efe + d3d90a7
commit fa6b80b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js
@@ -28,7 +28,8 @@ module.exports = {
       ],<% if (blueprint !== 'app') { %>
       excludedFiles: [
         'app/**',
-        'addon/**'
+        'addon/**',
+        'tests/dummy/app/**'
       ],<% } %>
       parserOptions: {
         sourceType: 'script',

diff --git a/tests/fixtures/addon/npm/.eslintrc.js b/tests/fixtures/addon/npm/.eslintrc.js
@@ -28,7 +28,8 @@ module.exports = {
       ],
       excludedFiles: [
         'app/**',
-        'addon/**'
+        'addon/**',
+        'tests/dummy/app/**'
       ],
       parserOptions: {
         sourceType: 'script',

diff --git a/tests/fixtures/addon/yarn/.eslintrc.js b/tests/fixtures/addon/yarn/.eslintrc.js
@@ -28,7 +28,8 @@ module.exports = {
       ],
       excludedFiles: [
         'app/**',
-        'addon/**'
+        'addon/**',
+        'tests/dummy/app/**'
       ],
       parserOptions: {
         sourceType: 'script',