From 4fb4f395850c32bbdf88623f5f01ae7e2ab85246 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco@fabscale.com>
Date: Wed, 5 May 2021 08:49:00 +0200
Subject: [PATCH] Use importSync instead of inline require

Inline require does not work well with embroider or newer versions of ember-auto-import as it is not statically analyzable.
---
 addon/utils/get-locale-asset-map.js |  5 ++--
 package.json                        |  1 +
 yarn.lock                           | 37 +++++++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/addon/utils/get-locale-asset-map.js b/addon/utils/get-locale-asset-map.js
index 61e83db..9d86a87 100644
--- a/addon/utils/get-locale-asset-map.js
+++ b/addon/utils/get-locale-asset-map.js
@@ -1,10 +1,10 @@
-import require from 'require';
+import { importSync } from '@embroider/macros';
 import { assert } from '@ember/debug';
 
 export function getLocaleAssetMap() {
   // FastBoot cannot read from document, so we require a (specifically built) file in that scenario
   if (typeof FastBoot !== 'undefined') {
-    let assetMap = require('ember-l10n/fastboot-locale-asset-map');
+    let assetMap = importSync('ember-l10n/fastboot-locale-asset-map');
     return assetMap.default;
   }
 
@@ -12,7 +12,6 @@ export function getLocaleAssetMap() {
     "meta[name='ember-l10n:localeAssetMap']"
   );
   if (!metaTag || !metaTag.content) {
-    // eslint-disable-next-line no-console
     assert('<meta name="ember-l10n:localeAssetMap"> tag is missing.', false);
     return {};
   }
diff --git a/package.json b/package.json
index fb5eba6..faa81a8 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2",
+    "@embroider/macros": "^0.47.1",
     "@embroider/test-setup": "^0.47.1",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 8bcf0e7..a8ecc54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1074,6 +1074,32 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
+"@embroider/macros@^0.47.1":
+  version "0.47.1"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.1.tgz#b3ef5e79b679295d10efdf6a2449527c95698d3d"
+  integrity sha512-asTmkWMmagL/ID38R8eqwIg3fRPBF9AYE+FBr83u4KW+JUxKloILEosO8tBlu1bEzXqGBb3aO6fAq/mDMBMn0Q==
+  dependencies:
+    "@embroider/shared-internals" "0.47.1"
+    assert-never "^1.2.1"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
+"@embroider/shared-internals@0.47.1":
+  version "0.47.1"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.47.1.tgz#75ed441045ef1b86bad37bbc8ad5805d6856add8"
+  integrity sha512-Sb4AGcOkfU3ttIvGHqa574G6LNQbmo9tAQf+Wk9xPhE0RlNk7JrYrHx8FTpz3QUoLI43zoQ9g1oTiKvclnALKQ==
+  dependencies:
+    babel-import-util "^0.2.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
 "@embroider/shared-internals@^0.40.0":
   version "0.40.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
@@ -2182,7 +2208,7 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
-assert-never@^1.1.0:
+assert-never@^1.1.0, assert-never@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
   integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
@@ -10750,6 +10776,13 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
+resolve-package-path@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -12210,7 +12243,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript-memoize@^1.0.0-alpha.3:
+typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
   integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==