Merge pull request #17426 from stukalin/master

[BUGFIX beta] fix 'strict mode does not allow function declarations'
emberjs · Jan 4, 2019 · ad5f092 · ad5f092
2 parents 5ebb3d6 + c9d9073
commit ad5f092
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -62,8 +62,6 @@ module.exports = {
         'no-unused-vars': 'off',
         'no-undef': 'off',
 
-        'no-inner-declarations': 'off',
-
         'import/export': 'off',
         'import/named': 'off',
         'import/no-unresolved': 'off',

diff --git a/packages/@ember/-internals/metal/tests/tracked/get_test.ts b/packages/@ember/-internals/metal/tests/tracked/get_test.ts
@@ -3,7 +3,7 @@ import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 import { get, getWithDefault, tracked } from '../..';
 
 if (EMBER_METAL_TRACKED_PROPERTIES) {
-  function createObj() {
+  const createObj = function() {
     class Obj {
       @tracked string = 'string';
       @tracked number = 23;
@@ -13,7 +13,7 @@ if (EMBER_METAL_TRACKED_PROPERTIES) {
     }
 
     return new Obj();
-  }
+  };
 
   moduleFor(
     '@tracked decorator: get',

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -266,6 +266,14 @@ RouterService.reopen({
 });
 
 if (EMBER_ROUTING_ROUTER_SERVICE) {
+  const cleanURL = function(url: string, rootURL: string) {
+    if (rootURL === '/') {
+      return url;
+    }
+
+    return url.substr(rootURL.length, url.length);
+  };
+
   RouterService.reopen(Evented, {
     init() {
       this._super(...arguments);
@@ -401,12 +409,4 @@ if (EMBER_ROUTING_ROUTER_SERVICE) {
       @public
     */
   });
-
-  function cleanURL(url: string, rootURL: string) {
-    if (rootURL === '/') {
-      return url;
-    }
-
-    return url.substr(rootURL.length, url.length);
-  }
 }