From dbe4523351a5455cee919967042430c4a54896e5 Mon Sep 17 00:00:00 2001 From: Marine Dunstetter Date: Thu, 30 May 2024 13:10:02 +0200 Subject: [PATCH] test(new config module): write the new config format for the different test templates --- pnpm-lock.yaml | 12 ++++++++++ .../tests/dummy/app/config/environment.js | 23 ++++--------------- tests/app-template/app/config/environment.js | 3 +++ tests/app-template/package.json | 1 + .../app/config/environment.ts | 3 +++ tests/ts-app-template-classic/package.json | 1 + .../ts-app-template/app/config/environment.ts | 3 +++ tests/ts-app-template/package.json | 1 + 8 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 tests/app-template/app/config/environment.js create mode 100644 tests/ts-app-template-classic/app/config/environment.ts create mode 100644 tests/ts-app-template/app/config/environment.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb1ed7c42d..0784000942 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1473,6 +1473,9 @@ importers: '@embroider/compat': specifier: workspace:* version: link:../../packages/compat + '@embroider/config-meta-loader': + specifier: workspace:* + version: link:../../packages/config-meta-loader '@embroider/core': specifier: workspace:* version: link:../../packages/core @@ -1857,6 +1860,9 @@ importers: '@embroider/compat': specifier: workspace:* version: link:../../packages/compat + '@embroider/config-meta-loader': + specifier: workspace:* + version: link:../../packages/config-meta-loader '@embroider/core': specifier: workspace:* version: link:../../packages/core @@ -2016,6 +2022,9 @@ importers: '@embroider/compat': specifier: workspace:* version: link:../../packages/compat + '@embroider/config-meta-loader': + specifier: workspace:* + version: link:../../packages/config-meta-loader '@embroider/core': specifier: workspace:* version: link:../../packages/core @@ -8351,6 +8360,9 @@ packages: /ajv-formats@2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} + peerDependenciesMeta: + ajv: + optional: true dependencies: ajv: 8.13.0 diff --git a/tests/addon-template/tests/dummy/app/config/environment.js b/tests/addon-template/tests/dummy/app/config/environment.js index 341cf533fb..f7fb3426f3 100644 --- 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 new file mode 100644 index 0000000000..2671cf2f36 --- /dev/null +++ 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 index 24c2391f0e..82d970d53c 100644 --- 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 new file mode 100644 index 0000000000..061966012f --- /dev/null +++ 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 index ff435e127e..81a5974f57 100644 --- 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 new file mode 100644 index 0000000000..061966012f --- /dev/null +++ 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 index ff435e127e..81a5974f57 100644 --- 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:*",