fix: update prettier to allow optional chaining

mrloop · mrloop · commit c0352d5dc2f9 · 2020-05-02T21:35:46.000+01:00
Current version of prettier complains about optional chaining with ``` Parsing error: Expression expected ``` See prettier/prettier#7088 This prevents the last commit from passing the test suite The suggested fix of upgrading prettier fixes this issue. After upgrading ran `yarn eslint --ext js,ts --fix .` to fix new linting errors.
diff --git a/config/deploy.js b/config/deploy.js
@@ -1,7 +1,7 @@
 /* eslint-env node */
 'use strict';
 
-module.exports = function(deployTarget) {
+module.exports = function (deployTarget) {
   let ENV = {
     build: {},
     // include other plugin configuration that applies to all deploy targets here
diff --git a/config/environment.js b/config/environment.js
@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function(/* environment, appConfig */) {
+module.exports = function (/* environment, appConfig */) {
   return {};
 };
diff --git a/ember-cli-build.js b/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, {
     'ember-cli-babel': {
       throwUnlessParallelizable: true,
diff --git a/package.json b/package.json
@@ -126,7 +126,7 @@
     "in-repo-b": "link:tests/dummy/lib/in-repo-b",
     "loader.js": "4.7.0",
     "mocha": "7.1.0",
-    "prettier": "1.18.2",
+    "prettier": "2.0.5",
     "prettier-eslint": "9.0.1",
     "qunit-dom": "1.1.0",
     "testdouble": "3.13.0",
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -6,19 +6,19 @@ const Router = AddonDocsRouter.extend({
   rootURL: config.rootURL,
 });
 
-Router.map(function() {
-  docsRoute(this, function() {
+Router.map(function () {
+  docsRoute(this, function () {
     this.route('upgrade-notes');
     this.route('configuration');
-    this.route('ts-guide', function() {
+    this.route('ts-guide', function () {
       this.route('with-addons');
       this.route('using-ts-effectively');
       this.route('current-limitations');
     });
-    this.route('troubleshooting', function() {
+    this.route('troubleshooting', function () {
       this.route('conflicting-types');
     });
-    this.route('type-defs', function() {
+    this.route('type-defs', function () {
       this.route('package-names');
     });
   });
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(environment) {
+module.exports = function (environment) {
   let ENV = {
     modulePrefix: 'dummy',
     environment,
diff --git a/tests/integration/components/js-importing-ts-test.js b/tests/integration/components/js-importing-ts-test.js
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-module('Integration | Component | js importing ts', function(hooks) {
+module('Integration | Component | js importing ts', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/tests/integration/components/ts-component-test.js b/tests/integration/components/ts-component-test.js
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-module('Integration | Component | ts component', function(hooks) {
+module('Integration | Component | ts component', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/tests/unit/build-test.ts b/tests/unit/build-test.ts
@@ -7,28 +7,28 @@ import fileB from 'dummy/b';
 import { description as fromAts } from 'in-repo-a/test-support/from-ats';
 import { description as fromTs } from 'dummy/tests/from-ts';
 
-module('Unit | Build', function() {
-  test("in-repo addons' addon trees wind up in the right place", function(assert) {
+module('Unit | Build', function () {
+  test("in-repo addons' addon trees wind up in the right place", function (assert) {
     assert.equal(addonFileA, 'in-repo-a/test-file');
     assert.equal(addonFileB, 'in-repo-b/test-file');
   });
 
-  test("in-repo addons' app trees wind up in the right place", function(assert) {
+  test("in-repo addons' app trees wind up in the right place", function (assert) {
     assert.equal(fileA, 'dummy/a');
     assert.equal(fileB, 'dummy/b');
   });
 
-  test("addon's addon-test-support files end up in <addon-name>/test-support/*", function(assert) {
+  test("addon's addon-test-support files end up in <addon-name>/test-support/*", function (assert) {
     assert.ok(fromAts);
     assert.equal(fromAts, 'From addon-test-support');
   });
 
-  test("addon's test-support files end up in dummy/tests/*", function(assert) {
+  test("addon's test-support files end up in dummy/tests/*", function (assert) {
     assert.ok(fromTs);
     assert.equal(fromTs, 'From test-support');
   });
 
-  test('property initialization occurs in the right order', function(assert) {
+  test('property initialization occurs in the right order', function (assert) {
     class TestClass {
       // we shouldn't encourage folks to write code like this, but tsc ensures
       // that constructor param fields are set before field initializers run
diff --git a/tests/unit/helpers/js-help-test.js b/tests/unit/helpers/js-help-test.js
@@ -1,9 +1,9 @@
 import { jsHelp } from 'dummy/helpers/js-help';
 import { module, test } from 'qunit';
 
-module('Unit | Helper | js help', function() {
+module('Unit | Helper | js help', function () {
   // Replace this with your real tests.
-  test('it works', function(assert) {
+  test('it works', function (assert) {
     let result = jsHelp([42]);
     assert.ok(result);
   });
diff --git a/tests/unit/helpers/typed-help-test.js b/tests/unit/helpers/typed-help-test.js
@@ -1,9 +1,9 @@
 import { typedHelp } from 'dummy/helpers/typed-help';
 import { module, test } from 'qunit';
 
-module('Unit | Helper | typed help', function() {
+module('Unit | Helper | typed help', function () {
   // Replace this with your real tests.
-  test('it works', function(assert) {
+  test('it works', function (assert) {
     let result = typedHelp([42]);
     assert.ok(result);
   });
diff --git a/ts/addon.ts b/ts/addon.ts
@@ -120,7 +120,7 @@ export default addon({
         let checked = false;
         let stew = require('broccoli-stew') as typeof import('broccoli-stew');
 
-        return stew.afterBuild(input, function() {
+        return stew.afterBuild(input, function () {
           if (!checked) {
             checked = true;
             addon._checkForFileCollisions(this.inputPaths[0]);
@@ -152,7 +152,7 @@ export default addon({
   },
 
   _checkBabelVersion() {
-    let babel = this.parent.addons.find(addon => addon.name === 'ember-cli-babel');
+    let babel = this.parent.addons.find((addon) => addon.name === 'ember-cli-babel');
     let version = babel && babel.pkg.version;
     if (!babel || !(semver.gte(version!, '7.7.3') && semver.lt(version!, '8.0.0'))) {
       let versionString = babel ? `version ${babel.pkg.version}` : `no instance of ember-cli-babel`;
@@ -263,7 +263,7 @@ export default addon({
     let childProcess = fork(`${__dirname}/lib/typechecking/worker/launch`);
     let worker = await connect<TypecheckWorker>(childProcess);
 
-    await worker.onTypecheck(status => {
+    await worker.onTypecheck((status) => {
       for (let error of status.errors) {
         this.ui.writeLine(error);
       }
diff --git a/ts/blueprints/ember-cli-typescript/index.js b/ts/blueprints/ember-cli-typescript/index.js
@@ -68,11 +68,12 @@ module.exports = {
     }
 
     return {
-      includes: JSON.stringify(includes.map(include => `${include}/**/*`), null, 2).replace(
-        /\n/g,
-        '\n  '
-      ),
-      pathsFor: dasherizedName => {
+      includes: JSON.stringify(
+        includes.map((include) => `${include}/**/*`),
+        null,
+        2
+      ).replace(/\n/g, '\n  '),
+      pathsFor: (dasherizedName) => {
         // We need to wait to use this module until `ember-cli-typescript-blueprints` has been installed
         let updatePathsForAddon = require('ember-cli-typescript-blueprints/lib/utilities/update-paths-for-addon');
         let appName = isAddon ? 'dummy' : dasherizedName;
@@ -105,12 +106,12 @@ module.exports = {
 
         return JSON.stringify(paths, null, 2).replace(/\n/g, '\n    ');
       },
-      indexDeclarations: dasherizedName => {
+      indexDeclarations: (dasherizedName) => {
         const isDummyApp = dasherizedName === 'dummy';
         const useAppDeclarations = !(isAddon || isDummyApp);
         return useAppDeclarations ? APP_DECLARATIONS : '';
       },
-      globalDeclarations: dasherizedName => {
+      globalDeclarations: (dasherizedName) => {
         /** @type {'classic' | 'pods'} */
         let projectLayout;
         if (isPods) projectLayout = 'pods';
@@ -179,7 +180,7 @@ module.exports = {
     let files = this._super.files.apply(this, arguments);
 
     if (!this._has('ember-data')) {
-      files = files.filter(file => file !== 'types/ember-data/types/registries/model.d.ts');
+      files = files.filter((file) => file !== 'types/ember-data/types/registries/model.d.ts');
     }
 
     return files;
diff --git a/ts/lib/commands/precompile.ts b/ts/lib/commands/precompile.ts
@@ -53,7 +53,7 @@ export default command({
     // Ensure that if we are dealing with an addon that is using a different
     // addon name from its package name, we use the addon name, since that is
     // how it will be written for imports.
-    let addon = this.project.addons.find(addon => addon.root === this.project.root);
+    let addon = this.project.addons.find((addon) => addon.root === this.project.root);
     if (addon && addon.name !== packageName) {
       packageName = addon.name;
     }
diff --git a/ts/lib/typechecking/worker/index.ts b/ts/lib/typechecking/worker/index.ts
@@ -112,7 +112,7 @@ export default class TypecheckWorker {
 
   private formatDiagnostic(diagnostic: Diagnostic) {
     return this.ts.formatDiagnosticsWithColorAndContext([diagnostic], {
-      getCanonicalFileName: path => path,
+      getCanonicalFileName: (path) => path,
       getCurrentDirectory: this.ts.sys.getCurrentDirectory,
       getNewLine: () => this.ts.sys.newLine,
     });
@@ -174,7 +174,7 @@ export default class TypecheckWorker {
       return createProgram.apply(host, params);
     };
 
-    host.afterProgramCreate = program => {
+    host.afterProgramCreate = (program) => {
       // The `afterProgramCreate` callback will be invoked synchronously when we first call
       // `createWatchProgram`, meaning we can enter `didTypecheck` before we're fully set up
       // (e.g. before `compilerOptions` has been set). We use `nextTick` to ensure that
@@ -188,7 +188,7 @@ export default class TypecheckWorker {
   }
 
   private makeStatus(diagnostics: ReadonlyArray<Diagnostic>): TypecheckStatus {
-    let errors = diagnostics.map(d => this.formatDiagnostic(d));
+    let errors = diagnostics.map((d) => this.formatDiagnostic(d));
     let failed = !!(this.compilerOptions.noEmitOnError && errors.length);
     return { errors, failed };
   }
diff --git a/ts/lib/utilities/copy-declarations.ts b/ts/lib/utilities/copy-declarations.ts
@@ -15,10 +15,7 @@ export default function copyDeclarations(
       logicalPath.startsWith(`${packageName}/`) &&
       logicalPath.indexOf('/*') === logicalPath.length - 2
     ) {
-      let subdirectory = logicalPath
-        .replace(packageName, '')
-        .replace('/*', '')
-        .replace(/^\//, '');
+      let subdirectory = logicalPath.replace(packageName, '').replace('/*', '').replace(/^\//, '');
 
       copySubpathDeclarations(output, pathRoots, path.join(destDir, subdirectory), physicalPaths);
     }
diff --git a/ts/tests/acceptance/build-test.ts b/ts/tests/acceptance/build-test.ts
@@ -13,14 +13,14 @@ import {
 
 const { expect } = chai;
 
-describe('Acceptance: build', function() {
+describe('Acceptance: build', function () {
   this.timeout(60 * 1000);
   let app: SkeletonApp;
-  beforeEach(function() {
+  beforeEach(function () {
     app = new SkeletonApp();
   });
 
-  afterEach(function() {
+  afterEach(function () {
     app.teardown();
   });
 
@@ -104,7 +104,7 @@ describe('Acceptance: build', function() {
 
   it('emits a warning when .js and .ts files conflict in the app/ tree', async () => {
     // Set up an in-repo addon
-    app.updatePackageJSON(pkg => {
+    app.updatePackageJSON((pkg) => {
       pkg['ember-addon'].paths.push('lib/in-repo-addon');
     });
 
@@ -153,9 +153,9 @@ function extractModuleBody(script: string, moduleName: string) {
   let parsed = esprima.parseScript(script);
   let [definition] = parsed.body
     .filter(isExpressionStatement)
-    .map(stmt => stmt.expression)
+    .map((stmt) => stmt.expression)
     .filter(isSpecialCallExpression)
-    .filter(expr => expr.arguments[0].value === moduleName);
+    .filter((expr) => expr.arguments[0].value === moduleName);
   if (!definition) throw new Error('Definition for call expression not found');
   let moduleDef = definition.arguments[2].body;
 
diff --git a/ts/tests/blueprints/ember-cli-typescript-test.ts b/ts/tests/blueprints/ember-cli-typescript-test.ts
@@ -11,21 +11,21 @@ import ects from '../../blueprints/ember-cli-typescript/index';
 const expect = chaiHelpers.expect;
 const file = chaiHelpers.file;
 
-describe('Acceptance: ember-cli-typescript generator', function() {
+describe('Acceptance: ember-cli-typescript generator', function () {
   helpers.setupTestHooks(this, {
     disabledTasks: ['addon-install', 'bower-install'],
   });
 
   const originalTaskForFn = Blueprint.prototype.taskFor;
 
-  beforeEach(function() {
-    Blueprint.prototype.taskFor = function(taskName) {
+  beforeEach(function () {
+    Blueprint.prototype.taskFor = function (taskName) {
       if (taskName === 'npm-install') {
         // Mock npm-install that only modifies package.json
         return {
-          run: function(options: { packages: string[] }) {
+          run: function (options: { packages: string[] }) {
             let pkgJson = fs.readJsonSync('package.json');
-            options.packages.forEach(function(pkg) {
+            options.packages.forEach(function (pkg) {
               let pkgName = pkg.match(/^(.*)@[^@]*$/);
               if (!pkgName) throw new Error(`Improperly-formatted package name: ${pkgName}`);
               pkgJson['devDependencies'][pkgName[1]] = '*';
@@ -38,7 +38,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
     };
   });
 
-  afterEach(function() {
+  afterEach(function () {
     Blueprint.prototype.taskFor = originalTaskForFn;
   });
 
@@ -149,7 +149,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
     expect(emberDataCatchallTypes).not.to.exist;
   });
 
-  it('moves from devDependencies to dependencies for addons', async function() {
+  it('moves from devDependencies to dependencies for addons', async function () {
     const args = ['ember-cli-typescript'];
 
     await helpers.emberNew({ target: 'addon' });
@@ -280,7 +280,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
     ]);
   });
 
-  describe('ember-mocha', function() {
+  describe('ember-mocha', function () {
     it('app with ember-cli-mocha', async () => {
       const args = ['ember-cli-typescript'];
 
diff --git a/ts/tests/commands/clean-test.ts b/ts/tests/commands/clean-test.ts
@@ -9,7 +9,7 @@ const emberNew = blueprintHelpers.emberNew;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Acceptance: ts:clean command', function() {
+describe('Acceptance: ts:clean command', function () {
   setupTestHooks(this);
 
   beforeEach(async () => {
diff --git a/ts/tests/commands/precompile-test.ts b/ts/tests/commands/precompile-test.ts
diff --git a/ts/tests/helpers/skeleton-app.ts b/ts/tests/helpers/skeleton-app.ts
diff --git a/ts/tests/unit/copy-declarations-test.ts b/ts/tests/unit/copy-declarations-test.ts
diff --git a/yarn.lock b/yarn.lock
