Skip to content

Merge master and move to oss-components 4.0.0-beta.3 - #299

Open
phndiaye wants to merge 11 commits into
feature/ember-upgrade-4-to-7from
pn/ember-6-12-green
Open

phndiaye wants to merge 11 commits into
feature/ember-upgrade-4-to-7from
pn/ember-6-12-green

Conversation

@phndiaye

@phndiaye phndiaye commented Nov 6, 2026 •

Copy link
Copy Markdown
Member

Brings master into the Ember 6.12 upgrade and moves the addon onto the @upfluence/oss-components 4.0.0-beta.3 release, so the stack is green and ready for a 4.0.0 beta.

No version bump and no tag in this PR.

Conflict resolutions

  • package.json: kept the feature side for every version (Ember 6.12 toolchain, @upfluence/oss-components 4.0.0-beta.2 at merge time, "version": "3.17.3"). Master only bumped oss-components to ^3.100.0. broccoli-asset-rev ^3.0.0 was already in devDependencies on the feature side, so the asset-map adapter has what it needs.
  • pnpm-workspace.yaml (add/add): kept master's version, which declares packages: ['.'] and still has the same onlyBuiltDependencies: ['@upfluence/oss-components'] entry the feature side had.
  • pnpm-lock.yaml: took the feature side and regenerated it with pnpm install.

These master changes merged without conflicts and are kept as they are:

  • ember-cli-build.js: fingerprint asset map plus injectAssetMap from @upfluence/oss-components/build/classic-asset-map.cjs, wrapped around the feature side's maybeEmbroider call. 4.0.0-beta.3 ships build/classic-asset-map.cjs.
  • tests/dummy/app/index.html and tests/index.html: the upfluence:asset-map meta tag and the shared Font Awesome stylesheet.

Ported to Ember 6.12 conventions

Nothing to port. Master only changed build config, HTML entry points and package files since the merge-base (6a6b98f), and I checked all of them for legacy patterns (inject as service, array prototype extensions, ember-data imports, store.find, this.get, ember-ajax). None turned up.

Dependencies

  • @upfluence/oss-components devDependency: 4.0.0-beta.2 → 4.0.0-beta.3 (exact).
  • @upfluence/oss-components peerDependency: ^3.x → ^4.0.0-beta.0.
  • publishConfig.tag: "beta" added next to the existing GitHub Packages registry. The release job runs npm publish on v* tags, and this makes sure a 4.0.0 beta does not become latest.
  • pnpm-lock.yaml: @upfluence/oss-components resolves to the single registry version 4.0.0-beta.3, with no git or codeload pins.

Release guard

  • .github/workflows/ci.yml: the release job's Trigger upfluence-web/deploy step now has if: ${{ !contains(github.ref, '-') }}. Prerelease tags such as v4.0.0-beta.0 still run npm publish (under the beta dist-tag), but they no longer dispatch the upfluence-web staging Bump Dependency workflow. Stable tags still do.
  • Once a stable 4.0.0 is cut, publishConfig.tag: "beta" must be removed, or 4.0.0 would also go out under beta.

Verification

  • pnpm install: ok
  • pnpm lint:js: ok
  • pnpm prettier '**/*.hbs' -c: ok
  • pnpm tsc --noEmit: ok
  • pnpm test:ember: 374 tests, 373 pass, 1 skipped, 0 failures. The test build includes injectAssetMap.
  • CI on bd95aed (with the release guard): Lint and Tests pass, Release and Deploy are skipped as expected.
  • pnpm lint:hbs (ember-template-lint, not run in CI) reports 22 errors (require-input-label and similar). They come from the feature branch, not from this PR, and I left them alone.
  • I could not run a local production build because the disk was full. CI only builds production on master.

🤖 Generated with Claude Code

phndiaye and others added 9 commits October 23, 2026 11:40
Duplicates the Font Awesome that oss-components still injects; groundwork for removing that injection.
The previous pin (9dcd77cf) still runs `ember ts:precompile` when installed from Git, which fails in CI with TS2742 under the pnpm store path. 156cdbbe removes that hook. Only pnpm-lock.yaml changes.
The Git pin pointed at pn/asset-map-service-adapter, which was deleted when oss-components#716 was merged. This uses the published release instead. Only the dependency spec and pnpm-lock.yaml change.
Adopt the @upfluence/oss-components asset-map adapter
# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	pnpm-workspace.yaml
@phndiaye
phndiaye requested a review from a team as a code owner November 6, 2026 19:01
@phndiaye
phndiaye requested review from aprentout, nathalieArnoux and olxmpe and removed request for a team November 6, 2026 19:01

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant