Skip to content

fix(schematics): fix issues with FS and Devkit Paths #2279

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 1 commit into from
Jan 17, 2020
Merged

fix(schematics): fix issues with FS and Devkit Paths #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/schematics/deploy/builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {
} from "@angular-devkit/architect";
import { NodeJsSyncHost } from "@angular-devkit/core/node";
import deploy from "./actions";
import { experimental, join, normalize } from "@angular-devkit/core";
import { experimental, normalize } from "@angular-devkit/core";
import * as path from "path";
import { getFirebaseProjectName } from "../utils";

// Call the createBuilder() function to create a builder. This mirrors
Expand All @@ -29,15 +30,15 @@ export default createBuilder<any>(
const project = workspace.getProject(context.target.project);

const firebaseProject = getFirebaseProjectName(
workspace.root,
context.workspaceRoot,
context.target.project
);

try {
await deploy(
require("firebase-tools"),
context,
join(workspace.root, project.root),
path.join(context.workspaceRoot, project.root),
firebaseProject
);
} catch (e) {
Expand Down
4 changes: 2 additions & 2 deletions src/schematics/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ export const projectPrompt = (projects: Project[]) => {
};

export function getFirebaseProjectName(
projectRoot: string,
workspaceRoot: string,
target: string
): string | undefined {
const { targets }: FirebaseRc = JSON.parse(
readFileSync(join(projectRoot, ".firebaserc"), "UTF-8")
readFileSync(join(workspaceRoot, ".firebaserc"), "UTF-8")
);
const projects = Object.keys(targets!);
return projects.find(
Expand Down