Skip to content

Commit 7b66779

Browse files
authored
[FDC] Update Dart import lib name to generated.dart (#9365)
1 parent 2edbb8a commit 7b66779

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
- Tighten --only filter resolution for functions deployment to prefer codebase names (#9353)
55
- Fixed an issue where the Data Connect emulator would attempt to export data when `FIREBASE_DATACONNECT_POSTGRESQL_STRING` is set (#9330)
66
- Added `functions.disallowLegacyRuntimeConfig` option to `firebase.json` to optionally skip fetching legacy Runtime Config during function deploys (#9354)
7+
- Update Data Connect Dart SDK's default import path to `import 'dataconnect_generated/generated.dart';` (#9365)

src/init/features/dataconnect/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,11 @@ export async function actuate(setup: Setup, config: Config, options: any): Promi
180180
await sdk.actuate(setup, config);
181181
} finally {
182182
const sdkInfo = setup.featureInfo?.dataconnectSdk;
183+
const source: Source = setup.featureInfo?.dataconnectSource || "init";
183184
void trackGA4(
184185
"dataconnect_init",
185186
{
186-
source: setup.featureInfo?.dataconnectSource || "init",
187+
source,
187188
flow: info.flow.substring(1), // Trim the leading `_`
188189
project_status: setup.projectId
189190
? (await isBillingEnabled(setup))

src/init/features/dataconnect/sdk.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe("addSdkGenerateToConnectorYaml", () => {
8282
expect(connectorYaml.generate?.dartSdk).to.deep.equal([
8383
{
8484
outputDir: "../app/lib/dataconnect_generated",
85-
package: "dataconnect_generated",
85+
package: "dataconnect_generated/generated.dart",
8686
},
8787
]);
8888
});

src/init/features/dataconnect/sdk.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import { createFlutterApp, createNextApp, createReactApp } from "./create_app";
3535
import { trackGA4 } from "../../../track";
3636
import { dirExistsSync, listFiles } from "../../../fsutils";
3737
import { isBillingEnabled } from "../../../gcp/cloudbilling";
38+
import { Source } from ".";
3839

3940
export const FDC_APP_FOLDER = "FDC_APP_FOLDER";
4041
export const FDC_SDK_FRAMEWORKS_ENV = "FDC_SDK_FRAMEWORKS";
@@ -168,10 +169,11 @@ export async function actuate(setup: Setup, config: Config) {
168169
// Otherwise, `firebase init dataconnect` will emit those stats.
169170
const fdcInfo = setup.featureInfo?.dataconnect;
170171
if (!fdcInfo) {
172+
const source: Source = setup.featureInfo?.dataconnectSource || "init_sdk";
171173
void trackGA4(
172174
"dataconnect_init",
173175
{
174-
source: setup.featureInfo?.dataconnectSource || "cli_sdk",
176+
source,
175177
project_status: setup.projectId
176178
? (await isBillingEnabled(setup))
177179
? "blaze"
@@ -370,7 +372,7 @@ export function addSdkGenerateToConnectorYaml(
370372
case Platform.FLUTTER: {
371373
const dartSdk: DartSDK = {
372374
outputDir: path.relative(connectorDir, path.join(appDir, `lib/dataconnect_generated`)),
373-
package: "dataconnect_generated",
375+
package: "dataconnect_generated/generated.dart",
374376
};
375377
if (!isArray(generate?.dartSdk)) {
376378
generate.dartSdk = generate.dartSdk ? [generate.dartSdk] : [];

0 commit comments

Comments
 (0)