Skip to content

ref(build): Split up rollup config code #4950

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.

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

Merged
merged 7 commits into from
Apr 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = {
},
},
{
files: ['scenarios/**'],
files: ['scenarios/**', 'rollup/**'],
parserOptions: {
sourceType: 'module',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"scripts": {
"build": "run-p build:cjs build:esm build:bundle build:types",
"build:bundle": "rollup --config",
"build:bundle": "rollup --config rollup.bundle.config.js",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:dev": "run-p build:cjs build:esm build:types",
"build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';

const builds = [];

Expand All @@ -11,7 +11,7 @@ const builds = [];
outputFileBase: `bundles/bundle${jsVersion === 'es6' ? '.es6' : ''}`,
});

builds.push(...makeConfigVariants(baseBundleConfig));
builds.push(...makeBundleConfigVariants(baseBundleConfig));
});

export default builds;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import commonjs from '@rollup/plugin-commonjs';

import { insertAt, makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
import { insertAt, makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';

const builds = [];

Expand All @@ -19,6 +19,6 @@ const baseBundleConfig = makeBaseBundleConfig({
baseBundleConfig.plugins = insertAt(baseBundleConfig.plugins, -2, commonjs());

// this makes non-minified, minified, and minified-with-debug-logging versions of each bundle
builds.push(...makeConfigVariants(baseBundleConfig));
builds.push(...makeBundleConfigVariants(baseBundleConfig));

export default builds;
2 changes: 1 addition & 1 deletion packages/integrations/scripts/buildBundles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ for filepath in ./src/*; do
fi

# run the build for each integration
INTEGRATION_FILE=$file JS_VERSION=$js_version yarn --silent rollup -c rollup.config.js
INTEGRATION_FILE=$file JS_VERSION=$js_version yarn --silent rollup --config rollup.bundle.config.js

done
done
Expand Down
2 changes: 1 addition & 1 deletion packages/tracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"scripts": {
"build": "run-p build:cjs build:esm build:types build:bundle && ts-node ../../scripts/prepack.ts #necessary for integration tests",
"build:bundle": "rollup --config",
"build:bundle": "rollup --config rollup.bundle.config.js",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:dev": "run-p build:cjs build:esm build:types",
"build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';

const builds = [];

Expand All @@ -11,7 +11,7 @@ const builds = [];
outputFileBase: `bundles/bundle.tracing${jsVersion === 'es6' ? '.es6' : ''}`,
});

builds.push(...makeConfigVariants(baseBundleConfig));
builds.push(...makeBundleConfigVariants(baseBundleConfig));
});

export default builds;
2 changes: 1 addition & 1 deletion packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"scripts": {
"build": "run-p build:cjs build:esm build:types",
"build:bundle": "rollup --config",
"build:bundle": "rollup --config rollup.bundle.config.js",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:dev": "run-p build:cjs build:esm build:types",
"build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';

const baseBundleConfig = makeBaseBundleConfig({
input: 'src/index.bundle.ts',
Expand All @@ -8,4 +8,4 @@ const baseBundleConfig = makeBaseBundleConfig({
outputFileBase: 'bundle.vue',
});

export default makeConfigVariants(baseBundleConfig);
export default makeBundleConfigVariants(baseBundleConfig);
2 changes: 1 addition & 1 deletion packages/wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"scripts": {
"build": "run-p build:cjs build:esm build:bundle build:types",
"build:bundle": "rollup --config",
"build:bundle": "rollup --config rollup.bundle.config.js",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:dev": "run-p build:cjs build:esm build:types",
"build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseBundleConfig, makeConfigVariants } from '../../rollup.config';
import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';

const baseBundleConfig = makeBaseBundleConfig({
input: 'src/index.ts',
Expand All @@ -8,4 +8,4 @@ const baseBundleConfig = makeBaseBundleConfig({
outputFileBase: 'bundles/wasm',
});

export default makeConfigVariants(baseBundleConfig);
export default makeBundleConfigVariants(baseBundleConfig);
270 changes: 0 additions & 270 deletions rollup.config.js

This file was deleted.

Loading