From 35fdfd1c3cbcedb6477e2f6766baa0f896e50063 Mon Sep 17 00:00:00 2001 From: Eugene Date: Thu, 25 Dec 2025 23:58:13 +0100 Subject: [PATCH] build fix --- app/src/plugins.ts | 3 ++- package.json | 3 +-- .../src/colorSchemes.ts | 2 +- .../src/api/baseTerminalTab.component.ts | 6 ++--- yarn.lock | 25 ++++--------------- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/app/src/plugins.ts b/app/src/plugins.ts index f21d57ea..2fe8cf86 100644 --- a/app/src/plugins.ts +++ b/app/src/plugins.ts @@ -36,7 +36,8 @@ const cachedBuiltinModules = { 'ngx-toastr': require('ngx-toastr'), rxjs: require('rxjs'), 'rxjs/operators': require('rxjs/operators'), - 'zone.js/dist/zone.js': require('zone.js/dist/zone.js'), + 'zone.js/dist/zone.js': require('zone.js'), + 'zone.js': require('zone.js'), } const builtinModules = [ diff --git a/package.json b/package.json index 64621cbf..b940cdfc 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,7 @@ "@types/electron-debug": "^2.1.0", "@types/fs-extra": "^9.0.13", "@types/js-yaml": "^4.0.5", - "@types/node": "20.3.1", - "@types/webpack-env": "^1.18.0", + "@types/node": "^20.3.1", "@typescript-eslint/eslint-plugin": "^6.4.1", "@typescript-eslint/parser": "^6.4.1", "apply-loader": "2.0.0", diff --git a/tabby-community-color-schemes/src/colorSchemes.ts b/tabby-community-color-schemes/src/colorSchemes.ts index 6988bc34..af725bd2 100644 --- a/tabby-community-color-schemes/src/colorSchemes.ts +++ b/tabby-community-color-schemes/src/colorSchemes.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import { TerminalColorSchemeProvider, TerminalColorScheme } from 'tabby-terminal' -const schemeContents = require.context('../schemes/', false, /.*/) +const schemeContents = (require as any).context('../schemes/', false, /.*/) @Injectable() export class ColorSchemes extends TerminalColorSchemeProvider { diff --git a/tabby-terminal/src/api/baseTerminalTab.component.ts b/tabby-terminal/src/api/baseTerminalTab.component.ts index f281f3cb..05156840 100644 --- a/tabby-terminal/src/api/baseTerminalTab.component.ts +++ b/tabby-terminal/src/api/baseTerminalTab.component.ts @@ -25,8 +25,8 @@ const OSC_FOCUS_OUT = Buffer.from('\x1b[O') */ @Component({ template: '' }) export class BaseTerminalTabComponent

extends BaseTabComponent implements OnInit, OnDestroy { - static template: string = require('../components/baseTerminalTab.component.pug') - static styles: string[] = [require('../components/baseTerminalTab.component.scss')] + static template: string = require('../components/baseTerminalTab.component.pug') + static styles: string[] = [require('../components/baseTerminalTab.component.scss')] static animations: AnimationTriggerMetadata[] = [ trigger('toolbarSlide', [ transition(':enter', [ @@ -330,7 +330,7 @@ export class BaseTerminalTabComponent

extends Bas }) this.bellPlayer = document.createElement('audio') - this.bellPlayer.src = require('../bell.ogg') + this.bellPlayer.src = require('../bell.ogg') this.bellPlayer.load() this.contextMenuProviders.sort((a, b) => a.weight - b.weight) diff --git a/yarn.lock b/yarn.lock index 69b6f2ca..53e8fdaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -889,17 +889,12 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*": - version "25.0.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.3.tgz#79b9ac8318f373fbfaaf6e2784893efa9701f269" - integrity sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA== +"@types/node@*", "@types/node@^20.3.1": + version "20.19.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.27.tgz#d51333f77953a5e4e71d3b5aefa83ec5297fbb80" + integrity sha512-N2clP5pJhB2YnZJ3PIHFk5RkygRX5WO/5f0WC08tp0wd+sv0rsJk3MqWn3CbNmT2J505a5336jaQj4ph1AdMug== dependencies: - undici-types "~7.16.0" - -"@types/node@20.3.1": - version "20.3.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" - integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== + undici-types "~6.21.0" "@types/node@^22.7.7": version "22.15.21" @@ -938,11 +933,6 @@ resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== -"@types/webpack-env@^1.18.0": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.8.tgz#71f083718c094204d7b64443701d32f1db3989e3" - integrity sha512-G9eAoJRMLjcvN4I08wB5I7YofOb/kaJNd5uoCMX+LbKXTPCF+ZIHuqTnFaK9Jz1rgs035f9JUPUhNFtqgucy/A== - "@types/yauzl@^2.9.1": version "2.10.0" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" @@ -9443,11 +9433,6 @@ undici-types@~6.21.0: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== -undici-types@~7.16.0: - version "7.16.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46" - integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw== - unique-filename@^1.1.0, unique-filename@~1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"