Skip to content

Made generateConfig public and switched order of merge #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CEbbinghaus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Made generateConfig public and switched order of merge #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import externalGlobals from 'rollup-plugin-external-globals';
*
* @returns {import('rollup').RollupOptions}
*/
function generateConfig(manifest) {
export function generateConfig(manifest) {
return {
input: './src/index.tsx',
plugins: [
Expand Down Expand Up @@ -73,5 +73,5 @@ export default function deckyPlugin(options = {}, sourceRoot = ".") {
const manifest = JSON.parse(readFileSync(join(sourceRoot, "plugin.json"), "utf-8"));
const defaultOptions = generateConfig(manifest);

return mergeAndConcat(options, defaultOptions)
return mergeAndConcat(defaultOptions, options)
}