From b543f406fecc15bf2383ab3920e2673b67260e17 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 11 Jan 2024 09:51:28 -0500 Subject: [PATCH] import individual functions from rollup.shared.ts --- packages/firestore/rollup.config.lite.ts | 41 +++++++++++++--------- packages/firestore/rollup.config.ts | 44 ++++++++++++++---------- packages/firestore/rollup.shared.ts | 2 +- 3 files changed, 51 insertions(+), 36 deletions(-) diff --git a/packages/firestore/rollup.config.lite.ts b/packages/firestore/rollup.config.lite.ts index 0dd7ed269bb..97d751e748f 100644 --- a/packages/firestore/rollup.config.lite.ts +++ b/packages/firestore/rollup.config.lite.ts @@ -27,7 +27,14 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import pkg from './lite/package.json'; -const util = require('./rollup.shared'); +import { + resolveNodeExterns, + manglePrivatePropertiesOptions, + generateAliasConfig, + removeAssertAndPrefixInternalTransformer, + removeAssertTransformer, + circularDependencyBreakingOnWarn, resolveBrowserExterns, es2017ToEs5Plugins +} from './rollup.shared'; function nodePlugins(): Plugin[] { return [ @@ -39,7 +46,7 @@ function nodePlugins(): Plugin[] { } }, abortOnError: true, - transformers: [util.removeAssertTransformer], + transformers: [removeAssertTransformer], verbosity: 2 }), json({ preferConst: true }) @@ -56,11 +63,11 @@ function browserPlugins(): Plugin[] { } }, abortOnError: true, - transformers: [util.removeAssertAndPrefixInternalTransformer], + transformers: [removeAssertAndPrefixInternalTransformer], verbosity: 2 }), json({ preferConst: true }), - terser(util.manglePrivatePropertiesOptions) + terser(manglePrivatePropertiesOptions) ]; } @@ -76,17 +83,17 @@ const allBuilds: RollupOptions[] = [ sourcemap: true }, plugins: [ - alias(util.generateAliasConfig('node_lite')), + alias(generateAliasConfig('node_lite')), ...nodePlugins(), replace({ '__RUNTIME_ENV__': 'node' }) ], - external: util.resolveNodeExterns, + external: resolveNodeExterns, treeshake: { moduleSideEffects: false }, - onwarn: util.onwarn + onwarn: circularDependencyBreakingOnWarn }, // Node CJS build { @@ -106,7 +113,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('cjs', 5)) ], - external: util.resolveNodeExterns, + external: resolveNodeExterns, treeshake: { moduleSideEffects: false } @@ -123,7 +130,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('esm', 2017)) ], - external: util.resolveNodeExterns, + external: resolveNodeExterns, treeshake: { moduleSideEffects: false } @@ -139,14 +146,14 @@ const allBuilds: RollupOptions[] = [ sourcemap: true }, plugins: [ - alias(util.generateAliasConfig('browser_lite')), + alias(generateAliasConfig('browser_lite')), ...browserPlugins(), // setting it to empty string because browser is the default env replace({ '__RUNTIME_ENV__': '' }) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -162,10 +169,10 @@ const allBuilds: RollupOptions[] = [ } ], plugins: [ - ...util.es2017ToEs5Plugins(/* mangled= */ true), + ...es2017ToEs5Plugins(/* mangled= */ true), replace(generateBuildTargetReplaceConfig('esm', 5)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -184,7 +191,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('cjs', 2017)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -203,7 +210,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('esm', 2017)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -217,14 +224,14 @@ const allBuilds: RollupOptions[] = [ sourcemap: true }, plugins: [ - alias(util.generateAliasConfig('rn_lite')), + alias(generateAliasConfig('rn_lite')), ...browserPlugins(), replace({ ...generateBuildTargetReplaceConfig('esm', 2017), '__RUNTIME_ENV__': 'rn' }) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } diff --git a/packages/firestore/rollup.config.ts b/packages/firestore/rollup.config.ts index 5a1b59f9e44..afe779cc61b 100644 --- a/packages/firestore/rollup.config.ts +++ b/packages/firestore/rollup.config.ts @@ -27,7 +27,14 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import pkg from './package.json'; import sourcemaps from 'rollup-plugin-sourcemaps'; -import * as util from './rollup.shared'; +import { + resolveNodeExterns, + manglePrivatePropertiesOptions, + generateAliasConfig, + removeAssertAndPrefixInternalTransformer, + removeAssertTransformer, + circularDependencyBreakingOnWarn, resolveBrowserExterns, es2017ToEs5Plugins +} from './rollup.shared'; function nodePlugins(): Plugin[] { return [ @@ -39,7 +46,7 @@ function nodePlugins(): Plugin[] { } }, abortOnError: true, - transformers: [util.removeAssertTransformer], + transformers: [removeAssertTransformer], verbosity: 2 }), json({ preferConst: true }), @@ -59,11 +66,11 @@ function browserPlugins(): Plugin[] { } }, abortOnError: true, - transformers: [util.removeAssertAndPrefixInternalTransformer], + transformers: [removeAssertAndPrefixInternalTransformer], verbosity: 2 }), json({ preferConst: true }), - terser(util.manglePrivatePropertiesOptions) + terser(manglePrivatePropertiesOptions) ]; } @@ -78,12 +85,12 @@ const allBuilds: RollupOptions[] = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('node')), ...nodePlugins()], - external: util.resolveNodeExterns, + plugins: [alias(generateAliasConfig('node')), ...nodePlugins()], + external: resolveNodeExterns, treeshake: { moduleSideEffects: false }, - onwarn: util.onwarn + onwarn: circularDependencyBreakingOnWarn }, // Node CJS build { @@ -94,10 +101,10 @@ const allBuilds: RollupOptions[] = [ sourcemap: true }, plugins: [ - ...util.es2017ToEs5Plugins(/* mangled= */ false), + ...es2017ToEs5Plugins(/* mangled= */ false), replace(generateBuildTargetReplaceConfig('cjs', 2017)) ], - external: util.resolveNodeExterns, + external: resolveNodeExterns, treeshake: { moduleSideEffects: false } @@ -114,7 +121,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('esm', 2017)) ], - external: util.resolveNodeExterns, + external: resolveNodeExterns, treeshake: { moduleSideEffects: false } @@ -129,8 +136,8 @@ const allBuilds: RollupOptions[] = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('browser')), ...browserPlugins()], - external: util.resolveBrowserExterns, + plugins: [alias(generateAliasConfig('browser')), ...browserPlugins()], + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -146,10 +153,10 @@ const allBuilds: RollupOptions[] = [ } ], plugins: [ - ...util.es2017ToEs5Plugins(/* mangled= */ true), + ...es2017ToEs5Plugins(/* mangled= */ true), replace(generateBuildTargetReplaceConfig('esm', 5)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -168,7 +175,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('cjs', 2017)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -187,7 +194,7 @@ const allBuilds: RollupOptions[] = [ sourcemaps(), replace(generateBuildTargetReplaceConfig('esm', 2017)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -201,11 +208,11 @@ const allBuilds: RollupOptions[] = [ sourcemap: true }, plugins: [ - alias(util.generateAliasConfig('rn')), + alias(generateAliasConfig('rn')), ...browserPlugins(), replace(generateBuildTargetReplaceConfig('esm', 2017)) ], - external: util.resolveBrowserExterns, + external: resolveBrowserExterns, treeshake: { moduleSideEffects: false } @@ -225,5 +232,6 @@ const allBuilds: RollupOptions[] = [ ]; export default function (command: Record): RollupOptions[] { + console.log(`zzyzx COMMAND: ${JSON.stringify(command)}`) return allBuilds; } diff --git a/packages/firestore/rollup.shared.ts b/packages/firestore/rollup.shared.ts index e65357864c2..bf034de20b3 100644 --- a/packages/firestore/rollup.shared.ts +++ b/packages/firestore/rollup.shared.ts @@ -95,7 +95,7 @@ export function resolveNodeExterns(id: string): boolean { } /** Breaks the build if there is a circular dependency. */ -export function onwarn( +export function circularDependencyBreakingOnWarn( warning: RollupWarning, defaultWarn: WarningHandler ): void {