Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions packages/cli/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,6 @@
"lib_compiler_copyResourcesFolderText": "Copying resources folder: {folder}",
"lib_compiler_copyResourcesFolderError": "Failed to copy resources folder: {folder}",
"lib_compiler_copyResourcesFolderWarning": "Warnings copying resources folder: {folder}",
"lib_compiler_outputMetadataText": "Metadata written",
"lib_compiler_outputMetadataError": "Failed to output metadata",
"lib_compiler_outputMetadataWarning": "Warnings writing metadata",
"lib_compiler_outputMetadataFileText": "Metadata written to {path}",
"lib_schemaComposer_abi_not_found": "ABI not found at {path}",
"lib_schemaComposer_unknown_abi": "Unknown ABI type at {path}. Supported types: {types}",
"lib_schemaComposer_invalid_yaml": "Invalid YAML at {path}",
Expand Down
4 changes: 0 additions & 4 deletions packages/cli/lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,6 @@
"lib_compiler_copyResourcesFolderText": "Copying resources folder: {folder}",
"lib_compiler_copyResourcesFolderError": "Failed to copy resources folder: {folder}",
"lib_compiler_copyResourcesFolderWarning": "Warnings copying resources folder: {folder}",
"lib_compiler_outputMetadataText": "Metadata written",
"lib_compiler_outputMetadataError": "Failed to output metadata",
"lib_compiler_outputMetadataWarning": "Warnings writing metadata",
"lib_compiler_outputMetadataFileText": "Metadata written to {path}",
"lib_schemaComposer_abi_not_found": "ABI not found at {path}",
"lib_schemaComposer_unknown_abi": "Unknown ABI type at {path}. Supported types: {types}",
"lib_schemaComposer_invalid_yaml": "Invalid YAML at {path}",
Expand Down
9 changes: 4 additions & 5 deletions packages/cli/src/__tests__/e2e/manifest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Migrates the polywrap project manifest to the latest version.
Arguments:
type Type of manifest file to migrate (default:
project) (choices: "project", "build", "deploy",
"infra", "meta", "workflow", default: "project")
"infra", "workflow", default: "project")

Options:
-m, --manifest-file <path> Path to the manifest file (default: polywrap.yaml
Expand All @@ -48,7 +48,7 @@ Prints out the schema for the current manifest format.
Arguments:
type Type of manifest file to migrate (default:
project) (choices: \"project\", \"build\", \"deploy\",
\"infra\", \"meta\", \"workflow\", default: \"project\")
\"infra\", \"workflow\", default: \"project\")

Options:
-r, --raw Output raw JSON Schema (default: false)
Expand Down Expand Up @@ -125,7 +125,7 @@ describe("e2e tests for manifest command", () => {
});

expect(error).toBe(
`error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, meta, workflow.\n`
`error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, workflow.\n`
);
expect(output).toEqual(``);
expect(code).toEqual(1);
Expand All @@ -143,7 +143,6 @@ describe("e2e tests for manifest command", () => {
build: "polywrap.build.yaml",
deploy: "polywrap.deploy.yaml",
infra: "polywrap.infra.yaml",
meta: "polywrap.meta.yaml",
workflow: "polywrap.test.yaml",
};

Expand Down Expand Up @@ -315,7 +314,7 @@ describe("e2e tests for manifest command", () => {
});

expect(error).toBe(
`error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, meta, workflow.\n`
`error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, workflow.\n`
);
expect(output).toEqual(``);
expect(code).toEqual(1);
Expand Down
41 changes: 0 additions & 41 deletions packages/cli/src/commands/manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
defaultBuildManifest,
defaultDeployManifest,
defaultInfraManifest,
defaultMetaManifest,
defaultWorkflowManifest,
getProjectManifestLanguage,
intlMsg,
Expand All @@ -24,7 +23,6 @@ import {
migrateBuildExtensionManifest,
migrateDeployExtensionManifest,
migrateInfraExtensionManifest,
migrateMetaExtensionManifest,
migratePluginProjectManifest,
migratePolywrapProjectManifest,
migrateWorkflow,
Expand All @@ -41,8 +39,6 @@ import {
DeployManifestSchemaFiles,
InfraManifestFormats,
InfraManifestSchemaFiles,
MetaManifestFormats,
MetaManifestSchemaFiles,
PluginManifestFormats,
PluginManifestSchemaFiles,
PolywrapManifestFormats,
Expand All @@ -53,7 +49,6 @@ import {
latestBuildManifestFormat,
latestDeployManifestFormat,
latestInfraManifestFormat,
latestMetaManifestFormat,
latestPluginManifestFormat,
latestPolywrapManifestFormat,
latestPolywrapWorkflowFormat,
Expand All @@ -72,7 +67,6 @@ const manifestTypes = [
"build",
"deploy",
"infra",
"meta",
"workflow",
] as const;
type ManifestType = typeof manifestTypes[number];
Expand Down Expand Up @@ -198,13 +192,6 @@ export const runSchemaCommand = async (
);
break;

case "meta":
manifestfile = parseManifestFileOption(
options.manifestFile,
defaultMetaManifest
);
break;

case "deploy":
manifestfile = parseManifestFileOption(
options.manifestFile,
Expand Down Expand Up @@ -307,20 +294,6 @@ export const runSchemaCommand = async (
);
break;

case "meta":
maybeFailOnUnsupportedManifestFormat(
manifestVersion,
Object.values(MetaManifestFormats),
manifestfile,
logger
);

manifestSchemaFile = path.join(
schemasPackageDir,
MetaManifestSchemaFiles[manifestVersion ?? latestMetaManifestFormat]
);
break;

case "deploy":
maybeFailOnUnsupportedManifestFormat(
manifestVersion,
Expand Down Expand Up @@ -467,20 +440,6 @@ const runMigrateCommand = async (
);
break;

case "meta":
maybeFailOnUnsupportedTargetFormat(
options.format,
Object.values(MetaManifestFormats),
logger
);
migrateManifestFile(
parseManifestFileOption(options.manifestFile, defaultMetaManifest),
migrateMetaExtensionManifest,
options.format ?? latestMetaManifestFormat,
logger
);
break;

case "deploy":
maybeFailOnUnsupportedTargetFormat(
options.format,
Expand Down
28 changes: 0 additions & 28 deletions packages/cli/src/lib/Compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import {
displayPath,
generateWrapFile,
intlMsg,
outputManifest,
copyMetadata,
PolywrapProject,
resetDir,
SchemaComposer,
Expand Down Expand Up @@ -55,9 +53,6 @@ export class Compiler {

// Copy: Resources folder
await this._copyResourcesFolder();

// Copy: Polywrap Metadata
await this._copyPolywrapMetadata();
};

try {
Expand Down Expand Up @@ -160,29 +155,6 @@ export class Compiler {
);
}

private async _copyPolywrapMetadata(): Promise<void> {
const { outputDir, project } = this._config;

const projectMetaManifest = await project.getMetaManifest();

if (!projectMetaManifest) {
return Promise.resolve();
}

const builtMetaManifest = await copyMetadata(
projectMetaManifest,
outputDir,
project.getManifestDir(),
project.logger
);

await outputManifest(
builtMetaManifest,
path.join(outputDir, "polywrap.meta.json"),
project.logger
);
}

private async _validateWasmModule(buildDir: string): Promise<void> {
const modulePath = path.join(buildDir, `wrap.wasm`);
const wasmSource = fs.readFileSync(modulePath);
Expand Down
1 change: 0 additions & 1 deletion packages/cli/src/lib/helpers/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from "./metadata";
export * from "./uuid";
export * from "./validate-client-config";
export * from "./workflow-validator";
Expand Down
83 changes: 0 additions & 83 deletions packages/cli/src/lib/helpers/metadata.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/cli/src/lib/manifest/migrate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export * from "./migrateAppProjectManifest";
export * from "./migrateBuildExtensionManifest";
export * from "./migrateDeployExtensionManifest";
export * from "./migrateInfraExtensionManifest";
export * from "./migrateMetaExtensionManifest";
export * from "./migratePluginProjectManifest";
export * from "./migratePolywrapProjectManifest";
export * from "./migrateTestExtensionManifest";

This file was deleted.

Loading