fix: fix project build issues (#796)

oramasearch · Sep 26, 2024 · 463b6e0 · 463b6e0
1 parent eeaf30a
commit 463b6e0
Show file tree

Hide file tree

Showing 28 changed files with 12,960 additions and 16,300 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/.swcrc b/.swcrc
@@ -1,9 +1,6 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -24,9 +21,6 @@
       "type": "commonjs",
       "ignoreDynamic": true
     },
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/package.json b/package.json
@@ -81,5 +81,6 @@
   },
   "engines": {
     "node": ">= 16.0.0"
-  }
+  },
+  "packageManager": "pnpm@8.15.4+sha512.0bd3a9be9eb0e9a692676deec00a303ba218ba279d99241475616b398dbaeedd11146f92c2843458f557b1d127e09d4c171e105bdcd6b61002b39685a8016b9e"
 }
diff --git a/packages/orama/.swcrc b/packages/orama/.swcrc
@@ -1,9 +1,7 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
+
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -24,9 +22,7 @@
       "type": "commonjs",
       "ignoreDynamic": true
     },
-    "env": {
-      "targets": "node >= 16"
-    },
+
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/packages/orama/tsconfig.json b/packages/orama/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM"],
     "esModuleInterop": true,

diff --git a/packages/plugin-analytics/package.json b/packages/plugin-analytics/package.json
@@ -27,7 +27,7 @@
   "files": ["dist"],
   "scripts": {
     "build": "tsup --config tsup.lib.js",
-    "lint": "ts-standard --fix src",
+    "lint": "eslint src --ext .js,.ts,.tsx,.cts",
     "test": "c8 -c src/tests/config/c8-local.json tap src/tests/*.test.ts"
   },
   "dependencies": {
@@ -44,7 +44,6 @@
     "tap": "^18.7.1",
     "tap-mocha-reporter": "^5.0.3",
     "tape": "^5.6.1",
-    "ts-standard": "^12.0.2",
     "tsup": "^7.2.0",
     "tsx": "4",
     "typescript": "^5.0.0"

diff --git a/packages/plugin-analytics/tsconfig.json b/packages/plugin-analytics/tsconfig.json
@@ -2,10 +2,10 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
-    "moduleResolution": "Node",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "declaration": true,
     "forceConsistentCasingInFileNames": true,

diff --git a/packages/plugin-astro/.swcrc b/packages/plugin-astro/.swcrc
@@ -1,9 +1,6 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/packages/plugin-astro/package.json b/packages/plugin-astro/package.json
@@ -29,7 +29,7 @@
     "build": "swc --delete-dir-on-start --extensions .ts -d dist src",
     "postbuild": "tsc -p . --emitDeclarationOnly",
     "pretest": "node ../../scripts/test-pack.mjs plugin-astro",
-    "test": "node --loader=tsx --no-warnings=loader --test ./test/integration.ts | tap-mocha-reporter spec",
+    "test": "node --import=tsx --no-warnings=loader --test ./test/integration.ts | tap-mocha-reporter spec",
     "lint": "eslint src --ext .js,.ts,.tsx,.cts"
   },
   "dependencies": {

diff --git a/packages/plugin-astro/src/index.ts b/packages/plugin-astro/src/index.ts
@@ -1,6 +1,6 @@
 import type { AnyOrama, Orama, SearchParams } from '@orama/orama'
 import { create as createOramaDB, insert as insertIntoOramaDB, save as saveOramaDB } from '@orama/orama'
-import type { AstroConfig, AstroIntegration, RouteData } from 'astro'
+import type { AstroIntegration, RouteData } from 'astro'
 import { compile } from 'html-to-text'
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import path from 'node:path'

diff --git a/packages/plugin-astro/tsconfig.json b/packages/plugin-astro/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM"],
     "esModuleInterop": true,
@@ -12,7 +12,7 @@
     "skipLibCheck": true,
     "resolveJsonModule": true,
     "sourceMap": true,
-    "moduleResolution": "node"
+    "moduleResolution": "NodeNext"
   },
   "include": ["src/*.ts", "src/**/*.ts"]
 }
diff --git a/packages/plugin-data-persistence/.swcrc b/packages/plugin-data-persistence/.swcrc
@@ -1,9 +1,6 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -24,9 +21,6 @@
       "type": "commonjs",
       "ignoreDynamic": true
     },
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/packages/plugin-data-persistence/tsconfig.json b/packages/plugin-data-persistence/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM"],
     "esModuleInterop": true,

diff --git a/packages/plugin-docusaurus-v3/scripts/postbuild.sh b/packages/plugin-docusaurus-v3/scripts/postbuild.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+mkdir -p dist/theme/SearchBar
 cp src/theme/SearchBar/*.css dist/theme/SearchBar
diff --git a/packages/plugin-docusaurus/.swcrc b/packages/plugin-docusaurus/.swcrc
@@ -1,9 +1,6 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -20,9 +17,6 @@
   },
   {
     "test": ".*\\.tsx$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -48,9 +42,6 @@
       "type": "commonjs",
       "ignoreDynamic": true
     },
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/packages/plugin-docusaurus/tsconfig.json b/packages/plugin-docusaurus/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM"],
     "jsx": "react-jsx",

diff --git a/packages/plugin-match-highlight/.swcrc b/packages/plugin-match-highlight/.swcrc
@@ -1,9 +1,6 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -24,9 +21,6 @@
       "type": "commonjs",
       "ignoreDynamic": true
     },
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/packages/plugin-match-highlight/src/commonjs.cts b/packages/plugin-match-highlight/src/commonjs.cts
@@ -1,4 +1,3 @@
-// @ts-expect-error Ignore broken resolution - This errors when using tsconfig.cjs.json
 import type { AnyOrama } from '@orama/orama'
 
 import type {
@@ -7,7 +6,6 @@ import type {
   searchWithHighlight as esmSearchWithHighlight,
   saveWithHighlight as esmSaveWithHighlight,
   loadWithHighlight as esmLoadWithHighlight
-  // @ts-expect-error Ignore broken resolution - This errors when using tsconfig.cjs.json
 } from './index.js'
 
 export interface OramaPluginMatchHighlight {

diff --git a/packages/plugin-match-highlight/src/index.ts b/packages/plugin-match-highlight/src/index.ts
@@ -11,6 +11,7 @@ import {
   save,
   search
 } from '@orama/orama'
+// @ts-ignore
 import { boundedLevenshtein } from '@orama/orama/internals'
 
 export interface Position {

diff --git a/packages/plugin-match-highlight/tsconfig.cjs.json b/packages/plugin-match-highlight/tsconfig.cjs.json
@@ -1,7 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "CommonJS"
+    "module": "CommonJS",
+    "moduleResolution": "node"
   },
   "include": ["src/*.cts"]
 }
diff --git a/packages/plugin-match-highlight/tsconfig.json b/packages/plugin-match-highlight/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "moduleResolution": "nodenext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM"],

diff --git a/packages/plugin-nextra/tsconfig.json b/packages/plugin-nextra/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ES5",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "jsx": "react",
     "noImplicitAny": false,

diff --git a/packages/plugin-parsedoc/.swcrc b/packages/plugin-parsedoc/.swcrc
@@ -1,9 +1,6 @@
 [
   {
     "test": ".*\\.ts$",
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {
@@ -24,9 +21,6 @@
       "type": "commonjs",
       "ignoreDynamic": true
     },
-    "env": {
-      "targets": "node >= 16"
-    },
     "jsc": {
       "target": "es2022",
       "parser": {

diff --git a/packages/plugin-parsedoc/tsconfig.json b/packages/plugin-parsedoc/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "outDir": "dist",
     "lib": ["ESNext", "DOM"],
     "esModuleInterop": true,

diff --git a/packages/plugin-vitepress/src/index.ts b/packages/plugin-vitepress/src/index.ts
@@ -171,8 +171,8 @@ export function OramaPlugin(pluginOptions: OramaPluginOptions = {}): Plugin {
 }
 
 const pluginSiteConfig: Partial<SiteConfig> = {
-  buildEnd(ctx) {},
-  transformHead(ctx) {
+  buildEnd() {},
+  transformHead() {
     return []
   }
 }
diff --git a/packages/stemmers/scripts/build.js b/packages/stemmers/scripts/build.js
@@ -43,11 +43,10 @@ async function compile(lang, fullLang, jsExtension, tsExtension, moduleType) {
   const language = `\nexport const language = '${fullLang}'`
   const compiled = await transform(content + language, {
     module: { type: moduleType },
-    env: { targets: 'node >= 16' },
     jsc: { target: 'es2022' }
   })
 
-  const minified = await minify(compiled.code, { sourceMap: true })
+  const minified = await minify(compiled.code, { sourceMap: true, module: moduleType !== "commonjs" })
 
   await writeFile(resolve(destinationDir, `${lang}.${jsExtension}`), minified.code, 'utf-8')
   await writeFile(resolve(destinationDir, `${lang}.${jsExtension}.map`), minified.map, 'utf-8')

diff --git a/packages/stopwords/scripts/build.js b/packages/stopwords/scripts/build.js
@@ -45,11 +45,10 @@ async function compile(lang, jsExtension, tsExtension, moduleType) {
 
   const compiled = await transform(content, {
     module: { type: moduleType },
-    env: { targets: 'node >= 16' },
     jsc: { target: 'es2022' }
   })
 
-  const minified = await minify(compiled.code, { sourceMap: true })
+  const minified = await minify(compiled.code, { sourceMap: true, module: moduleType !== "commonjs" })
 
   await writeFile(resolve(destinationDir, `${lang}.${jsExtension}`), minified.code, 'utf-8')
   await writeFile(resolve(destinationDir, `${lang}.${jsExtension}.map`), minified.map, 'utf-8')