diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90043e65dc..bcad45df17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1691,13 +1691,10 @@ importers: version: 3.1.1 '@ember/test-helpers': specifier: ^4.0.4 - version: 4.0.4(@babel/core@7.26.0)(ember-source@5.12.0) + version: 4.0.4(@babel/core@7.26.0)(ember-source@6.1.0-beta.1) '@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 @@ -1728,54 +1725,30 @@ importers: decorator-transforms: specifier: ^2.0.0 version: 2.3.0(@babel/core@7.26.0) - ember-auto-import: - specifier: ^2.6.3 - version: 2.10.0(@glint/template@1.5.0) ember-cli: specifier: ~5.0.0 version: 5.0.0 - ember-cli-app-version: - specifier: ^6.0.0 - version: 6.0.1(ember-source@5.12.0) ember-cli-babel: specifier: ^7.26.11 version: 7.26.11 - ember-cli-clean-css: - specifier: ^2.0.0 - version: 2.0.1 - ember-cli-dependency-checker: - specifier: ^3.3.1 - version: 3.3.3(ember-cli@5.0.0) - ember-cli-htmlbars: - specifier: ^6.2.0 - version: 6.3.0 ember-cli-inject-live-reload: specifier: ^2.1.0 version: 2.1.0 - ember-cli-sri: - specifier: ^2.1.1 - version: 2.1.1 - ember-cli-terser: - specifier: ^4.0.2 - version: 4.0.2 - ember-load-initializers: - specifier: ^3.0.0 - version: 3.0.1(ember-source@5.12.0) ember-modifier: specifier: ^4.1.0 - version: 4.2.0(@babel/core@7.26.0)(ember-source@5.12.0) + version: 4.2.0(@babel/core@7.26.0)(ember-source@6.1.0-beta.1) ember-page-title: specifier: ^7.0.0 version: 7.0.0 ember-qunit: specifier: ^8.1.1 - version: 8.1.1(@ember/test-helpers@4.0.4)(ember-source@5.12.0)(qunit@2.22.0) + version: 8.1.1(@ember/test-helpers@4.0.4)(ember-source@6.1.0-beta.1)(qunit@2.22.0) ember-resolver: specifier: ^13.1.0 - version: 13.1.0(ember-source@5.12.0) + version: 13.1.0(ember-source@6.1.0-beta.1) ember-source: - specifier: ~5.12.0 - version: 5.12.0(@glimmer/component@1.1.2) + specifier: ~6.1.0-beta.1 + version: 6.1.0-beta.1(@glimmer/component@1.1.2) ember-template-lint: specifier: ^5.10.1 version: 5.13.0 @@ -1797,9 +1770,6 @@ importers: eslint-plugin-qunit: specifier: ^7.3.4 version: 7.3.4(eslint@8.57.1) - loader.js: - specifier: ^4.7.0 - version: 4.7.0 prettier: specifier: ^2.8.8 version: 2.8.8 @@ -5854,6 +5824,24 @@ packages: - supports-color dev: true + /@ember/test-helpers@4.0.4(@babel/core@7.26.0)(ember-source@6.1.0-beta.1): + resolution: {integrity: sha512-1mbOVyVEcLxYOGzBaeeaQkCrL1o9Av86QaHk/1RvrVBW24I6YUj1ILLEi2qLZT5PzcCy0TdfadHT3hKJwJ0GcQ==} + peerDependencies: + ember-source: '>= 4.0.0' + dependencies: + '@ember/test-waiters': 3.1.0 + '@embroider/addon-shim': 1.9.0 + '@embroider/macros': 1.16.9(@glint/template@1.5.0) + '@simple-dom/interface': 1.4.0 + decorator-transforms: 2.3.0(@babel/core@7.26.0) + dom-element-descriptors: 0.5.1 + ember-source: 6.1.0-beta.1(@glimmer/component@1.1.2) + transitivePeerDependencies: + - '@babel/core' + - '@glint/template' + - supports-color + dev: true + /@ember/test-waiters@3.1.0: resolution: {integrity: sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ==} engines: {node: 10.* || 12.* || >= 14.*} @@ -7218,7 +7206,7 @@ packages: '@glimmer/component': 1.1.2(@babel/core@7.26.0) '@glint/template': 1.5.0 ember-cli-htmlbars: 6.3.0 - ember-modifier: 4.2.0(@babel/core@7.26.0)(ember-source@5.3.0) + ember-modifier: 4.2.0(@babel/core@7.26.0)(ember-source@5.12.0) dev: true /@glint/template@1.5.0: @@ -15831,6 +15819,24 @@ packages: - supports-color dev: true + /ember-modifier@4.2.0(@babel/core@7.26.0)(ember-source@6.1.0-beta.1): + resolution: {integrity: sha512-BJ48eTEGxD8J7+lofwVmee7xDgNDgpr5dd6+MSu4gk+I6xb35099RMNorXY5hjjwMJEyi/IRR6Yn3M7iJMz8Zw==} + peerDependencies: + ember-source: ^3.24 || >=4.0 + peerDependenciesMeta: + ember-source: + optional: true + dependencies: + '@embroider/addon-shim': 1.9.0 + decorator-transforms: 2.3.0(@babel/core@7.26.0) + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-string-utils: 1.1.0 + ember-source: 6.1.0-beta.1(@glimmer/component@1.1.2) + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: true + /ember-modifier@4.2.0(@babel/core@7.26.0)(ember-source@6.2.0-alpha.3): resolution: {integrity: sha512-BJ48eTEGxD8J7+lofwVmee7xDgNDgpr5dd6+MSu4gk+I6xb35099RMNorXY5hjjwMJEyi/IRR6Yn3M7iJMz8Zw==} peerDependencies: @@ -16093,6 +16099,25 @@ packages: - supports-color dev: true + /ember-qunit@8.1.1(@ember/test-helpers@4.0.4)(ember-source@6.1.0-beta.1)(qunit@2.22.0): + resolution: {integrity: sha512-nT+6s74j3BKNn+QQY/hINC3Xw3kn0NF0cU9zlgVQmCBWoyis1J24xWrY2LFOMThPmF6lHqcrUb5JwvBD4BXEXg==} + peerDependencies: + '@ember/test-helpers': '>=3.0.3' + ember-source: '>=4.0.0' + qunit: ^2.13.0 + dependencies: + '@ember/test-helpers': 4.0.4(@babel/core@7.26.0)(ember-source@6.1.0-beta.1) + '@embroider/addon-shim': 1.9.0 + '@embroider/macros': 1.16.9(@glint/template@1.5.0) + ember-cli-test-loader: 3.1.0 + ember-source: 6.1.0-beta.1(@glimmer/component@1.1.2) + qunit: 2.22.0 + qunit-theme-ember: 1.0.0 + transitivePeerDependencies: + - '@glint/template' + - supports-color + dev: true + /ember-ref-bucket@4.1.0(@babel/core@7.26.0): resolution: {integrity: sha512-oEUU2mDtuYuMM039U9YEqrrOCVHH6rQfvbFOmh3WxOVEgubmLVyKEpGgU4P/6j0B/JxTqqTwM3ULTQyDto8dKg==} engines: {node: 10.* || >= 12} @@ -16179,6 +16204,21 @@ packages: - supports-color dev: true + /ember-resolver@13.1.0(ember-source@6.1.0-beta.1): + resolution: {integrity: sha512-t/PjXLCl5tM9EQXGIFoBgHiA41HkLJpfo17Nud5Cy9eyUPGcnsMjWJqQ+O5QHA0E63Sp+zTn4y/RS5Tu2v2ydg==} + engines: {node: 14.* || 16.* || >= 18} + peerDependencies: + ember-source: ^4.12.0 || >= 5.0.0 + peerDependenciesMeta: + ember-source: + optional: true + dependencies: + ember-cli-babel: 7.26.11 + ember-source: 6.1.0-beta.1(@glimmer/component@1.1.2) + transitivePeerDependencies: + - supports-color + dev: true + /ember-rfc176-data@0.3.18: resolution: {integrity: sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==} @@ -16771,6 +16811,62 @@ packages: - webpack dev: true + /ember-source@6.1.0-beta.1(@glimmer/component@1.1.2): + resolution: {integrity: sha512-ErAYSpftkTnxr6rS6eaCkW/p5Cn8keXW/92P3MfkZNXTD3iAwARS2k7E6lYrnmCONPlae1yaSmkGbKf+fkV0rw==} + engines: {node: '>= 18.*'} + peerDependencies: + '@glimmer/component': '>= 1.1.2' + dependencies: + '@babel/core': 7.26.0 + '@ember/edition-utils': 1.2.0 + '@embroider/addon-shim': 1.9.0 + '@glimmer/compiler': 0.92.4 + '@glimmer/component': 1.1.2(@babel/core@7.26.0) + '@glimmer/destroyable': 0.92.3 + '@glimmer/env': 0.1.7 + '@glimmer/global-context': 0.92.3 + '@glimmer/interfaces': 0.92.3 + '@glimmer/manager': 0.92.4 + '@glimmer/node': 0.92.4 + '@glimmer/opcode-compiler': 0.92.4 + '@glimmer/owner': 0.92.3 + '@glimmer/program': 0.92.4 + '@glimmer/reference': 0.92.3 + '@glimmer/runtime': 0.92.4 + '@glimmer/syntax': 0.92.3 + '@glimmer/util': 0.92.3 + '@glimmer/validator': 0.92.3 + '@glimmer/vm': 0.92.3 + '@glimmer/vm-babel-plugins': 0.92.3(@babel/core@7.26.0) + '@simple-dom/interface': 1.4.0 + backburner.js: 2.8.0 + broccoli-file-creator: 2.1.1 + broccoli-funnel: 3.0.8 + broccoli-merge-trees: 4.2.0 + chalk: 4.1.2 + ember-auto-import: 2.10.0(@glint/template@1.5.0) + ember-cli-babel: 8.2.0(@babel/core@7.26.0) + ember-cli-get-component-path-option: 1.0.0 + ember-cli-is-package-missing: 1.0.0 + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-path-utils: 1.0.0 + ember-cli-string-utils: 1.1.0 + ember-cli-typescript-blueprint-polyfill: 0.1.0 + ember-cli-version-checker: 5.1.2 + ember-router-generator: 2.0.0 + inflection: 2.0.1 + route-recognizer: 0.3.4 + router_js: 8.0.6(route-recognizer@0.3.4) + semver: 7.6.3 + silent-error: 1.1.1 + simple-html-tokenizer: 0.5.11 + transitivePeerDependencies: + - '@glint/template' + - rsvp + - supports-color + - webpack + dev: true + /ember-source@6.1.0-beta.1(@glint/template@1.5.0): resolution: {integrity: sha512-ErAYSpftkTnxr6rS6eaCkW/p5Cn8keXW/92P3MfkZNXTD3iAwARS2k7E6lYrnmCONPlae1yaSmkGbKf+fkV0rw==} engines: {node: '>= 18.*'} diff --git a/tests/app-template-minimal/app/app.js b/tests/app-template-minimal/app/app.js index a3c0402fce..7cea1309ad 100644 --- a/tests/app-template-minimal/app/app.js +++ b/tests/app-template-minimal/app/app.js @@ -1,13 +1,13 @@ import Application from '@ember/application'; -import compatModules from '@embroider/virtual/compat-modules'; import Resolver from 'ember-resolver'; -import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; +const templates = import.meta.glob(`templates/**/*`, { eager: true }); + export default class App extends Application { modulePrefix = config.modulePrefix; podModulePrefix = config.podModulePrefix; - Resolver = Resolver.withModules(compatModules); + Resolver = Resolver.withModules({ + ...templates, + }); } - -loadInitializers(App, config.modulePrefix, compatModules); diff --git a/tests/app-template-minimal/app/components/.gitkeep b/tests/app-template-minimal/app/components/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/app-template-minimal/app/config/environment.js b/tests/app-template-minimal/app/config/environment.js index 7f4085e512..71d5896d87 100644 --- a/tests/app-template-minimal/app/config/environment.js +++ b/tests/app-template-minimal/app/config/environment.js @@ -1,3 +1,33 @@ -import loadConfigFromMeta from '@embroider/config-meta-loader'; +export default { + modulePrefix: 'app-template-minimal', + environment: import.meta.env.DEV ? 'development' : 'production', + rootURL: '/', + locationType: 'history', + EmberENV: { + EXTEND_PROTOTYPES: false, + FEATURES: { + // Here you can enable experimental features on an ember canary build + // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true + }, + }, -export default loadConfigFromMeta('app-template'); + ...(import.meta.env.MODE === 'test' + ? { + locationType: 'none', + } + : {}), + APP: { + // Here you can pass flags/options to your application instance + // when it is created + ...(import.meta.env.MODE === 'test' + ? { + // keep test console output quieter + LOG_ACTIVE_GENERATION: false, + LOG_VIEW_LOOKUPS: false, + + rootElement: '#ember-testing', + autoboot: false, + } + : {}), + }, +}; diff --git a/tests/app-template-minimal/app/controllers/.gitkeep b/tests/app-template-minimal/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/app-template-minimal/app/helpers/.gitkeep b/tests/app-template-minimal/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/app-template-minimal/app/models/.gitkeep b/tests/app-template-minimal/app/models/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/app-template-minimal/app/router.js b/tests/app-template-minimal/app/router.js index a761874297..9f79253ba5 100644 --- a/tests/app-template-minimal/app/router.js +++ b/tests/app-template-minimal/app/router.js @@ -1,5 +1,5 @@ import EmberRouter from '@ember/routing/router'; -import config from 'app-template/config/environment'; +import config from 'app-template-minimal/config/environment'; export default class Router extends EmberRouter { location = config.locationType; diff --git a/tests/app-template-minimal/app/routes/.gitkeep b/tests/app-template-minimal/app/routes/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/app-template-minimal/app/templates/components/.gitkeep b/tests/app-template-minimal/app/templates/components/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/app-template-minimal/config/environment.js b/tests/app-template-minimal/config/environment.js index 778f59a908..fa79c86da0 100644 --- a/tests/app-template-minimal/config/environment.js +++ b/tests/app-template-minimal/config/environment.js @@ -2,7 +2,7 @@ module.exports = function (environment) { const ENV = { - modulePrefix: 'app-template', + modulePrefix: 'app-template-minimal', environment, rootURL: '/', locationType: 'history', diff --git a/tests/app-template-minimal/package.json b/tests/app-template-minimal/package.json index 869170e54b..b85a061da1 100644 --- a/tests/app-template-minimal/package.json +++ b/tests/app-template-minimal/package.json @@ -1,5 +1,5 @@ { - "name": "app-template", + "name": "app-template-minimal", "version": "0.0.0", "private": true, "description": "Small description for app-template goes here", @@ -37,7 +37,6 @@ "@ember/string": "^3.1.1", "@ember/test-helpers": "^4.0.4", "@embroider/compat": "workspace:*", - "@embroider/config-meta-loader": "workspace:*", "@embroider/core": "workspace:*", "@embroider/router": "workspace:*", "@embroider/test-setup": "workspace:*", @@ -47,23 +46,15 @@ "@rollup/plugin-babel": "^5.3.1", "babel-plugin-ember-template-compilation": "^2.3.0", "concurrently": "^8.2.0", - "ember-auto-import": "^2.6.3", "decorator-transforms": "^2.0.0", "ember-cli": "~5.0.0", - "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.26.11", - "ember-cli-clean-css": "^2.0.0", - "ember-cli-dependency-checker": "^3.3.1", - "ember-cli-htmlbars": "^6.2.0", "ember-cli-inject-live-reload": "^2.1.0", - "ember-cli-sri": "^2.1.1", - "ember-cli-terser": "^4.0.2", - "ember-load-initializers": "^3.0.0", "ember-modifier": "^4.1.0", "ember-page-title": "^7.0.0", "ember-qunit": "^8.1.1", "ember-resolver": "^13.1.0", - "ember-source": "~5.12.0", + "ember-source": "~6.1.0-beta.1", "ember-template-lint": "^5.10.1", "eslint": "^8.42.0", "eslint-config-prettier": "^8.8.0", @@ -71,7 +62,6 @@ "eslint-plugin-n": "^16.0.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-qunit": "^7.3.4", - "loader.js": "^4.7.0", "prettier": "^2.8.8", "qunit": "^2.19.4", "qunit-dom": "^2.0.0", diff --git a/tests/app-template-minimal/tests/test-helper.js b/tests/app-template-minimal/tests/test-helper.js index c9a2a7b4db..acf13d772d 100644 --- a/tests/app-template-minimal/tests/test-helper.js +++ b/tests/app-template-minimal/tests/test-helper.js @@ -1,5 +1,5 @@ -import Application from 'app-template/app'; -import config from 'app-template/config/environment'; +import Application from 'app-template-minimal/app'; +import config from 'app-template-minimal/config/environment'; import * as QUnit from 'qunit'; import { setApplication } from '@ember/test-helpers'; import { setup } from 'qunit-dom'; diff --git a/tests/app-template-minimal/vite.config.mjs b/tests/app-template-minimal/vite.config.mjs index b745b73b20..8d299e17a2 100644 --- a/tests/app-template-minimal/vite.config.mjs +++ b/tests/app-template-minimal/vite.config.mjs @@ -1,10 +1,9 @@ import { defineConfig } from "vite"; -import { extensions, classicEmberSupport, ember } from "@embroider/vite"; +import { extensions, ember } from "@embroider/vite"; import { babel } from "@rollup/plugin-babel"; export default defineConfig({ plugins: [ - classicEmberSupport(), ember(), // extra plugins here babel({