remove fallback from package.ts and product.ts

joaomoreno · joaomoreno · commit ecd39ef3c1f0 · 2016-08-17T09:04:36.000+02:00
diff --git a/src/vs/platform/package.ts b/src/vs/platform/package.ts
@@ -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;
diff --git a/src/vs/platform/product.ts b/src/vs/platform/product.ts
@@ -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';
diff --git a/test/all.js b/test/all.js
@@ -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
 	};
