empathicqubit/vscode-vsce
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes manifest overriding in case version is automatically set

Browse source
This commit is contained in:
Roberto Huertas 2017-03-18 18:02:39 +01:00
parent 999a34c401
commit 4d7822b1b7
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/package.ts
View file

@ -442,7 +442,7 @@ export function validateManifest(manifest: Manifest): Manifest {
return manifest;
}
export function readManifest(cwd = process.cwd()): Promise<Manifest> {
export function readManifest(cwd = process.cwd(), nls = true): Promise<Manifest> {
const manifestPath = path.join(cwd, 'package.json');
const manifestNLSPath = path.join(cwd, 'package.nls.json');
@ -457,19 +457,23 @@ export function readManifest(cwd = process.cwd()): Promise<Manifest> {
})
.then(validateManifest);
const manifestNLS = readFile(manifestNLSPath, 'utf8')
.catch<string>(err => err.code !== 'ENOENT' ? Promise.reject(err) : Promise.resolve('{}'))
.then<ITranslations>(raw => {
try {
return Promise.resolve(JSON.parse(raw));
} catch (e) {
return Promise.reject(`Error parsing manifest translations file: not a valid JSON file.`);
}
});
if (nls) {
const manifestNLS = readFile(manifestNLSPath, 'utf8')
.catch<string>(err => err.code !== 'ENOENT' ? Promise.reject(err) : Promise.resolve('{}'))
.then<ITranslations>(raw => {
try {
return Promise.resolve(JSON.parse(raw));
} catch (e) {
return Promise.reject(`Error parsing manifest translations file: not a valid JSON file.`);
}
});
return Promise.all([manifest, manifestNLS]).then(([manifest, translations]) => {
return patchNLS(manifest, translations);
});
return Promise.all([manifest, manifestNLS]).then(([manifest, translations]) => {
return patchNLS(manifest, translations);
});
} else {
return manifest;
}
}
export function writeManifest(cwd: string, manifest: Manifest): Promise<void> {

2
src/publish.ts
View file

@ -90,7 +90,7 @@ function versionBump(cwd: string = process.cwd(), version?: string): Promise<voi
return Promise.resolve(null);
}
return readManifest(cwd)
return readManifest(cwd, false)
.then(manifest => {
switch (version) {
case 'major':