Merge branch 'origin-dev' into update-client-readme

Author: dOrgJelli

packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts

@@ -29,16 +29,19 @@ const DEFAULTS_DIR = path.join(
 export interface VMConfig {
   defaultIncludes: string[];
   baseImage: string;
+  version: string;
 }
 
 const CONFIGS: Record<BuildableLanguage, VMConfig> = {
   "wasm/rust": {
     defaultIncludes: ["Cargo.toml", "Cargo.lock"],
     baseImage: "polywrap/vm-base-rs",
+    version: "0.2.0",
   },
   "wasm/assemblyscript": {
     defaultIncludes: ["package.json", "package-lock.json", "yarn.lock"],
     baseImage: "polywrap/vm-base-as",
+    version: "0.1.0",
   },
 };
 
@@ -194,7 +197,7 @@ export class DockerVMBuildStrategy extends BuildStrategy<void> {
                 this._volumePaths.linkedPackages
               )}:/linked-packages`,
               cacheVolume,
-              `${CONFIGS[language].baseImage}:latest`,
+              `${CONFIGS[language].baseImage}:${process.arch}-${CONFIGS[language].version}`,
               "/bin/bash",
               "--verbose",
               "/project/polywrap-build.sh",
@@ -221,7 +224,7 @@ export class DockerVMBuildStrategy extends BuildStrategy<void> {
               `${path.resolve(
                 this._volumePaths.linkedPackages
               )}:/linked-packages`,
-              `${CONFIGS[language].baseImage}:latest`,
+              `${CONFIGS[language].baseImage}:${process.arch}-${CONFIGS[language].version}`,
               "/bin/bash",
               "-c",
               '"chmod -R 777 /project && chmod -R 777 /linked-packages"',

packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache

@@ -1,13 +1,12 @@
-FROM rust:1.65.0 as base
+FROM rust:1.66-alpine as base
 
 # Install the wasm32 rust build target
 RUN rustup target add wasm32-unknown-unknown
 
 WORKDIR /build-deps
 
 # Install curl
-RUN apt-get update
-RUN apt-get -y install curl clang llvm build-essential
+RUN apk add curl build-base pkgconfig openssl-dev bash
 
 # Install wasm-opt
 RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \

packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile

@@ -1,13 +1,12 @@
-FROM rust:1.65.0 as base
+FROM rust:1.66-alpine as base
 
 # Install the wasm32 rust build target
 RUN rustup target add wasm32-unknown-unknown
 
 WORKDIR /build-deps
 
 # Install curl
-RUN apt-get update
-RUN apt-get -y install curl clang llvm build-essential
+RUN apk add curl build-base pkgconfig openssl-dev bash
 
 # Install wasm-opt
 RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \

packages/js/core/src/interfaces/uri-resolver.ts

@@ -7,10 +7,10 @@ import { Result } from "@polywrap/result";
 /** Contains either a Uri, a manifest, or neither */
 export interface MaybeUriOrManifest {
   /** wrap URI */
-  uri?: string;
+  uri?: string | null;
 
   /** Serialized wrap manifest */
-  manifest?: Uint8Array;
+  manifest?: Uint8Array | null;
 }
 // $end
 
@@ -54,8 +54,8 @@ export const module = {
       invoker: Invoker,
       wrapper: Uri,
       path: string
-    ): Promise<Result<Uint8Array | undefined, WrapError>> /* $ */ => {
-      return invoker.invoke<Uint8Array | undefined>({
+    ): Promise<Result<Uint8Array | null, WrapError>> /* $ */ => {
+      return invoker.invoke<Uint8Array | null>({
         uri: wrapper.uri,
         method: "getFile",
         args: {

packages/js/uri-resolver-extensions/src/UriResolverExtensionFileReader.ts

@@ -34,7 +34,7 @@ export class UriResolverExtensionFileReader implements IFileReader {
       path
     );
     if (!result.ok) return result;
-    if (result.value === undefined) {
+    if (!result.value) {
       return ResultErr(new Error(`File not found at ${path}`));
     }
     return {