Merge pull request #704 from Gaurav0/update_ember_to_3.16

Update ember to 3.16

Author: Gaurav0

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -24,7 +24,7 @@ module.exports = {
     CodeMirror: false
   },
   rules: {
-    'ember/new-module-imports': 'off'
+    'ember/no-new-mixins': 'off'
   },
   overrides: [
     // node files

.travis.yml

@@ -20,6 +20,11 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
+branches:
+  only:
+    - master
+    - release
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH

app/app.js

@@ -1,14 +1,12 @@
 import Application from '@ember/application';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver
-});
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;

app/components/user-menu.js

@@ -28,6 +28,9 @@ export default Component.extend({
 
       case 'staging':
         return `${baseLink}/commit/${currentRevision}`;
+
+      default:
+        return '';
     }
   }),
 

app/mixins/files.js

@@ -112,11 +112,21 @@ export default Mixin.create({
     //strip file extension if present
     path = path.replace(/\.[^/.]+$/, "");
 
+    let isGlimmer = false; // TODO: decide how to let user choose
+
     if (this.isPathInvalid('component', path)) {
       return;
     }
     ['js', 'hbs'].forEach((fileExt, i)=>{
-      let fileProperties = this.emberCli.buildProperties(`component-${fileExt}`);
+      let replacements = {};
+      if (fileExt === 'js') {
+        replacements.importComponent = isGlimmer ?
+          `import Component from '@glimmer/component';` :
+          `import Component from '@ember/component';`;
+        replacements.importTemplate = '';
+        replacements.defaultExport = "class extends Component {\n}";
+      }
+      let fileProperties = this.emberCli.buildProperties(`component-${fileExt}`, replacements);
       let notPodPrefix = "components/";
       let filePath;
       if (path.substr(0, notPodPrefix.length) === notPodPrefix) {

app/mixins/test-files.js

@@ -56,14 +56,16 @@ export default Mixin.create({
     let openComponent = descriptor => `<${descriptor}>`;
     let closeComponent = descriptor => `</${descriptor}>`;
     let selfCloseComponent = descriptor => `<${descriptor} />`;
+    let hbsImportStatement = `import hbs from 'htmlbars-inline-precomipile';`;
 
     const fileProperties = this.emberCli.buildProperties(blueprint, {
       testType: 'integration',
       componentName: camelizedName,
       friendlyTestDescription: 'TODO: put something here',
       openComponent,
       closeComponent,
-      selfCloseComponent
+      selfCloseComponent,
+      hbsImportStatement
     });
 
     if (this.isPathInvalid(blueprint, filePath)) {

app/router.js

@@ -1,10 +1,10 @@
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = EmberRouter.extend({
-  location: config.locationType,
-  rootURL: config.rootURL
-});
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function() {
   this.route('gist', {path: '/'}, function() {
@@ -19,5 +19,3 @@ Router.map(function() {
   this.route('twiddles');
   this.route('catchall', { path: '*:' });
 });
-
-export default Router;

app/templates/components/.gitkeep

@@ -0,0 +1,14 @@
+import Application from '@ember/application';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
+import config from './config/environment';
+
+const App = Application.extend({
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
+  Resolver
+});
+
+loadInitializers(App, config.modulePrefix);
+
+export default App;