Skip to content

Commit beda76e

Browse files
MarkDuckworthMarkDuckworth
authored
Fix pipelines CI (#9306)
* Skip pipeline tests in lite, for now * update bundle definitions for size report * Fix size testing for pipelines bundles * fixed typings * Fixed package paths * Fix integration tests that run on the built packages
1 parent c407cb9 commit beda76e

File tree

14 files changed

+142
-31
lines changed

14 files changed

+142
-31
lines changed

‎integration/firestore/gulpfile.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,23 @@ if (typeof process === 'undefined') {
6969
`
7070
)
7171
)
72+
.pipe(
73+
replace(
74+
/**
75+
* This regex is designed to match the Firebase import in our
76+
* integration tests.
77+
*/
78+
/\s+from '\.(\.\/util)?\/pipeline_export';/,
79+
` from '${resolve(__dirname, './pipeline_export')}';
80+
81+
if (typeof process === 'undefined') {
82+
process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
83+
} else {
84+
process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
85+
}
86+
`
87+
)
88+
)
7289
.pipe(
7390
/**
7491
* Fixing the project.json require to properly reference the file

‎integration/firestore/pipeline_export.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* @license
3+
* Copyright 2025 Google LLC
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
// This file replaces "packages/firestore/test/integration/util/pipeline_export"
19+
// and depends on the minified sources.
20+
21+
export * from '@firebase/firestore/pipelines';

‎packages/firebase/firestore/lite/pipelines/index.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/**
2+
* @license
3+
* Copyright 2024 Google LLC
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
export * from '@firebase/firestore/lite/pipelines';

‎packages/firebase/firestore/lite/pipelines/package.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "firebase/firestore/lite/pipelines",
3+
"main": "dist/pipelines.cjs.js",
4+
"browser": "dist/esm/pipelines.esm.js",
5+
"module": "dist/esm/pipelines.esm.js",
6+
"typings": "dist/firestore/lite/pipelines/index.d.ts"
7+
}

‎packages/firebase/firestore/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"browser": "dist/esm/index.esm.js",
55
"module": "dist/esm/index.esm.js",
66
"typings": "dist/firestore/index.d.ts"
7-
}
7+
}

‎packages/firebase/firestore/pipelines/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"main": "dist/pipelines.cjs.js",
44
"browser": "dist/esm/pipelines.esm.js",
55
"module": "dist/esm/pipelines.esm.js",
6-
"typings": "dist/firestore/lite/pipelines.d.ts"
6+
"typings": "dist/firestore/pipelines/index.d.ts"
77
}

‎packages/firebase/package.json‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,16 @@
132132
"default": "./firestore/dist/esm/index.esm.js"
133133
},
134134
"./firestore/pipelines": {
135-
"types": "./firestore/dist/firestore/pipelines.d.ts",
135+
"types": "./firestore/pipelines/dist/firestore/pipelines/index.d.ts",
136136
"node": {
137-
"require": "./firestore/dist/pipelines.cjs.js",
138-
"import": "./firestore/dist/pipelines.mjs"
137+
"require": "./firestore/pipelines/dist/pipelines.cjs.js",
138+
"import": "./firestore/pipelines/dist/pipelines.mjs"
139139
},
140140
"browser": {
141-
"require": "./firestore/dist/pipelines.cjs.js",
142-
"import": "./firestore/dist/esm/pipelines.esm.js"
141+
"require": "./firestore/pipelines/dist/pipelines.cjs.js",
142+
"import": "./firestore/pipelines/dist/esm/pipelines.esm.js"
143143
},
144-
"default": "./firestore/dist/esm/pipelines.esm.js"
144+
"default": "./firestore/pipelines/dist/esm/pipelines.esm.js"
145145
},
146146
"./firestore/lite": {
147147
"types": "./firestore/lite/dist/firestore/lite/index.d.ts",
@@ -155,6 +155,18 @@
155155
},
156156
"default": "./firestore/lite/dist/esm/index.esm.js"
157157
},
158+
"./firestore/lite/pipelines": {
159+
"types": "./firestore/lite/pipelines/dist/firestore/lite/pipelines/index.d.ts",
160+
"node": {
161+
"require": "./firestore/lite/pipelines/dist/pipelines.cjs.js",
162+
"import": "./firestore/lite/pipelines/dist/pipelines.mjs"
163+
},
164+
"browser": {
165+
"require": "./firestore/lite/pipelines/dist/pipelines.cjs.js",
166+
"import": "./firestore/lite/pipelines/dist/esm/pipelines.esm.js"
167+
},
168+
"default": "./firestore/lite/pipelines/dist/esm/pipelines.esm.js"
169+
},
158170
"./functions": {
159171
"types": "./functions/dist/functions/index.d.ts",
160172
"node": {
@@ -464,7 +476,9 @@
464476
"auth/web-extension",
465477
"functions",
466478
"firestore",
479+
"firestore/pipelines",
467480
"firestore/lite",
481+
"firestore/lite/pipelines",
468482
"installations",
469483
"storage",
470484
"performance",

‎packages/firestore/lite/pipelines/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Pipelines for the lite Firestore SDK",
44
"main": "../../dist/lite/pipelines.node.cjs.js",
55
"main-esm": "../../dist/lite/pipelines.node.mjs",
6-
"module": "../../dist/lite/pipelines.browser.esm2017.js",
7-
"browser": "../../dist/lite/pipelines.browser.esm2017.js",
8-
"react-native": "../../dist/lite/pipelines.rn.esm2017.js",
6+
"module": "../../dist/lite/pipelines.browser.esm.js",
7+
"browser": "../../dist/lite/pipelines.browser.esm.js",
8+
"react-native": "../../dist/lite/pipelines.rn.esm.js",
99
"typings": "./pipelines.d.ts",
1010
"private": true,
1111
"engines": {
12-
"node": ">=18.0.0"
12+
"node": ">=20.0.0"
1313
}
1414
}

‎packages/firestore/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"require": "./dist/pipelines.node.cjs.js",
110110
"import": "./dist/pipelines.node.mjs"
111111
},
112-
"react-native": "./dist/index.rn.esm.js",
112+
"react-native": "./dist/index.rn.js",
113113
"browser": {
114114
"require": "./dist/pipelines.cjs.js",
115115
"import": "./dist/pipelines.esm.js"
@@ -173,7 +173,7 @@
173173
"bugs": {
174174
"url": "https://github.com/firebase/firebase-js-sdk/issues"
175175
},
176-
"types": "dist/firestore/src/index.d.ts",
176+
"typings": "dist/firestore/src/index.d.ts",
177177
"nyc": {
178178
"extension": [
179179
".ts"

‎packages/firestore/pipelines/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"name": "@firebase/firestore/pipelines",
2+
"name": "@firebase/firestore-pipelines",
33
"description": "pipelines",
44
"main": "../dist/pipelines.node.cjs.js",
55
"main-esm": "../dist/pipelines.node.mjs",
6-
"module": "../dist/pipelines.browser.esm2017.js",
7-
"browser": "../dist/pipelines.browser.esm2017.js",
8-
"react-native": "../dist/pipelines.rn.esm2017.js",
6+
"module": "../dist/pipelines.esm.js",
7+
"browser": "../dist/pipelines.esm.js",
8+
"react-native": "../dist/pipelines.rn.js",
99
"typings": "./pipelines.d.ts",
1010
"private": true,
1111
"engines": {
12-
"node": ">=18.0.0"
12+
"node": ">=20.0.0"
1313
}
1414
}

0 commit comments

Comments
 (0)