Skip to content

Fix the shaka-player CSS font patch not being applied - #9839

Merged
FreeTubeBot merged 1 commit into
FreeTubeApp:developmentfrom
absidue:webpack-shaka-patch-fix
Sep 27, 2026
Merged

FreeTubeBot merged 1 commit into
FreeTubeApp:developmentfrom
absidue:webpack-shaka-patch-fix

Conversation

@absidue

@absidue absidue commented Sep 24, 2026

Copy link
Copy Markdown
Member

Pull Request Type

  • Bugfix

Description

Because pnpm places the hardlinks from the global store to node_modules in node_modules/.pnpm instead of directly into node_modules and then symlinks the direct dependencies that are listed in the package.json file into node_modules and symlinks are resolved as part of module resolution (hardlinks aren't), webpack was using the node_modules/.pnpm/shaka-player@version path so it never matched the path configured in the rule. This pull request switches to require.resolve rather than manually constructing the path to fix that issue. Without the patch shaka-player links to the Roboto font on Google Fonts.

Testing

  1. pnpm run pack:renderer
  2. Check that the dist/renderer.*.css file only contains a single Roboto @font-face declaration that points to the bundled font.
  3. pnpm run pack:web
  4. Check that the dist/web/web.*.css file only contains a single Roboto @font-face declaration that points to the bundled font.

Desktop

  • OS: Windows
  • OS Version: 11

@FreeTubeBot
FreeTubeBot enabled auto-merge (squash) September 24, 2026 21:28
@github-actions github-actions Bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Sep 24, 2026

@PikachuEXE PikachuEXE left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to run pnpm run clean first to avoid being confused on which file to check

@FreeTubeBot
FreeTubeBot merged commit 3ef7da2 into FreeTubeApp:development Sep 27, 2026
6 checks passed
@github-actions github-actions Bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Sep 27, 2026
@absidue
absidue deleted the webpack-shaka-patch-fix branch September 27, 2026 14:51
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.

5 participants