Skip to content

fix(migrate): create polyfills.ts if missing for angular projects #5593

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
Oct 20, 2021
Merged

fix(migrate): create polyfills.ts if missing for angular projects #5593

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
90 changes: 88 additions & 2 deletions lib/controllers/migrate-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { IInjector } from "../common/definitions/yok";
import { injector } from "../common/yok";
import { IJsonFileSettingsService } from "../common/definitions/json-file-settings-service";
import { SupportedConfigValues } from "../tools/config-manipulation/config-transformer";
import * as temp from "temp";

// const wait: (ms: number) => Promise<void> = (ms: number = 1000) =>
// new Promise((resolve) => setTimeout(resolve, ms));
Expand Down Expand Up @@ -432,12 +433,29 @@ export class MigrateController

this.spinner.succeed("Project dependencies have been updated");

const isAngular = this.hasDependency(
{
packageName: "@nativescript/angular",
},
projectData
);

// ensure polyfills.ts exists in angular projects
let polyfillsPath;
if (isAngular) {
polyfillsPath = await this.checkOrCreatePolyfillsTS(projectData);
}

// update tsconfig
const tsConfigPath = path.resolve(projectDir, "tsconfig.json");
if (this.$fs.exists(tsConfigPath)) {
this.spinner.info(`Updating ${"tsconfig.json".yellow}`);

await this.migrateTSConfig(tsConfigPath);
await this.migrateTSConfig({
tsConfigPath,
isAngular,
polyfillsPath,
});

this.spinner.succeed(`Updated ${"tsconfig.json".yellow}`);
}
Expand Down Expand Up @@ -1189,7 +1207,15 @@ export class MigrateController
return dependencies;
}

private async migrateTSConfig(tsConfigPath: string): Promise<boolean> {
private async migrateTSConfig({
tsConfigPath,
isAngular,
polyfillsPath,
}: {
tsConfigPath: string;
isAngular: boolean;
polyfillsPath?: string;
}): Promise<boolean> {
try {
const configContents = this.$fs.readJson(tsConfigPath);

Expand All @@ -1205,6 +1231,18 @@ export class MigrateController
...new Set([...(configContents.compilerOptions.lib || []), "es2017"]),
];

if (isAngular) {
// make sure polyfills.ts is in files
if (configContents.files) {
configContents.files = [
...new Set([
...(configContents.files || []),
polyfillsPath ?? "./src/polyfills.ts",
]),
];
}
}

this.$fs.writeJson(tsConfigPath, configContents);

return true;
Expand All @@ -1214,6 +1252,48 @@ export class MigrateController
}
}

private async checkOrCreatePolyfillsTS(
projectData: IProjectData
): Promise<string> {
const { projectDir, appDirectoryPath } = projectData;

const possiblePaths = [
`${appDirectoryPath}/polyfills.ts`,
`./src/polyfills.ts`,
`./app/polyfills.ts`,
].map((possiblePath) => path.resolve(projectDir, possiblePath));

let polyfillsPath = possiblePaths.find((possiblePath) => {
return this.$fs.exists(possiblePath);
});

if (polyfillsPath) {
return "./" + path.relative(projectDir, polyfillsPath);
}

const tempDir = temp.mkdirSync({
prefix: "migrate-angular-polyfills",
});

// get from default angular template
await this.$pacoteService.extractPackage(
constants.RESERVED_TEMPLATE_NAMES["angular"],
tempDir
);

this.$fs.copyFile(
path.resolve(tempDir, "src/polyfills.ts"),
possiblePaths[0]
);

// clean up temp project
this.$fs.deleteDirectory(tempDir);

this.spinner.succeed(`Created fresh ${"polyfills.ts".cyan}`);

return "./" + path.relative(projectDir, possiblePaths[0]);
}

private async migrateNativeScriptAngular(): Promise<IMigrationDependency[]> {
const minVersion = "10.0.0";
const desiredVersion = "^12.2.5";
Expand Down Expand Up @@ -1281,6 +1361,12 @@ export class MigrateController
},

// devDependencies
{
packageName: "@angular/cli",
minVersion,
desiredVersion,
isDev: true,
},
{
packageName: "@angular/compiler-cli",
minVersion,
Expand Down