diff --git a/package.json b/package.json index dc2ab05e8af..a9c00a38b1f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "ci:lint": "npm run lint:nofix", "ci:test": "npm run build:cjs && npm run build:bootstrap && npm run test:all", "ci:test:only": "npm run build:cjs && npm run build:bootstrap && npm run test:only", - "ci:coverage": "npm run build:cjs && nyc --reporter lcovonly mocha", + "ci:coverage": "npm run build:cjs && npm run build:bootstrap && nyc --reporter lcovonly mocha", "lint": "npx eslint . --fix --cache && npm run lint:markdown", "lint:nofix": "npx eslint . && npm run lint:markdown", "lint:markdown": "markdownlint --config markdownlint.json docs/**/*.md", diff --git a/src/browser-entry.ts b/src/browser-entry.ts index 228d6517e81..8f03c2d6209 100644 --- a/src/browser-entry.ts +++ b/src/browser-entry.ts @@ -1,2 +1,2 @@ -export { default as rollup } from './rollup/rollup'; +export { default as rollup, defineConfig } from './rollup/rollup'; export { version as VERSION } from 'package.json'; diff --git a/src/node-entry.ts b/src/node-entry.ts index a488fb584ac..d2a08e5f631 100644 --- a/src/node-entry.ts +++ b/src/node-entry.ts @@ -1,3 +1,3 @@ -export { default as rollup } from './rollup/rollup'; +export { default as rollup, defineConfig } from './rollup/rollup'; export { default as watch } from './watch/watch-proxy'; export { version as VERSION } from 'package.json'; diff --git a/test/cli/samples/config-defineConfig-cjs/_config.js b/test/cli/samples/config-defineConfig-cjs/_config.js new file mode 100644 index 00000000000..48bf7c3a5ff --- /dev/null +++ b/test/cli/samples/config-defineConfig-cjs/_config.js @@ -0,0 +1,5 @@ +module.exports = { + description: 'uses cjs config file which return config wrapped by defineConfig', + command: 'rollup --config rollup.config.js', + execute: true +}; diff --git a/test/cli/samples/config-defineConfig-cjs/main.js b/test/cli/samples/config-defineConfig-cjs/main.js new file mode 100644 index 00000000000..888cae37af9 --- /dev/null +++ b/test/cli/samples/config-defineConfig-cjs/main.js @@ -0,0 +1 @@ +module.exports = 42; diff --git a/test/cli/samples/config-defineConfig-cjs/rollup.config.js b/test/cli/samples/config-defineConfig-cjs/rollup.config.js new file mode 100644 index 00000000000..2827d477764 --- /dev/null +++ b/test/cli/samples/config-defineConfig-cjs/rollup.config.js @@ -0,0 +1,8 @@ +const { defineConfig } = require("../../../../dist/rollup"); + +module.exports = defineConfig({ + input: 'main.js', + output: { + format: 'cjs' + }, +}); diff --git a/test/cli/samples/config-defineConfig-mjs/_config.js b/test/cli/samples/config-defineConfig-mjs/_config.js new file mode 100644 index 00000000000..bd51b3ca622 --- /dev/null +++ b/test/cli/samples/config-defineConfig-mjs/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'uses mjs config file which return config wrapped by defineConfig', + command: 'rollup --config rollup.config.mjs', + minNodeVersion: 13, + execute: true +}; diff --git a/test/cli/samples/config-defineConfig-mjs/main.js b/test/cli/samples/config-defineConfig-mjs/main.js new file mode 100644 index 00000000000..888cae37af9 --- /dev/null +++ b/test/cli/samples/config-defineConfig-mjs/main.js @@ -0,0 +1 @@ +module.exports = 42; diff --git a/test/cli/samples/config-defineConfig-mjs/rollup.config.mjs b/test/cli/samples/config-defineConfig-mjs/rollup.config.mjs new file mode 100644 index 00000000000..10abdde3d84 --- /dev/null +++ b/test/cli/samples/config-defineConfig-mjs/rollup.config.mjs @@ -0,0 +1,8 @@ +import { defineConfig } from "../../../../dist/es/rollup.js" + +export default defineConfig({ + input: 'main.js', + output: { + format: 'cjs' + }, +});