Merge pull request #8 from vite-plugin/v2.0.1

V2.0.1

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.1 (2023-06-20)
+
+- f80f4c9 feat(test): add `better-sqlite3`
+- 1716007 fix: reserve `.Interop.mjs` for build-watch mode
+
 ## 2.0.0 (2023-06-20)
 
 **Break**. This will be a completely new version.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-native",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Supports Node/Electron C/C++ native addons",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,9 @@
     "webpack": "^5.70.0"
   },
   "devDependencies": {
+    "@types/better-sqlite3": "^7.6.10",
     "@types/node": "^20.14.2",
+    "better-sqlite3": "^11.0.0",
     "fsevents": "^2.3.3",
     "serialport": "^12.0.0",
     "sqlite3": "^5.1.7",

src/index.ts

@@ -34,6 +34,7 @@ export default function native(options: NativeOptions): Plugin {
   const assetsDir = options.assetsDir ??= 'node_natives'
   const nativesMap = new Map<string, {
     built: boolean
+    nativeFilename: string
     interopFilename: string
   }>
   // Webpack output(absolute path)
@@ -60,6 +61,7 @@ export default function native(options: NativeOptions): Plugin {
       options.natives.length && ensureDir(output)
 
       for (const native of options.natives) {
+        const nativeFilename = path.join(output, native + NativeExt)
         const interopFilename = path.join(output, native + InteropExt)
 
         aliases.push({
@@ -76,7 +78,7 @@ export default function native(options: NativeOptions): Plugin {
               // because `build.emptyOutDir = true` will cause the built file to be removed.
 
               // Collect modules that are explicitly used.
-              nativesMap.set(native, { built: false, interopFilename })
+              nativesMap.set(native, { built: false, nativeFilename, interopFilename })
             }
 
             return { id: source }
@@ -104,7 +106,6 @@ export default function native(options: NativeOptions): Plugin {
           try {
             await webpackBundle(native, output, options.webpack)
             info.built = true
-            fs.rmSync(info.interopFilename, { force: true })
           } catch (error: any) {
             console.error(`\n${TAG}`, error)
             process.exit(1)

test/fixtures/.gitignore

@@ -1,2 +1,2 @@
 /dist-native
-db.sqlite3
+/db

test/fixtures/better-sqlite3.db

@@ -1,9 +1,11 @@
 // TODO: https://github.com/serialport/node-serialport/issues/2464
 // import * as serialport from 'serialport'
-import sqlite3 from 'sqlite3'
 import * as fsevents from 'fsevents'
+import sqlite3 from 'sqlite3'
+import better_sqlite3 from 'better-sqlite3'
 
 export {
-  sqlite3,
   fsevents,
+  sqlite3,
+  better_sqlite3,
 }

test/fixtures/main.ts

@@ -10,25 +10,45 @@ import {
 const root = path.join(__dirname, 'fixtures')
 
 function initSqlite3(sqlite3: typeof import('sqlite3')) {
-  const database = path.join(root, 'db.sqlite3')
+  const sqlite3_db = path.join(root, 'db/sqlite3.db')
 
   return new Promise<{
     database: import('sqlite3').Database
     error: Error | null
   }>(resolve => {
-    const _database = new (sqlite3.verbose().Database)(database, error => {
+    const db = new (sqlite3.verbose().Database)(sqlite3_db, error => {
       resolve({
-        database: _database,
+        database: db,
         error,
       })
     })
   })
 }
 
+function initBetterSqlite3(BetterSqlite3: typeof import('better-sqlite3')) {
+  const better_sqlite3_db = path.join(root, 'db/better-sqlite3.db')
+
+  return new Promise<{
+    database: import('better-sqlite3').Database
+    error: Error | null
+  }>(resolve => {
+    const db = new BetterSqlite3(better_sqlite3_db, { verbose: console.log })
+    // https://github.com/WiseLibs/better-sqlite3/blob/v11.1.0/docs/api.md#pragmastring-options---results
+    db.pragma('cache_size = 32000')
+    resolve({
+      database: db,
+      error: db.pragma('cache_size', { simple: true }) === 32000
+        ? null
+        : new Error('better-sqlite3 initialize failed'),
+    })
+  })
+}
+
 beforeAll(async () => {
-  for (const name of ['dist', 'db.sqlite3']) {
+  for (const name of ['dist', 'db']) {
     fs.rmSync(path.join(root, name), { recursive: true, force: true })
   }
+  fs.mkdirSync(path.join(root, 'db'), { recursive: true })
 
   await build({ configFile: path.join(root, 'vite.config.ts') })
 })
@@ -38,6 +58,7 @@ test('vite-plugin-native', async () => {
   const fsevents = main.fsevents
   const sqlite3 = main.sqlite3
   const sqlite3DB = await initSqlite3(main.sqlite3)
+  const better_sqlite3DB = await initBetterSqlite3(main.better_sqlite3)
 
   expect(Object.getOwnPropertyNames(fsevents).filter(name => name !== 'default').reverse())
     .toEqual(Object.getOwnPropertyNames(require('fsevents')))
@@ -46,4 +67,6 @@ test('vite-plugin-native', async () => {
     .toEqual(Object.getOwnPropertyNames(require('sqlite3')).filter(name => name !== 'path'))
   expect(sqlite3DB.database && typeof sqlite3DB.database).eq('object')
   expect(sqlite3DB.error).null
+  expect(better_sqlite3DB.database && typeof better_sqlite3DB.database).eq('object')
+  expect(better_sqlite3DB.error).null
 })

test/fixtures/sqlite3.db

@@ -392,6 +392,13 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@types/better-sqlite3@^7.6.10":
+  version "7.6.10"
+  resolved "https://registry.yarnpkg.com/@types/better-sqlite3/-/better-sqlite3-7.6.10.tgz#1818e56490953404acfd44cdde0464f201be6105"
+  integrity sha512-TZBjD+yOsyrUJGmcUj6OS3JADk3+UZcNv3NOBqGkM09bZdi28fNZw8ODqbMOLfKCu7RYCO62/ldq1iHbzxqoPw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/eslint-scope@^3.7.3":
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
@@ -702,6 +709,14 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+better-sqlite3@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.0.0.tgz#12083acfe0ded6abdba908ed73520f2003e3ea0e"
+  integrity sha512-1NnNhmT3EZTsKtofJlMox1jkMxdedILury74PwUbQBjWgo4tL4kf7uTAjU55mgQwjdzqakSTjkf+E1imrFwjnA==
+  dependencies:
+    bindings "^1.5.0"
+    prebuild-install "^7.1.1"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"