Merge pull request #12 from vite-plugin/v2.2.1

V2.2.1

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.1 (2023-06-29)
+
+- 548fedb fix: avoid Vite built-in alias
+
 ## 2.2.0 (2023-06-27)
 
 - 64b881a feat: add `options.forceCopyIfUnbuilt`

README.md

@@ -36,8 +36,15 @@ export default {
 export interface NativeOptions {
   /** @default 'node_natives' */
   assetsDir?: string
-  /** By default native modules are automatically detected if this option is not explicitly configure by the user. */
+  /** 
+   * By default native modules are automatically detected if this option is not explicitly configure by the user.
+   * @deprecated use `ignore` option instead
+   */
   natives?: string[] | ((natives: string[]) => string[])
+  /** Ignore the specified native module. */
+  ignore?: (name: string) => boolean | undefined
+  /** Force copy *.node files to dist/node_modules path if Webpack can't bundle native modules correctly. */
+  forceCopyIfUnbuilt?: true
   /** Enable and configure webpack. */
   webpack?: {
     config?: (config: Configuration) => Configuration | undefined | Promise<Configuration | undefined>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-native",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Supports Node/Electron C/C++ native addons",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/index.ts

@@ -46,10 +46,10 @@ const loader1 = '@vercel/webpack-asset-relocator-loader'
 const outputAssetBase = 'native_modules'
 const NativeExt = '.native.cjs'
 const InteropExt = '.interop.mjs'
-// https://github.com/vitejs/vite/blob/v5.3.1/packages/vite/src/node/plugins/index.ts#L55
-const bareImportRE = /^(?![a-zA-Z]:)[\w@](?!.*:\/\/)/
 // `nativesMap` is placed in the global scope and can be effective for multiple builds.
 const nativesMap = new Map<string, ResolvedNativeRecord>
+// https://github.com/npm/validate-npm-package-name/blob/v5.0.1/lib/index.js#L4
+const scopedPackagePattern = /^(?![a-zA-Z]:)[\w@](?!.*:\/\/)/
 
 export default function native(options: NativeOptions): Plugin {
   const assetsDir = options.assetsDir ??= 'node_natives'
@@ -75,13 +75,13 @@ export default function native(options: NativeOptions): Plugin {
 
       const withDistAssetBase = (p: string) => (assetsDir && p) ? `${assetsDir}/${p}` : p
       const alias: Alias = {
-        find: /(.*)/,
+        find: /^(?!(?:\/?@vite\/|\.))(.*)/,
         // Keep `customResolver` receive original source.
         // @see https://github.com/rollup/plugins/blob/alias-v5.1.0/packages/alias/src/index.ts#L92
         replacement: '$1',
         async customResolver(source, importer) {
           if (!importer) return
-          if (!bareImportRE.test(source)) return
+          if (!scopedPackagePattern.test(source)) return
 
           if (!nativeRecord.has(source)) {
             // Dynamic deep detection.