Skip to content

Commit 819ea9d

Browse files
yxukoyxuko
committed
Bump packages
1 parent 4181107 commit 819ea9d

8 files changed

Lines changed: 632 additions & 2938 deletions

File tree

‎bun.lock‎

Lines changed: 550 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,22 @@
3232
},
3333
"license": "MIT",
3434
"peerDependencies": {
35-
"@angular/core": "^12.*",
36-
"tabby-core": "*",
37-
"tabby-terminal": "*"
35+
"@angular/core": "^15",
36+
"tabby-core": "v1.0.197-nightly.1",
37+
"tabby-terminal": "v1.0.197-nightly.1"
3838
},
3939
"devDependencies": {
40-
"@angular/animations": "^12.0.0",
41-
"@angular/common": "^12.0.0",
42-
"@angular/core": "^12.0.0",
43-
"@angular/forms": "^12.0.0",
44-
"@angular/platform-browser": "^12.0.0",
45-
"@ng-bootstrap/ng-bootstrap": "^10.0.0",
46-
"@types/node": "16.0.1",
47-
"@types/webpack-env": "^1.16.2",
48-
"bootstrap": "^4.6.1",
49-
"css-loader": "^6.2.0",
50-
"electron": "^13.5.1",
51-
"ngx-toastr": "^14.1.4",
52-
"node-sass": "^6.0.1",
53-
"raw-loader": "4.0.2",
54-
"rxjs": "^7.4.0",
55-
"sass-loader": "^12.1.0",
56-
"tabby-core": "^1.0.150",
57-
"tabby-settings": "^1.0.150",
58-
"tabby-terminal": "^1.0.150",
59-
"to-string-loader": "^1.2.0",
60-
"ts-loader": "^9.2.6",
61-
"typescript": "^4.3.5",
40+
"@angular/cdk": "^15.2.6",
41+
"@ngtools/webpack": "^15.2.5",
42+
"@ngx-translate/core": "^14.0.0",
43+
"@tabby-gang/to-string-loader": "^1.1.7-beta.2",
44+
"bootstrap": "^5.3.6",
45+
"css-loader": "^6.7.3",
46+
"ngx-translate-messageformat-compiler": "^4.11.0",
47+
"sass": "^1.63.4",
48+
"sass-loader": "^13.2.0",
6249
"webpack": "^5.57.1",
63-
"webpack-cli": "^4.8.0"
50+
"webpack-cli": "^4.8.0",
51+
"xterm": "^5.3.0"
6452
}
6553
}

‎src/colorScheme.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { Injectable } from "@angular/core";
21
import {
3-
TerminalColorSchemeProvider,
42
TerminalColorScheme,
3+
TerminalColorSchemeProvider,
54
} from "tabby-terminal";
65

6+
import { Injectable } from "@angular/core";
7+
78
@Injectable()
89
export class AltairColorScheme extends TerminalColorSchemeProvider {
910
async getSchemes(): Promise<TerminalColorScheme[]> {

‎src/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { NgModule, Injectable } from "@angular/core";
2-
import { TerminalColorSchemeProvider } from "tabby-terminal";
3-
import { Theme } from "tabby-core";
1+
import { Injectable, NgModule } from "@angular/core";
42

53
import { AltairColorScheme } from "colorScheme";
4+
import { TerminalColorSchemeProvider } from "tabby-terminal";
5+
import { Theme } from "tabby-core";
66

77
@Injectable()
88
class AltairTheme extends Theme {

‎src/theme.scss‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:color";
2+
13
// Color system
24
$white: #f9f9f9;
35
$black: #22242d;
@@ -19,8 +21,8 @@ $body-bg: #22242d;
1921
$body-bg2: #0d0e11;
2022
$body-bg3: #363740;
2123
$body-color: $white;
22-
$font-family-sans-serif: "Source Sans Pro";
23-
$font-size-base: 12rem / 16;
24+
$font-family-sans-serif: "Source Sans Pro", sans-serif;
25+
$font-size-base: 0.75rem;
2426

2527
// Nav Tabs
2628
$nav-tabs-border-color: $blue;
@@ -29,7 +31,7 @@ $nav-tabs-border-radius: 0;
2931
$nav-tabs-link-hover-border-color: $white;
3032
$nav-tabs-link-active-color: $white;
3133
$nav-tabs-link-active-bg: $blue;
32-
$nav-tabs-link-active-border-color: darken($blue, 30%);
34+
$nav-tabs-link-active-border-color: color.adjust($blue, $lightness: -30%);
3335

3436
// Buttons
3537
$button-hover-bg: rgba(255, 255, 255, 0.05);
@@ -79,7 +81,7 @@ $alert-danger-bg: $body-bg2;
7981
$alert-danger-text: $red;
8082
$alert-danger-border: $red;
8183

82-
@import "~bootstrap/scss/bootstrap.scss";
84+
@use "bootstrap/scss/bootstrap" as bs;
8385

8486
@keyframes topactivity {
8587
from,

‎webpack.config.js‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎webpack.config.mjs‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import * as path from "path";
2+
import * as url from "url";
3+
4+
import { AngularWebpackPlugin } from "@ngtools/webpack";
5+
6+
const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
7+
8+
export default (options) => {
9+
const config = {
10+
target: "node",
11+
entry: "src/index.ts",
12+
devtool: "source-map",
13+
context: __dirname,
14+
output: {
15+
path: path.resolve(__dirname, "dist"),
16+
filename: "index.js",
17+
pathinfo: true,
18+
libraryTarget: "umd",
19+
},
20+
resolve: {
21+
modules: [".", "src", "node_modules"].map((x) => path.join(__dirname, x)),
22+
extensions: [".ts", ".js"],
23+
},
24+
module: {
25+
rules: [
26+
{
27+
test: /\.ts$/,
28+
use: [
29+
{
30+
loader: "@ngtools/webpack",
31+
},
32+
],
33+
},
34+
{
35+
test: /\.scss$/,
36+
use: ["@tabby-gang/to-string-loader", "css-loader", "sass-loader"],
37+
include: /(theme.*|component)\.scss/,
38+
},
39+
{
40+
test: /\.scss$/,
41+
use: ["style-loader", "css-loader", "sass-loader"],
42+
exclude: /(theme.*|component)\.scss/,
43+
},
44+
],
45+
},
46+
externals: [/^@angular/, /^@ng-bootstrap/, /^tabby-/],
47+
plugins: [
48+
new AngularWebpackPlugin({
49+
tsconfig: path.resolve(__dirname, "tsconfig.json"),
50+
directTemplateLoading: false,
51+
jitMode: true,
52+
}),
53+
],
54+
};
55+
return config;
56+
};

0 commit comments

Comments
 (0)