Skip to content

Fix css assets #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CGNonofr merged 3 commits into from
Feb 11, 2026
Merged

Fix css assets #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db7e1b
lib: update to vscode 1.109.2
Feb 11, 2026
c4fc238
fix: handle weird relative asset import from css files
Feb 11, 2026
11b8b45
feat: warn failing asset resolution
Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
},
"config": {
"vscode": {
"version": "1.109.0",
"ref": "1.109.0",
"commit": "bdd88df003631aaa0bcbe057cb0a940b80a476fa"
"version": "1.109.2",
"ref": "1.109.2",
"commit": "591199df409fbf59b4b52d5ad4ee0470152a9b31"
},
"monaco": {
"ref": "v0.55.1",
Expand Down
9 changes: 8 additions & 1 deletion rollup/plugins/css-import-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ export default ({
await postcss([
postcssUrl({
url: async (asset) => {
if (asset.url.startsWith('data:') || asset.url.startsWith('http')) {
return asset.url
}
let fileName: string | undefined
if (preserveAssetsRoot != null) {
fileName = path
Expand All @@ -62,7 +65,11 @@ export default ({
}

const resolved = await this.resolve(asset.url, id)
if (resolved != null && !resolved.external) {
if (resolved == null) {
this.warn(`Could not resolve asset ${asset.url} from ${id}`)
return asset.url
}
if (!resolved.external) {
const assetId = this.emitFile({
type: 'asset',
fileName,
Expand Down
4 changes: 3 additions & 1 deletion rollup/tools/vscode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,9 @@ function resolveVscode(importee: string, importer?: string) {
if (importee.endsWith('.js')) {
importee = importee.slice(0, -3)
}
if (importer != null && importee.startsWith('.')) {
// For some reasons, some image references from css in VSCode don't have the "./" prefix, even if they are relative, so we need to resolve them as relative to the importer
const isRelative = importer != null && (importee.startsWith('.') || importer.endsWith('.css'))
if (isRelative) {
importee = nodePath.resolve(nodePath.dirname(importer), importee)
}

Expand Down
4 changes: 2 additions & 2 deletions vscode-patches/0086-fix-make-product-field-optional.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ index c890ef2216a..232ef4e7d93 100644
if (packExtension.local && !extensionsToUninstall.some(e => areSameExtensions(e.extension.identifier, packExtension.identifier))) {
extensionsToUninstall.push({ extension: packExtension.local });
diff --git a/src/vs/workbench/services/accounts/browser/defaultAccount.ts b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
index f0a645aea45..1934513c605 100644
index 0317ea570ac..89585c4d8f6 100644
--- a/src/vs/workbench/services/accounts/browser/defaultAccount.ts
+++ b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
@@ -121,14 +121,16 @@ export class DefaultAccountService extends Disposable implements IDefaultAccount
Expand Down Expand Up @@ -168,7 +168,7 @@ index f0a645aea45..1934513c605 100644
return {
...this.defaultAccountConfig.authenticationProvider.default,
enterprise: false
@@ -786,8 +792,11 @@ class DefaultAccountProviderContribution extends Disposable implements IWorkbenc
@@ -835,8 +841,11 @@ class DefaultAccountProviderContribution extends Disposable implements IWorkbenc
@IDefaultAccountService defaultAccountService: IDefaultAccountService,
) {
super();
Expand Down