Fix linking errors

Author: cibernox

.eslintrc.js

@@ -4,10 +4,54 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js',
+        'lib/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        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 files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };

.npmignore

@@ -1,4 +1,5 @@
 /bower_components
+/config/ember-try.js
 /dist
 /test
 /tests
@@ -7,10 +8,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

app/locations/none.js

@@ -1,16 +1,12 @@
-import Ember from 'ember';
-
-const {
-  computed,
-  computed: { bool, readOnly },
-  inject: { service },
-  get,
-  getOwner
-} = Ember;
+import { computed, get } from '@ember/object';
+import { bool, readOnly } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { getOwner } from '@ember/application'
+import NoneLocation from '@ember/routing/none-location'
 
 const TEMPORARY_REDIRECT_CODE = 307;
 
-export default Ember.NoneLocation.extend({
+export default NoneLocation.extend({
   implementation: 'fastboot',
   fastboot: service(),
 

app/services/fastboot.js

@@ -1,10 +1,12 @@
 /* global FastBoot */
-import Ember from "ember";
-
-const { deprecate, computed, get, assert } = Ember;
-const { deprecatingAlias, readOnly } = computed;
-
-const RequestObject = Ember.Object.extend({
+import { deprecate } from '@ember/application/deprecations';
+import { computed, get } from '@ember/object';
+import { deprecatingAlias, readOnly } from '@ember/object/computed';
+import { assert } from '@ember/debug';
+import EObject from '@ember/object';
+import Service from '@ember/service';
+
+const RequestObject = EObject.extend({
   init() {
     this._super(...arguments);
 
@@ -28,7 +30,7 @@ const RequestObject = Ember.Object.extend({
   })
 });
 
-const Shoebox = Ember.Object.extend({
+const Shoebox = EObject.extend({
   put(key, value) {
     assert('shoebox.put is only invoked from the FastBoot rendered application', this.get('fastboot.isFastBoot'));
     assert('the provided key is a string', typeof key === 'string');
@@ -62,7 +64,7 @@ const Shoebox = Ember.Object.extend({
   }
 });
 
-const FastBootService = Ember.Service.extend({
+const FastBootService = Service.extend({
   cookies: deprecatingAlias('request.cookies', { id: 'fastboot.cookies-to-request', until: '0.9.9' }),
   headers: deprecatingAlias('request.headers', { id: 'fastboot.headers-to-request', until: '0.9.9' }),
   isFastBoot: typeof FastBoot !== 'undefined',

config/environment.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

lib/broccoli/fastboot-config.js

@@ -143,11 +143,10 @@ module.exports = class FastBootConfig extends Plugin {
 
     this.dependencies = dependencies;
     this.moduleWhitelist = uniq(moduleWhitelist);
-  };
+  }
 
   readAssetManifest() {
     let assetMapPath = path.join(this.inputPaths[0], this.assetMapPath);
-    const assetMapEnabled = this.assetMapEnabled;
 
     try {
       let assetMap = JSON.parse(fs.readFileSync(assetMapPath));
@@ -206,10 +205,10 @@ module.exports = class FastBootConfig extends Plugin {
   }
 
   buildHostWhitelist() {
-    if (!!this.fastbootAppConfig) {
+    if (this.fastbootAppConfig) {
       this.hostWhitelist = this.fastbootAppConfig.hostWhitelist;
     }
-  };
+  }
 
   toJSONString() {
     return stringify({

package.json

@@ -14,7 +14,8 @@
   "repository": "https://github.com/ember-fastboot/ember-cli-fastboot",
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
+    "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
+    "start": "ember serve",
     "test": "mocha && ember test",
     "test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js"
   },
@@ -26,7 +27,8 @@
     "chalk": "^2.0.1",
     "ember-cli-babel": "^6.7.2",
     "ember-cli-lodash-subset": "2.0.1",
-    "ember-cli-version-checker": "^2.0.0",
+    "ember-cli-version-checker": "^2.1.0",
+    "ember-cli-preprocess-registry": "^3.1.0",
     "fastboot": "^1.1.0",
     "fastboot-express-middleware": "^1.1.0",
     "fastboot-transform": "^0.1.2",
@@ -43,23 +45,25 @@
     "chai-fs": "^2.0.0",
     "co": "^4.6.0",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~2.16.2",
+    "ember-cli": "~2.18.0",
     "ember-cli-addon-tests": "^0.11.0",
     "ember-cli-dependency-checker": "^2.0.1",
-    "ember-cli-eslint": "^4.1.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.2",
     "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-qunit": "^4.2.1",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.3.0",
     "ember-sinon": "^1.0.0",
-    "ember-source": "~2.16.0",
+    "ember-source": "~2.18.0",
+    "eslint-plugin-ember": "^5.0.0",
+    "eslint-plugin-node": "^5.2.1",
     "glob": "^7.0.0",
     "loader.js": "^4.2.3",
     "mocha": "^4.0.0",

testem.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
@@ -12,10 +11,11 @@ module.exports = {
     Chrome: {
       mode: 'ci',
       args: [
-      '--disable-gpu',
-      '--headless',
-      '--remote-debugging-port=9222',
-      '--window-size=1440,900'
+        '--disable-gpu',
+        '--headless',
+        '--no-sandbox',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
       ]
     }
   }

tests/dummy/config/environment.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(environment) {
@@ -41,10 +40,11 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;