Skip to content

fix: hash plugin files after prepare #5753

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 6, 2023
Merged

fix: hash plugin files after prepare #5753

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion lib/services/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,15 @@ export class PluginsService implements IPluginsService {
pluginData,
projectData
);

const updatedPluginNativeHashes = await this.getPluginNativeHashes(
pluginPlatformsFolderPath
);

this.setPluginNativeHashes({
pathToPluginsBuildFile,
pluginData,
currentPluginNativeHashes,
currentPluginNativeHashes: updatedPluginNativeHashes,
allPluginsNativeHashes,
});
}
Expand Down
30 changes: 26 additions & 4 deletions test/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ describe("Plugins service", () => {
newPluginHashes?: IStringDictionary;
buildDataFileExists?: boolean;
hasPluginPlatformsDir?: boolean;
pluginHashesAfterPrepare?: IStringDictionary;
}): any => {
const testData: any = {
pluginsService: null,
Expand Down Expand Up @@ -730,7 +731,10 @@ describe("Plugins service", () => {
currentPluginNativeHashes: IStringDictionary
) => !!opts.hasChangesInShasums,
generateHashes: async (files: string[]): Promise<IStringDictionary> =>
pluginHashes,
testData.isPreparePluginNativeCodeCalled &&
opts.pluginHashesAfterPrepare
? opts.pluginHashesAfterPrepare
: pluginHashes,
});

unitTestsInjector.register("fs", {
Expand Down Expand Up @@ -767,9 +771,8 @@ describe("Plugins service", () => {
unitTestsInjector.register("nodeModulesDependenciesBuilder", {});
unitTestsInjector.register("tempService", stubs.TempServiceStub);

const pluginsService: PluginsService = unitTestsInjector.resolve(
PluginsService
);
const pluginsService: PluginsService =
unitTestsInjector.resolve(PluginsService);
testData.pluginsService = pluginsService;
testData.pluginData = samplePluginData;
return testData;
Expand Down Expand Up @@ -805,6 +808,25 @@ describe("Plugins service", () => {
});
});

it("should hash the plugin files after prepare", async () => {
const newPluginHashes = { file: "hash" };
const pluginHashesAfterPrepare = { file: "hasedafterprepare" };
const testData = setupTest({
newPluginHashes,
hasPluginPlatformsDir: true,
pluginHashesAfterPrepare,
});
await testData.pluginsService.preparePluginNativeCode({
pluginData: testData.pluginData,
platform,
projectData,
});
assert.isTrue(testData.isPreparePluginNativeCodeCalled);
assert.deepStrictEqual(testData.dataPassedToWriteJson, {
[testData.pluginData.name]: pluginHashesAfterPrepare,
});
});

it("does not prepare the files when plugin has platforms dir and files have not changed since then", async () => {
const testData = setupTest({
hasChangesInShasums: false,
Expand Down