Merge pull request #1388 from NullVoxPopuli/enable-prettier-in-ci

Enable prettier in ci

.prettierignore

@@ -0,0 +1,60 @@
+# No need to run prettier here
+*.md 
+*.yml
+*.html
+*.json
+
+
+# Compiled output
+/packages/core/**/*.js
+/packages/core/**/*.d.ts
+/packages/shared-internals/**/*.js
+/packages/shared-internals/**/*.d.ts
+/packages/compat/**/*.js
+/packages/compat/**/*.d.ts
+/packages/macros/**/*.js
+/packages/macros/**/*.d.ts
+/packages/util/src/**/*.js
+/packages/util/src/**/*.d.ts
+/packages/webpack/**/*.js
+/packages/webpack/**/*.d.ts
+/packages/hbs-loader/**/*.js
+/packages/hbs-loader/**/*.d.ts
+/test-packages/support/**/*.js
+/test-packages/**/*.d.ts
+/tests/scenarios/**/*.js
+/tests/scenarios/**/*.d.ts
+/packages/test-setup/**/*.js
+/packages/test-setup/**/*.d.ts
+/packages/addon-shim/**/*.js
+/packages/addon-shim/**/*.d.ts
+/packages/addon-dev/**/*.js
+/packages/addon-dev/**/*.d.ts
+/tests/fixtures/
+
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/packages/*/dist/
+/packages/*/tmp/
+/test-packages/*/dist/
+/test-packages/*/tmp/
+
+# dependencies
+bower_components/
+node_modules/
+
+# misc
+coverage/
+!.*
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
+
+#types added
+/types/**
+

.prettierrc.js

@@ -1,8 +1,15 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
-  trailingComma: 'es5',
   printWidth: 120,
-  arrowParens: 'avoid',
+  overrides: [
+    {
+      files: '*{js,ts}',
+      options: {
+        trailingComma: 'es5',
+        arrowParens: 'avoid',
+        singleQuote: true,
+      },
+    },
+  ],
 };

package.json

@@ -29,8 +29,12 @@
     "release": "changeset publish",
     "clean": "git clean -x -f",
     "compile": "tsc",
-    "lint": "concurrently 'yarn:lint:*'",
+    "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
+    "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
     "lint:eslint": "eslint . --cache",
+    "lint:eslint:fix": "eslint . --fix",
+    "lint:prettier": "prettier . -c",
+    "lint:prettier:fix": "prettier . -w",
     "lint:router-types": "cd packages/router && yarn lint:types",
     "prepare": "tsc && yarn build-v2-addons",
     "build-v2-addons": "concurrently 'yarn:build-v2-addons:*'",

packages/util/.prettierrc.js

@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

test-packages/sample-transforms/.eslintrc.js

@@ -2,20 +2,14 @@ module.exports = {
   root: true,
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
   },
-  plugins: [
-    'ember'
-  ],
-  extends: [
-    'eslint:recommended',
-    'plugin:ember/recommended'
-  ],
+  plugins: ['ember'],
+  extends: ['eslint:recommended', 'plugin:ember/recommended'],
   env: {
-    browser: true
-  },
-  rules: {
+    browser: true,
   },
+  rules: {},
   overrides: [
     // node files
     {
@@ -27,26 +21,21 @@ module.exports = {
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js'
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**'
+        'tests/dummy/config/**/*.js',
       ],
+      excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015
+        ecmaVersion: 2015,
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
         // add your custom rules and overrides for node files here
-      })
-    }
-  ]
+      }),
+    },
+  ],
 };

test-packages/sample-transforms/.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended'
+  extends: 'recommended',
 };

test-packages/sample-transforms/config/environment.js

@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function(/* environment, appConfig */) {
-  return { };
+module.exports = function (/* environment, appConfig */) {
+  return {};
 };

test-packages/sample-transforms/ember-cli-build.js

@@ -2,7 +2,7 @@
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-module.exports = function(defaults) {
+module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
     // Add options here
   });

test-packages/sample-transforms/tests/dummy/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);

test-packages/sample-transforms/tests/dummy/app/router.js

@@ -3,10 +3,9 @@ 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;

test-packages/sample-transforms/tests/dummy/config/environment.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(environment) {
+module.exports = function (environment) {
   let ENV = {
     modulePrefix: 'dummy',
     environment,
@@ -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') {

test-packages/sample-transforms/tests/dummy/config/targets.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const browsers = [
-  'last 1 Chrome versions',
-  'last 1 Firefox versions',
-  'last 1 Safari versions'
-];
+const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
 
 const isCI = !!process.env.CI;
 const isProduction = process.env.EMBER_ENV === 'production';
@@ -14,5 +10,5 @@ if (isCI || isProduction) {
 }
 
 module.exports = {
-  browsers
+  browsers,
 };

tests/addon-template/.prettierrc.js

@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

tests/app-template/.prettierrc.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = {
+  overrides: [
+    {
+      files: '*{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
+};

tests/app-template/config/targets.js

@@ -1,6 +1,10 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions',
+];
 
 module.exports = {
   browsers,

tests/ts-app-template/app/templates/application.hbs

@@ -1,4 +1,3 @@
 {{page-title "TsAppTemplate"}}
 
-
 {{outlet}}