Merge pull request #51 from vite-plugin/v1.3.2

V1.3.2

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2023-04-30] v1.3.2
+
+- 1b96e39 v1.3.2
+- 6f0fadf feat: `glob` files log
+
 ## [2023-04-30] v1.3.1
 
 - 9c81c19 docs: v1.3.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dynamic-import",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Enhance Vite builtin dynamic import",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
     "build": "vite build",
     "test": "vitest run",
     "types": "tsc",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run test && npm run build"
   },
   "dependencies": {
     "acorn": "^8.8.2",
@@ -36,7 +36,7 @@
     "node-fetch": "^3.3.0",
     "typescript": "^4.9.4",
     "vite": "^4.3.2",
-    "vite-plugin-utils": "^0.4.2",
+    "vite-plugin-utils": "^0.4.3",
     "vitest": "^0.30.1"
   },
   "keywords": [

src/index.ts

@@ -10,6 +10,7 @@ import { parse as parseAst } from 'acorn'
 import fastGlob from 'fast-glob'
 import { DEFAULT_EXTENSIONS } from 'vite-plugin-utils/constant'
 import {
+  COLOURS,
   MagicString,
   cleanUrl,
   relativeify,
@@ -40,6 +41,8 @@ export {
   globFiles,
 }
 
+export const TAG = '[vite-plugin-dynamic-import]'
+
 export interface Options {
   filter?: (id: string) => boolean | void
   /**
@@ -216,43 +219,53 @@ async function transformDynamicImport({
     if (!globResult) continue
 
     let { files, resolved, normally } = globResult
-    // skip itself
-    files = files!.filter(f => path.posix.join(path.dirname(id), f) !== id)
-    // execute the Options.onFiles
-    options.onFiles && (files = options.onFiles(files, id) || files)
 
     if (normally) {
-      // normally importee (🚧-③ After `expressiontoglob()` processing)
+      // normally importee (🚧-③ After `import('./dynamic-import-to-glob').expressiontoglob()` processing)
       ms.overwrite(expStart, expEnd, `import('${normally}')`)
-    } else {
-      if (!files?.length) continue
-      const mapAlias = resolved
-        ? { [resolved.alias.relative]: resolved.alias.findString }
-        : undefined
-
-      const maps = mappingPath(files, mapAlias)
-      const runtimeName = `__variableDynamicImportRuntime${dynamicImportIndex++}__`
-      const runtimeFn = generateDynamicImportRuntime(maps, runtimeName)
-
-      // extension should be removed, because if the "index" file is in the directory, an error will occur
-      //
-      // e.g. 
-      // ├─┬ views
-      // │ ├─┬ foo
-      // │ │ └── index.js
-      // │ └── bar.js
-      //
-      // the './views/*.js' should be matched ['./views/foo/index.js', './views/bar.js'], this may not be rigorous
-      ms.overwrite(expStart, expEnd, `${runtimeName}(${rawImportee})`)
-      runtimeFunctions.push(runtimeFn)
+      continue
+    }
+
+    if (!files?.length) {
+      console.log(
+        TAG,
+        COLOURS.yellow(`no files matched: ${importExpression}\n`),
+        `  file: ${id}`,
+      )
+      continue
     }
+
+    // skip itself
+    files = files.filter(f => path.posix.join(path.dirname(id), f) !== id)
+    // execute the Options.onFiles
+    options.onFiles && (files = options.onFiles(files, id) || files)
+
+    const mapAlias = resolved
+      ? { [resolved.alias.relative]: resolved.alias.findString }
+      : undefined
+
+    const maps = mappingPath(files, mapAlias)
+    const runtimeName = `__variableDynamicImportRuntime${dynamicImportIndex++}__`
+    const runtimeFn = generateDynamicImportRuntime(maps, runtimeName)
+
+    // extension should be removed, because if the "index" file is in the directory, an error will occur
+    //
+    // e.g. 
+    // ├─┬ views
+    // │ ├─┬ foo
+    // │ │ └── index.js
+    // │ └── bar.js
+    //
+    // the './views/*.js' should be matched ['./views/foo/index.js', './views/bar.js'], this may not be rigorous
+    ms.overwrite(expStart, expEnd, `${runtimeName}(${rawImportee})`)
+    runtimeFunctions.push(runtimeFn)
   }
 
   if (runtimeFunctions.length) {
     ms.append([
-      '// [vite-plugin-dynamic-import] runtime -S-',
+      `// ${TAG} runtime -S-`,
       ...runtimeFunctions,
-      '// [vite-plugin-dynamic-import] runtime -E-',
+      `// ${TAG} runtime -E-`,
     ].join('\n'))
   }