rolldown-require 1.0.4 → 1.0.5

package/dist/index.cjs

@@ -5,7 +5,7 @@
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.19_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.14.0_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -881,40 +881,70 @@ async function bundleFile(fileName, options) {
   const filenameVarName = "__vite_injected_original_filename";
   const importMetaUrlVarName = "__vite_injected_original_import_meta_url";
   const rolldownInputOptions = _optionalChain([options, 'optionalAccess', _39 => _39.rolldownOptions, 'optionalAccess', _40 => _40.input]) || {};
-  const bundle = await _rolldown.rolldown.call(void 0, {
-    ...rolldownInputOptions,
-    input: fileName,
-    // target: [`node${process.versions.node}`],
-    platform: "node",
-    resolve: {
-      mainFields: ["main"],
-      tsconfigFilename: options.tsconfig
-    },
-    define: {
-      "__dirname": dirnameVarName,
-      "__filename": filenameVarName,
-      "import.meta.url": importMetaUrlVarName,
-      "import.meta.dirname": dirnameVarName,
-      "import.meta.filename": filenameVarName
-    },
-    // disable treeshake to include files that is not sideeffectful to `moduleIds`
-    treeshake: false,
-    plugins: [
-      createExternalizeDepsPlugin({
-        entryFile: fileName,
-        isESM,
-        moduleSyncEnabled
-      }),
-      createFileScopeVariablesPlugin({
-        dirnameVarName,
-        filenameVarName,
-        importMetaUrlVarName
-      })
-    ],
-    external: options.external
-    // preserveEntrySignatures: 'exports-only'
-  });
-  const rolldownOutputOptions = _optionalChain([options, 'optionalAccess', _41 => _41.rolldownOptions, 'optionalAccess', _42 => _42.output]) || {};
+  const {
+    transform: userTransform,
+    resolve: userResolve,
+    ...restRolldownInputOptions
+  } = rolldownInputOptions;
+  const transformDefine = {
+    ..._nullishCoalesce(_optionalChain([userTransform, 'optionalAccess', _41 => _41.define]), () => ( {})),
+    "__dirname": dirnameVarName,
+    "__filename": filenameVarName,
+    "import.meta.url": importMetaUrlVarName,
+    "import.meta.dirname": dirnameVarName,
+    "import.meta.filename": filenameVarName
+  };
+  const transformOptions = {
+    ..._nullishCoalesce(userTransform, () => ( {})),
+    define: transformDefine
+  };
+  const resolveOptions = {
+    ..._nullishCoalesce(userResolve, () => ( {})),
+    mainFields: ["main"],
+    tsconfigFilename: options.tsconfig
+  };
+  const originalConsoleWarn = console.warn;
+  console.warn = (...args) => {
+    const message = typeof args[0] === "string" ? args[0] : "";
+    if (message.includes("resolve.tsconfigFilename") || message.includes("Invalid input options") || message.includes('top-level "define" option is deprecated')) {
+      return;
+    }
+    originalConsoleWarn(...args);
+  };
+  let bundle;
+  try {
+    bundle = await _rolldown.rolldown.call(void 0, {
+      ...restRolldownInputOptions,
+      input: fileName,
+      // target: [`node${process.versions.node}`],
+      platform: "node",
+      resolve: resolveOptions,
+      define: transformDefine,
+      transform: transformOptions,
+      // disable treeshake to include files that is not sideeffectful to `moduleIds`
+      treeshake: false,
+      plugins: [
+        createExternalizeDepsPlugin({
+          entryFile: fileName,
+          isESM,
+          moduleSyncEnabled
+        }),
+        createFileScopeVariablesPlugin({
+          dirnameVarName,
+          filenameVarName,
+          importMetaUrlVarName
+        })
+      ],
+      external: options.external
+      // preserveEntrySignatures: 'exports-only'
+    });
+  } finally {
+    console.warn = originalConsoleWarn;
+  }
+  if (!bundle) {
+    throw new Error("Failed to initialize bundler");
+  }
+  const rolldownOutputOptions = _optionalChain([options, 'optionalAccess', _42 => _42.rolldownOptions, 'optionalAccess', _43 => _43.output]) || {};
   const result = await bundle.generate({
     ...rolldownOutputOptions,
     format: options.format,
@@ -975,7 +1005,7 @@ async function loadFromBundledFile(fileName, bundledCode, options) {
       );
       return mod;
     } finally {
-      if (!_optionalChain([options, 'optionalAccess', _43 => _43.preserveTemporaryFile])) {
+      if (!_optionalChain([options, 'optionalAccess', _44 => _44.preserveTemporaryFile])) {
         _fs2.default.unlink(outfile, () => {
         });
       }
@@ -1028,7 +1058,7 @@ function createExternalizeDepsPlugin({
 }) {
   const packageCache = /* @__PURE__ */ new Map();
   const resolveByViteResolver = (id, importer, isRequire) => {
-    return _optionalChain([tryNodeResolve, 'call', _44 => _44(id, importer, {
+    return _optionalChain([tryNodeResolve, 'call', _45 => _45(id, importer, {
       root: _path2.default.dirname(entryFile),
       isBuild: true,
       isProduction: true,
@@ -1048,7 +1078,7 @@ function createExternalizeDepsPlugin({
       packageCache,
       isRequire,
       builtins: nodeLikeBuiltins
-    }), 'optionalAccess', _45 => _45.id]);
+    }), 'optionalAccess', _46 => _46.id]);
   };
   return {
     name: "externalize-deps",
@@ -1150,7 +1180,7 @@ function resolveTsconfigPath(options) {
   if (typeof options.tsconfig === "string") {
     return options.tsconfig;
   }
-  return _nullishCoalesce(_optionalChain([_gettsconfig.getTsconfig.call(void 0, options.cwd, "tsconfig.json"), 'optionalAccess', _46 => _46.path]), () => ( void 0));
+  return _nullishCoalesce(_optionalChain([_gettsconfig.getTsconfig.call(void 0, options.cwd, "tsconfig.json"), 'optionalAccess', _47 => _47.path]), () => ( void 0));
 }
 
 

package/dist/index.mjs

@@ -870,39 +870,69 @@ async function bundleFile(fileName, options) {
   const filenameVarName = "__vite_injected_original_filename";
   const importMetaUrlVarName = "__vite_injected_original_import_meta_url";
   const rolldownInputOptions = options?.rolldownOptions?.input || {};
-  const bundle = await rolldown({
-    ...rolldownInputOptions,
-    input: fileName,
-    // target: [`node${process.versions.node}`],
-    platform: "node",
-    resolve: {
-      mainFields: ["main"],
-      tsconfigFilename: options.tsconfig
-    },
-    define: {
-      "__dirname": dirnameVarName,
-      "__filename": filenameVarName,
-      "import.meta.url": importMetaUrlVarName,
-      "import.meta.dirname": dirnameVarName,
-      "import.meta.filename": filenameVarName
-    },
-    // disable treeshake to include files that is not sideeffectful to `moduleIds`
-    treeshake: false,
-    plugins: [
-      createExternalizeDepsPlugin({
-        entryFile: fileName,
-        isESM,
-        moduleSyncEnabled
-      }),
-      createFileScopeVariablesPlugin({
-        dirnameVarName,
-        filenameVarName,
-        importMetaUrlVarName
-      })
-    ],
-    external: options.external
-    // preserveEntrySignatures: 'exports-only'
-  });
+  const {
+    transform: userTransform,
+    resolve: userResolve,
+    ...restRolldownInputOptions
+  } = rolldownInputOptions;
+  const transformDefine = {
+    ...userTransform?.define ?? {},
+    "__dirname": dirnameVarName,
+    "__filename": filenameVarName,
+    "import.meta.url": importMetaUrlVarName,
+    "import.meta.dirname": dirnameVarName,
+    "import.meta.filename": filenameVarName
+  };
+  const transformOptions = {
+    ...userTransform ?? {},
+    define: transformDefine
+  };
+  const resolveOptions = {
+    ...userResolve ?? {},
+    mainFields: ["main"],
+    tsconfigFilename: options.tsconfig
+  };
+  const originalConsoleWarn = console.warn;
+  console.warn = (...args) => {
+    const message = typeof args[0] === "string" ? args[0] : "";
+    if (message.includes("resolve.tsconfigFilename") || message.includes("Invalid input options") || message.includes('top-level "define" option is deprecated')) {
+      return;
+    }
+    originalConsoleWarn(...args);
+  };
+  let bundle;
+  try {
+    bundle = await rolldown({
+      ...restRolldownInputOptions,
+      input: fileName,
+      // target: [`node${process.versions.node}`],
+      platform: "node",
+      resolve: resolveOptions,
+      define: transformDefine,
+      transform: transformOptions,
+      // disable treeshake to include files that is not sideeffectful to `moduleIds`
+      treeshake: false,
+      plugins: [
+        createExternalizeDepsPlugin({
+          entryFile: fileName,
+          isESM,
+          moduleSyncEnabled
+        }),
+        createFileScopeVariablesPlugin({
+          dirnameVarName,
+          filenameVarName,
+          importMetaUrlVarName
+        })
+      ],
+      external: options.external
+      // preserveEntrySignatures: 'exports-only'
+    });
+  } finally {
+    console.warn = originalConsoleWarn;
+  }
+  if (!bundle) {
+    throw new Error("Failed to initialize bundler");
+  }
   const rolldownOutputOptions = options?.rolldownOptions?.output || {};
   const result = await bundle.generate({
     ...rolldownOutputOptions,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-require",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "bundle and require a file using rolldown!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^5.3.0",
-    "get-tsconfig": "^4.12.0",
+    "get-tsconfig": "^4.13.0",
     "mlly": "^1.8.0",
     "resolve.exports": "^2.0.3"
   },