Merge pull request #1929 from polywrap/fix-templates

dOrgJelli · web-flow · commit 10b41cb25fdd · 2023-11-23T12:49:14.000-05:00
chore: update templates
diff --git a/packages/cli/src/lib/test-env/client-config.ts b/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";
 
diff --git a/packages/cli/src/lib/test-env/index.ts b/packages/cli/src/lib/test-env/index.ts
@@ -1,2 +1 @@
 export * from "./client-config";
-export * from "./providers";
diff --git a/packages/cli/src/lib/test-env/providers.ts b/packages/cli/src/lib/test-env/providers.ts
diff --git a/packages/templates/app/android/package.json b/packages/templates/app/android/package.json
@@ -5,6 +5,6 @@
     "codegen": "npx polywrap codegen -g app/src/main/java/wrap"
   },
   "devDependencies": {
-    "polywrap": "0.11.2"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/app/ios/package.json b/packages/templates/app/ios/package.json
@@ -5,6 +5,6 @@
     "codegen": "npx polywrap codegen -g Template/wrap"
   },
   "devDependencies": {
-    "polywrap": "0.11.2"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/app/python/package.json b/packages/templates/app/python/package.json
@@ -6,6 +6,6 @@
     "test": "poetry run python -m sample"
   },
   "devDependencies": {
-    "polywrap": "0.11.2"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/app/rust/Cargo.toml b/packages/templates/app/rust/Cargo.toml
@@ -11,7 +11,7 @@ include = [
 ]
 
 [dependencies]
-polywrap = { version = "~0.1.9-beta.2" }
+polywrap = { version = "~0.1.10" }
 serde = {version = "1.0.145", features = ["derive"]}
 
 [dev-dependencies]
diff --git a/packages/templates/app/rust/package.json b/packages/templates/app/rust/package.json
@@ -5,6 +5,6 @@
     "codegen": "npx polywrap codegen"
   },
   "devDependencies": {
-    "polywrap": "0.11.2"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/app/typescript/package.json b/packages/templates/app/typescript/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@types/node": "18.15.0",
-    "polywrap": "0.12.1",
+    "polywrap": "~0.12.1",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
   }
diff --git a/packages/templates/plugin/python/package.json b/packages/templates/plugin/python/package.json
@@ -6,6 +6,6 @@
     "test": "poetry run pytest"
   },
   "dependencies": {
-    "polywrap": "0.11.3"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/plugin/rust/Cargo.toml b/packages/templates/plugin/rust/Cargo.toml
@@ -11,11 +11,11 @@ include = [
 ]
 
 [dependencies]
-polywrap_core = { version = "~0.1.8" }
-polywrap_plugin = { version = "~0.1.8" }
+polywrap_core = { version = "~0.1.10" }
+polywrap_plugin = { version = "~0.1.10" }
 polywrap_msgpack_serde = { version = "~0.0.2-beta.7" }
-wrap_manifest_schemas = { version = "~0.1.8" }
+wrap_manifest_schemas = { version = "~0.1.10" }
 serde = {version = "1.0.145", features = ["derive"]}
 
 [dev-dependencies]
-polywrap_client = { version = "~0.1.8" }
+polywrap = { version = "~0.1.10" }
diff --git a/packages/templates/plugin/rust/package.json b/packages/templates/plugin/rust/package.json
@@ -2,6 +2,6 @@
   "name": "templates-plugin-rust",
   "private": true,
   "dependencies": {
-    "polywrap": "0.11.3"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/plugin/rust/tests/e2e.rs b/packages/templates/plugin/rust/tests/e2e.rs
@@ -1,30 +1,28 @@
 use template_plugin_rs::SamplePlugin;
 use template_plugin_rs::wrap::module::ArgsSampleMethod;
-use polywrap_core::{
-    client::ClientConfig,
-    uri::Uri,
+use polywrap::{
+    Client,
+    ClientConfig,
+    ClientConfigBuilder,
+    Uri,
 };
 use polywrap_plugin::{package::PluginPackage};
-use polywrap_client::{
-    client::PolywrapClient,
-    builder::{PolywrapClientConfig, PolywrapClientConfigBuilder},
-};
 use polywrap_msgpack_serde::to_vec;
 use std::{
-    sync::{Arc, Mutex},
+    sync::{Arc},
 };
 
-fn get_client() -> PolywrapClient {
+fn get_client() -> Client {
     let sample_plugin = SamplePlugin {};
     let plugin_pkg = PluginPackage::<SamplePlugin>::from(sample_plugin);
 
-    let mut config = PolywrapClientConfig::new();
+    let mut config = ClientConfig::new();
     config.add_package(
         Uri::try_from("plugin/sample").unwrap(),
         Arc::new(plugin_pkg)
     );
 
-    PolywrapClient::new(config.into())
+    Client::new(config.into())
 }
 
 #[test]
diff --git a/packages/templates/plugin/typescript/package.json b/packages/templates/plugin/typescript/package.json
@@ -23,7 +23,7 @@
     "@types/jest": "26.0.8",
     "@types/prettier": "2.6.0",
     "jest": "26.6.3",
-    "polywrap": "0.12.1",
+    "polywrap": "~0.12.1",
     "rimraf": "3.0.2",
     "ts-jest": "26.5.4",
     "ts-node": "10.9.1",
diff --git a/packages/templates/wasm/assemblyscript/package.json b/packages/templates/wasm/assemblyscript/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@types/jest": "26.0.8",
     "jest": "26.6.3",
-    "polywrap": "0.12.1",
+    "polywrap": "~0.12.1",
     "ts-jest": "26.5.4",
     "typescript": "4.9.5"
   },
diff --git a/packages/templates/wasm/golang/package.json b/packages/templates/wasm/golang/package.json
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@types/jest": "26.0.8",
     "jest": "26.6.3",
-    "polywrap": "0.12.1",
+    "polywrap": "~0.12.1",
     "ts-jest": "26.5.4",
     "typescript": "4.9.5"
   }
diff --git a/packages/templates/wasm/interface/package.json b/packages/templates/wasm/interface/package.json
@@ -2,6 +2,6 @@
   "name": "templates-interface",
   "private": true,
   "dependencies": {
-    "polywrap": "~0.11.0"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/wasm/rust/Cargo.toml b/packages/templates/wasm/rust/Cargo.toml
@@ -10,12 +10,12 @@ edition = "2021"
 include = ["src"]
 
 [dependencies]
-polywrap-wasm-rs = { version = "0.12.0" }
-polywrap_msgpack_serde = "0.0.2-beta.7"
+polywrap-wasm-rs = { version = "~0.12.1" }
+polywrap_msgpack_serde = "0.0.2"
 serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
-polywrap = { version = "0.1.9-beta.2" }
+polywrap = { version = "~0.1.10" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/packages/templates/wasm/rust/package.json b/packages/templates/wasm/rust/package.json
@@ -7,12 +7,10 @@
     "codegen": "npx polywrap codegen",
     "build": "npx polywrap build",
     "deploy": "npx polywrap deploy",
-    "test": "yarn test:e2e && yarn test:workflow",
-    "test:e2e": "yarn test:e2e:codegen && cargo test --release",
-    "test:e2e:codegen": "npx polywrap codegen -m ./tests/types/polywrap.app.yaml -g ./tests/types/wrap",
-    "test:workflow": "npx polywrap test"
+    "test": "yarn test:codegen && cargo test --release",
+    "test:codegen": "npx polywrap codegen -m ./tests/types/polywrap.app.yaml -g ./tests/types/wrap"
   },
   "devDependencies": {
-    "polywrap": "0.12.1"
+    "polywrap": "~0.12.1"
   }
 }
diff --git a/packages/templates/wasm/rust/polywrap.test.cue b/packages/templates/wasm/rust/polywrap.test.cue
diff --git a/packages/templates/wasm/rust/polywrap.test.yaml b/packages/templates/wasm/rust/polywrap.test.yaml
diff --git a/packages/templates/wasm/rust/tests/it/module.rs b/packages/templates/wasm/rust/tests/it/module.rs
@@ -1,14 +1,14 @@
 use crate::types::wrap::types::{
-    TemplateModule,
-    TemplateModuleArgsSampleMethod
+    Template,
+    TemplateArgsSampleMethod
 };
 
 #[test]
 fn sample_method() {
-    let args = TemplateModuleArgsSampleMethod {
+    let args = TemplateArgsSampleMethod {
         arg: "input data".to_string(),
     };
-    let template: TemplateModule = TemplateModule::new(None, None, None);
-    let response = template.sample_method(&args, None, None, None).unwrap();
+    let template: Template = Template::new(None);
+    let response = template.sample_method(&args, None).unwrap();
     assert_eq!(response.result, "input data from sample_method");
 }
diff --git a/packages/templates/wasm/typescript/package.json b/packages/templates/wasm/typescript/package.json
@@ -21,7 +21,7 @@
     "@rollup/plugin-typescript": "^11.1.2",
     "@types/jest": "26.0.8",
     "jest": "26.6.3",
-    "polywrap": "0.12.1",
+    "polywrap": "~0.12.1",
     "rollup": "^3.28.0",
     "typescript": "^5.1.6"
   }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`export * from "./client-config";`
`2`		`-export * from "./providers";`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`"codegen": "npx polywrap codegen -g app/src/main/java/wrap"`
`6`	`6`	`},`
`7`	`7`	`"devDependencies": {`
`8`		`- "polywrap": "0.11.2"`
	`8`	`+ "polywrap": "~0.12.1"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`"codegen": "npx polywrap codegen -g Template/wrap"`
`6`	`6`	`},`
`7`	`7`	`"devDependencies": {`
`8`		`- "polywrap": "0.11.2"`
	`8`	`+ "polywrap": "~0.12.1"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"test": "poetry run python -m sample"`
`7`	`7`	`},`
`8`	`8`	`"devDependencies": {`
`9`		`- "polywrap": "0.11.2"`
	`9`	`+ "polywrap": "~0.12.1"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ include = [`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`[dependencies]`
`14`		`-polywrap = { version = "~0.1.9-beta.2" }`
	`14`	`+polywrap = { version = "~0.1.10" }`
`15`	`15`	`serde = {version = "1.0.145", features = ["derive"]}`
`16`	`16`
`17`	`17`	`[dev-dependencies]`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`"codegen": "npx polywrap codegen"`
`6`	`6`	`},`
`7`	`7`	`"devDependencies": {`
`8`		`- "polywrap": "0.11.2"`
	`8`	`+ "polywrap": "~0.12.1"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`},`
`13`	`13`	`"devDependencies": {`
`14`	`14`	`"@types/node": "18.15.0",`
`15`		`- "polywrap": "0.12.1",`
	`15`	`+ "polywrap": "~0.12.1",`
`16`	`16`	`"ts-node": "10.9.1",`
`17`	`17`	`"typescript": "4.9.5"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"test": "poetry run pytest"`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`		`- "polywrap": "0.11.3"`
	`9`	`+ "polywrap": "~0.12.1"`
`10`	`10`	`}`
`11`	`11`	`}`