@embroider/compat 3.8.4 → 3.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.8.4",
+  "version": "3.9.0",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -33,7 +33,7 @@
     "@types/yargs": "^17.0.3",
     "assert-never": "^1.1.0",
     "babel-import-util": "^2.0.0",
-    "babel-plugin-ember-template-compilation": "^2.1.1",
+    "babel-plugin-ember-template-compilation": "~2.3.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babylon": "^6.18.0",
     "bind-decorator": "^1.0.11",
@@ -62,7 +62,7 @@
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
     "yargs": "^17.0.1",
-    "@embroider/macros": "1.16.11"
+    "@embroider/macros": "1.16.13"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.3",
@@ -85,12 +85,12 @@
     "ember-engines": "^0.8.19",
     "scenario-tester": "^2.1.2",
     "typescript": "^5.1.6",
-    "@embroider/core": "^3.5.4",
+    "@embroider/core": "^3.5.6",
     "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0"
   },
   "peerDependencies": {
-    "@embroider/core": "^3.5.4"
+    "@embroider/core": "^3.5.6"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/compat-adapters/ember-fetch.d.ts

@@ -0,0 +1,6 @@
+import AddToTree from '../add-to-tree';
+import V1Addon from '../v1-addon';
+export default class extends V1Addon {
+    get packageMeta(): Partial<import("@embroider/core").AddonMeta>;
+    get v2Tree(): AddToTree;
+}

package/src/compat-adapters/ember-fetch.js

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = require("fs-extra");
+const add_to_tree_1 = __importDefault(require("../add-to-tree"));
+const v1_addon_1 = __importDefault(require("../v1-addon"));
+const path_1 = require("path");
+const fs_1 = require("fs");
+class default_1 extends v1_addon_1.default {
+    get packageMeta() {
+        let result = super.packageMeta;
+        result['renamed-modules'] = {
+            fetch: 'ember-fetch/index.js',
+        };
+        return result;
+    }
+    get v2Tree() {
+        // ember-fetch attempts to emits an AMD define into vendor.js. We instead
+        // adapt it into an ES module, so it can continue accessing ember even once
+        // ember is not in AMD.
+        return new add_to_tree_1.default(super.v2Tree, (outputPath) => {
+            let vendorFile = (0, path_1.resolve)(outputPath, 'vendor/ember-fetch.js');
+            let src = (0, fs_extra_1.readFileSync)(vendorFile, 'utf8');
+            // the addon has already done "app.import('vendor/ember-fetch.js')", which
+            // pushes it onto a list down inside the guts of ember-cli. If we delete
+            // the file, we'll get a crash when ember-cli goes looking for it.
+            // Instead, we just make it empty.
+            (0, fs_1.writeFileSync)(vendorFile, '');
+            (0, fs_1.writeFileSync)((0, path_1.resolve)(outputPath, 'index.js'), `import Ember from 'ember';
+const outputs = {};
+
+function define(name, deps, fn) {
+  if (name !== 'fetch') {
+    throw new Error('bug: we were attempting to capture ember-fetch');
+  }
+  if (deps[0] !== 'exports' && deps[1] !== 'ember') {
+    throw new Error('bug: we unexpected deps while capturing ember-fetch');
+  }
+  fn(outputs, Ember);
+}
+${src}
+export default outputs.default;
+export const Headers = outputs.Headers;
+export const Request = outputs.Request;
+export const Response = outputs.Response;
+export const AbortController = outputs.AbortController;
+export const AbortSignal = outputs.AbortSignal;
+export const fetch = outputs.fetch;
+`);
+        });
+    }
+}
+exports.default = default_1;
+//# sourceMappingURL=ember-fetch.js.map

package/src/compat-adapters/ember-fetch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ember-fetch.js","sourceRoot":"","sources":["ember-fetch.ts"],"names":[],"mappings":";;;;;AAAA,uCAAwC;AACxC,iEAAuC;AACvC,2DAAkC;AAClC,+BAA+B;AAC/B,2BAAmC;AAEnC,eAAqB,SAAQ,kBAAO;IAClC,IAAI,WAAW;QACb,IAAI,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC;QAC/B,MAAM,CAAC,iBAAiB,CAAC,GAAG;YAC1B,KAAK,EAAE,sBAAsB;SAC9B,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,MAAM;QACR,yEAAyE;QACzE,2EAA2E;QAC3E,uBAAuB;QACvB,OAAO,IAAI,qBAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,UAAkB,EAAE,EAAE;YACxD,IAAI,UAAU,GAAG,IAAA,cAAO,EAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;YAC9D,IAAI,GAAG,GAAG,IAAA,uBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC3C,0EAA0E;YAC1E,wEAAwE;YACxE,kEAAkE;YAClE,kCAAkC;YAClC,IAAA,kBAAa,EAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC9B,IAAA,kBAAa,EACX,IAAA,cAAO,EAAC,UAAU,EAAE,UAAU,CAAC,EAC/B;;;;;;;;;;;;EAYN,GAAG;;;;;;;;CAQJ,CACM,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA9CD,4BA8CC","sourcesContent":["import { readFileSync } from 'fs-extra';\nimport AddToTree from '../add-to-tree';\nimport V1Addon from '../v1-addon';\nimport { resolve } from 'path';\nimport { writeFileSync } from 'fs';\n\nexport default class extends V1Addon {\n  get packageMeta() {\n    let result = super.packageMeta;\n    result['renamed-modules'] = {\n      fetch: 'ember-fetch/index.js',\n    };\n    return result;\n  }\n  get v2Tree() {\n    // ember-fetch attempts to emits an AMD define into vendor.js. We instead\n    // adapt it into an ES module, so it can continue accessing ember even once\n    // ember is not in AMD.\n    return new AddToTree(super.v2Tree, (outputPath: string) => {\n      let vendorFile = resolve(outputPath, 'vendor/ember-fetch.js');\n      let src = readFileSync(vendorFile, 'utf8');\n      // the addon has already done \"app.import('vendor/ember-fetch.js')\", which\n      // pushes it onto a list down inside the guts of ember-cli. If we delete\n      // the file, we'll get a crash when ember-cli goes looking for it.\n      // Instead, we just make it empty.\n      writeFileSync(vendorFile, '');\n      writeFileSync(\n        resolve(outputPath, 'index.js'),\n        `import Ember from 'ember';\nconst outputs = {};\n\nfunction define(name, deps, fn) {\n  if (name !== 'fetch') {\n    throw new Error('bug: we were attempting to capture ember-fetch');\n  }\n  if (deps[0] !== 'exports' && deps[1] !== 'ember') {\n    throw new Error('bug: we unexpected deps while capturing ember-fetch');\n  }\n  fn(outputs, Ember);\n}\n${src}\nexport default outputs.default;\nexport const Headers = outputs.Headers;\nexport const Request = outputs.Request;\nexport const Response = outputs.Response;\nexport const AbortController = outputs.AbortController;\nexport const AbortSignal = outputs.AbortSignal;\nexport const fetch = outputs.fetch;\n`\n      );\n    });\n  }\n}\n"]}