wip

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
       run: yarn run build
 
     - name: Prepackage plugins
-      run: scripts/prepackage-plugins.js
+      run: scripts/prepackage-plugins.mjs
       env:
         ARCH: ${{matrix.arch}}
 
@@ -78,7 +78,7 @@ jobs:
     - run: ln -s ../../node_modules/electron app/node_modules
 
     - name: Build and sign packages
-      run: scripts/build-macos.js
+      run: scripts/build-macos.mjs
       if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
       env:
         ARCH: ${{matrix.arch}}
@@ -92,7 +92,7 @@ jobs:
         # DEBUG: electron-builder,electron-builder:*
 
     - name: Build packages without signing
-      run: scripts/build-macos.js
+      run: scripts/build-macos.mjs
       if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
       env:
         ARCH: ${{matrix.arch}}
@@ -101,7 +101,7 @@ jobs:
     - name: Upload symbols
       run: |
         sudo npm install -g @sentry/cli --unsafe-perm
-        ./scripts/sentry-upload.js
+        ./scripts/sentry-upload.mjs
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
         SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
@@ -162,11 +162,11 @@ jobs:
       if: matrix.build-arch == 'x64'
 
     - name: Prepackage plugins (x64)
-      run: scripts/prepackage-plugins.js
+      run: scripts/prepackage-plugins.mjs
       if: ${{matrix.build-arch == 'x64'}}
 
     - name: Build packages (x64)
-      run: scripts/build-linux.js
+      run: scripts/build-linux.mjs
       if: ${{matrix.build-arch == 'x64'}}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -193,8 +193,8 @@ jobs:
             cd /github/workspace &&
             yarn --network-timeout 1000000 &&
             yarn run build &&
-            scripts/prepackage-plugins.js &&
+            scripts/prepackage-plugins.mjs &&
-            USE_SYSTEM_FPM=true scripts/build-linux.js"
+            USE_SYSTEM_FPM=true scripts/build-linux.mjs"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         KEYGEN_TOKEN: ${{ secrets.KEYGEN_TOKEN }}
@@ -217,8 +217,8 @@ jobs:
             sed -i '/    \"electron\":/c\    \"electron\": \"17.0.0\",' package.json &&
             yarn --network-timeout 1000000 &&
             yarn run build &&
-            scripts/prepackage-plugins.js &&
+            scripts/prepackage-plugins.mjs &&
-            USE_SYSTEM_FPM=true scripts/build-linux.js"
+            USE_SYSTEM_FPM=true scripts/build-linux.mjs"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         KEYGEN_TOKEN: ${{ secrets.KEYGEN_TOKEN }}
@@ -228,7 +228,7 @@ jobs:
     - name: Upload symbols
       run: |
         sudo npm install -g @sentry/cli --unsafe-perm
-        ./scripts/sentry-upload.js
+        ./scripts/sentry-upload.mjs
       if: matrix.build-arch == 'x64'
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -308,12 +308,12 @@ jobs:
         npm i -g yarn@1.19.1
         yarn --network-timeout 1000000
         yarn run build
-        node scripts/prepackage-plugins.js
+        node scripts/prepackage-plugins.mjs
       env:
         ARCH: ${{matrix.arch}}
 
     - name: Build and sign packages
-      run: node scripts/build-windows.js
+      run: node scripts/build-windows.mjs
       if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
       env:
         ARCH: ${{matrix.arch}}
@@ -324,7 +324,7 @@ jobs:
         DEBUG: electron-builder,electron-builder:*
 
     - name: Build packages without signing
-      run: node scripts/build-windows.js
+      run: node scripts/build-windows.mjs
       if: "!(github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
       env:
         ARCH: ${{matrix.arch}}
@@ -332,7 +332,7 @@ jobs:
     - name: Upload symbols
       run: |
         npm install @sentry/cli
-        node scripts/sentry-upload.js
+        node scripts/sentry-upload.mjs
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
         SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

package.json

@@ -99,17 +99,17 @@
     "**/graceful-fs": "^4.2.4"
   },
   "scripts": {
-    "build": "npm run build:typings && node scripts/build-modules.js",
+    "build": "npm run build:typings && node scripts/build-modules.mjs",
-    "build:typings": "node scripts/build-typings.js",
+    "build:typings": "node scripts/build-typings.mjs",
     "watch": "cross-env TABBY_DEV=1 webpack --progress --color --watch",
     "start": "cross-env TABBY_DEV=1 electron app -d --inspect",
     "start:prod": "electron app --debug",
     "prod": "cross-env TABBY_DEV=1 electron app",
-    "docs": "node scripts/build-docs.js",
+    "docs": "node scripts/build-docs.mjs",
     "lint": "eslint --ext ts */src */lib",
     "postinstall": "patch-package && node ./scripts/install-deps.mjs && node ./scripts/build-native.mjs",
     "i18n:pull": "crowdin pull --skip-untranslated-strings",
-    "i18n:extract": "node scripts/i18n-extract.js",
+    "i18n:extract": "node scripts/i18n-extract.mjs",
     "i18n:push": "crowdin push"
   },
   "type": "module",

scripts/build-docs.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-const sh = require('shelljs')
+import sh from 'shelljs'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
-const log = require('npmlog')
+import log from 'npmlog'
 
 vars.packagesWithDocs.forEach(([dest, src]) => {
     log.info('docs', src)

scripts/build-linux.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-const builder = require('electron-builder').build
+import { build as builder } from 'electron-builder'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
 
 const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
 

scripts/build-macos.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-const builder = require('electron-builder').build
+import { build as builder } from 'electron-builder'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
 
 const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
 

scripts/build-modules.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-const vars = require('./vars')
-const log = require('npmlog')
-const webpack = require('webpack')
-const { promisify } = require('util')
-
-const configs = [
-    '../app/webpack.main.config.js',
-    '../app/webpack.config.js',
-    ...vars.allPackages.map(x => `../${x}/webpack.config.js`),
-]
-
-;(async () => {
-    for (const c of configs) {
-        log.info('build', c)
-        const stats = await promisify(webpack)(require(c))
-        console.log(stats.toString({ colors: true }))
-        if (stats.hasErrors()) {
-            process.exit(1)
-        }
-    }
-})()

scripts/build-modules.mjs

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+import * as vars from './vars.mjs'
+import log from 'npmlog'
+import webpack from 'webpack'
+import { promisify } from 'node:util'
+
+const configs = [
+    '../app/webpack.config.main.mjs',
+    '../app/webpack.config.mjs',
+    ...vars.allPackages.map(x => `../${x}/webpack.config.mjs`),
+]
+
+;(async () => {
+    for (const c of configs) {
+        log.info('build', c)
+        const stats = await promisify(webpack)((await import(c)).default())
+        console.log(stats.toString({ colors: true }))
+        if (stats.hasErrors()) {
+            process.exit(1)
+        }
+    }
+})()

scripts/build-typings.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-const sh = require('shelljs')
+import sh from 'shelljs'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
-const log = require('npmlog')
+import log from 'npmlog'
 
 vars.builtinPlugins.forEach(plugin => {
     log.info('typings', plugin)

scripts/build-windows.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-const builder = require('electron-builder').build
+import { build as builder } from 'electron-builder'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
 
 const isTag = (process.env.GITHUB_REF || process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
 

scripts/generate-icon-metadata.mjs

@@ -1,7 +1,10 @@
 #!/usr/bin/env node
-const jsYaml = require('js-yaml')
+import jsYaml from 'js-yaml'
-const fs = require('fs')
+import fs from 'node:fs'
-const path = require('path')
+import path from 'node:path'
+
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
+
 const metadata = jsYaml.load(fs.readFileSync(path.resolve(__dirname, '../node_modules/@fortawesome/fontawesome-free/metadata/icons.yml')))
 
 let result = {}

scripts/i18n-extract.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-const sh = require('shelljs')
+import sh from 'shelljs'
-const fs = require('fs/promises')
+import fs from 'node:fs/promises'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
-const log = require('npmlog')
+import log from 'npmlog'
-const { GettextExtractor, JsExtractors, HtmlExtractors } = require('gettext-extractor')
+import { GettextExtractor, JsExtractors, HtmlExtractors } from 'gettext-extractor'
 
 let extractor = new GettextExtractor()
 

scripts/prepackage-plugins.mjs

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
-const rebuild = require('electron-rebuild').default
+import { rebuild } from 'electron-rebuild'
-const sh = require('shelljs')
+import sh from 'shelljs'
-const path = require('path')
+import path from 'node:path'
-const fs = require('fs')
+import fs from 'node:fs'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
-const log = require('npmlog')
+import log from 'npmlog'
+
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 
 let target = path.resolve(__dirname, '../builtin-plugins')
 sh.mkdir('-p', target)

scripts/publish-plugins.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-const sh = require('shelljs')
+import sh from 'shelljs'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
-const log = require('npmlog')
+import log from 'npmlog'
-const { execSync } = require('child_process')
+import { execSync } from 'child_process'
 
 vars.allPackages.forEach(plugin => {
     log.info('bump', plugin)

scripts/sentry-upload.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const sh = require('shelljs')
+import sh from 'shelljs'
-const vars = require('./vars')
+import * as vars from './vars.mjs'
 
 const sentryCli = process.platform === 'win32' ? 'node_modules\\.bin\\sentry-cli.cmd' : 'sentry-cli'
 

tabby-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-core",
-  "version": "1.0.189-nightly.2",
+  "version": "1.0.189-nightly.0",
   "description": "Tabby core",
   "keywords": [
     "tabby-builtin-plugin"

tabby-core/src/components/splitTabSpanner.component.scss

@@ -3,7 +3,6 @@
     position: absolute;
     z-index: 5;
     transition: 0.125s background;
-    background: rgba(0, 0, 0, .2);
 
     &.v {
         cursor: ns-resize;
@@ -16,8 +15,4 @@
         width: 10px;
         margin-left: -5px;
     }
-
-    &:hover, &.active {
-        background: rgba(255, 255, 255, .125);
-    }
 }

tabby-core/src/theme.new.scss

@@ -559,3 +559,11 @@ ngx-colors-panel .opened {
 start-page {
     background: var(--theme-bg);
 }
+
+split-tab-spanner {
+    background: rgba(var(--bs-dark-rgb), .1);
+
+    &:hover, &.active {
+        background: rgba(var(--bs-dark-rgb), .2);
+    }
+}

tabby-core/src/theme.paper.scss

@@ -397,3 +397,11 @@ terminal-toolbar {
 .bg-dark{
     background-color: $base2 !important;
 }
+
+split-tab-spanner {
+    background: rgba(0, 0, 0, .2);
+
+    &:hover, &.active {
+        background: rgba(255, 255, 255, .125);
+    }
+}

tabby-core/src/theme.scss

@@ -418,3 +418,11 @@ ngx-colors-panel .opened {
         fill: white;
     }
 }
+
+split-tab-spanner {
+    background: rgba(0, 0, 0, .2);
+
+    &:hover, &.active {
+        background: rgba(255, 255, 255, .125);
+    }
+}