Repository: ember-cli/ember-cli
Pull request #7453 (2017-11-21 05:16:24)

Revert "Add prettier and eslint-plugin-ember to linting config."
Reverts ember-cli/ember-cli#7450

Discussed with @kellyselden in slack, he would like more discussion before landing so this PR reverts for now.


Patch:
diff --git a/blueprints/addon/files/addon-config/ember-try.js b/blueprints/addon/files/addon-config/ember-try.js
index 0a6fdce51..1ab8ae562 100644
--- a/blueprints/addon/files/addon-config/ember-try.js
+++ b/blueprints/addon/files/addon-config/ember-try.js
@@ -5,71 +5,71 @@ module.exports = {
       name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0',
-        },
-      },
+          'ember-source': '~2.12.0'
+        }
+      }
     },
     {
       name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': '~2.16.0',
-        },
-      },
+          'ember-source': '~2.16.0'
+        }
+      }
     },
     {
       name: 'ember-release',
       bower: {
         dependencies: {
-          ember: 'components/ember#release',
+          'ember': 'components/ember#release'
         },
         resolutions: {
-          ember: 'release',
-        },
+          'ember': 'release'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-beta',
       bower: {
         dependencies: {
-          ember: 'components/ember#beta',
+          'ember': 'components/ember#beta'
         },
         resolutions: {
-          ember: 'beta',
-        },
+          'ember': 'beta'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-canary',
       bower: {
         dependencies: {
-          ember: 'components/ember#canary',
+          'ember': 'components/ember#canary'
         },
         resolutions: {
-          ember: 'canary',
-        },
+          'ember': 'canary'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-default',
       npm: {
-        devDependencies: {},
-      },
-    },
-  ],
+        devDependencies: {}
+      }
+    }
+  ]
 };
diff --git a/blueprints/addon/files/addon-config/environment.js b/blueprints/addon/files/addon-config/environment.js
index 9707ea62a..0dfaed472 100644
--- a/blueprints/addon/files/addon-config/environment.js
+++ b/blueprints/addon/files/addon-config/environment.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
-  return {};
+  return { };
 };
diff --git a/blueprints/addon/files/index.js b/blueprints/addon/files/index.js
index 1fbb6a2a1..8eaaa2f0c 100644
--- a/blueprints/addon/files/index.js
+++ b/blueprints/addon/files/index.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  name: '<%= addonModulePrefix %>',
+  name: '<%= addonModulePrefix %>'
 };
diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js
index e660d625f..450138401 100644
--- a/blueprints/app/files/.eslintrc.js
+++ b/blueprints/app/files/.eslintrc.js
@@ -2,19 +2,13 @@ module.exports = {
   root: true,
   parserOptions: {
     ecmaVersion: 2017,
-    sourceType: 'module',
+    sourceType: 'module'
   },
-  extends: ['eslint:recommended', 'prettier', 'plugin:ember/recommended'],
-  plugins: ['prettier', 'ember'],
+  extends: 'eslint:recommended',
   env: {
-    browser: true,
+    browser: true
   },
   rules: {
-    'prettier/prettier': ['error', {
-      singleQuote: true,
-      trailingComma: 'es5',
-      printWidth: 120,
-    }],
   },
   overrides: [
     // node files
@@ -24,15 +18,15 @@ module.exports = {
         'testem.js',
         'ember-cli-build.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js',
+        'tests/dummy/config/**/*.js'
       ],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015,
+        ecmaVersion: 2015
       },
       env: {
         browser: false,
-        node: true,
+        node: true
       }
     },
 
@@ -41,8 +35,8 @@ module.exports = {
       files: ['tests/**/*.js'],
       excludedFiles: ['tests/dummy/**/*.js'],
       env: {
-        embertest: true,
-      },
-    },
-  ],
+        embertest: true
+      }
+    }
+  ]
 };
diff --git a/blueprints/app/files/app/app.js b/blueprints/app/files/app/app.js
index f08aaaf03..b3b2bd677 100644
--- a/blueprints/app/files/app/app.js
+++ b/blueprints/app/files/app/app.js
@@ -6,7 +6,7 @@ import config from './config/environment';
 const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver,
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);
diff --git a/blueprints/app/files/app/router.js b/blueprints/app/files/app/router.js
index 8f6f45989..d0bb00952 100644
--- a/blueprints/app/files/app/router.js
+++ b/blueprints/app/files/app/router.js
@@ -3,9 +3,10 @@ import config from './config/environment';
 
 const Router = EmberRouter.extend({
   location: config.locationType,
-  rootURL: config.rootURL,
+  rootURL: config.rootURL
 });
 
-Router.map(function() {});
+Router.map(function() {
+});
 
 export default Router;
diff --git a/blueprints/app/files/config/environment.js b/blueprints/app/files/config/environment.js
index d8533ae56..1e14621c9 100644
--- a/blueprints/app/files/config/environment.js
+++ b/blueprints/app/files/config/environment.js
@@ -13,14 +13,14 @@ module.exports = function(environment) {
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
-        Date: false,
-      },
+        Date: false
+      }
     },
 
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
-    },
+    }
   };
 
   if (environment === 'development') {
diff --git a/blueprints/app/files/config/targets.js b/blueprints/app/files/config/targets.js
index 071439de3..082e68b51 100644
--- a/blueprints/app/files/config/targets.js
+++ b/blueprints/app/files/config/targets.js
@@ -1,3 +1,8 @@
 module.exports = {
-  browsers: ['ie 9', 'last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'],
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
 };
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index a8522f7e8..37564ef61 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -36,11 +36,7 @@
     "ember-resolver": "^4.0.0",
     "ember-source": "~2.17.0-beta.2<% if (welcome) { %>",
     "ember-welcome-page": "^3.0.0<% } %>",
-    "eslint-config-prettier": "^2.7.0",
-    "eslint-plugin-ember": "^5.0.0",
-    "eslint-plugin-prettier": "^2.3.1",
-    "loader.js": "^4.2.3",
-    "prettier": "^1.8.2"
+    "loader.js": "^4.2.3"
   },
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"


Test patch:
diff --git a/blueprints/app/files/testem.js b/blueprints/app/files/testem.js
index 219ca13fb..10ecc1045 100644
--- a/blueprints/app/files/testem.js
+++ b/blueprints/app/files/testem.js
@@ -1,12 +1,21 @@
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  launch_in_ci: ['Chrome'],
-  launch_in_dev: ['Chrome'],
+  launch_in_ci: [
+    'Chrome'
+  ],
+  launch_in_dev: [
+    'Chrome'
+  ],
   browser_args: {
     Chrome: {
       mode: 'ci',
-      args: ['--disable-gpu', '--headless', '--remote-debugging-port=0', '--window-size=1440,900'],
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ]
     },
-  },
+  }
 };
diff --git a/blueprints/app/files/tests/helpers/module-for-acceptance.js b/blueprints/app/files/tests/helpers/module-for-acceptance.js
index 364089288..90a93bac2 100644
--- a/blueprints/app/files/tests/helpers/module-for-acceptance.js
+++ b/blueprints/app/files/tests/helpers/module-for-acceptance.js
@@ -16,6 +16,6 @@ export default function(name, options = {}) {
     afterEach() {
       let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
       return resolve(afterEach).then(() => destroyApp(this.application));
-    },
+    }
   });
 }
diff --git a/tests/fixtures/addon/npm/config/ember-try.js b/tests/fixtures/addon/npm/config/ember-try.js
index 1732ac436..1c31c5491 100644
--- a/tests/fixtures/addon/npm/config/ember-try.js
+++ b/tests/fixtures/addon/npm/config/ember-try.js
@@ -4,71 +4,71 @@ module.exports = {
       name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0',
-        },
-      },
+          'ember-source': '~2.12.0'
+        }
+      }
     },
     {
       name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': '~2.16.0',
-        },
-      },
+          'ember-source': '~2.16.0'
+        }
+      }
     },
     {
       name: 'ember-release',
       bower: {
         dependencies: {
-          ember: 'components/ember#release',
+          'ember': 'components/ember#release'
         },
         resolutions: {
-          ember: 'release',
-        },
+          'ember': 'release'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-beta',
       bower: {
         dependencies: {
-          ember: 'components/ember#beta',
+          'ember': 'components/ember#beta'
         },
         resolutions: {
-          ember: 'beta',
-        },
+          'ember': 'beta'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-canary',
       bower: {
         dependencies: {
-          ember: 'components/ember#canary',
+          'ember': 'components/ember#canary'
         },
         resolutions: {
-          ember: 'canary',
-        },
+          'ember': 'canary'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-default',
       npm: {
-        devDependencies: {},
-      },
-    },
-  ],
+        devDependencies: {}
+      }
+    }
+  ]
 };
diff --git a/tests/fixtures/addon/yarn/config/ember-try.js b/tests/fixtures/addon/yarn/config/ember-try.js
index 1de83a7f7..1a4a5bbd3 100644
--- a/tests/fixtures/addon/yarn/config/ember-try.js
+++ b/tests/fixtures/addon/yarn/config/ember-try.js
@@ -5,71 +5,71 @@ module.exports = {
       name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0',
-        },
-      },
+          'ember-source': '~2.12.0'
+        }
+      }
     },
     {
       name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': '~2.16.0',
-        },
-      },
+          'ember-source': '~2.16.0'
+        }
+      }
     },
     {
       name: 'ember-release',
       bower: {
         dependencies: {
-          ember: 'components/ember#release',
+          'ember': 'components/ember#release'
         },
         resolutions: {
-          ember: 'release',
-        },
+          'ember': 'release'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-beta',
       bower: {
         dependencies: {
-          ember: 'components/ember#beta',
+          'ember': 'components/ember#beta'
         },
         resolutions: {
-          ember: 'beta',
-        },
+          'ember': 'beta'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-canary',
       bower: {
         dependencies: {
-          ember: 'components/ember#canary',
+          'ember': 'components/ember#canary'
         },
         resolutions: {
-          ember: 'canary',
-        },
+          'ember': 'canary'
+        }
       },
       npm: {
         devDependencies: {
-          'ember-source': null,
-        },
-      },
+          'ember-source': null
+        }
+      }
     },
     {
       name: 'ember-default',
       npm: {
-        devDependencies: {},
-      },
-    },
-  ],
+        devDependencies: {}
+      }
+    }
+  ]
 };