chore: replicate python template tweaks to beaker template (#68)

algorandfoundation · May 7, 2024 · 65d533a · 65d533a
1 parent 7e6efb2
commit 65d533a
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 16 deletions.
diff --git a/examples/generators/production_beaker_smart_contract_python/pyproject.toml b/examples/generators/production_beaker_smart_contract_python/pyproject.toml
@@ -13,6 +13,7 @@ python-dotenv = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
 setuptools = "^69.0.2" # Adding explicitly to work around pyteal https://github.com/algorand/pyteal/issues/712
+algokit-client-generator = "^1.1.3"
 black = {extras = ["d"], version = "*"}
 ruff = "^0.1.6"
 mypy = "*"

diff --git a/examples/generators/production_beaker_smart_contract_python/smart_contracts/helpers/build.py b/examples/generators/production_beaker_smart_contract_python/smart_contracts/helpers/build.py
@@ -34,7 +34,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/examples/generators/production_beaker_smart_contract_typescript/package.json b/examples/generators/production_beaker_smart_contract_typescript/package.json
@@ -14,10 +14,11 @@
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^5.1.0",
-    "algosdk": "^2.5.0"
+    "@algorandfoundation/algokit-utils": "^6.0.2",
+    "algosdk": "^2.7.0"
   },
   "devDependencies": {
+    "@algorandfoundation/algokit-client-generator": "^3.0.3",
     "@types/jest": "^29.5.11",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.4",

diff --git a/...s/generators/production_beaker_smart_contract_typescript/smart_contracts/helpers/build.py b/...s/generators/production_beaker_smart_contract_typescript/smart_contracts/helpers/build.py
@@ -34,7 +34,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/examples/generators/production_beaker_smart_contract_typescript/tsconfig.json b/examples/generators/production_beaker_smart_contract_typescript/tsconfig.json
@@ -14,11 +14,12 @@
     "forceConsistentCasingInFileNames": true,
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
+    "module": "CommonJS",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["smart_contracts/**/*.ts"],
   "exclude": ["node_modules", "dist", "coverage"]
 }
diff --git a/examples/generators/starter_beaker_smart_contract_python/pyproject.toml b/examples/generators/starter_beaker_smart_contract_python/pyproject.toml
@@ -13,6 +13,7 @@ python-dotenv = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
 setuptools = "^69.0.2" # Adding explicitly to work around pyteal https://github.com/algorand/pyteal/issues/712
+algokit-client-generator = "^1.1.3"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/examples/generators/starter_beaker_smart_contract_python/smart_contracts/helpers/build.py b/examples/generators/starter_beaker_smart_contract_python/smart_contracts/helpers/build.py
@@ -34,7 +34,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/examples/generators/starter_beaker_smart_contract_typescript/package.json b/examples/generators/starter_beaker_smart_contract_typescript/package.json
@@ -13,10 +13,11 @@
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^5.1.0",
-    "algosdk": "^2.5.0"
+    "@algorandfoundation/algokit-utils": "^6.0.2",
+    "algosdk": "^2.7.0"
   },
   "devDependencies": {
+    "@algorandfoundation/algokit-client-generator": "^3.0.3",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.4",
     "ts-node-dev": "^2.0.0",

diff --git a/...ples/generators/starter_beaker_smart_contract_typescript/smart_contracts/helpers/build.py b/...ples/generators/starter_beaker_smart_contract_typescript/smart_contracts/helpers/build.py
@@ -34,7 +34,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/examples/generators/starter_beaker_smart_contract_typescript/tsconfig.json b/examples/generators/starter_beaker_smart_contract_typescript/tsconfig.json
@@ -14,11 +14,12 @@
     "forceConsistentCasingInFileNames": true,
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
+    "module": "CommonJS",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["smart_contracts/**/*.ts"],
   "exclude": ["node_modules", "dist", "coverage"]
 }
diff --git a/examples/production_beaker/pyproject.toml b/examples/production_beaker/pyproject.toml
@@ -13,6 +13,7 @@ python-dotenv = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
 setuptools = "^69.0.2" # Adding explicitly to work around pyteal https://github.com/algorand/pyteal/issues/712
+algokit-client-generator = "^1.1.3"
 black = {extras = ["d"], version = "*"}
 ruff = "^0.1.6"
 mypy = "*"

diff --git a/examples/production_beaker/smart_contracts/helpers/build.py b/examples/production_beaker/smart_contracts/helpers/build.py
@@ -34,7 +34,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/examples/starter_beaker/pyproject.toml b/examples/starter_beaker/pyproject.toml
@@ -13,6 +13,7 @@ python-dotenv = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
 setuptools = "^69.0.2" # Adding explicitly to work around pyteal https://github.com/algorand/pyteal/issues/712
+algokit-client-generator = "^1.1.3"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/examples/starter_beaker/smart_contracts/helpers/build.py b/examples/starter_beaker/smart_contracts/helpers/build.py
@@ -34,7 +34,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/template_content/pyproject.toml.jinja b/template_content/pyproject.toml.jinja
@@ -13,6 +13,9 @@ python-dotenv = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
 setuptools = "^69.0.2" # Adding explicitly to work around pyteal https://github.com/algorand/pyteal/issues/712
+{% if deployment_language == 'python' -%}
+algokit-client-generator = "^1.1.3"
+{% endif -%}
 {% if use_python_black -%}
 black = {extras = ["d"], version = "*"}
 {% endif -%}

diff --git a/template_content/smart_contracts/helpers/build.py.jinja b/template_content/smart_contracts/helpers/build.py.jinja
@@ -37,7 +37,7 @@ def build(output_dir: Path, app: beaker.Application) -> Path:
     if result.returncode:
         if "No such command" in result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.8.0 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:

diff --git a/...eployment_language == 'typescript' or use_typescript_jest %}package.json{% endif %}.jinja b/...eployment_language == 'typescript' or use_typescript_jest %}package.json{% endif %}.jinja
@@ -16,10 +16,11 @@
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^5.1.0",
-    "algosdk": "^2.5.0"
+    "@algorandfoundation/algokit-utils": "^6.0.2",
+    "algosdk": "^2.7.0"
   },
   "devDependencies": {
+    "@algorandfoundation/algokit-client-generator": "^3.0.3",
     {%- if use_typescript_jest  %}
     "@types/jest": "^29.5.11",
     {%- endif %}

diff --git a/... if deployment_language == 'typescript' or use_typescript_jest %}tsconfig.json{% endif %} b/... if deployment_language == 'typescript' or use_typescript_jest %}tsconfig.json{% endif %}
@@ -14,11 +14,12 @@
     "forceConsistentCasingInFileNames": true,
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
+    "module": "CommonJS",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["smart_contracts/**/*.ts"],
   "exclude": ["node_modules", "dist", "coverage"]
 }