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

Jump to bottom

fix: bug 27332508: disable auto install dependencies for manifest-only office add-in #11234

Merged
merged 13 commits into from
May 23, 2024
Merged

fix: bug 27332508: disable auto install dependencies for manifest-only office add-in #11234

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
427d7a9
fix: bug 27332508: disable auto install dependencies for manifest-onl…
Mar 29, 2024
63681de
feat: greyout preview and stop debugging in treeview when manifest-on…
Apr 2, 2024
6cb5010
Merge branch 'OfficeDev:dev' into fix/27332508
richard6094 Apr 2, 2024
5908b18
fix: revert handler.ts to the latest status
Apr 2, 2024
5417be1
fix: combine the enablement condition of localdebug when teamsFx and …
Apr 2, 2024
b5f16a8
fix: convert the wrong change of the title
Apr 2, 2024
d6baefe
Merge branch 'dev' into fix/27332508
richard6094 Apr 24, 2024
5479f45
fix: optimize the control condition
May 8, 2024
23786cf
fix: remove multi import of isOfficeAddInProject
May 11, 2024
a796a2c
fix: modify UT for the new change
May 16, 2024
09c51e1
fix: pass the 2 UTs
May 16, 2024
54bb137
fix: add UT for manifest only add-in check
May 20, 2024
d715c30
fix: add UT for manifest only add-in check 1
May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/vscode-extension/src/officeDevHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,14 @@ export async function autoOpenOfficeDevProjectHandler(): Promise<void> {
await globalStateUpdate(GlobalKey.OpenSampleReadMe, false);
}
if (autoInstallDependency) {
void popupOfficeAddInDependenciesMessage();
if (!isManifestOnlyAddin(globalVariables.workspaceUri?.fsPath ?? ""))
void popupOfficeAddInDependenciesMessage();
await globalStateUpdate(GlobalKey.AutoInstallDependency, false);
}
if (
globalVariables.isOfficeAddInProject &&
!checkOfficeAddInInstalled(globalVariables.workspaceUri?.fsPath ?? "")
!checkOfficeAddInInstalled(globalVariables.workspaceUri?.fsPath ?? "") &&
!isManifestOnlyAddin(globalVariables.workspaceUri?.fsPath ?? "")
) {
void popupOfficeAddInDependenciesMessage();
}
Expand All @@ -251,3 +253,8 @@ export function checkOfficeAddInInstalled(directory: string): boolean {
const nodeModulesExists = fs.existsSync(path.join(directory, "node_modules"));
return nodeModulesExists;
}

export function isManifestOnlyAddin(directory: string): boolean {
const srcPath = path.join(directory, "src");
richard6094 marked this conversation as resolved.
Show resolved Hide resolved
return !fs.existsSync(srcPath);
}