Allow for inlining package.json when bundling (#145)

src/spec-node/devContainers.ts

@@ -6,7 +6,7 @@
 import * as path from 'path';
 import * as crypto from 'crypto';
 
-import { DockerResolverParameters, getPackageConfig, DevContainerAuthority, UpdateRemoteUserUIDDefault, BindMountConsistency } from './utils';
+import { DockerResolverParameters, DevContainerAuthority, UpdateRemoteUserUIDDefault, BindMountConsistency } from './utils';
 import { createNullPostCreate, finishBackgroundTasks, ResolverParameters, UserEnvProbe } from '../spec-common/injectHeadless';
 import { getCLIHost, loadNativeModule } from '../spec-common/commonUtils';
 import { resolve } from './configContainer';
@@ -15,7 +15,7 @@ import { promisify } from 'util';
 import { LogLevel, LogDimensions, toErrorText, createCombinedLog, createTerminalLog, Log, makeLog, LogFormat, createJSONLog } from '../spec-utils/log';
 import { dockerComposeCLIConfig } from './dockerCompose';
 import { Mount } from '../spec-configuration/containerFeaturesConfiguration';
-import { PackageConfiguration } from '../spec-utils/product';
+import { getPackageConfig, PackageConfiguration } from '../spec-utils/product';
 import { dockerBuildKitVersion } from '../spec-shutdown/dockerUtils';
 
 export interface ProvisionOptions {
@@ -84,7 +84,7 @@ export async function createDockerParams(options: ProvisionOptions, disposables:
 	}
 	const extensionPath = path.join(__dirname, '..', '..');
 	const sessionStart = new Date();
-	const pkg = await getPackageConfig(extensionPath);
+	const pkg = getPackageConfig();
 	const output = createLog(options, pkg, sessionStart, disposables, options.omitLoggerHeader);
 
 	const appRoot = undefined;

src/spec-node/devContainersSpecCLI.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import yargs, { Argv } from 'yargs';
 
 import { createDockerParams, createLog, launch, ProvisionOptions } from './devContainers';
-import { createContainerProperties, createFeaturesTempFolder, envListToObj, getPackageConfig, isDockerFileConfig } from './utils';
+import { createContainerProperties, createFeaturesTempFolder, envListToObj, isDockerFileConfig } from './utils';
 import { URI } from 'vscode-uri';
 import { ContainerError } from '../spec-common/errors';
 import { Log, LogLevel, makeLog, mapLogLevel } from '../spec-utils/log';
@@ -29,13 +29,14 @@ import { featuresPackageHandler, featuresPackageOptions } from './featuresCLI/pa
 import { featuresPublishHandler, featuresPublishOptions } from './featuresCLI/publish';
 import { featuresInfoHandler, featuresInfoOptions } from './featuresCLI/info';
 import { containerSubstitute } from '../spec-common/variableSubstitution';
+import { getPackageConfig } from '../spec-utils/product';
 
 const defaultDefaultUserEnvProbe: UserEnvProbe = 'loginInteractiveShell';
 
 (async () => {
 
 	const packageFolder = path.join(__dirname, '..', '..');
-	const version = (await getPackageConfig(packageFolder)).version;
+	const version = getPackageConfig().version;
 	const argv = process.argv.slice(2);
 	const restArgs = argv[0] === 'exec' && argv[1] !== '--help'; // halt-at-non-option doesn't work in subcommands: https://github.com/yargs/yargs/issues/1417
 	const y = yargs([])
@@ -666,7 +667,7 @@ async function readConfiguration({
 		const cliHost = await getCLIHost(cwd, loadNativeModule);
 		const extensionPath = path.join(__dirname, '..', '..');
 		const sessionStart = new Date();
-		const pkg = await getPackageConfig(extensionPath);
+		const pkg = getPackageConfig();
 		output = createLog({
 			logLevel: mapLogLevel(logLevel),
 			logFormat,

src/spec-node/featuresCLI/info.ts

@@ -1,10 +1,9 @@
-import path from 'path';
 import { Argv } from 'yargs';
 import { getFeatureRef, getPublishedVersions } from '../../spec-configuration/containerFeaturesOCI';
 import { Log, LogLevel, mapLogLevel } from '../../spec-utils/log';
+import { getPackageConfig } from '../../spec-utils/product';
 import { createLog } from '../devContainers';
 import { UnpackArgv } from '../devContainersSpecCLI';
-import { getPackageConfig } from '../utils';
 
 export function featuresInfoOptions(y: Argv) {
 	return y
@@ -31,8 +30,7 @@ async function featuresInfo({
 		await Promise.all(disposables.map(d => d()));
 	};
 
-	const extensionPath = path.join(__dirname, '..', '..', '..');
-	const pkg = await getPackageConfig(extensionPath);
+	const pkg = getPackageConfig();
 
 	const output = createLog({
 		logLevel: mapLogLevel(inputLogLevel),

src/spec-node/featuresCLI/package.ts

@@ -1,11 +1,10 @@
-import path from 'path';
 import { Argv } from 'yargs';
 import { CLIHost, getCLIHost } from '../../spec-common/cliHost';
 import { loadNativeModule } from '../../spec-common/commonUtils';
 import { Log, mapLogLevel } from '../../spec-utils/log';
+import { getPackageConfig } from '../../spec-utils/product';
 import { createLog } from '../devContainers';
 import { UnpackArgv } from '../devContainersSpecCLI';
-import { getPackageConfig } from '../utils';
 import { doFeaturesPackageCommand } from './packageCommandImpl';
 
 const targetPositionalDescription = `
@@ -55,8 +54,7 @@ async function featuresPackage({
 		await Promise.all(disposables.map(d => d()));
 	};
 
-	const extensionPath = path.join(__dirname, '..', '..', '..');
-	const pkg = await getPackageConfig(extensionPath);
+	const pkg = getPackageConfig();
 
 	const cwd = process.cwd();
 	const cliHost = await getCLIHost(cwd, loadNativeModule);

src/spec-node/featuresCLI/publish.ts

@@ -49,8 +49,7 @@ async function featuresPublish({
         await Promise.all(disposables.map(d => d()));
     };
 
-    const extensionPath = path.join(__dirname, '..', '..', '..');
-    const pkg = await getPackageConfig(extensionPath);
+    const pkg = getPackageConfig();
 
     const cwd = process.cwd();
     const cliHost = await getCLIHost(cwd, loadNativeModule);

src/spec-node/featuresCLI/test.ts

@@ -1,4 +1,3 @@
-import * as path from 'path';
 import { Argv } from 'yargs';
 import { CLIHost, getCLIHost } from '../../spec-common/cliHost';
 import { loadNativeModule } from '../../spec-common/commonUtils';
@@ -70,8 +69,7 @@ async function featuresTest({
 
 	const cwd = process.cwd();
 	const cliHost = await getCLIHost(cwd, loadNativeModule);
-	const extensionPath = path.join(__dirname, '..', '..', '..');
-	const pkg = await getPackageConfig(extensionPath);
+	const pkg = getPackageConfig();
 
 	const logLevel = mapLogLevel(inputLogLevel);
 

src/spec-node/utils.ts

@@ -28,7 +28,6 @@ import { PackageConfiguration } from '../spec-utils/product';
 export { getConfigFilePath, getDockerfilePath, isDockerFileConfig, resolveConfigFilePath } from '../spec-configuration/configuration';
 export { uriToFsPath, parentURI } from '../spec-configuration/configurationCommonUtils';
 export { CLIHostDocuments, Documents, createDocuments, Edit, fileDocuments, RemoteDocuments } from '../spec-configuration/editableFiles';
-export { getPackageConfig } from '../spec-utils/product';
 
 
 export type BindMountConsistency = 'consistent' | 'cached' | 'delegated' | undefined;

src/spec-utils/product.ts

@@ -3,18 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
-import { readLocalFile } from './pfs';
 
 export interface PackageConfiguration {
 	name: string;
-	publisher?: string;
 	version: string;
-	aiKey?: string;
 }
 
-export async function getPackageConfig(packageFolder: string): Promise<PackageConfiguration> {
-	const raw = await readLocalFile(path.join(packageFolder, 'package.json'), 'utf8');
-	return JSON.parse(raw);
+export function getPackageConfig(): PackageConfiguration {
+	return require('../../package.json');
 }
 export const includeAllConfiguredFeatures = true;