wxt 0.5.5 → 0.6.0-alpha1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.cjs +31 -24
- package/dist/client.d.ts +54 -2
- package/dist/client.js +134 -1
- package/dist/index.cjs +30 -23
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +59 -5
- package/dist/index.d.ts +59 -5
- package/dist/index.js +30 -23
- package/dist/index.js.map +1 -1
- package/dist/virtual-modules/content-script-entrypoint.js +118 -1
- package/dist/virtual-modules/content-script-entrypoint.js.map +1 -1
- package/package.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -1,5 +1,57 @@
|
|
|
1
1
|
import { Manifest } from 'webextension-polyfill';
|
|
2
2
|
|
|
3
|
+
/**
|
|
4
|
+
* Extends [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
|
|
5
|
+
* Used to detect and stop content script code when the script is invalidated.
|
|
6
|
+
*
|
|
7
|
+
* It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in
|
|
8
|
+
* content scripts instead of `window.setTimeout` or `window.setInterval`.
|
|
9
|
+
*/
|
|
10
|
+
declare class ContentScriptContext extends AbortController {
|
|
11
|
+
#private;
|
|
12
|
+
private readonly contentScriptName;
|
|
13
|
+
static SCRIPT_STARTED_MESSAGE_TYPE: string;
|
|
14
|
+
constructor(contentScriptName: string);
|
|
15
|
+
get isInvalid(): boolean;
|
|
16
|
+
get isValid(): boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Add a listener that is called when the content script's context is invalidated.
|
|
19
|
+
*
|
|
20
|
+
* @returns A function to remove the listener.
|
|
21
|
+
*
|
|
22
|
+
* @example
|
|
23
|
+
* browser.runtime.onMessage.addListener(cb);
|
|
24
|
+
* const removeInvalidatedListener = ctx.onInvalidated(() => {
|
|
25
|
+
* browser.runtime.onMessage.removeListener(cb);
|
|
26
|
+
* })
|
|
27
|
+
* // ...
|
|
28
|
+
* removeInvalidatedListener();
|
|
29
|
+
*/
|
|
30
|
+
onInvalidated(cb: () => void): () => void;
|
|
31
|
+
/**
|
|
32
|
+
* Wrapper around `window.setInterval` that automatically clears the interval when invalidated.
|
|
33
|
+
*/
|
|
34
|
+
setInterval(handler: () => void, timeout?: number): number;
|
|
35
|
+
/**
|
|
36
|
+
* Wrapper around `window.setTimeout` that automatically clears the interval when invalidated.
|
|
37
|
+
*/
|
|
38
|
+
setTimeout(handler: () => void, timeout?: number): number;
|
|
39
|
+
/**
|
|
40
|
+
* Wrapper around `window.requestAnimationFrame` that automatically cancels the request when
|
|
41
|
+
* invalidated.
|
|
42
|
+
*/
|
|
43
|
+
requestAnimationFrame(callback: FrameRequestCallback): number;
|
|
44
|
+
/**
|
|
45
|
+
* Wrapper around `window.requestIdleCallback` that automatically cancels the request when
|
|
46
|
+
* invalidated.
|
|
47
|
+
*/
|
|
48
|
+
requestIdleCallback(callback: IdleRequestCallback, options?: IdleRequestOptions): number;
|
|
49
|
+
/**
|
|
50
|
+
* Abort the abort controller and execute all `onInvalidated` listeners.
|
|
51
|
+
*/
|
|
52
|
+
notifyInvalidated(): void;
|
|
53
|
+
}
|
|
54
|
+
|
|
3
55
|
type TargetBrowser = string;
|
|
4
56
|
interface ContentScriptDefinition extends ExcludableEntrypoint {
|
|
5
57
|
matches: Manifest.ContentScript['matches'];
|
|
@@ -46,7 +98,7 @@ interface ContentScriptDefinition extends ExcludableEntrypoint {
|
|
|
46
98
|
/**
|
|
47
99
|
* Main function executed when the content script is loaded.
|
|
48
100
|
*/
|
|
49
|
-
main(): void | Promise<void>;
|
|
101
|
+
main(ctx: ContentScriptContext): void | Promise<void>;
|
|
50
102
|
}
|
|
51
103
|
interface BackgroundScriptDefintition extends ExcludableEntrypoint {
|
|
52
104
|
type?: 'module';
|
|
@@ -76,4 +128,4 @@ declare function defineBackground(definition: BackgroundScriptDefintition): Back
|
|
|
76
128
|
|
|
77
129
|
declare function mountContentScriptUi(): void;
|
|
78
130
|
|
|
79
|
-
export { defineBackground, defineContentScript, mountContentScriptUi };
|
|
131
|
+
export { ContentScriptContext, defineBackground, defineContentScript, mountContentScriptUi };
|
package/dist/client.js
CHANGED
|
@@ -14,9 +14,142 @@ function defineBackground(arg) {
|
|
|
14
14
|
function mountContentScriptUi() {
|
|
15
15
|
throw Error("Not implemented: mountContentScriptUi");
|
|
16
16
|
}
|
|
17
|
+
|
|
18
|
+
// src/client/browser.ts
|
|
19
|
+
import originalBrowser from "webextension-polyfill";
|
|
20
|
+
var browser = originalBrowser;
|
|
21
|
+
|
|
22
|
+
// src/client/utils/logger.ts
|
|
23
|
+
function print(method, ...args) {
|
|
24
|
+
if (typeof args[0] === "string") {
|
|
25
|
+
const message = args.shift();
|
|
26
|
+
method(`[wxt] ${message}`, ...args);
|
|
27
|
+
} else {
|
|
28
|
+
method("[wxt]", ...args);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
var logger = {
|
|
32
|
+
debug: (...args) => print(console.debug, ...args),
|
|
33
|
+
log: (...args) => print(console.log, ...args),
|
|
34
|
+
warn: (...args) => print(console.warn, ...args),
|
|
35
|
+
error: (...args) => print(console.error, ...args)
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
// src/client/utils/ContentScriptContext.ts
|
|
39
|
+
var ContentScriptContext = class _ContentScriptContext extends AbortController {
|
|
40
|
+
constructor(contentScriptName) {
|
|
41
|
+
super();
|
|
42
|
+
this.contentScriptName = contentScriptName;
|
|
43
|
+
if (this.#isTopFrame) {
|
|
44
|
+
this.#stopOldScripts();
|
|
45
|
+
}
|
|
46
|
+
this.setTimeout(() => {
|
|
47
|
+
this.#listenForNewerScripts();
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
static SCRIPT_STARTED_MESSAGE_TYPE = "wxt:content-script-started";
|
|
51
|
+
#isTopFrame = window.self === window.top;
|
|
52
|
+
get isInvalid() {
|
|
53
|
+
if (browser.runtime.id == null) {
|
|
54
|
+
this.notifyInvalidated();
|
|
55
|
+
}
|
|
56
|
+
return this.signal.aborted;
|
|
57
|
+
}
|
|
58
|
+
get isValid() {
|
|
59
|
+
return !this.isInvalid;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Add a listener that is called when the content script's context is invalidated.
|
|
63
|
+
*
|
|
64
|
+
* @returns A function to remove the listener.
|
|
65
|
+
*
|
|
66
|
+
* @example
|
|
67
|
+
* browser.runtime.onMessage.addListener(cb);
|
|
68
|
+
* const removeInvalidatedListener = ctx.onInvalidated(() => {
|
|
69
|
+
* browser.runtime.onMessage.removeListener(cb);
|
|
70
|
+
* })
|
|
71
|
+
* // ...
|
|
72
|
+
* removeInvalidatedListener();
|
|
73
|
+
*/
|
|
74
|
+
onInvalidated(cb) {
|
|
75
|
+
this.signal.addEventListener("abort", cb);
|
|
76
|
+
return () => this.signal.removeEventListener("abort", cb);
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Wrapper around `window.setInterval` that automatically clears the interval when invalidated.
|
|
80
|
+
*/
|
|
81
|
+
setInterval(handler, timeout) {
|
|
82
|
+
const id = setInterval(() => {
|
|
83
|
+
if (this.isValid)
|
|
84
|
+
handler();
|
|
85
|
+
}, timeout);
|
|
86
|
+
this.onInvalidated(() => clearInterval(id));
|
|
87
|
+
return id;
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Wrapper around `window.setTimeout` that automatically clears the interval when invalidated.
|
|
91
|
+
*/
|
|
92
|
+
setTimeout(handler, timeout) {
|
|
93
|
+
const id = setTimeout(() => {
|
|
94
|
+
if (this.isValid)
|
|
95
|
+
handler();
|
|
96
|
+
}, timeout);
|
|
97
|
+
this.onInvalidated(() => clearTimeout(id));
|
|
98
|
+
return id;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Wrapper around `window.requestAnimationFrame` that automatically cancels the request when
|
|
102
|
+
* invalidated.
|
|
103
|
+
*/
|
|
104
|
+
requestAnimationFrame(callback) {
|
|
105
|
+
const id = requestAnimationFrame((...args) => {
|
|
106
|
+
if (this.isValid)
|
|
107
|
+
callback(...args);
|
|
108
|
+
});
|
|
109
|
+
this.onInvalidated(() => cancelAnimationFrame(id));
|
|
110
|
+
return id;
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Wrapper around `window.requestIdleCallback` that automatically cancels the request when
|
|
114
|
+
* invalidated.
|
|
115
|
+
*/
|
|
116
|
+
requestIdleCallback(callback, options) {
|
|
117
|
+
const id = requestIdleCallback((...args) => {
|
|
118
|
+
if (!this.signal.aborted)
|
|
119
|
+
callback(...args);
|
|
120
|
+
}, options);
|
|
121
|
+
this.onInvalidated(() => cancelIdleCallback(id));
|
|
122
|
+
return id;
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Abort the abort controller and execute all `onInvalidated` listeners.
|
|
126
|
+
*/
|
|
127
|
+
notifyInvalidated() {
|
|
128
|
+
this.abort("Content script context invalidated");
|
|
129
|
+
logger.debug(
|
|
130
|
+
`Content script "${this.contentScriptName}" context invalidated`
|
|
131
|
+
);
|
|
132
|
+
}
|
|
133
|
+
#stopOldScripts() {
|
|
134
|
+
window.postMessage({
|
|
135
|
+
event: _ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE,
|
|
136
|
+
contentScriptName: this.contentScriptName
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
#listenForNewerScripts() {
|
|
140
|
+
const cb = (event) => {
|
|
141
|
+
if (event.data?.type === _ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE && event.data?.contentScriptName === this.contentScriptName) {
|
|
142
|
+
this.notifyInvalidated();
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
addEventListener("message", cb);
|
|
146
|
+
this.onInvalidated(() => removeEventListener("message", cb));
|
|
147
|
+
}
|
|
148
|
+
};
|
|
17
149
|
export {
|
|
150
|
+
ContentScriptContext,
|
|
18
151
|
defineBackground,
|
|
19
152
|
defineContentScript,
|
|
20
153
|
mountContentScriptUi
|
|
21
154
|
};
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2NsaWVudC9kZWZpbmVDb250ZW50U2NyaXB0LnRzIiwgIi4uL3NyYy9jbGllbnQvZGVmaW5lQmFja2dyb3VuZC50cyIsICIuLi9zcmMvY2xpZW50L21vdW50Q29udGVudFNjcmlwdFVpLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJpbXBvcnQgeyBDb250ZW50U2NyaXB0RGVmaW5pdGlvbiB9IGZyb20gJy4uL2NvcmUvdHlwZXMnO1xuXG5leHBvcnQgZnVuY3Rpb24gZGVmaW5lQ29udGVudFNjcmlwdChcbiAgZGVmaW5pdGlvbjogQ29udGVudFNjcmlwdERlZmluaXRpb24sXG4pOiBDb250ZW50U2NyaXB0RGVmaW5pdGlvbiB7XG4gIHJldHVybiBkZWZpbml0aW9uO1xufVxuIiwgImltcG9ydCB7IEJhY2tncm91bmRTY3JpcHREZWZpbnRpdGlvbiB9IGZyb20gJy4uJztcblxuZXhwb3J0IGZ1bmN0aW9uIGRlZmluZUJhY2tncm91bmQobWFpbjogKCkgPT4gdm9pZCk6IEJhY2tncm91bmRTY3JpcHREZWZpbnRpdGlvbjtcbmV4cG9ydCBmdW5jdGlvbiBkZWZpbmVCYWNrZ3JvdW5kKFxuICBkZWZpbml0aW9uOiBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb24sXG4pOiBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb247XG5leHBvcnQgZnVuY3Rpb24gZGVmaW5lQmFja2dyb3VuZChcbiAgYXJnOiAoKCkgPT4gdm9pZCkgfCBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb24sXG4pOiBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb24ge1xuICBpZiAodHlwZW9mIGFyZyA9PT0gJ2Z1bmN0aW9uJykgcmV0dXJuIHsgbWFpbjogYXJnIH07XG4gIHJldHVybiBhcmc7XG59XG4iLCAiZXhwb3J0IGZ1bmN0aW9uIG1vdW50Q29udGVudFNjcmlwdFVpKCkge1xuICB0aHJvdyBFcnJvcignTm90IGltcGxlbWVudGVkOiBtb3VudENvbnRlbnRTY3JpcHRVaScpO1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUVPLFNBQVMsb0JBQ2QsWUFDeUI7QUFDekIsU0FBTztBQUNUOzs7QUNBTyxTQUFTLGlCQUNkLEtBQzZCO0FBQzdCLE1BQUksT0FBTyxRQUFRO0FBQVksV0FBTyxFQUFFLE1BQU0sSUFBSTtBQUNsRCxTQUFPO0FBQ1Q7OztBQ1hPLFNBQVMsdUJBQXVCO0FBQ3JDLFFBQU0sTUFBTSx1Q0FBdUM7QUFDckQ7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../src/client/defineContentScript.ts", "../src/client/defineBackground.ts", "../src/client/mountContentScriptUi.ts", "../src/client/browser.ts", "../src/client/utils/logger.ts", "../src/client/utils/ContentScriptContext.ts"],
  "sourcesContent": ["import { ContentScriptDefinition } from '../core/types';\n\nexport function defineContentScript(\n  definition: ContentScriptDefinition,\n): ContentScriptDefinition {\n  return definition;\n}\n", "import { BackgroundScriptDefintition } from '..';\n\nexport function defineBackground(main: () => void): BackgroundScriptDefintition;\nexport function defineBackground(\n  definition: BackgroundScriptDefintition,\n): BackgroundScriptDefintition;\nexport function defineBackground(\n  arg: (() => void) | BackgroundScriptDefintition,\n): BackgroundScriptDefintition {\n  if (typeof arg === 'function') return { main: arg };\n  return arg;\n}\n", "export function mountContentScriptUi() {\n  throw Error('Not implemented: mountContentScriptUi');\n}\n", "import originalBrowser, { Browser, Runtime, I18n } from 'webextension-polyfill';\n\nexport interface AugmentedBrowser extends Browser {\n  runtime: WxtRuntime;\n  i18n: WxtI18n;\n}\n\nexport interface WxtRuntime extends Runtime.Static {\n  // Overriden per-project\n}\n\nexport interface WxtI18n extends I18n.Static {\n  // Overriden per-project\n}\n\nexport const browser: AugmentedBrowser = originalBrowser;\n", "function print(method: (...args: any[]) => void, ...args: any[]) {\n  if (typeof args[0] === 'string') {\n    const message = args.shift();\n    method(`[wxt] ${message}`, ...args);\n  } else {\n    method('[wxt]', ...args);\n  }\n}\n\n/**\n * Wrapper around `console` with a \"[wxt]\" prefix\n */\nexport const logger = {\n  debug: (...args: any[]) => print(console.debug, ...args),\n  log: (...args: any[]) => print(console.log, ...args),\n  warn: (...args: any[]) => print(console.warn, ...args),\n  error: (...args: any[]) => print(console.error, ...args),\n};\n", "import { browser } from '../browser';\nimport { logger } from './logger';\n\n/**\n * Extends [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).\n * Used to detect and stop content script code when the script is invalidated.\n *\n * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in\n * content scripts instead of `window.setTimeout` or `window.setInterval`.\n */\nexport class ContentScriptContext extends AbortController {\n  static SCRIPT_STARTED_MESSAGE_TYPE = 'wxt:content-script-started';\n\n  #isTopFrame = window.self === window.top;\n\n  constructor(private readonly contentScriptName: string) {\n    super();\n\n    if (this.#isTopFrame) {\n      this.#stopOldScripts();\n    }\n    this.setTimeout(() => {\n      // Run on next tick so the listener it adds isn't triggered by stopOldScript\n      this.#listenForNewerScripts();\n    });\n  }\n\n  get isInvalid(): boolean {\n    if (browser.runtime.id == null) {\n      this.notifyInvalidated(); // Sets `signal.aborted` to true\n    }\n    return this.signal.aborted;\n  }\n\n  get isValid(): boolean {\n    return !this.isInvalid;\n  }\n\n  /**\n   * Add a listener that is called when the content script's context is invalidated.\n   *\n   * @returns A function to remove the listener.\n   *\n   * @example\n   * browser.runtime.onMessage.addListener(cb);\n   * const removeInvalidatedListener = ctx.onInvalidated(() => {\n   *   browser.runtime.onMessage.removeListener(cb);\n   * })\n   * // ...\n   * removeInvalidatedListener();\n   */\n  onInvalidated(cb: () => void): () => void {\n    this.signal.addEventListener('abort', cb);\n    return () => this.signal.removeEventListener('abort', cb);\n  }\n\n  /**\n   * Wrapper around `window.setInterval` that automatically clears the interval when invalidated.\n   */\n  setInterval(handler: () => void, timeout?: number): number {\n    const id = setInterval(() => {\n      if (this.isValid) handler();\n    }, timeout) as unknown as number;\n    this.onInvalidated(() => clearInterval(id));\n    return id;\n  }\n\n  /**\n   * Wrapper around `window.setTimeout` that automatically clears the interval when invalidated.\n   */\n  setTimeout(handler: () => void, timeout?: number): number {\n    const id = setTimeout(() => {\n      if (this.isValid) handler();\n    }, timeout) as unknown as number;\n    this.onInvalidated(() => clearTimeout(id));\n    return id;\n  }\n\n  /**\n   * Wrapper around `window.requestAnimationFrame` that automatically cancels the request when\n   * invalidated.\n   */\n  requestAnimationFrame(callback: FrameRequestCallback): number {\n    const id = requestAnimationFrame((...args) => {\n      if (this.isValid) callback(...args);\n    });\n\n    this.onInvalidated(() => cancelAnimationFrame(id));\n    return id;\n  }\n\n  /**\n   * Wrapper around `window.requestIdleCallback` that automatically cancels the request when\n   * invalidated.\n   */\n  requestIdleCallback(\n    callback: IdleRequestCallback,\n    options?: IdleRequestOptions,\n  ): number {\n    const id = requestIdleCallback((...args) => {\n      if (!this.signal.aborted) callback(...args);\n    }, options);\n\n    this.onInvalidated(() => cancelIdleCallback(id));\n    return id;\n  }\n\n  /**\n   * Abort the abort controller and execute all `onInvalidated` listeners.\n   */\n  notifyInvalidated() {\n    this.abort('Content script context invalidated');\n    logger.debug(\n      `Content script \"${this.contentScriptName}\" context invalidated`,\n    );\n  }\n\n  #stopOldScripts() {\n    // Use postMessage so it get's sent to all the frames of the page.\n    window.postMessage({\n      event: ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE,\n      contentScriptName: this.contentScriptName,\n    });\n  }\n\n  #listenForNewerScripts() {\n    const cb = (event: MessageEvent) => {\n      if (\n        event.data?.type === ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE &&\n        event.data?.contentScriptName === this.contentScriptName\n      ) {\n        this.notifyInvalidated();\n      }\n    };\n\n    addEventListener('message', cb);\n    this.onInvalidated(() => removeEventListener('message', cb));\n  }\n}\n"],
  "mappings": "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",
  "names": []
}

|
package/dist/index.cjs
CHANGED
|
@@ -492,6 +492,15 @@ function getGlobals(config) {
|
|
|
492
492
|
}
|
|
493
493
|
];
|
|
494
494
|
}
|
|
495
|
+
function getEntrypointGlobals(config, entrypointName) {
|
|
496
|
+
return [
|
|
497
|
+
{
|
|
498
|
+
name: "__ENTRYPOINT__",
|
|
499
|
+
value: entrypointName,
|
|
500
|
+
type: `string`
|
|
501
|
+
}
|
|
502
|
+
];
|
|
503
|
+
}
|
|
495
504
|
|
|
496
505
|
// src/core/utils/getInternalConfig.ts
|
|
497
506
|
async function getInternalConfig(inlineConfig, command) {
|
|
@@ -538,6 +547,7 @@ async function getInternalConfig(inlineConfig, command) {
|
|
|
538
547
|
command,
|
|
539
548
|
debug,
|
|
540
549
|
entrypointsDir,
|
|
550
|
+
env,
|
|
541
551
|
fsCache: createFsCache(wxtDir),
|
|
542
552
|
imports: mergedConfig.imports ?? {},
|
|
543
553
|
logger,
|
|
@@ -551,16 +561,12 @@ async function getInternalConfig(inlineConfig, command) {
|
|
|
551
561
|
runnerConfig,
|
|
552
562
|
srcDir,
|
|
553
563
|
typesDir,
|
|
554
|
-
vite: {},
|
|
564
|
+
vite: () => ({}),
|
|
555
565
|
// Real value added after this object is initialized.
|
|
556
566
|
wxtDir,
|
|
557
567
|
zip: resolveInternalZipConfig(root, mergedConfig)
|
|
558
568
|
};
|
|
559
|
-
finalConfig.vite =
|
|
560
|
-
env,
|
|
561
|
-
mergedConfig,
|
|
562
|
-
finalConfig
|
|
563
|
-
);
|
|
569
|
+
finalConfig.vite = (env2) => resolveInternalViteConfig(env2, mergedConfig, finalConfig);
|
|
564
570
|
return finalConfig;
|
|
565
571
|
}
|
|
566
572
|
async function resolveManifestConfig(env, manifest) {
|
|
@@ -584,9 +590,9 @@ function mergeInlineConfig(inlineConfig, userConfig) {
|
|
|
584
590
|
return vite2.mergeConfig(user, inline);
|
|
585
591
|
};
|
|
586
592
|
const viteConfig = async (env) => {
|
|
587
|
-
const user = await
|
|
588
|
-
const inline = await
|
|
589
|
-
return vite2.mergeConfig(user, inline);
|
|
593
|
+
const user = await userConfig.vite?.(env);
|
|
594
|
+
const inline = await inlineConfig.vite?.(env);
|
|
595
|
+
return vite2.mergeConfig(user ?? {}, inline ?? {});
|
|
590
596
|
};
|
|
591
597
|
const runner = vite2.mergeConfig(
|
|
592
598
|
userConfig.runner ?? {},
|
|
@@ -614,9 +620,6 @@ function mergeInlineConfig(inlineConfig, userConfig) {
|
|
|
614
620
|
zip
|
|
615
621
|
};
|
|
616
622
|
}
|
|
617
|
-
async function resolveViteConfig(env, vite6) {
|
|
618
|
-
return await (typeof vite6 === "function" ? vite6(env) : vite6 ?? {});
|
|
619
|
-
}
|
|
620
623
|
function resolveInternalZipConfig(root, mergedConfig) {
|
|
621
624
|
return {
|
|
622
625
|
sourcesTemplate: "{{name}}-{{version}}-sources.zip",
|
|
@@ -638,10 +641,7 @@ function resolveInternalZipConfig(root, mergedConfig) {
|
|
|
638
641
|
};
|
|
639
642
|
}
|
|
640
643
|
async function resolveInternalViteConfig(env, mergedConfig, finalConfig) {
|
|
641
|
-
const internalVite = await
|
|
642
|
-
env,
|
|
643
|
-
mergedConfig.vite
|
|
644
|
-
);
|
|
644
|
+
const internalVite = await mergedConfig.vite?.(env) ?? {};
|
|
645
645
|
internalVite.root = finalConfig.root;
|
|
646
646
|
internalVite.configFile = false;
|
|
647
647
|
internalVite.logLevel = "warn";
|
|
@@ -851,9 +851,12 @@ async function buildSingleEntrypoint(entrypoint, config) {
|
|
|
851
851
|
"process.env.NODE_ENV": JSON.stringify(config.mode)
|
|
852
852
|
}
|
|
853
853
|
};
|
|
854
|
+
for (const global of getEntrypointGlobals(config, entrypoint.name)) {
|
|
855
|
+
libMode.define[global.name] = JSON.stringify(global.value);
|
|
856
|
+
}
|
|
854
857
|
const entryConfig = vite3.mergeConfig(
|
|
855
858
|
libMode,
|
|
856
|
-
config.vite
|
|
859
|
+
await config.vite(config.env)
|
|
857
860
|
);
|
|
858
861
|
const result = await vite3.build(entryConfig);
|
|
859
862
|
return {
|
|
@@ -879,11 +882,15 @@ async function buildMultipleEntrypoints(entrypoints, config) {
|
|
|
879
882
|
assetFileNames: "assets/[name]-[hash].[ext]"
|
|
880
883
|
}
|
|
881
884
|
}
|
|
882
|
-
}
|
|
885
|
+
},
|
|
886
|
+
define: {}
|
|
883
887
|
};
|
|
888
|
+
for (const global of getEntrypointGlobals(config, "html")) {
|
|
889
|
+
multiPage.define[global.name] = JSON.stringify(global.value);
|
|
890
|
+
}
|
|
884
891
|
const entryConfig = vite3.mergeConfig(
|
|
885
892
|
multiPage,
|
|
886
|
-
config.vite
|
|
893
|
+
await config.vite(config.env)
|
|
887
894
|
);
|
|
888
895
|
const result = await vite3.build(entryConfig);
|
|
889
896
|
return {
|
|
@@ -1403,7 +1410,7 @@ declare module "wxt/browser" {
|
|
|
1403
1410
|
}
|
|
1404
1411
|
async function writeGlobalsDeclarationFile(config) {
|
|
1405
1412
|
const filePath = (0, import_path9.resolve)(config.typesDir, "globals.d.ts");
|
|
1406
|
-
const globals = getGlobals(config);
|
|
1413
|
+
const globals = [...getGlobals(config), ...getEntrypointGlobals(config, "")];
|
|
1407
1414
|
await writeFileIfDifferent(
|
|
1408
1415
|
filePath,
|
|
1409
1416
|
[
|
|
@@ -2186,7 +2193,7 @@ async function getServerInfo() {
|
|
|
2186
2193
|
async function setupServer(serverInfo, config) {
|
|
2187
2194
|
const runner = createWebExtRunner();
|
|
2188
2195
|
const viteServer = await vite5.createServer(
|
|
2189
|
-
vite5.mergeConfig(serverInfo, config.vite)
|
|
2196
|
+
vite5.mergeConfig(serverInfo, await config.vite(config.env))
|
|
2190
2197
|
);
|
|
2191
2198
|
const start = async () => {
|
|
2192
2199
|
await viteServer.listen(server.port);
|
|
@@ -2287,7 +2294,7 @@ async function clean(root = process.cwd()) {
|
|
|
2287
2294
|
}
|
|
2288
2295
|
|
|
2289
2296
|
// package.json
|
|
2290
|
-
var version2 = "0.
|
|
2297
|
+
var version2 = "0.6.0-alpha1";
|
|
2291
2298
|
|
|
2292
2299
|
// src/core/utils/defineConfig.ts
|
|
2293
2300
|
function defineConfig(config) {
|
|
@@ -2310,7 +2317,7 @@ async function createServer2(config) {
|
|
|
2310
2317
|
return getInternalConfig(
|
|
2311
2318
|
{
|
|
2312
2319
|
...config,
|
|
2313
|
-
vite: serverInfo.viteServerConfig
|
|
2320
|
+
vite: () => serverInfo.viteServerConfig
|
|
2314
2321
|
},
|
|
2315
2322
|
"serve"
|
|
2316
2323
|
);
|