Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

feat(harper.js): optimize bundler configuration and fix worker shims

Asuka109fde9f2edc9b9
diff --git a/packages/harper.js/src/WorkerLinter/shims.ts b/packages/harper.js/src/WorkerLinter/shims.ts
new file mode 100644
index 000000000..3f1a8e708
--- /dev/null
+++ b/packages/harper.js/src/WorkerLinter/shims.ts
@@ -0,0 +1,4 @@
+if (import.meta.env.MODE === 'test') {
+ // @ts-expect-error
+ globalThis.__vitest_browser_runner__ = { wrapDynamicImport: (f) => f() };
+}
diff --git a/packages/harper.js/src/WorkerLinter/worker.ts b/packages/harper.js/src/WorkerLinter/worker.ts
index c41f1bc28..a0a450dd3 100644
--- a/packages/harper.js/src/WorkerLinter/worker.ts
+++ b/packages/harper.js/src/WorkerLinter/worker.ts
@@ -1,9 +1,8 @@
/// <reference lib="webworker" />
+import './shims';
import { isSerializedRequest, SerializedRequest } from '../binary';
-// @ts-expect-error: https://github.com/vitest-dev/vitest/pull/6569/files#diff-929cb96abb1c2e297c6711af0875db4ecdc700c54b824cc4ce7e0716657b28aeR375
-import { BinaryModule } from '../binary?worker_file&type=module';
-// @ts-expect-error
-import LocalLinter from '../LocalLinter?worker_file&type=module';
+import { BinaryModule } from '../binary';
+import LocalLinter from '../LocalLinter';
// Notify the main thread that we are ready
self.postMessage('ready');
@@ -20,6 +19,7 @@ self.onmessage = (e) => {
const { procName, args } = await binary.deserialize(v);
if (procName in linter) {
+ // @ts-expect-error
const res = await linter[procName](...args);
postMessage(await binary.serializeArg(res));
}
diff --git a/packages/harper.js/src/binary.ts b/packages/harper.js/src/binary.ts
index b5ff58bc3..16c006924 100644
--- a/packages/harper.js/src/binary.ts
+++ b/packages/harper.js/src/binary.ts
@@ -1,4 +1,4 @@
-import { default as binaryUrl } from 'harper-wasm/harper_wasm_bg.wasm?url';
+import { default as binaryUrl } from 'harper-wasm/harper_wasm_bg.wasm?no-inline';
import { default as binaryInlinedUrl } from 'harper-wasm/harper_wasm_bg.wasm?inline';
import type { Span, Suggestion, Linter as WasmLinter } from 'harper-wasm';
import { invariant } from './utils';
@@ -58,7 +58,7 @@ export function isSerializedRequest(v: unknown): v is SerializedRequest {
export class BinaryModule {
private exported: Promise<typeof import('harper-wasm')>;
- constructor(public url: string) {
+ constructor(public url: string | URL) {
this.exported = import('harper-wasm').then(async (exports) => {
await exports.default({ module_or_path: url });
return exports;
@@ -176,6 +176,6 @@ export class BinaryModule {
}
}
-export const binary = new BinaryModule(binaryUrl);
+export const binary = /*@__PURE__*/ new BinaryModule(binaryUrl);
-export const binaryInlined = new BinaryModule(binaryInlinedUrl);
+export const binaryInlined = /*@__PURE__*/ new BinaryModule(binaryInlinedUrl);
diff --git a/packages/harper.js/vite.config.js b/packages/harper.js/vite.config.ts
similarity index 52%
rename from packages/harper.js/vite.config.js
rename to packages/harper.js/vite.config.ts
index 8be7ec3a9..7d85a0b87 100644
--- a/packages/harper.js/vite.config.js
+++ b/packages/harper.js/vite.config.ts
@@ -1,7 +1,20 @@
/// <reference types="vitest" />
import { resolve } from 'path';
import dts from 'vite-plugin-dts';
-import { defineConfig } from 'vite';
+import { defineConfig, type Plugin } from 'vite';
+
+function removeAssetsPlugin(options: { test: RegExp }): Plugin {
+ return {
+ name: 'remove-wasm',
+ generateBundle(_, bundle) {
+ for (const file in bundle) {
+ if (options.test.test(file)) {
+ delete bundle[file];
+ }
+ }
+ }
+ };
+}
export default defineConfig({
build: {
@@ -9,12 +22,18 @@ export default defineConfig({
entry: resolve(__dirname, 'src/main.ts'),
fileName: `harper`,
name: 'harper',
- formats: ['es'],
+ formats: ['es']
},
+ minify: false,
+ assetsInlineLimit: 0,
rollupOptions: {
output: {
minifyInternalExports: false,
inlineDynamicImports: true
+ },
+ treeshake: {
+ moduleSideEffects: false,
+ propertyReadSideEffects: false
}
}
},
@@ -23,14 +42,15 @@ export default defineConfig({
dts({
...require('./api-extractor.json'),
rollupTypes: true,
- tsconfigPath: './tsconfig.json',
- }),
+ tsconfigPath: './tsconfig.json'
+ })
],
worker: {
- format: 'iife',
+ format: 'es',
+ plugins: () => [removeAssetsPlugin({ test: /\.wasm$/ })],
rollupOptions: {
output: {
- // inlineDynamicImports: true
+ inlineDynamicImports: true
}
}
},
@@ -42,13 +62,10 @@ export default defineConfig({
test: {
browser: {
provider: 'playwright',
- headless: true,
enabled: true,
+ headless: true,
screenshotFailures: false,
- instances: [
- { browser: 'chromium' },
- { browser: 'firefox' }
- ]
+ instances: [{ browser: 'chromium' }, { browser: 'firefox' }]
}
},
assetsInclude: ['**/*.wasm']