Skip to content

Commit 8aff92c

Browse files
committed
chore: revert some changes
1 parent feeb473 commit 8aff92c

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

dev-packages/rollup-utils/bundleHelpers.mjs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -142,35 +142,25 @@ export function makeBundleConfigVariants(baseConfig, options = {}) {
142142
const terserPlugin = makeTerserPlugin();
143143
const setSdkSourcePlugin = makeSetSDKSourcePlugin('cdn');
144144

145-
const baseOutput = baseConfig.output;
146-
if (!baseOutput || Array.isArray(baseOutput)) {
147-
throw new Error('Base config must have a single output object');
148-
}
149-
150-
const baseOutputEntryFileNames = baseOutput.entryFileNames;
151-
if (typeof baseOutputEntryFileNames !== 'function') {
152-
throw new Error('Base config must have a function for entryFileNames');
153-
}
154-
155145
// The additional options to use for each variant we're going to create.
156146
const variantSpecificConfigMap = {
157147
'.js': {
158148
output: {
159-
entryFileNames: chunkInfo => `${baseOutputEntryFileNames(chunkInfo)}.js`,
149+
entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.js`,
160150
},
161151
plugins: [includeDebuggingPlugin, setSdkSourcePlugin],
162152
},
163153

164154
'.min.js': {
165155
output: {
166-
entryFileNames: chunkInfo => `${baseOutputEntryFileNames(chunkInfo)}.min.js`,
156+
entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.min.js`,
167157
},
168158
plugins: [stripDebuggingPlugin, setSdkSourcePlugin, terserPlugin],
169159
},
170160

171161
'.debug.min.js': {
172162
output: {
173-
entryFileNames: chunkInfo => `${baseOutputEntryFileNames(chunkInfo)}.debug.min.js`,
163+
entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.debug.min.js`,
174164
},
175165
plugins: [includeDebuggingPlugin, setSdkSourcePlugin, terserPlugin],
176166
},

dev-packages/rollup-utils/npmHelpers.mjs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,18 @@ export function makeBaseNPMConfig(options = {}) {
9797

9898
export function makeNPMConfigVariants(baseConfig, options = {}) {
9999
const { emitEsm = true, emitCjs = true, splitDevProd = false } = options;
100-
const baseOutput = baseConfig.output;
101-
if (!baseOutput || Array.isArray(baseOutput)) {
102-
throw new Error('Base config must have a single output object');
103-
}
104-
105-
const baseOutputDir = baseOutput.dir;
106-
if (typeof baseOutputDir !== 'string') {
107-
throw new Error('Base config must have a string for dir');
108-
}
109100

110101
const variantSpecificConfigs = [];
111102

112103
if (emitCjs) {
113104
if (splitDevProd) {
114-
variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseOutputDir, 'cjs/dev') } });
105+
variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/dev') } });
115106
variantSpecificConfigs.push({
116-
output: { format: 'cjs', dir: path.join(baseOutputDir, 'cjs/prod') },
107+
output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/prod') },
117108
plugins: [makeProductionReplacePlugin()],
118109
});
119110
} else {
120-
variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseOutputDir, 'cjs') } });
111+
variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } });
121112
}
122113
}
123114

@@ -126,22 +117,22 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
126117
variantSpecificConfigs.push({
127118
output: {
128119
format: 'esm',
129-
dir: path.join(baseOutputDir, 'esm/dev'),
120+
dir: path.join(baseConfig.output.dir, 'esm/dev'),
130121
plugins: [makePackageNodeEsm()],
131122
},
132123
});
133124
variantSpecificConfigs.push({
134125
output: {
135126
format: 'esm',
136-
dir: path.join(baseOutputDir, 'esm/prod'),
127+
dir: path.join(baseConfig.output.dir, 'esm/prod'),
137128
plugins: [makeProductionReplacePlugin(), makePackageNodeEsm()],
138129
},
139130
});
140131
} else {
141132
variantSpecificConfigs.push({
142133
output: {
143134
format: 'esm',
144-
dir: path.join(baseOutputDir, 'esm'),
135+
dir: path.join(baseConfig.output.dir, 'esm'),
145136
plugins: [makePackageNodeEsm()],
146137
},
147138
});

0 commit comments

Comments
 (0)