Repository navigation
Conversation
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
requested review from
aprentout,
nathalieArnoux and
olxmpe
and removed request for
a team
November 6, 2026 19:01
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.
Brings
masterinto the Ember 6.12 upgrade and moves the addon onto the@upfluence/oss-components4.0.0-beta.3 release, so the stack is green and ready for a 4.0.0 beta.master(31914b6, the OSS asset-map adapter from Adopt the @upfluence/oss-components asset-map adapter #288) intofeature/ember-upgrade-4-to-7.@upfluence/oss-components4.0.0-beta.3 and publishes under thebetadist-tag.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-components4.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.0was 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 declarespackages: ['.']and still has the sameonlyBuiltDependencies: ['@upfluence/oss-components']entry the feature side had.pnpm-lock.yaml: took the feature side and regenerated it withpnpm install.These master changes merged without conflicts and are kept as they are:
ember-cli-build.js: fingerprint asset map plusinjectAssetMapfrom@upfluence/oss-components/build/classic-asset-map.cjs, wrapped around the feature side'smaybeEmbroidercall. 4.0.0-beta.3 shipsbuild/classic-asset-map.cjs.tests/dummy/app/index.htmlandtests/index.html: theupfluence:asset-mapmeta 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-dataimports,store.find,this.get, ember-ajax). None turned up.Dependencies
@upfluence/oss-componentsdevDependency:4.0.0-beta.2→4.0.0-beta.3(exact).@upfluence/oss-componentspeerDependency:^3.x→^4.0.0-beta.0.publishConfig.tag: "beta"added next to the existing GitHub Packages registry. The release job runsnpm publishonv*tags, and this makes sure a 4.0.0 beta does not becomelatest.pnpm-lock.yaml:@upfluence/oss-componentsresolves 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'sTrigger upfluence-web/deploystep now hasif: ${{ !contains(github.ref, '-') }}. Prerelease tags such asv4.0.0-beta.0still runnpm publish(under thebetadist-tag), but they no longer dispatch the upfluence-web stagingBump Dependencyworkflow. Stable tags still do.publishConfig.tag: "beta"must be removed, or 4.0.0 would also go out underbeta.Verification
pnpm install: okpnpm lint:js: okpnpm prettier '**/*.hbs' -c: okpnpm tsc --noEmit: okpnpm test:ember: 374 tests, 373 pass, 1 skipped, 0 failures. The test build includesinjectAssetMap.pnpm lint:hbs(ember-template-lint, not run in CI) reports 22 errors (require-input-labeland similar). They come from the feature branch, not from this PR, and I left them alone.master.🤖 Generated with Claude Code