Skip to content

Commit 4da27f9

Browse files
tophftophf
committed
fix linux/ci build: use @ as a root alias
1 parent 9e30433 commit 4da27f9

File tree

101 files changed

+512
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+512
-486
lines changed

‎.github/workflows/ci.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,23 @@ jobs:
1212
node-version: '>=20.6.0'
1313
- run: npm install
1414
- run: npm test
15+
16+
- run: echo "_REV=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
17+
18+
# MV2
19+
20+
- run: rm -rf dist && npm run build-chrome-mv2
21+
- uses: actions/upload-artifact@v4
22+
with:
23+
name: 'stylus-chrome-mv2-${{ env._VER }}-${{ env._REV }}'
24+
path: 'dist/*'
25+
if-no-files-found: error
26+
27+
# MV3
28+
29+
- run: rm -rf dist && npm run build-chrome-mv3
30+
- uses: actions/upload-artifact@v4
31+
with:
32+
name: 'stylus-chrome-mv3-${{ env._VER }}-${{ env._REV }}'
33+
path: 'dist/*'
34+
if-no-files-found: error

‎jsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"compilerOptions": {
33
"baseUrl": ".",
44
"paths": {
5-
"/*": ["./src/*"]
5+
"@/*": ["./src/*"]
66
}
77
},
88
"exclude": ["node_modules"],
99
"typeAcquisition": {
10-
"include": ["./types.d.ts"]
10+
"include": ["@/types.d.ts"]
1111
}
1212
}

‎src/background/broadcast-injector-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as prefs from '/js/prefs';
1+
import * as prefs from '@/js/prefs';
22
import {broadcast} from './broadcast';
33
import * as colorScheme from './color-scheme';
44
import {bgBusy, safeTimeout} from './common';

‎src/background/broadcast.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import '/js/browser';
2-
import {rxIgnorableError} from '/js/msg-api';
3-
import {ownRoot} from '/js/urls';
1+
import '@/js/browser';
2+
import {rxIgnorableError} from '@/js/msg-api';
3+
import {ownRoot} from '@/js/urls';
44
import * as tabMan from './tab-manager';
55

66
/**

‎src/background/browser-cmd-hotkeys.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import '/js/browser';
2-
import {knownKeys, subscribe} from '/js/prefs';
1+
import '@/js/browser';
2+
import {knownKeys, subscribe} from '@/js/prefs';
33

44
export default function initBrowserCommandsApi() {
55
const browserCommands = browser.commands;

‎src/background/color-scheme.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as prefs from '/js/prefs';
2-
import {debounce, isCssDarkScheme} from '/js/util';
1+
import * as prefs from '@/js/prefs';
2+
import {debounce, isCssDarkScheme} from '@/js/util';
33
import {bgBusy, bgPreInit, stateDB} from './common';
44

55
const changeListeners = new Set();

‎src/background/common.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {kResolve, kStateDB} from '/js/consts';
2-
import {CHROME} from '/js/ua';
3-
import {promiseWithResolve} from '/js/util';
4-
import {browserWindows} from '/js/util-webext';
1+
import {kResolve, kStateDB} from '@/js/consts';
2+
import {CHROME} from '@/js/ua';
3+
import {promiseWithResolve} from '@/js/util';
4+
import {browserWindows} from '@/js/util-webext';
55
import {getDbProxy} from './db';
66

77
export let bgBusy = promiseWithResolve();

‎src/background/content-scripts.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import '/js/browser';
2-
import {kUrl} from '/js/consts';
3-
import * as URLS from '/js/urls';
4-
import {sleep, stringAsRegExpStr} from '/js/util';
5-
import {ignoreChromeError, MF} from '/js/util-webext';
1+
import '@/js/browser';
2+
import {kUrl} from '@/js/consts';
3+
import * as URLS from '@/js/urls';
4+
import {sleep, stringAsRegExpStr} from '@/js/util';
5+
import {ignoreChromeError, MF} from '@/js/util-webext';
66
import {sendTab} from './broadcast';
77
import {webNavigation} from './navigation-manager';
88
import * as tabMan from './tab-manager';

‎src/background/context-menus.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import '/js/browser';
2-
import {kDisableAll} from '/js/consts';
3-
import {API} from '/js/msg';
4-
import * as prefs from '/js/prefs';
5-
import {CHROME} from '/js/ua';
6-
import {ownRoot} from '/js/urls';
7-
import {ignoreChromeError} from '/js/util-webext';
1+
import '@/js/browser';
2+
import {kDisableAll} from '@/js/consts';
3+
import {API} from '@/js/msg';
4+
import * as prefs from '@/js/prefs';
5+
import {CHROME} from '@/js/ua';
6+
import {ownRoot} from '@/js/urls';
7+
import {ignoreChromeError} from '@/js/util-webext';
88
import {sendTab} from './broadcast';
99

1010
const kStyleManager = 'styleManager';

‎src/background/db-chrome-storage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {chromeLocal} from '/js/storage-util';
1+
import {chromeLocal} from '@/js/storage-util';
22

33
export default function ChromeStorageDB(PREFIX) {
44
let INC;

‎src/background/db.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {API} from '/js/msg';
2-
import {STORAGE_KEY} from '/js/prefs';
3-
import {chromeLocal} from '/js/storage-util';
4-
import {CHROME} from '/js/ua';
5-
import {deepCopy} from '/js/util';
1+
import {API} from '@/js/msg';
2+
import {STORAGE_KEY} from '@/js/prefs';
3+
import {chromeLocal} from '@/js/storage-util';
4+
import {CHROME} from '@/js/ua';
5+
import {deepCopy} from '@/js/util';
66
import ChromeStorageDB from './db-chrome-storage';
77

88
/*

‎src/background/download.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {kAppUrlencoded, kContentType} from '/js/consts';
2-
import {uso, usoJson} from '/js/urls';
3-
import {tryJSONparse} from '/js/util';
1+
import {kAppUrlencoded, kContentType} from '@/js/consts';
2+
import {uso, usoJson} from '@/js/urls';
3+
import {tryJSONparse} from '@/js/util';
44

55
/** @type {Record<string, {req: Promise, ports: Set<chrome.runtime.Port>}>} */
66
const jobs = {};

‎src/background/icon-manager.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {kDisableAll} from '/js/consts';
2-
import {subscribe, __values as __prefs} from '/js/prefs';
3-
import {CHROME, FIREFOX, MOBILE, VIVALDI} from '/js/ua';
4-
import {debounce} from '/js/util';
5-
import {ignoreChromeError, MF_ICON_EXT, MF_ICON_PATH} from '/js/util-webext';
1+
import {kDisableAll} from '@/js/consts';
2+
import {subscribe, __values as __prefs} from '@/js/prefs';
3+
import {CHROME, FIREFOX, MOBILE, VIVALDI} from '@/js/ua';
4+
import {debounce} from '@/js/util';
5+
import {ignoreChromeError, MF_ICON_EXT, MF_ICON_PATH} from '@/js/util-webext';
66
import * as colorScheme from './color-scheme';
77
import {bgBusy, bgInit} from './common';
88
import {removePreloadedStyles} from './style-via-webrequest';

‎src/background/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import './intro';
2-
import '/js/browser';
3-
import {kInstall, kResolve} from '/js/consts';
4-
import {DNR, getRuleIds, updateDynamicRules, updateSessionRules} from '/js/dnr';
5-
import {_execute, API, onMessage} from '/js/msg';
6-
import {createPortProxy} from '/js/port';
7-
import * as prefs from '/js/prefs';
8-
import {CHROME, FIREFOX, MOBILE, WINDOWS} from '/js/ua';
9-
import {workerPath} from '/js/urls';
2+
import '@/js/browser';
3+
import {kInstall, kResolve} from '@/js/consts';
4+
import {DNR, getRuleIds, updateDynamicRules, updateSessionRules} from '@/js/dnr';
5+
import {_execute, API, onMessage} from '@/js/msg';
6+
import {createPortProxy} from '@/js/port';
7+
import * as prefs from '@/js/prefs';
8+
import {CHROME, FIREFOX, MOBILE, WINDOWS} from '@/js/ua';
9+
import {workerPath} from '@/js/urls';
1010
import {broadcast, pingTab} from './broadcast';
1111
import './broadcast-injector-config';
1212
import initBrowserCommandsApi from './browser-cmd-hotkeys';

‎src/background/navigation-manager.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import '/js/browser';
2-
import {kAboutBlank} from '/js/consts';
3-
import {CHROME, FIREFOX} from '/js/ua';
4-
import {chromeProtectsNTP} from '/js/urls';
5-
import {deepEqual} from '/js/util';
6-
import {ignoreChromeError, MF} from '/js/util-webext';
1+
import '@/js/browser';
2+
import {kAboutBlank} from '@/js/consts';
3+
import {CHROME, FIREFOX} from '@/js/ua';
4+
import {chromeProtectsNTP} from '@/js/urls';
5+
import {deepEqual} from '@/js/util';
6+
import {ignoreChromeError, MF} from '@/js/util-webext';
77
import {pingTab, sendTab} from './broadcast';
88
import * as tabMan from './tab-manager';
99

‎src/background/popup-data.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import '/js/browser';
2-
import {kAboutBlank, kPopup} from '/js/consts';
3-
import {API} from '/js/msg';
4-
import {CHROME, FIREFOX} from '/js/ua';
5-
import {chromeProtectsNTP, ownRoot, supported} from '/js/urls';
6-
import {getActiveTab} from '/js/util-webext';
1+
import '@/js/browser';
2+
import {kAboutBlank, kPopup} from '@/js/consts';
3+
import {API} from '@/js/msg';
4+
import {CHROME, FIREFOX} from '@/js/ua';
5+
import {chromeProtectsNTP, ownRoot, supported} from '@/js/urls';
6+
import {getActiveTab} from '@/js/util-webext';
77
import {pingTab} from './broadcast';
88
import reinjectContentScripts from './content-scripts';
99
import * as tabMan from './tab-manager';

‎src/background/prefs-api.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as chromeSync from '/js/chrome-sync';
2-
import * as prefs from '/js/prefs';
3-
import {debounce, deepEqual, deepMerge, isObject} from '/js/util';
1+
import * as chromeSync from '@/js/chrome-sync';
2+
import * as prefs from '@/js/prefs';
3+
import {debounce, deepEqual, deepMerge, isObject} from '@/js/util';
44
import {bgBusy, bgPreInit} from './common';
55

66
const nondefaults = {};

‎src/background/set-client-data.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {kPopup} from '/js/consts';
2-
import {API} from '/js/msg';
3-
import * as prefs from '/js/prefs';
4-
import {FIREFOX} from '/js/ua';
1+
import {kPopup} from '@/js/consts';
2+
import {API} from '@/js/msg';
3+
import * as prefs from '@/js/prefs';
4+
import {FIREFOX} from '@/js/ua';
55
import {isDark, setSystemDark} from './color-scheme';
66
import {bgBusy, isVivaldi} from './common';
77
import makePopupData from './popup-data';

‎src/background/style-manager.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {kUrl, UCD} from '/js/consts';
2-
import {API} from '/js/msg';
3-
import * as prefs from '/js/prefs';
4-
import {calcStyleDigest, styleCodeEmpty} from '/js/sections-util';
5-
import {CHROME} from '/js/ua';
6-
import * as URLS from '/js/urls';
7-
import {deepEqual, isEmptyObj, mapObj, stringAsRegExpStr, tryRegExp, tryURL} from '/js/util';
1+
import {kUrl, UCD} from '@/js/consts';
2+
import {API} from '@/js/msg';
3+
import * as prefs from '@/js/prefs';
4+
import {calcStyleDigest, styleCodeEmpty} from '@/js/sections-util';
5+
import {CHROME} from '@/js/ua';
6+
import * as URLS from '@/js/urls';
7+
import {deepEqual, isEmptyObj, mapObj, stringAsRegExpStr, tryRegExp, tryURL} from '@/js/util';
88
import {broadcast, broadcastExtension} from './broadcast';
99
import broadcastInjectorConfig from './broadcast-injector-config';
1010
import * as colorScheme from './color-scheme';

‎src/background/style-search-db.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {UCD} from '/js/consts';
2-
import {debounce, RX_META, stringAsRegExp, tryRegExp} from '/js/util';
1+
import {UCD} from '@/js/consts';
2+
import {debounce, RX_META, stringAsRegExp, tryRegExp} from '@/js/util';
33
import {getByUrl, iterStyles} from './style-manager';
44

55
// toLocaleLowerCase cache, autocleared after 1 minute

‎src/background/style-via-api.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import '/js/browser';
2-
import {API} from '/js/msg';
3-
import * as prefs from '/js/prefs';
4-
import {isEmptyObj} from '/js/util';
1+
import '@/js/browser';
2+
import {API} from '@/js/msg';
3+
import * as prefs from '@/js/prefs';
4+
import {isEmptyObj} from '@/js/util';
55
import {webNavigation} from './navigation-manager';
66
import {getSectionsByUrl, order} from './style-manager';
77

‎src/background/style-via-webrequest.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import {kAppJson, kMainFrame, kPopup, kSubFrame} from '/js/consts';
2-
import {updateSessionRules} from '/js/dnr';
3-
import {API} from '/js/msg';
4-
import * as prefs from '/js/prefs';
5-
import {CHROME, FIREFOX} from '/js/ua';
6-
import {actionPopupUrl, ownRoot} from '/js/urls';
7-
import {deepEqual, isEmptyObj} from '/js/util';
8-
import {ignoreChromeError, ownId, toggleListener} from '/js/util-webext';
1+
import {kAppJson, kMainFrame, kPopup, kSubFrame} from '@/js/consts';
2+
import {updateSessionRules} from '@/js/dnr';
3+
import {API} from '@/js/msg';
4+
import * as prefs from '@/js/prefs';
5+
import {CHROME, FIREFOX} from '@/js/ua';
6+
import {actionPopupUrl, ownRoot} from '@/js/urls';
7+
import {deepEqual, isEmptyObj} from '@/js/util';
8+
import {ignoreChromeError, ownId, toggleListener} from '@/js/util-webext';
99
import {bgBusy, bgPreInit, stateDB} from './common';
1010
import {webNavigation} from './navigation-manager';
1111
import makePopupData from './popup-data';

‎src/background/sw/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import '../intro'; // sets global.API
22
import './keep-alive'; // sets global.keepAlive
3-
import {kMainFrame, kSubFrame} from '/js/consts';
4-
import {_execute, API} from '/js/msg';
5-
import {CONNECTED, createPortProxy, initRemotePort} from '/js/port';
6-
import * as prefs from '/js/prefs';
7-
import {ownRoot, workerPath} from '/js/urls';
8-
import {sleep} from '/js/util';
3+
import {kMainFrame, kSubFrame} from '@/js/consts';
4+
import {_execute, API} from '@/js/msg';
5+
import {CONNECTED, createPortProxy, initRemotePort} from '@/js/port';
6+
import * as prefs from '@/js/prefs';
7+
import {ownRoot, workerPath} from '@/js/urls';
8+
import {sleep} from '@/js/util';
99
import {setSystemDark} from '../color-scheme';
1010
import {bgBusy, bgPreInit} from '../common';
1111
import {cloudDrive} from '../db-to-cloud-broker';

‎src/background/sw/keep-alive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as prefs from '/js/prefs';
1+
import * as prefs from '@/js/prefs';
22
import {bgBusy} from '../common';
33

44
/** @type {?Promise[]} */

‎src/background/sw/offscreen.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {createPortProxy} from '/js/port';
2-
import {ownRoot} from '/js/urls';
1+
import {createPortProxy} from '@/js/port';
2+
import {ownRoot} from '@/js/urls';
33

44
let creating;
55

‎src/background/sync-manager.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import '/js/browser';
2-
import * as chromeSync from '/js/chrome-sync';
3-
import * as prefs from '/js/prefs';
4-
import {chromeLocal} from '/js/storage-util';
5-
import {fetchWebDAV, hasOwn} from '/js/util';
1+
import '@/js/browser';
2+
import * as chromeSync from '@/js/chrome-sync';
3+
import * as prefs from '@/js/prefs';
4+
import {chromeLocal} from '@/js/storage-util';
5+
import {fetchWebDAV, hasOwn} from '@/js/util';
66
import {broadcastExtension} from './broadcast';
77
import {uuidIndex} from './common';
88
import {db} from './db';

‎src/background/tab-manager.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {kApplyPort} from '/js/consts';
2-
import {supported} from '/js/urls';
3-
import {ignoreChromeError} from '/js/util-webext';
1+
import {kApplyPort} from '@/js/consts';
2+
import {supported} from '@/js/urls';
3+
import {ignoreChromeError} from '@/js/util-webext';
44
import {bgBusy, bgInit, stateDB} from './common';
55
import {onUrlChange} from './navigation-manager';
66

‎src/background/tab-util.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import '/js/browser';
2-
import {API} from '/js/msg';
3-
import * as prefs from '/js/prefs';
4-
import {CHROME, FIREFOX} from '/js/ua';
5-
import {browserWindows, getActiveTab} from '/js/util-webext';
1+
import '@/js/browser';
2+
import {API} from '@/js/msg';
3+
import * as prefs from '@/js/prefs';
4+
import {CHROME, FIREFOX} from '@/js/ua';
5+
import {browserWindows, getActiveTab} from '@/js/util-webext';
66
import {sendTab} from './broadcast';
77

88
// FF57+ supports openerTabId, but not in Android

‎src/background/token-manager.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {kAppUrlencoded, kContentType} from '/js/consts';
2-
import {DNR_ID_IDENTITY, updateDynamicRules} from '/js/dnr';
3-
import {chromeLocal} from '/js/storage-util';
4-
import {FIREFOX} from '/js/ua';
5-
import * as URLS from '/js/urls';
6-
import {clamp, getHost} from '/js/util';
7-
import {browserWindows} from '/js/util-webext';
1+
import {kAppUrlencoded, kContentType} from '@/js/consts';
2+
import {DNR_ID_IDENTITY, updateDynamicRules} from '@/js/dnr';
3+
import {chromeLocal} from '@/js/storage-util';
4+
import {FIREFOX} from '@/js/ua';
5+
import * as URLS from '@/js/urls';
6+
import {clamp, getHost} from '@/js/util';
7+
import {browserWindows} from '@/js/util-webext';
88
import launchWebAuthFlow from 'webext-launch-web-auth-flow';
99
import {isVivaldi} from './common';
1010

0 commit comments

Comments
 (0)