Skip to content

Commit 6a52d07

Browse files
committed
fix: use getRollupFunction to avoid require errors
1 parent 20da66f commit 6a52d07

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "rollup-plugin-atomic",
33
"main": "dist/main.js",
4-
"version": "1.9.0",
4+
"version": "2.0.0",
55
"author": "Amin Yahyaabadi",
66
"description": "Rollup plugin used in atom-ide-community",
77
"keywords": [

src/main.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { includesAny } from "./utils"
1+
import { includesAny, getPluginFunction } from "./utils"
22

33
// common plugins
44
import type resolve from "@rollup/plugin-node-resolve"
@@ -192,8 +192,7 @@ export function createPlugins(
192192
) {
193193
const index = includesAny(inputPluginsNames, [...nameTriggers, moduleName])
194194
if (index !== null) {
195-
const modul = require(moduleName)
196-
const pluginFunction = typeof prop === "string" ? modul[prop] : modul
195+
const pluginFunction = getPluginFunction(require(moduleName), prop)
197196
if (typeof inputPluginsNames[index] === "string") {
198197
// plugin name only
199198
plugins.push(pluginFunction(pluginDefaultOptions))
@@ -205,8 +204,7 @@ export function createPlugins(
205204
plugins.push(pluginFunction(inputPluginsNames[index][1]))
206205
}
207206
} else if (includeByDefault) {
208-
const modul = require(moduleName)
209-
const pluginFunction = typeof prop === "string" ? modul[prop] : modul
207+
const pluginFunction = getPluginFunction(require(moduleName), prop)
210208
plugins.push(pluginFunction(pluginDefaultOptions))
211209
}
212210
}

src/utils.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,12 @@ export function includesAny(arr1: Array<string | [string, Object, boolean?]>, ar
1717
}
1818
return null
1919
}
20+
21+
export function getPluginFunction(modul: any, prop?: string) {
22+
let pluginFunction = typeof prop === "string" ? modul[prop] : modul
23+
if (typeof pluginFunction !== "function" && typeof pluginFunction.default === "function") {
24+
return pluginFunction.default
25+
} else {
26+
return pluginFunction
27+
}
28+
}

0 commit comments

Comments
 (0)