Skip to content

Commit db60e28

Browse files
committed
s/makeMinificationVariants/makeConfigVariants, s/newConfigs/configVariants, s/bundleVariants/variantSpecificOptionsVariants
1 parent 72b9451 commit db60e28

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

packages/browser/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeBaseBundleConfig, makeMinificationVariants } from '../../rollup.config';
1+
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
22

33
const builds = [];
44

@@ -11,7 +11,7 @@ const builds = [];
1111
outputFileBase: `build/bundle${jsVersion === 'es6' ? '.es6' : ''}`,
1212
});
1313

14-
builds.push(...makeMinificationVariants(baseBundleConfig));
14+
builds.push(...makeConfigVariants(baseBundleConfig));
1515
});
1616

1717
export default builds;

packages/integrations/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as fs from 'fs';
22

33
import commonjs from '@rollup/plugin-commonjs';
44

5-
import { insertAt, makeBaseBundleConfig, makeMinificationVariants } from '../../rollup.config';
5+
import { insertAt, makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
66

77
const builds = [];
88

@@ -20,7 +20,7 @@ integrationSourceFiles.forEach(file => {
2020
// TODO We only need `commonjs` for localforage (used in the offline plugin). Once that's fixed, this can come out.
2121
baseBundleConfig.plugins = insertAt(baseBundleConfig.plugins, -2, commonjs());
2222

23-
builds.push(...makeMinificationVariants(baseBundleConfig));
23+
builds.push(...makeConfigVariants(baseBundleConfig));
2424
});
2525

2626
export default builds;

packages/tracing/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeBaseBundleConfig, makeMinificationVariants } from '../../rollup.config';
1+
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
22

33
const builds = [];
44

@@ -11,7 +11,7 @@ const builds = [];
1111
outputFileBase: `build/bundle.tracing${jsVersion === 'es6' ? '.es6' : ''}`,
1212
});
1313

14-
builds.push(...makeMinificationVariants(baseBundleConfig));
14+
builds.push(...makeConfigVariants(baseBundleConfig));
1515
});
1616

1717
export default builds;

packages/vue/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeBaseBundleConfig, makeMinificationVariants } from '../../rollup.config';
1+
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
22

33
const baseBundleConfig = makeBaseBundleConfig({
44
input: 'src/index.bundle.ts',
@@ -8,4 +8,4 @@ const baseBundleConfig = makeBaseBundleConfig({
88
outputFileBase: 'build/bundle.vue',
99
});
1010

11-
export default makeMinificationVariants(baseBundleConfig);
11+
export default makeConfigVariants(baseBundleConfig);

packages/wasm/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeBaseBundleConfig, makeMinificationVariants } from '../../rollup.config';
1+
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
22

33
const baseBundleConfig = makeBaseBundleConfig({
44
input: 'src/index.ts',
@@ -8,4 +8,4 @@ const baseBundleConfig = makeBaseBundleConfig({
88
outputFileBase: 'build/wasm',
99
});
1010

11-
export default makeMinificationVariants(baseBundleConfig);
11+
export default makeConfigVariants(baseBundleConfig);

rollup.config.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,14 @@ export function makeBaseBundleConfig(options) {
190190
return deepMerge(sharedBundleConfig, isAddOn ? addOnBundleConfig : standAloneBundleConfig);
191191
}
192192

193-
export function makeMinificationVariants(baseConfig) {
194-
const newConfigs = [];
193+
/**
194+
* Takes the CDN rollup config for a given package and produces configs for both minified and unminified bundles.
195+
*
196+
* @param baseConfig The rollup config shared by the entire package
197+
* @returns An array of versions of that config
198+
*/
199+
export function makeConfigVariants(baseConfig) {
200+
const configVariants = [];
195201

196202
const { plugins } = baseConfig;
197203

@@ -201,7 +207,8 @@ export function makeMinificationVariants(baseConfig) {
201207
`Last plugin in given options should be \`rollup-plugin-license\`. Found ${getLastElement(plugins).name}`,
202208
);
203209

204-
const bundleVariants = [
210+
// The additional options to use for each variant we're going to create #namingishard
211+
const variantSpecificOptionsVariants = [
205212
{
206213
output: {
207214
file: `${baseConfig.output.file}.js`,
@@ -216,14 +223,14 @@ export function makeMinificationVariants(baseConfig) {
216223
},
217224
];
218225

219-
bundleVariants.forEach(variant => {
226+
variantSpecificOptionsVariants.forEach(variant => {
220227
const mergedConfig = deepMerge(baseConfig, variant, {
221228
// this makes it so that instead of concatenating the `plugin` properties of the two objects, the first value is
222229
// just overwritten by the second value
223230
arrayMerge: (first, second) => second,
224231
});
225-
newConfigs.push(mergedConfig);
232+
configVariants.push(mergedConfig);
226233
});
227234

228-
return newConfigs;
235+
return configVariants;
229236
}

0 commit comments

Comments
 (0)