test(new config module): write the new config format for the differen…

…t test templates
embroider-build · May 30, 2024 · dbe4523 · dbe4523
1 parent 9be1814
commit dbe4523
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 19 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/addon-template/tests/dummy/app/config/environment.js b/tests/addon-template/tests/dummy/app/config/environment.js
@@ -1,19 +1,4 @@
-// from https://github.com/ember-cli/ember-cli/blob/master/lib/broccoli/app-config-from-meta.js
-export default (function() {
-  let config = function() {
-    let prefix = 'dummy';
-    let metaName = prefix + '/config/environment';
-    try {
-      let rawConfig = document.querySelector('meta[name="' + metaName + '"]').getAttribute('content');
-      let config = JSON.parse(decodeURIComponent(rawConfig));
-      let exports = { 'default': config };
-      Object.defineProperty(exports, '__esModule', { value: true });
-      return exports;
-		}
-		catch(err) {
-      throw new Error('Could not read config from meta tag with name "' + metaName + '".');
-    }
-  }()
-  config.default.APP.fromConfigModule = 'hello new world';
-  return config;
-})().default;
+import loadConfigFromMeta from '@embroider/config-meta-loader';
+
+export default loadConfigFromMeta('dummy');
+// config.APP.fromConfigModule = 'hello new world';
diff --git a/tests/app-template/app/config/environment.js b/tests/app-template/app/config/environment.js
@@ -0,0 +1,3 @@
+import loadConfigFromMeta from "@embroider/config-meta-loader";
+
+export default loadConfigFromMeta('app-template');
diff --git a/tests/app-template/package.json b/tests/app-template/package.json
@@ -32,6 +32,7 @@
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.0.3",
     "@embroider/compat": "workspace:*",
+    "@embroider/config-meta-loader": "workspace:*",
     "@embroider/core": "workspace:*",
     "@embroider/router": "workspace:*",
     "@embroider/test-setup": "workspace:*",

diff --git a/tests/ts-app-template-classic/app/config/environment.ts b/tests/ts-app-template-classic/app/config/environment.ts
@@ -0,0 +1,3 @@
+import loadConfigFromMeta from '@embroider/config-meta-loader';
+
+export default loadConfigFromMeta('ts-app-template');
diff --git a/tests/ts-app-template-classic/package.json b/tests/ts-app-template-classic/package.json
@@ -32,6 +32,7 @@
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.0",
     "@embroider/compat": "workspace:*",
+    "@embroider/config-meta-loader": "workspace:*",
     "@embroider/core": "workspace:*",
     "@embroider/router": "workspace:*",
     "@embroider/test-setup": "workspace:*",

diff --git a/tests/ts-app-template/app/config/environment.ts b/tests/ts-app-template/app/config/environment.ts
@@ -0,0 +1,3 @@
+import loadConfigFromMeta from '@embroider/config-meta-loader';
+
+export default loadConfigFromMeta('ts-app-template');
diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json
@@ -32,6 +32,7 @@
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.0",
     "@embroider/compat": "workspace:*",
+    "@embroider/config-meta-loader": "workspace:*",
     "@embroider/core": "workspace:*",
     "@embroider/router": "workspace:*",
     "@embroider/test-setup": "workspace:*",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import loadConfigFromMeta from "@embroider/config-meta-loader";

		export default loadConfigFromMeta('app-template');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import loadConfigFromMeta from '@embroider/config-meta-loader';

		export default loadConfigFromMeta('ts-app-template');