Merge pull request #1931 from polywrap/origin-0.12-dev

prep origin 0.12.2 | /workflows/release-pr

Author: dOrgJelli

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Polywrap Origin (0.12.2)
+## Features
+**`polywrap` CLI:**
+* [PR-1928](https://github.com/polywrap/cli/pull/1928) **Add `--no-wasm` Option To `polywrap build`**
+  * `build` command now supports the `--no-wasm` option, which disables the wasm compilation step when compiling projects.
+
+## Bugs
+**`@polywrap/templates`:**
+* [PR-1929](https://github.com/polywrap/cli/pull/1929) **Fix Rust Codegen Compiler Errors**
+
 # Polywrap Origin (0.12.1)
 ## Features
 **`polywrap` CLI:**

VERSION

@@ -1 +1 @@
-0.12.1
+0.12.2

packages/cli/README.md

@@ -104,6 +104,10 @@ Currently, `build` can be run for Wasm, Plugin and Interface projects.
   Skip codegen before building.
   By default, `build` performs a `codegen` step before building your Project. This option skips this step.
 
+- `--no-wasm`
+  Skip wasm compilation.
+  By default, `build` performs wasm compilation. This option skips this step.
+
 - `-s, --strategy <strategy>`
   Specify which build strategy to use. By default, the `vm` build strategy is used.
   Available strategies:

packages/cli/lang/en.json

@@ -21,6 +21,7 @@
   "commands_build_options_options": "options",
   "commands_build_options_t": "Use the development server's ENS instance",
   "commands_build_options_codegen": "Skip code generation before build",
+  "commands_build_options_no_wasm": "Skip wasm compilation",
   "commands_build_options_codegen_dir": "Codegen output directory (default: {default})",
   "commands_build_options_s": "Strategy to use for building the wrapper (default: {default})",
   "commands_build_options_s_strategy": "strategy",

packages/cli/lang/es.json

@@ -21,6 +21,7 @@
   "commands_build_options_options": "options",
   "commands_build_options_t": "Use the development server's ENS instance",
   "commands_build_options_codegen": "Skip code generation before build",
+  "commands_build_options_no_wasm": "Skip wasm compilation",
   "commands_build_options_codegen_dir": "Codegen output directory (default: {default})",
   "commands_build_options_s": "Strategy to use for building the wrapper (default: {default})",
   "commands_build_options_s_strategy": "strategy",

packages/cli/src/__tests__/e2e/p2/build.wasm.spec.ts

@@ -24,6 +24,7 @@ Options:
   -c, --client-config <config-path>    Add custom configuration to the
                                        PolywrapClient
   -n, --no-codegen                     Skip code generation before build
+  --no-wasm                            Skip wasm compilation
   --codegen-dir                        Codegen output directory (default:
                                        ./src/wrap)
   --wrapper-envs <envs-path>           Path to a JSON file containing wrapper
@@ -265,7 +266,7 @@ describe("e2e tests for build command", () => {
       expect(output).toContain(`WRAP manifest written in ${buildDir}/wrap.info`);
     });
   })
-  
+
   describe("test-cases", () => {
     for (let i = 0; i < testCases.length; i++) {
       const testCaseName = testCases[i];

packages/cli/src/commands/build.ts

@@ -51,6 +51,7 @@ export interface BuildCommandOptions extends BaseCommandOptions {
   clientConfig: string | false;
   wrapperEnvs: string | false;
   noCodegen: boolean;
+  noWasm: boolean;
   codegenDir: string | false;
   watch: boolean;
   strategy: `${SupportedStrategies}`;
@@ -80,6 +81,7 @@ export const build: Command = {
         `${intlMsg.commands_common_options_config()}`
       )
       .option(`-n, --no-codegen`, `${intlMsg.commands_build_options_codegen()}`)
+      .option(`--no-wasm`, `${intlMsg.commands_build_options_no_wasm()}`)
       .option(
         `--codegen-dir`,
         `${intlMsg.commands_build_options_codegen_dir({
@@ -117,6 +119,7 @@ export const build: Command = {
             outputDir: parseDirOption(options.outputDir, defaultOutputDir),
             bindgen: options.bindgen || false,
             noCodegen: !options.codegen || false,
+            noWasm: !options.wasm || false,
             codegenDir: parseDirOptionNoDefault(options.codegenDir),
             strategy: options.strategy || defaultStrategy,
             watch: options.watch || false,
@@ -174,6 +177,7 @@ async function run(options: Required<BuildCommandOptions>) {
     bindgen,
     strategy,
     noCodegen,
+    noWasm,
     codegenDir,
     verbose,
     quiet,
@@ -220,7 +224,7 @@ async function run(options: Required<BuildCommandOptions>) {
 
     const isInterface = language === "interface";
 
-    if (isInterface) {
+    if (isInterface || noWasm) {
       buildStrategy = new NoopBuildStrategy({
         project: project as PolywrapProject,
         outputDir,

packages/cli/src/lib/test-env/client-config.ts

@@ -1,4 +1,3 @@
-import { getTestEnvProviders } from "./providers";
 import { ETH_ENS_IPFS_MODULE_CONSTANTS } from "../../lib";
 
 import {
@@ -18,14 +17,8 @@ import { IWrapPackage, Uri } from "@polywrap/core-js";
 export function getTestEnvClientConfig(): Partial<BuilderConfig> {
   // TODO: move this into its own package, since it's being used everywhere?
   // maybe have it exported from test-env.
-  const providers = getTestEnvProviders();
-  const ipfsProvider = providers.ipfsProvider;
-  const ethProvider = providers.ethProvider;
-
-  if (!ipfsProvider || !ethProvider) {
-    throw Error("Test environment not found.");
-  }
-
+  const ipfsProvider = ETH_ENS_IPFS_MODULE_CONSTANTS.ipfsProvider;
+  const ethProvider = ETH_ENS_IPFS_MODULE_CONSTANTS.ethereumProvider;
   const ensAddress = ETH_ENS_IPFS_MODULE_CONSTANTS.ensAddresses.ensAddress;
   const testnetEnsResolverUri = "proxy/testnet-ens-contenthash-uri-resolver";
 

packages/cli/src/lib/test-env/index.ts

@@ -1,2 +1 @@
 export * from "./client-config";
-export * from "./providers";