Skip to content

Sync retainStagingFolder, stagingFolderPath with options. #100

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
TwitchBronBron merged 2 commits into from
Sep 20, 2022
Merged

Sync retainStagingFolder, stagingFolderPath with options. #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf80948
Sync retainStagingFolder, stagingFolderPath with options.
TwitchBronBron Sep 20, 2022
7877712
Fix broken test
TwitchBronBron Sep 20, 2022
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
4 changes: 2 additions & 2 deletions src/RokuDeploy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2906,7 +2906,7 @@ describe('index', () => {
).to.eql(s`${cwd}/staging-dir`);
expect(
rokuDeploy.getOptions({ stagingFolderPath: 'staging-folder-path' }).stagingFolderPath
).to.be.undefined;
).to.eql(s`${cwd}/staging-folder-path`);
});

it('supports deprecated retainStagingFolder option', () => {
Expand All @@ -2921,7 +2921,7 @@ describe('index', () => {
).to.be.false;
expect(
rokuDeploy.getOptions({ retainStagingFolder: true, retainStagingDir: false }).retainStagingFolder
).to.be.undefined;
).to.be.false;
});

it('calling with no parameters works', () => {
Expand Down
6 changes: 4 additions & 2 deletions src/RokuDeploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,10 +863,10 @@ export class RokuDeploy {
finalOptions.rootDir = path.resolve(process.cwd(), finalOptions.rootDir);
finalOptions.outDir = path.resolve(process.cwd(), finalOptions.outDir);
finalOptions.retainStagingDir = (finalOptions.retainStagingDir !== undefined) ? finalOptions.retainStagingDir : finalOptions.retainStagingFolder;
delete finalOptions.retainStagingFolder;
//sync the new option with the old one (for back-compat)
finalOptions.retainStagingFolder = finalOptions.retainStagingDir;

let stagingDir = finalOptions.stagingDir || finalOptions.stagingFolderPath;
delete finalOptions.stagingFolderPath;

//stagingDir
if (stagingDir) {
Expand All @@ -877,6 +877,8 @@ export class RokuDeploy {
util.standardizePath(`${finalOptions.outDir}/.roku-deploy-staging`)
);
}
//sync the new option with the old one (for back-compat)
finalOptions.stagingFolderPath = finalOptions.stagingDir;

return finalOptions;
}
Expand Down