maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove fallback from package.ts and product.ts

Browse source
This commit is contained in:
Joao Moreno 2016-08-17 09:04:36 +02:00
parent 195e77304b
commit ecd39ef3c1
3 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vs/platform/package.ts
View file

@ -11,16 +11,6 @@ export interface IPackageConfiguration {
version: string;
}
let pkg: IPackageConfiguration;
try {
const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
const packageJsonPath = path.join(rootPath, 'package.json');
pkg = require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
} catch (error) {
pkg = {
name: 'code-oss-dev',
version: '1.x.x'
};
}
export default pkg;
const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
const packageJsonPath = path.join(rootPath, 'package.json');
export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;

15
src/vs/platform/product.ts
View file

@ -47,18 +47,9 @@ export interface IProductConfiguration {
npsSurveyUrl: string;
}
let product: IProductConfiguration;
try {
const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
const productJsonPath = path.join(rootPath, 'product.json');
product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
} catch (error) {
product = <IProductConfiguration>{
nameLong: 'Code - OSS',
applicationName: 'code-oss',
dataFolderName: '.vscode-oss'
};
}
const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
const productJsonPath = path.join(rootPath, 'product.json');
const product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
if (process.env['VSCODE_DEV']) {
product.nameShort += ' Dev';

8
test/all.js
View file

@ -79,11 +79,11 @@ function main() {
var loaderConfig = {
nodeRequire: require,
nodeMain: __filename,
baseUrl: path.join(path.dirname(__dirname)),
baseUrl: path.join(path.dirname(__dirname), 'src'),
paths: {
'vs': out + '/vs',
'lib': out + '/lib',
'bootstrap': out + '/bootstrap'
'vs': `../${ out }/vs`,
'lib': `../${ out }/lib`,
'bootstrap': `../${ out }/bootstrap`
},
catchError: true
};