Skip to content

Separate memory build further. #4143

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.

Sign up for GitHub

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 5 commits into from
Dec 3, 2020
Merged

Separate memory build further. #4143

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b08248a
Split up firestore and firestore-memory build
schmidt-sebastian Nov 30, 2020
27c397e
Fix sebstian's memory build my separating it further..
wu-hui Dec 1, 2020
4499213
Merge branch 'wuandy/RollBundlesAsPatchedModule' into wuandy/FixSebas…
wu-hui Dec 2, 2020
c2c2d90
To mangle or not to mangle.
wu-hui Dec 2, 2020
161e64a
Add the missing return!
wu-hui Dec 2, 2020
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 integration/firestore/firebase_export_memory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import firebase from '@firebase/app';
import '@firebase/firestore/memory';
import '@firebase/firestore/bundle';
import '@firebase/firestore/memory-bundle';
import { FirebaseApp } from '@firebase/app-types';
import { Settings, FirebaseFirestore } from '@firebase/firestore-types';

Expand Down
2 changes: 1 addition & 1 deletion packages/firebase/firestore/memory/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
*/

import '@firebase/firestore/memory';
import '@firebase/firestore/bundle';
import '@firebase/firestore/memory-bundle';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be @firebase/firestore/memory/bundle?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It cannot be done gracefully.

The reason is relative paths in packages/firestore/memory-bundle/package.json are interpreted in different context (in rollup or in Typescript import from packages/firebase/firestore/...) and therefore some of them need to be prefixed ../.. and some of them just ../, which is confusing.

10 changes: 10 additions & 0 deletions packages/firestore/memory-bundle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "@firebase/firestore/memory-bundle",
"description": "Firestore bundle",
"main": "../dist/memory/node-cjs/bundle.js",
"main-esm2017": "../dist/memory/node-esm2017/bundle.js",
"react-native": "../dist/memory/rn/bundle.js",
"browser": "../dist/memory/esm5/bundle.js",
"module": "../dist/memory/esm5/bundle.js",
"esm2017": "../dist/memory/esm2017/bundle.js"
}
12 changes: 6 additions & 6 deletions packages/firestore/memory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@firebase/firestore/memory",
"description": "A memory-only build of the Cloud Firestore JS SDK.",
"main": "../dist/node-cjs/memory.js",
"main-esm2017": "../dist/node-esm2017/memory.js",
"react-native": "../dist/rn/memory.js",
"browser": "../dist/esm5/memory.js",
"module": "../dist/esm5/memory.js",
"esm2017": "../dist/esm2017/memory.js",
"main": "../dist/memory/node-cjs/index.js",
"main-esm2017": "../dist/memory/node-esm2017/index.js",
"react-native": "../dist/memory/rn/index.js",
"browser": "../dist/memory/esm5/index.js",
"module": "../dist/memory/esm5/index.js",
"esm2017": "../dist/memory/esm2017/index.js",
"typings": "../dist/index.d.ts"
}
1 change: 1 addition & 0 deletions packages/firestore/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"json-stable-stringify": "1.0.1",
"protobufjs": "6.10.2",
"rollup": "2.33.2",
"rollup-plugin-copy": "3.3.0",
"rollup-plugin-copy-assets": "2.0.3",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-sourcemaps": "0.6.3",
Expand Down
63 changes: 48 additions & 15 deletions packages/firestore/rollup.config.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import pkg from './package.json';
import path from 'path';
import memoryPkg from './memory/package.json';
import bundlePkg from './bundle/package.json';
import memoryBundlePkg from './memory-bundle/package.json';

/**
* @license
Expand All @@ -20,14 +21,14 @@ import bundlePkg from './bundle/package.json';
* limitations under the License.
*/

const alias = require('@rollup/plugin-alias');
const util = require('./rollup.shared');

export default [
// Create a temporary build that includes the mangled classes for all exports
{
input: 'export.ts',
output: {
file: 'dist/prebuild.js',
file: 'dist/prebuilt.js',
format: 'es',
sourcemap: true
},
Expand All @@ -37,10 +38,10 @@ export default [
moduleSideEffects: false
}
},
// Create main build
{
input: {
index: 'index.ts',
memory: 'index.memory.ts',
bundle: 'index.bundle.ts'
},
output: {
Expand All @@ -49,25 +50,18 @@ export default [
sourcemap: true
},
plugins: [
alias({
entries: [
{
find: /^(.*)\/export$/,
replacement: `$1\/dist/prebuild.js`
}
]
}),
...util.es2017Plugins('browser', /* mangled= */ false)
util.applyPrebuilt(),
...util.es2017Plugins('browser', /* mangled= */ true)
],
external: util.resolveBrowserExterns,
treeshake: {
moduleSideEffects: false
}
},
// Convert main build to ES5
{
input: {
index: pkg['esm2017'],
memory: path.resolve('./memory', memoryPkg['esm2017']),
bundle: path.resolve('./bundle', bundlePkg['esm2017'])
},
output: [
Expand All @@ -77,8 +71,47 @@ export default [
sourcemap: true
}
],
plugins: util.es2017ToEs5Plugins(),
external: util.resolveNodeExterns,
plugins: util.es2017ToEs5Plugins(/* mangled= */ true),
external: util.resolveBrowserExterns,
treeshake: {
moduleSideEffects: false
}
},
// Create memory build
{
input: {
index: 'index.memory.ts',
bundle: 'index.bundle.ts'
},
output: {
dir: 'dist/memory/esm2017',
format: 'es',
sourcemap: true
},
plugins: [
util.applyPrebuilt(),
...util.es2017Plugins('browser', /* mangled= */ true)
],
external: util.resolveBrowserExterns,
treeshake: {
moduleSideEffects: false
}
},
// Convert memory build to ES5
{
input: {
index: path.resolve('./memory', memoryPkg['esm2017']),
bundle: path.resolve('./bundle', memoryBundlePkg['esm2017'])
},
output: [
{
dir: 'dist/memory/esm5',
format: 'es',
sourcemap: true
}
],
plugins: util.es2017ToEs5Plugins(/* mangled= */ true),
external: util.resolveBrowserExterns,
treeshake: {
moduleSideEffects: false
}
Expand Down
47 changes: 42 additions & 5 deletions packages/firestore/rollup.config.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
*/

import replace from 'rollup-plugin-replace';
import copy from 'rollup-plugin-copy-assets';
import copy from 'rollup-plugin-copy';
import pkg from './package.json';
import bundlePkg from './bundle/package.json';
import memoryPkg from './memory/package.json';
import memoryBundlePkg from './memory-bundle/package.json';
import path from 'path';

const util = require('./rollup.shared');
Expand All @@ -28,7 +29,6 @@ export default [
{
input: {
index: 'index.node.ts',
memory: 'index.node.memory.ts',
bundle: 'index.bundle.ts'
},
output: {
Expand All @@ -39,10 +39,10 @@ export default [
plugins: [
...util.es2017Plugins('node'),
replace({
'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('src/protos')
'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('../protos')
}),
copy({
assets: ['./src/protos']
targets: [{ src: 'src/protos', dest: 'dist' }]
})
],
external: util.resolveNodeExterns,
Expand All @@ -53,7 +53,6 @@ export default [
{
input: {
index: pkg['main-esm2017'],
memory: path.resolve('./memory', memoryPkg['main-esm2017']),
bundle: path.resolve('./bundle', bundlePkg['main-esm2017'])
},
output: [
Expand All @@ -68,5 +67,43 @@ export default [
treeshake: {
moduleSideEffects: false
}
},
{
input: {
index: 'index.node.memory.ts',
bundle: 'index.bundle.ts'
},
output: {
dir: 'dist/memory/node-esm2017',
format: 'es',
sourcemap: true
},
plugins: [
...util.es2017Plugins('node'),
replace({
'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('../protos')
})
],
external: util.resolveNodeExterns,
treeshake: {
moduleSideEffects: false
}
},
{
input: {
index: path.resolve('./memory', memoryPkg['main-esm2017']),
bundle: path.resolve('./bundle', memoryBundlePkg['main-esm2017'])
},
output: [
{
dir: 'dist/memory/node-cjs',
format: 'cjs',
sourcemap: true
}
],
external: util.resolveNodeExterns,
treeshake: {
moduleSideEffects: false
}
}
];
37 changes: 25 additions & 12 deletions packages/firestore/rollup.config.rn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* limitations under the License.
*/

const alias = require('@rollup/plugin-alias');
const util = require('./rollup.shared');

export default [
// Create a temporary build that includes the mangled classes for all exports
{
input: 'export.ts',
output: {
file: 'dist/prebuild.rn.js',
file: 'dist/prebuilt.rn.js',
format: 'es',
sourcemap: true
},
Expand All @@ -32,10 +32,10 @@ export default [
moduleSideEffects: false
}
},
// Create main build
{
input: {
index: 'index.ts',
memory: 'index.memory.ts',
bundle: 'index.bundle.ts'
},
output: {
Expand All @@ -44,15 +44,28 @@ export default [
sourcemap: true
},
plugins: [
alias({
entries: [
{
find: /^(.*)\/export$/,
replacement: `$1\/dist/prebuild.rn.js`
}
]
}),
...util.es2017Plugins('rn', /* mangled= */ false)
util.applyPrebuilt('prebuilt.rn.js'),
...util.es2017Plugins('rn', /* mangled= */ true)
],
external: util.resolveBrowserExterns,
treeshake: {
moduleSideEffects: false
}
},
// Create memory build
{
input: {
index: 'index.memory.ts',
bundle: 'index.bundle.ts'
},
output: {
dir: 'dist/rn',
format: 'es',
sourcemap: true
},
plugins: [
util.applyPrebuilt('prebuilt.rn.js'),
...util.es2017Plugins('rn', /* mangled= */ true)
],
external: util.resolveBrowserExterns,
treeshake: {
Expand Down
11 changes: 11 additions & 0 deletions packages/firestore/rollup.shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,17 @@ const manglePrivatePropertiesOptions = {
};
exports.manglePrivatePropertiesOptions = manglePrivatePropertiesOptions;

exports.applyPrebuilt = function (name = 'prebuilt.js') {
alias({
entries: [
{
find: /^(.*)\/export$/,
replacement: `$1\/dist/${name}`
}
]
});
};

exports.es2017Plugins = function (platform, mangled = false) {
if (mangled) {
return [
Expand Down
Loading