Merge branch 'master' into upgrade-b-c-ts-again

Author: chriskrycho

.gitignore

@@ -15,7 +15,6 @@
 /libpeerconnection.log
 npm-debug.log*
 testem.log
-yarn.lock
 
 # TypeScript
 jsconfig.json

README.md

@@ -93,6 +93,12 @@ on the background and roadmap for the project.
 
 [typing-your-ember]: http://www.chriskrycho.com/typing-your-ember.html
 
+## Environment configuration typings
+
+Along with the @types/ files mentioned above, ember-cli-typescript adds a
+starter interface for `config/environment.js` in `config/environment.d.ts`.
+This interface will likely require some changes to match your app.
+
 ## :construction: Using ember-cli-typescript with Ember CLI addons
 
 **:warning: Warning: this is *not* currently recommended. This is a WIP part of

blueprints/ember-cli-typescript/files/app/config/environment.d.ts

@@ -11,6 +11,6 @@ declare namespace config {
   export var environment: any;
   export var modulePrefix: string;
   export var podModulePrefix: string;
-  export var locationType: string;    
+  export var locationType: string;
   export var rootURL: string;
 }

blueprints/ember-cli-typescript/index.js

@@ -28,7 +28,7 @@ module.exports = {
 
   locals() {
     return {
-      inRepoAddons: (this.project.pkg['ember-addon'] || {}).paths || []
+      inRepoAddons: (this.project.pkg['ember-addon'] || {}).paths || [],
     };
   },
 
@@ -38,10 +38,10 @@ module.exports = {
 
   afterInstall() {
     return this.addPackagesToProject([
-      { name: 'typescript', target: '^2.4.2' },
-      { name: '@types/ember', target: '^2.7.43' },
-      { name: '@types/rsvp', target: '^3.3.0' },
-      { name: '@types/ember-testing-helpers' },
+      { name: 'typescript', target: 'latest' },
+      { name: '@types/ember', target: 'latest' },
+      { name: '@types/rsvp', target: 'latest' },
+      { name: '@types/ember-testing-helpers', target: 'latest' },
     ]);
   },
 };

config/ember-try.js

@@ -5,87 +5,87 @@ module.exports = {
       name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          'ember': 'components/ember#lts-2-4'
+          ember: 'components/ember#lts-2-4',
         },
         resolutions: {
-          'ember': 'lts-2-4'
-        }
+          ember: 'lts-2-4',
+        },
       },
       npm: {
         devDependencies: {
-          'ember-source': null
-        }
-      }
+          'ember-source': null,
+        },
+      },
     },
     {
       name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          'ember': 'components/ember#lts-2-8'
+          ember: 'components/ember#lts-2-8',
         },
         resolutions: {
-          'ember': 'lts-2-8'
-        }
+          ember: 'lts-2-8',
+        },
       },
       npm: {
         devDependencies: {
-          'ember-source': null
-        }
-      }
+          'ember-source': null,
+        },
+      },
     },
     {
       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: {},
+      },
+    },
+  ],
 };

config/environment.js

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

index.js

@@ -5,7 +5,6 @@ const path = require('path');
 const SilentError = require('silent-error');
 const TsPreprocessor = require('./lib/typescript-preprocessor');
 
-
 module.exports = {
   name: 'ember-cli-typescript',
 
@@ -18,18 +17,23 @@ module.exports = {
 
       this.ui.writeInfoLine(
         'Skipping TypeScript preprocessing as there is no tsconfig.json. ' +
-        '(If this is during installation of the add-on, this is as expected. If it is ' +
-        'while building, serving, or testing the application, this is an error.)'
+          '(If this is during installation of the add-on, this is as expected. If it is ' +
+          'while building, serving, or testing the application, this is an error.)'
       );
       return;
     }
 
     try {
-      registry.add('js', new TsPreprocessor({
-        ui: this.ui
-      }));
+      registry.add(
+        'js',
+        new TsPreprocessor({
+          ui: this.ui,
+        })
+      );
     } catch (ex) {
-      throw new SilentError(`Failed to instantiate TypeScript preprocessor, probably due to an invalid tsconfig.json. Please fix or run \`ember generate ember-cli-typescript\`.\n${ex}`);
+      throw new SilentError(
+        `Failed to instantiate TypeScript preprocessor, probably due to an invalid tsconfig.json. Please fix or run \`ember generate ember-cli-typescript\`.\n${ex}`
+      );
     }
   },
 };

lib/typescript-preprocessor.js

@@ -50,10 +50,7 @@ class TypeScriptPreprocessor {
     });
     tsc.setDiagnosticWriter(this.ui.writeWarnLine.bind(this.ui));
 
-    const ts = debugTree(
-      tsc,
-      `${this._tag}`
-    );
+    const ts = debugTree(tsc, `${this._tag}`);
 
     // Put everything together.
     return mergeTrees([js, ts], {

node-tests/blueprints/ember-cli-typescript-test.js

@@ -5,7 +5,7 @@ const path = require('path');
 const {
   setupTestHooks,
   emberNew,
-  emberGenerate
+  emberGenerate,
 } = require('ember-cli-blueprint-test-helpers/helpers');
 const { expect, file } = require('ember-cli-blueprint-test-helpers/chai');
 
@@ -23,10 +23,10 @@ describe('Acceptance: ember-cli-typescript generator', function() {
 
         const json = JSON.parse(tsconfig.content);
         expect(json.compilerOptions.paths).to.deep.equal({
-          'my-app/tests/*': [ 'tests/*' ],
-          'my-app/*': [ 'app/*' ]
+          'my-app/tests/*': ['tests/*'],
+          'my-app/*': ['app/*'],
         });
-    });
+      });
   });
 
   it('in-repo addons', function() {
@@ -37,10 +37,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
         const packagePath = path.resolve(process.cwd(), 'package.json');
         const contents = JSON.parse(fs.readFileSync(packagePath, { encoding: 'utf8' }));
         contents['ember-addon'] = {
-          paths: [
-            'lib/my-addon-1',
-            'lib/my-addon-2'
-          ]
+          paths: ['lib/my-addon-1', 'lib/my-addon-2'],
         };
         fs.writeFileSync(packagePath, JSON.stringify(contents, null, 2));
       })
@@ -51,14 +48,9 @@ describe('Acceptance: ember-cli-typescript generator', function() {
 
         const json = JSON.parse(tsconfig.content);
         expect(json.compilerOptions.paths).to.deep.equal({
-          'my-app/tests/*': [ 'tests/*' ],
-          'my-app/*': [
-            'app/*',
-            'lib/my-addon-1/app/*',
-            'lib/my-addon-2/app/*',
-          ]
+          'my-app/tests/*': ['tests/*'],
+          'my-app/*': ['app/*', 'lib/my-addon-1/app/*', 'lib/my-addon-2/app/*'],
         });
       });
   });
-
 });

package.json

@@ -45,7 +45,7 @@
     "broccoli-asset-rev": "^2.4.5",
     "ember-cli": "^2.13.3",
     "ember-cli-app-version": "^2.0.0",
-    "ember-cli-blueprint-test-helpers": "^0.17.2",
+    "ember-cli-blueprint-test-helpers": "^0.18.3",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-eslint": "^3.0.0",
     "ember-cli-htmlbars": "^1.1.1",
@@ -76,5 +76,12 @@
     "before": [
       "ember-cli-babel"
     ]
+  },
+  "prettier": {
+    "printWidth": 100,
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "tabWidth": 2
   }
 }