Repository navigation
Conversation
…ert.requiredLabel
…ds from their root
…ing it up from the field root
…ading getErrors for custom errors
Add displayErrorsToast to form instances
Add an assert.formField custom assertion
[OSS::Smart::Pill] Add a icon only mode
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges
master(3.100.2 and 3.100.3) into the Ember 6.12 upgrade so the stack no longer conflicts withmaster, and ports the incoming changes to the feature branch's conventions.Incoming from
master:formInstance.displayErrorsToast()on the FormManager service (Add displayErrorsToast to form instances #736)assert.formFieldcustom assertion for required labels (Add an assert.formField custom assertion #737)OSS::Smart::Pill([OSS::Smart::Pill] Add a icon only mode #739)Conflict resolutions
package.json: the only conflict wasversion. Kept the feature side (4.0.0-beta.2), not master's3.100.3.Everything else merged cleanly.
Ported to Ember 6.12 conventions
addon/services/form-manager.ts:import { inject as service }changed toimport { service }.addon-test-support/custom-assertions/form-field.ts:SafeStringis now imported from@ember/template. The@ember/template/-private/handlebarspath does not exist in Ember's native types.addon-test-support/register-assertions.ts: added the preserved triple-slash reference forform-field.ts, so the published declarations keep theassert.formFieldaugmentation, like the other custom assertions.addon-test-support/custom-assertions/form-field.stories.mdxrenamed toform-field.mdx, matching the other docs-only MDX files on Storybook 9. The Storybook globs only pick up*.mdx.tests/unit/services/form-manager-test.ts,tests/integration/components/o-s-s/form-test.ts:setupIntl(hooks)changed tosetupIntl(hooks, 'en-us').Dependencies
pnpm installleftpnpm-lock.yamlunchanged.publishConfig.tagis alreadybeta.@fortawesome/fontawesome-prois kept as declared on the feature side (master did not change it).Verification
pnpm install: OK, lockfile unchangedpnpm tsc --noEmit: OKpnpm lint:js: OK. The CI Lint job runs only this script.ember-template-linton the master-changed templates: OK. I used a temporary config without the local./linters/handlebarsplugin because the plugin does not resolve in this checkout. This failure is unrelated to this PR and CI does not run it.pnpm test:asset-map-build: 12/12 passpnpm test:ember(Chrome and Firefox): 4089/4090 pass. The one failure waso-s-s/carousel"uses the slide animation style", on Firefox only. It is a timing flake: the carousel module passed 54/54 when run again.🤖 Generated with Claude Code