diff --git a/packages/base/field-component.gts b/packages/base/field-component.gts index 650971ee6ab..019d6457b9c 100644 --- a/packages/base/field-component.gts +++ b/packages/base/field-component.gts @@ -86,18 +86,14 @@ export class CardContextConsumer extends Component }; } - + } export class CardCrudFunctionsConsumer extends Component { @consume(CardCrudFunctionsContextName) declare cardCrudFunctions: CardCrudFunctions; - + } interface DefaultFormatConsumerSignature { @@ -113,9 +109,7 @@ export class DefaultFormatsConsumer extends Component - {{yield this.effectiveDefaultFormats}} - + } interface DefaultFormatsProviderSignature { @@ -137,9 +131,7 @@ interface PermissionsConsumerSignature { export class PermissionsConsumer extends Component { @consume(PermissionsContextName) declare permissions: Permissions | undefined; - + } const componentCache = initSharedState( @@ -527,7 +519,11 @@ function getFields(card: typeof CardDef): { } return [[maybeFieldName, maybeField]]; }); - fields = { ...fields, ...Object.fromEntries(currentFields) }; + fields = Object.assign( + Object.create(null), + fields, + Object.fromEntries(currentFields), + ); obj = Reflect.getPrototypeOf(obj); } return fields; diff --git a/packages/base/field-support.ts b/packages/base/field-support.ts index 6ff64d4db8d..66ee5c93c35 100644 --- a/packages/base/field-support.ts +++ b/packages/base/field-support.ts @@ -280,7 +280,11 @@ export function getFields( } return [[maybeFieldName, maybeField]]; }); - fields = { ...fields, ...Object.fromEntries(currentFields) }; + fields = Object.assign( + Object.create(null), + fields, + Object.fromEntries(currentFields), + ); obj = Reflect.getPrototypeOf(obj); } return fields; diff --git a/packages/boxel-icons/unpublished-development-types/index.d.ts b/packages/boxel-icons/unpublished-development-types/index.d.ts index 4f7deab2532..1afd42fe9be 100644 --- a/packages/boxel-icons/unpublished-development-types/index.d.ts +++ b/packages/boxel-icons/unpublished-development-types/index.d.ts @@ -2,7 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; -import 'ember-source/types/stable'; +import 'ember-source/types'; declare module '@glint/environment-ember-loose/registry' { export default interface Registry { diff --git a/packages/boxel-ui/addon/src/types/@cardstack/boxel-ui/index.d.ts b/packages/boxel-ui/addon/src/types/@cardstack/boxel-ui/index.d.ts index 42b849012e4..a2e59775409 100644 --- a/packages/boxel-ui/addon/src/types/@cardstack/boxel-ui/index.d.ts +++ b/packages/boxel-ui/addon/src/types/@cardstack/boxel-ui/index.d.ts @@ -1,4 +1,3 @@ import 'ember-source/types'; -import 'ember-source/types/preview'; export {}; diff --git a/packages/boxel-ui/test-app/tests/test-helper.js b/packages/boxel-ui/test-app/tests/test-helper.js index 8b4e5bf003e..fcad112a38a 100644 --- a/packages/boxel-ui/test-app/tests/test-helper.js +++ b/packages/boxel-ui/test-app/tests/test-helper.js @@ -3,7 +3,8 @@ import config from 'test-app/config/environment'; import * as QUnit from 'qunit'; import { setApplication } from '@ember/test-helpers'; import { setup } from 'qunit-dom'; -import { start } from 'ember-qunit'; +import { loadTests } from 'ember-qunit/test-loader'; +import { start, setupEmberOnerrorValidation } from 'ember-qunit'; import { setRunOptions, setupConsoleLogger, @@ -23,5 +24,6 @@ setRunOptions({ }, }); setupConsoleLogger(); - +setupEmberOnerrorValidation(); +loadTests(); start(); diff --git a/packages/boxel-ui/test-app/types/boxel-ui-test-app/index.d.ts b/packages/boxel-ui/test-app/types/boxel-ui-test-app/index.d.ts index 42b849012e4..a2e59775409 100644 --- a/packages/boxel-ui/test-app/types/boxel-ui-test-app/index.d.ts +++ b/packages/boxel-ui/test-app/types/boxel-ui-test-app/index.d.ts @@ -1,4 +1,3 @@ import 'ember-source/types'; -import 'ember-source/types/preview'; export {}; diff --git a/packages/host/app/deprecation-workflow.js b/packages/host/app/deprecation-workflow.js index 7e793b0fd30..ed6e5da65e9 100644 --- a/packages/host/app/deprecation-workflow.js +++ b/packages/host/app/deprecation-workflow.js @@ -1,3 +1,30 @@ import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow'; -setupDeprecationWorkflow(); +setupDeprecationWorkflow({ + workflow: [ + { + handler: 'silence', + matchId: 'importing-inject-from-ember-service', + }, + { + handler: 'silence', + matchId: 'deprecate-import--set-classic-decorator-from-ember', + }, + { + handler: 'silence', + matchId: 'deprecate-import-view-utils-from-ember', + }, + { + handler: 'silence', + matchId: 'deprecate-import-env-from-ember', + }, + { + handler: 'silence', + matchId: 'deprecate-import-onerror-from-ember', + }, + { + handler: 'silence', + matchId: 'deprecate-import-libraries-from-ember', + }, + ], +}); diff --git a/packages/host/app/index.html b/packages/host/app/index.html index 0c8951cd565..358866cc61f 100644 --- a/packages/host/app/index.html +++ b/packages/host/app/index.html @@ -35,6 +35,15 @@
{{content-for "body"}} +