From afff49b54654366ab266546e024c078601ba4eb8 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 18 May 2023 12:47:29 +0200 Subject: [PATCH] fix(scripts-generators): migrate away from deprecated nx interfaces to pass lint --- scripts/generators/create-component/index.ts | 4 ++-- scripts/generators/create-package/index.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/generators/create-component/index.ts b/scripts/generators/create-component/index.ts index aecadc770d852b..de09d8787fe24f 100644 --- a/scripts/generators/create-component/index.ts +++ b/scripts/generators/create-component/index.ts @@ -5,7 +5,7 @@ import * as os from 'os'; import * as path from 'path'; import { findGitRoot, getAllPackageInfo, isConvergedPackage } from '@fluentui/scripts-monorepo'; -import { WorkspaceJsonConfiguration, names } from '@nrwl/devkit'; +import { ProjectsConfigurations, names } from '@nrwl/devkit'; import chalk from 'chalk'; import * as fs from 'fs-extra'; import { Actions } from 'node-plop'; @@ -173,7 +173,7 @@ const appendToPackageIndex = (data: Data): string => { //#endregion function getProjectMetadata(options: { root: string; name: string }) { - const nxWorkspace: WorkspaceJsonConfiguration = JSON.parse( + const nxWorkspace: ProjectsConfigurations = JSON.parse( fs.readFileSync(path.join(options.root, 'workspace.json'), 'utf-8'), ); diff --git a/scripts/generators/create-package/index.ts b/scripts/generators/create-package/index.ts index 335aaec0ff5868..c8634f0365b412 100644 --- a/scripts/generators/create-package/index.ts +++ b/scripts/generators/create-package/index.ts @@ -2,7 +2,7 @@ import { spawnSync } from 'child_process'; import * as path from 'path'; import { PackageJson, findGitRoot } from '@fluentui/scripts-monorepo'; -import { WorkspaceJsonConfiguration } from '@nrwl/devkit'; +import { ProjectsConfigurations } from '@nrwl/devkit'; import chalk from 'chalk'; import * as fs from 'fs-extra'; import * as jju from 'jju'; @@ -306,7 +306,7 @@ function updateNxWorkspace(_answers: Answers, config: { root: string; projectNam }; const nxWorkspaceContent = fs.readFileSync(paths.workspace, 'utf-8'); - const nxWorkspace: WorkspaceJsonConfiguration = jju.parse(nxWorkspaceContent); + const nxWorkspace: ProjectsConfigurations = jju.parse(nxWorkspaceContent); Object.assign(nxWorkspace.projects, templates.workspace); const updatedNxWorkspace = jju.update(nxWorkspaceContent, nxWorkspace, { mode: 'json', indent: 2 }); @@ -315,7 +315,7 @@ function updateNxWorkspace(_answers: Answers, config: { root: string; projectNam } function getProjectMetadata(options: { root: string; name: string }) { - const nxWorkspace: WorkspaceJsonConfiguration = JSON.parse( + const nxWorkspace: ProjectsConfigurations = JSON.parse( fs.readFileSync(path.join(options.root, 'workspace.json'), 'utf-8'), );