Skip to content
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

fix: import SPFx project fail due to case sensitive file system on ub… #11972

Merged
merged 3 commits into from
Jul 8, 2024
Merged

fix: import SPFx project fail due to case sensitive file system on ub… #11972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0396ba1
fix: import SPFx project fail due to case sensitive file system on ub…
HuihuiWu-Microsoft Jul 8, 2024
fb49720
test: fix ut fail
HuihuiWu-Microsoft Jul 8, 2024
75916c6
test: add ut to fix code coverage
HuihuiWu-Microsoft Jul 8, 2024
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
17 changes: 9 additions & 8 deletions packages/fx-core/src/component/generator/spfx/spfxGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,23 +649,24 @@ export class SPFxGenerator {
return undefined;
}

const webpartName = webparts[0].split(path.sep).pop();
const webpartManifestPath = path.join(
webpartsDir,
webparts[0],
`${webpartName as string}WebPart.manifest.json`
const webpartManifest = (await fs.readdir(path.join(webpartsDir, webparts[0]))).find((file) =>
file.endsWith("WebPart.manifest.json")
);
if (!(await fs.pathExists(webpartManifestPath))) {
if (webpartManifest === undefined) {
throw new FileNotFoundError(
Constants.PLUGIN_NAME,
webpartManifestPath,
path.join(
webpartsDir,
webparts[0],
`${webparts[0].split(path.sep).pop() as string}WebPart.manifest.json`
),
Constants.IMPORT_HELP_LINK
);
}

const matchHashComment = new RegExp(/(\/\/ .*)/, "gi");
const manifest = JSON.parse(
(await fs.readFile(webpartManifestPath, "utf8"))
(await fs.readFile(path.join(webpartsDir, webparts[0], webpartManifest), "utf8"))
.toString()
.replace(matchHashComment, "")
.trim()
Expand Down
52 changes: 49 additions & 3 deletions packages/fx-core/tests/component/generator/spfxGenerator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,40 @@ describe("SPFxGenerator", function () {
}
});

it("No valid web part manifest when import SPFx solution", async () => {
const inputs: Inputs = {
platform: Platform.VSCode,
projectPath: testFolder,
"app-name": "spfxTestApp",
"spfx-solution": "import",
"spfx-folder": "c:\\test",
};

sinon.stub(fs, "pathExists").resolves(true);
sinon.stub(fs, "readdir").callsFake((directory: any) => {
if (directory === path.join("c:\\test", "teams")) {
return ["1_color.png", "1_outline.png"] as any;
} else if (directory === path.join("c:\\test", "src", "webparts")) {
return ["helloworld", "second"] as any;
} else {
return [];
}
});
sinon.stub(fs, "statSync").returns({
isDirectory: () => {
return true;
},
} as any);
sinon.stub(fs, "copy").resolves();

const result = await SPFxGenerator.generate(context, inputs, testFolder);

chai.expect(result.isErr()).to.eq(true);
if (result.isErr()) {
chai.expect(result.error.name).to.eq("FileNotFoundError");
}
});

it("Copy existing SPFx solution failed when import SPFx solution", async () => {
const inputs: Inputs = {
platform: Platform.VSCode,
Expand Down Expand Up @@ -469,8 +503,10 @@ describe("SPFxGenerator", function () {
sinon.stub(fs, "readdir").callsFake((directory: any) => {
if (directory === path.join("c:\\test", "teams")) {
return ["1_color.png", "1_outline.png"] as any;
} else {
} else if (directory === path.join("c:\\test", "src", "webparts")) {
return ["helloworld", "second"] as any;
} else {
return ["HelloWorldWebPart.manifest.json"] as any;
}
});
sinon.stub(fs, "statSync").returns({
Expand Down Expand Up @@ -502,7 +538,15 @@ describe("SPFxGenerator", function () {
};

sinon.stub(fs, "pathExists").resolves(true);
sinon.stub(fs, "readdir").resolves(["helloworld", "second"] as any);
sinon.stub(fs, "readdir").callsFake((directory: any) => {
if (directory === path.join("c:\\test", "teams")) {
return ["1_color.png", "1_outline.png"] as any;
} else if (directory === path.join("c:\\test", "src", "webparts")) {
return ["helloworld", "second"] as any;
} else {
return ["HelloWorldWebPart.manifest.json"] as any;
}
});
sinon.stub(fs, "statSync").returns({
isDirectory: () => {
return true;
Expand Down Expand Up @@ -532,8 +576,10 @@ describe("SPFxGenerator", function () {
sinon.stub(fs, "readdir").callsFake((directory: any) => {
if (directory === path.join("c:\\test", "teams")) {
return ["1_color.png", "1_outline.png"] as any;
} else {
} else if (directory === path.join("c:\\test", "src", "webparts")) {
return ["helloworld", "second"] as any;
} else {
return ["HelloWorldWebPart.manifest.json"] as any;
}
});
sinon.stub(fs, "statSync").returns({
Expand Down
Loading