From b004221f442f68dc000b4169109cfcf1d0b4c0e1 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Fri, 4 Dec 2020 09:57:25 -0700 Subject: [PATCH 1/2] Add 'clean' back to TypeScript build This solves an unresolved import problem on my local machine (likely due to a corrupted cache). --- packages/firestore/rollup.config.exp.js | 5 ++--- packages/firestore/rollup.config.lite.js | 5 ++--- packages/firestore/rollup.shared.js | 11 ++++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/firestore/rollup.config.exp.js b/packages/firestore/rollup.config.exp.js index a23680e7953..060c691dc83 100644 --- a/packages/firestore/rollup.config.exp.js +++ b/packages/firestore/rollup.config.exp.js @@ -15,7 +15,6 @@ * limitations under the License. */ -import tmp from 'tmp'; import json from '@rollup/plugin-json'; import alias from '@rollup/plugin-alias'; import typescriptPlugin from 'rollup-plugin-typescript2'; @@ -38,7 +37,7 @@ const nodePlugins = [ target: 'es2017' } }, - cacheDir: tmp.dirSync(), + clean: true, abortOnError: false, transformers: [util.removeAssertTransformer, importPathTransformer] }), @@ -65,7 +64,7 @@ const browserPlugins = [ target: 'es2017' } }, - cacheDir: tmp.dirSync(), + clean: true, abortOnError: false, transformers: [ util.removeAssertAndPrefixInternalTransformer, diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js index 57a8712437d..8b658bb5aaa 100644 --- a/packages/firestore/rollup.config.lite.js +++ b/packages/firestore/rollup.config.lite.js @@ -15,7 +15,6 @@ * limitations under the License. */ -import tmp from 'tmp'; import path from 'path'; import json from '@rollup/plugin-json'; import alias from '@rollup/plugin-alias'; @@ -39,7 +38,7 @@ const nodePlugins = [ target: 'es2017' } }, - cacheDir: tmp.dirSync(), + clean: true, abortOnError: false, transformers: [util.removeAssertTransformer, importPathTransformer] }), @@ -65,7 +64,7 @@ const browserPlugins = [ target: 'es2017' } }, - cacheDir: tmp.dirSync(), + clean: true, abortOnError: false, transformers: [ util.removeAssertAndPrefixInternalTransformer, diff --git a/packages/firestore/rollup.shared.js b/packages/firestore/rollup.shared.js index 009facb4041..a19ff062572 100644 --- a/packages/firestore/rollup.shared.js +++ b/packages/firestore/rollup.shared.js @@ -15,7 +15,6 @@ * limitations under the License. */ -const tmp = require('tmp'); const json = require('@rollup/plugin-json'); const alias = require('@rollup/plugin-alias'); const typescriptPlugin = require('rollup-plugin-typescript2'); @@ -214,7 +213,7 @@ exports.es2017Plugins = function (platform, mangled = false) { target: 'es2017' } }, - cacheDir: tmp.dirSync(), + clean: true, transformers: [removeAssertAndPrefixInternalTransformer] }), json({ preferConst: true }), @@ -230,7 +229,7 @@ exports.es2017Plugins = function (platform, mangled = false) { target: 'es2017' } }, - cacheDir: tmp.dirSync(), + clean: true, transformers: [removeAssertTransformer] }), json({ preferConst: true }) @@ -248,7 +247,8 @@ exports.es2017ToEs5Plugins = function (mangled = false) { allowJs: true } }, - include: ['dist/*.js', 'dist/exp/*.js'] + include: ['dist/*.js', 'dist/exp/*.js'], + clean: true }), terser({ output: { @@ -268,7 +268,8 @@ exports.es2017ToEs5Plugins = function (mangled = false) { allowJs: true } }, - include: ['dist/*.js', 'dist/exp/*.js'] + include: ['dist/*.js', 'dist/exp/*.js'], + clean: true }), sourcemaps() ]; From 3a0245622710fc8a863a0b58076d638be9e699e4 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Fri, 4 Dec 2020 10:22:27 -0700 Subject: [PATCH 2/2] Undo clean, add functions --- packages/firestore/rollup.config.exp.js | 99 +++++++++++++----------- packages/firestore/rollup.config.lite.js | 97 ++++++++++++----------- packages/firestore/rollup.shared.js | 9 ++- 3 files changed, 108 insertions(+), 97 deletions(-) diff --git a/packages/firestore/rollup.config.exp.js b/packages/firestore/rollup.config.exp.js index 060c691dc83..9f0760f2d48 100644 --- a/packages/firestore/rollup.config.exp.js +++ b/packages/firestore/rollup.config.exp.js @@ -15,6 +15,7 @@ * limitations under the License. */ +import tmp from 'tmp'; import json from '@rollup/plugin-json'; import alias from '@rollup/plugin-alias'; import typescriptPlugin from 'rollup-plugin-typescript2'; @@ -29,51 +30,55 @@ import pkg from './exp/package.json'; const util = require('./rollup.shared'); -const nodePlugins = [ - typescriptPlugin({ - typescript, - tsconfigOverride: { - compilerOptions: { - target: 'es2017' - } - }, - clean: true, - abortOnError: false, - transformers: [util.removeAssertTransformer, importPathTransformer] - }), - json({ preferConst: true }), - // Needed as we also use the *.proto files - copy({ - targets: [ - { - src: 'src/protos', - dest: 'dist/exp/src' - } - ] - }), - replace({ - 'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('../src/protos') - }) -]; +const nodePlugins = function () { + return [ + typescriptPlugin({ + typescript, + tsconfigOverride: { + compilerOptions: { + target: 'es2017' + } + }, + cacheDir: tmp.dirSync(), + abortOnError: false, + transformers: [util.removeAssertTransformer, importPathTransformer] + }), + json({ preferConst: true }), + // Needed as we also use the *.proto files + copy({ + targets: [ + { + src: 'src/protos', + dest: 'dist/exp/src' + } + ] + }), + replace({ + 'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('../src/protos') + }) + ]; +}; -const browserPlugins = [ - typescriptPlugin({ - typescript, - tsconfigOverride: { - compilerOptions: { - target: 'es2017' - } - }, - clean: true, - abortOnError: false, - transformers: [ - util.removeAssertAndPrefixInternalTransformer, - importPathTransformer - ] - }), - json({ preferConst: true }), - terser(util.manglePrivatePropertiesOptions) -]; +const browserPlugins = function () { + return [ + typescriptPlugin({ + typescript, + tsconfigOverride: { + compilerOptions: { + target: 'es2017' + } + }, + cacheDir: tmp.dirSync(), + abortOnError: false, + transformers: [ + util.removeAssertAndPrefixInternalTransformer, + importPathTransformer + ] + }), + json({ preferConst: true }), + terser(util.manglePrivatePropertiesOptions) + ]; +}; const allBuilds = [ // Node ESM build @@ -84,7 +89,7 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('node')), ...nodePlugins], + plugins: [alias(util.generateAliasConfig('node')), ...nodePlugins()], external: util.resolveNodeExterns, treeshake: { moduleSideEffects: false @@ -113,7 +118,7 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('browser')), ...browserPlugins], + plugins: [alias(util.generateAliasConfig('browser')), ...browserPlugins()], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false @@ -127,7 +132,7 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('rn')), ...browserPlugins], + plugins: [alias(util.generateAliasConfig('rn')), ...browserPlugins()], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js index 8b658bb5aaa..d47f8750ab5 100644 --- a/packages/firestore/rollup.config.lite.js +++ b/packages/firestore/rollup.config.lite.js @@ -15,6 +15,7 @@ * limitations under the License. */ +import tmp from 'tmp'; import path from 'path'; import json from '@rollup/plugin-json'; import alias from '@rollup/plugin-alias'; @@ -30,50 +31,54 @@ import pkg from './lite/package.json'; const util = require('./rollup.shared'); -const nodePlugins = [ - typescriptPlugin({ - typescript, - tsconfigOverride: { - compilerOptions: { - target: 'es2017' - } - }, - clean: true, - abortOnError: false, - transformers: [util.removeAssertTransformer, importPathTransformer] - }), - json({ preferConst: true }), - copy({ - targets: [ - { - src: 'src/protos', - dest: 'dist/lite/src' - } - ] - }), - replace({ - 'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('src/protos') - }) -]; +const nodePlugins = function () { + return [ + typescriptPlugin({ + typescript, + tsconfigOverride: { + compilerOptions: { + target: 'es2017' + } + }, + cacheDir: tmp.dirSync(), + abortOnError: false, + transformers: [util.removeAssertTransformer, importPathTransformer] + }), + json({ preferConst: true }), + copy({ + targets: [ + { + src: 'src/protos', + dest: 'dist/lite/src' + } + ] + }), + replace({ + 'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('src/protos') + }) + ]; +}; -const browserPlugins = [ - typescriptPlugin({ - typescript, - tsconfigOverride: { - compilerOptions: { - target: 'es2017' - } - }, - clean: true, - abortOnError: false, - transformers: [ - util.removeAssertAndPrefixInternalTransformer, - importPathTransformer - ] - }), - json({ preferConst: true }), - terser(util.manglePrivatePropertiesOptions) -]; +const browserPlugins = function () { + return [ + typescriptPlugin({ + typescript, + tsconfigOverride: { + compilerOptions: { + target: 'es2017' + } + }, + cacheDir: tmp.dirSync(), + abortOnError: false, + transformers: [ + util.removeAssertAndPrefixInternalTransformer, + importPathTransformer + ] + }), + json({ preferConst: true }), + terser(util.manglePrivatePropertiesOptions) + ]; +}; const allBuilds = [ // Node ESM build @@ -84,7 +89,7 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('node_lite')), ...nodePlugins], + plugins: [alias(util.generateAliasConfig('node_lite')), ...nodePlugins()], external: util.resolveNodeExterns, treeshake: { moduleSideEffects: false @@ -126,7 +131,7 @@ const allBuilds = [ }, plugins: [ alias(util.generateAliasConfig('browser_lite')), - ...browserPlugins + ...browserPlugins() ], external: util.resolveBrowserExterns, treeshake: { @@ -141,7 +146,7 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [alias(util.generateAliasConfig('rn_lite')), ...browserPlugins], + plugins: [alias(util.generateAliasConfig('rn_lite')), ...browserPlugins()], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false diff --git a/packages/firestore/rollup.shared.js b/packages/firestore/rollup.shared.js index a19ff062572..17625853a85 100644 --- a/packages/firestore/rollup.shared.js +++ b/packages/firestore/rollup.shared.js @@ -15,6 +15,7 @@ * limitations under the License. */ +const tmp = require('tmp'); const json = require('@rollup/plugin-json'); const alias = require('@rollup/plugin-alias'); const typescriptPlugin = require('rollup-plugin-typescript2'); @@ -213,7 +214,7 @@ exports.es2017Plugins = function (platform, mangled = false) { target: 'es2017' } }, - clean: true, + cacheDir: tmp.dirSync(), transformers: [removeAssertAndPrefixInternalTransformer] }), json({ preferConst: true }), @@ -229,7 +230,7 @@ exports.es2017Plugins = function (platform, mangled = false) { target: 'es2017' } }, - clean: true, + cacheDir: tmp.dirSync(), transformers: [removeAssertTransformer] }), json({ preferConst: true }) @@ -248,7 +249,7 @@ exports.es2017ToEs5Plugins = function (mangled = false) { } }, include: ['dist/*.js', 'dist/exp/*.js'], - clean: true + cacheDir: tmp.dirSync() }), terser({ output: { @@ -269,7 +270,7 @@ exports.es2017ToEs5Plugins = function (mangled = false) { } }, include: ['dist/*.js', 'dist/exp/*.js'], - clean: true + cacheDir: tmp.dirSync() }), sourcemaps() ];