From f686cd2d8affa9a104672b085565d202c9d22655 Mon Sep 17 00:00:00 2001 From: Wu-Hui Date: Wed, 17 Aug 2022 15:24:25 -0400 Subject: [PATCH 1/2] Target ES6 for Console Build --- .../firestore-compat/tools/console.build.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/firestore-compat/tools/console.build.js b/packages/firestore-compat/tools/console.build.js index a1bc0436a52..71692a1a429 100644 --- a/packages/firestore-compat/tools/console.build.js +++ b/packages/firestore-compat/tools/console.build.js @@ -34,12 +34,17 @@ const EXPORTNAME = '__firestore_exports__'; const OUTPUT_FOLDER = 'dist'; const OUTPUT_FILE = 'standalone.js'; -const es5InputOptions = { +const es6InputOptions = { input: 'src/index.console.ts', plugins: [ nodeResolve(), typescriptPlugin({ typescript, + tsconfigOverride: { + compilerOptions: { + target: 'es6' + } + }, transformers: [rollupUtil.removeAssertTransformer] }), json({ preferConst: true }), @@ -51,19 +56,19 @@ const es5InputOptions = { ] }; -const es5OutputOptions = { +const es6OutputOptions = { file: `${OUTPUT_FOLDER}/${OUTPUT_FILE}`, name: EXPORTNAME, - format: 'iife' + format: 'es' }; const POSTFIX = `window['${EXPORTNAME}']=${EXPORTNAME};`; async function build() { - const es5Bundle = await rollup.rollup(es5InputOptions); + const es6Bundle = await rollup.rollup(es6InputOptions); const { output: [{ code }] - } = await es5Bundle.generate(es5OutputOptions); + } = await es6Bundle.generate(es6OutputOptions); const output = `${String(code)}${POSTFIX}`; @@ -71,7 +76,7 @@ async function build() { fs.mkdirSync(OUTPUT_FOLDER); } - await fs_writeFile(es5OutputOptions.file, output, 'utf-8'); + await fs_writeFile(es6OutputOptions.file, output, 'utf-8'); } build(); From abea588d80eb14212f8c6c3f8ed06b245724ba37 Mon Sep 17 00:00:00 2001 From: Wu-Hui Date: Thu, 25 Aug 2022 14:01:13 -0400 Subject: [PATCH 2/2] Fix format for console --- packages/firestore-compat/tools/console.build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firestore-compat/tools/console.build.js b/packages/firestore-compat/tools/console.build.js index 71692a1a429..4c49e137343 100644 --- a/packages/firestore-compat/tools/console.build.js +++ b/packages/firestore-compat/tools/console.build.js @@ -59,7 +59,7 @@ const es6InputOptions = { const es6OutputOptions = { file: `${OUTPUT_FOLDER}/${OUTPUT_FILE}`, name: EXPORTNAME, - format: 'es' + format: 'iife' }; const POSTFIX = `window['${EXPORTNAME}']=${EXPORTNAME};`;