fix: spfx scaffolding (#12173)

OfficeDev · Nov 8, 2024 · 352a386 · 352a386
1 parent 298dffb
commit 352a386
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/packages/fx-core/src/component/generator/spfx/depsChecker/generatorChecker.ts b/packages/fx-core/src/component/generator/spfx/depsChecker/generatorChecker.ts
@@ -21,8 +21,10 @@ import { DependencyValidateError } from "../error";
 import { Constants } from "../utils/constants";
 import { telemetryHelper } from "../utils/telemetry-helper";
 import { TelemetryEvents, TelemetryProperty } from "../utils/telemetryEvents";
+import { DependencyValidateError, NpmInstallError } from "../error";
+import { cpUtils } from "../../../../common/deps-checker/util/cpUtils";
+import { Constants } from "../utils/constants";
 import { getExecCommand, getShellOptionValue, Utils } from "../utils/utils";
-import { DependencyChecker } from "./dependencyChecker";
 
 const name = Constants.GeneratorPackageName;
 const displayName = `${name}`;

diff --git a/packages/fx-core/src/component/generator/spfx/depsChecker/yoChecker.ts b/packages/fx-core/src/component/generator/spfx/depsChecker/yoChecker.ts
@@ -18,8 +18,8 @@ import {
 import { DependencyChecker } from "./dependencyChecker";
 import { telemetryHelper } from "../utils/telemetry-helper";
 import { TelemetryEvents, TelemetryProperty } from "../utils/telemetryEvents";
-import { DependencyValidateError } from "../error";
-import { cpUtils } from "../../../deps-checker/util/cpUtils";
+import { DependencyValidateError, NpmInstallError } from "../error";
+import { cpUtils } from "../../../../common/deps-checker/util/cpUtils";
 import { getExecCommand, getShellOptionValue, Utils } from "../utils/utils";
 import { Constants } from "../utils/constants";
 import { NpmInstallError } from "../../../../error";

diff --git a/packages/fx-core/src/component/generator/spfx/utils/utils.ts b/packages/fx-core/src/component/generator/spfx/utils/utils.ts
@@ -6,7 +6,7 @@ import { glob } from "glob";
 import { exec, execSync } from "child_process";
 import { LogProvider } from "@microsoft/teamsfx-api";
 import axios, { AxiosInstance } from "axios";
-import { cpUtils, DebugLogger } from "../../../deps-checker/util/cpUtils";
+import { cpUtils, DebugLogger } from "../../../../common/deps-checker/util/cpUtils";
 import os from "os";
 import { Constants } from "./constants";
 

diff --git a/packages/fx-core/tests/component/generator/spfxGenerator.test.ts b/packages/fx-core/tests/component/generator/spfxGenerator.test.ts
@@ -21,7 +21,8 @@ import {
   SPFxGeneratorImport,
   SPFxGeneratorNew,
 } from "../../../src/component/generator/spfx/spfxGenerator";
-import { getShellOptionValue, Utils } from "../../../src/component/generator/spfx/utils/utils";
+import { Utils, getShellOptionValue } from "../../../src/component/generator/spfx/utils/utils";
+import { createContextV3 } from "../../../src/component/utils";
 import { envUtil } from "../../../src/component/utils/envUtil";
 import { FileNotFoundError, UserCancelError } from "../../../src/error";
 import {
@@ -31,6 +32,8 @@ import {
   SPFxVersionOptionIds,
 } from "../../../src/question";
 import { MockTools } from "../../core/utils";
+import { getLocalizedString } from "../../../src/common/localizeUtils";
+import { FileNotFoundError, UserCancelError } from "../../../src/error";
 import os from "os";
 
 describe("SPFxGenerator", function () {