fix(options): bundle defaults

Signed-off-by: Lexus Drumgold <[email protected]>
flex-development · Feb 16, 2023 · 51c88a9 · 51c88a9
1 parent c09abaa
commit 51c88a9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/src/internal/esbuilder.ts b/src/internal/esbuilder.ts
@@ -77,21 +77,27 @@ const esbuilder = async (
    *
    * @const {string[]} files
    */
-  const files: string[] = await fg(bundle ? source : pattern, {
-    braceExpansion: true,
-    caseSensitiveMatch: true,
-    cwd: pathe.join(absWorkingDir, bundle ? '' : source),
-    dot: true,
-    extglob: true,
-    fs: omit(fs, ['readdir']),
-    globstar: true,
-    ignore: [...new Set(ignore)],
-    objectMode: false,
-    onlyFiles: true,
-    stats: false,
-    throwErrorOnBrokenSymbolicLink: false,
-    unique: true
-  })
+  const files: string[] = await fg(
+    bundle
+      ? (!pathe.extname(source) && source + '.*') || /* c8 ignore next */ source
+      : pattern,
+    {
+      absolute: false,
+      braceExpansion: true,
+      caseSensitiveMatch: true,
+      cwd: pathe.join(absWorkingDir, bundle ? '' : source),
+      dot: true,
+      extglob: true,
+      fs: omit(fs, ['readdir']),
+      globstar: true,
+      ignore: [...new Set(ignore)],
+      objectMode: false,
+      onlyFiles: true,
+      stats: false,
+      throwErrorOnBrokenSymbolicLink: false,
+      unique: true
+    }
+  )
 
   /**
    * Source file objects.

diff --git a/src/make.ts b/src/make.ts
@@ -49,7 +49,6 @@ async function make({ cwd = '.', ...config }: Config = {}): Promise<Result[]> {
   } = defu(await loadBuildConfig(cwd), config, {
     bundle: false,
     clean: true,
-    createRequire: false,
     cwd,
     dts: await (async () => {
       try {
@@ -66,7 +65,6 @@ async function make({ cwd = '.', ...config }: Config = {}): Promise<Result[]> {
     ignore: [...IGNORE_PATTERNS],
     outdir: 'dist',
     pattern: '**',
-    platform: '',
     source: 'src',
     write: false
   })
@@ -99,17 +97,18 @@ async function make({ cwd = '.', ...config }: Config = {}): Promise<Result[]> {
       bundle = options.bundle,
       cwd: entrydir = cwd,
       format = options.format,
-      platform = options.platform
+      platform,
+      source = options.source
     } = entry
 
+    // remove default source to reset based on bundling
+    Reflect.deleteProperty(options, 'source')
+
     return defuConcat(entry, options, {
-      bundle,
       createRequire: bundle && format === 'esm' && platform === 'node',
       cwd: pathe.resolve(cwd, entrydir),
       external: bundle ? Object.keys(peerDependencies) : [],
-      format,
-      platform,
-      source: bundle ? 'src/index' : options.source
+      source: (!bundle && source) || source || /* c8 ignore next */ 'src/index'
     })
   })