From 9809f5c9f5896bb4fad14add6443ed803fe24f24 Mon Sep 17 00:00:00 2001 From: Bobby Lat Date: Fri, 19 Sep 2025 17:14:50 +0700 Subject: [PATCH 1/4] chore: update to use latest alpha versions of puya-ts, algorand-typescript and algorand-typescript-testing --- examples/production/package.json | 6 +++--- examples/starter/package.json | 4 ++-- template_content/package.json.jinja | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/production/package.json b/examples/production/package.json index 265330c..db64278 100644 --- a/examples/production/package.json +++ b/examples/production/package.json @@ -20,13 +20,13 @@ "npm": ">=9.0" }, "dependencies": { - "@algorandfoundation/algorand-typescript": "~1.0.0-beta.25 <1.0.0" + "@algorandfoundation/algorand-typescript": ">=1.0.0-alpha <1.0.0-alpha0" }, "devDependencies": { "@algorandfoundation/algokit-client-generator": "^6.0.0", "@algorandfoundation/algokit-utils": "^9.0.0", "@algorandfoundation/algokit-utils-debug": "^1.0.4", - "@algorandfoundation/puya-ts": "~1.0.0-beta.50 <1.0.0", + "@algorandfoundation/puya-ts": ">=1.0.0-alpha <1.0.0-alpha0", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node22": "^22.0.0", "algosdk": "^3.0.0", @@ -37,7 +37,7 @@ "typescript-eslint": "^8.19.1", "prettier": "^3.4.2", "ts-node-dev": "^2.0.0", - "@algorandfoundation/algorand-typescript-testing": "~1.0.0-beta.30 <1.0.0", + "@algorandfoundation/algorand-typescript-testing": ">=1.0.0-alpha <1.0.0-alpha0", "vitest": "^2.1.8", "@vitest/coverage-v8": "^2.1.8", "typescript": "^5.7.3" diff --git a/examples/starter/package.json b/examples/starter/package.json index 634c1b9..d22e8e2 100644 --- a/examples/starter/package.json +++ b/examples/starter/package.json @@ -14,13 +14,13 @@ "npm": ">=9.0" }, "dependencies": { - "@algorandfoundation/algorand-typescript": "~1.0.0-beta.25 <1.0.0" + "@algorandfoundation/algorand-typescript": ">=1.0.0-alpha <1.0.0-alpha0" }, "devDependencies": { "@algorandfoundation/algokit-client-generator": "^6.0.0", "@algorandfoundation/algokit-utils": "^9.0.0", "@algorandfoundation/algokit-utils-debug": "^1.0.4", - "@algorandfoundation/puya-ts": "~1.0.0-beta.50 <1.0.0", + "@algorandfoundation/puya-ts": ">=1.0.0-alpha <1.0.0-alpha0", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node22": "^22.0.0", "algosdk": "^3.0.0", diff --git a/template_content/package.json.jinja b/template_content/package.json.jinja index 2650354..b716ccc 100644 --- a/template_content/package.json.jinja +++ b/template_content/package.json.jinja @@ -28,13 +28,13 @@ "npm": ">=9.0" }, "dependencies": { - "@algorandfoundation/algorand-typescript": "~1.0.0-beta.25 <1.0.0" + "@algorandfoundation/algorand-typescript": ">=1.0.0-alpha <1.0.0-alpha0" }, "devDependencies": { "@algorandfoundation/algokit-client-generator": "^6.0.0", "@algorandfoundation/algokit-utils": "^9.0.0", "@algorandfoundation/algokit-utils-debug": "^1.0.4", - "@algorandfoundation/puya-ts": "~1.0.0-beta.50 <1.0.0", + "@algorandfoundation/puya-ts": ">=1.0.0-alpha <1.0.0-alpha0", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node22": "^22.0.0", "algosdk": "^3.0.0", @@ -52,7 +52,7 @@ {%- endif %} "ts-node-dev": "^2.0.0", {%- if use_vitest %} - "@algorandfoundation/algorand-typescript-testing": "~1.0.0-beta.30 <1.0.0", + "@algorandfoundation/algorand-typescript-testing": ">=1.0.0-alpha <1.0.0-alpha0", "vitest": "^2.1.8", "@vitest/coverage-v8": "^2.1.8", {%- endif %} From f65fcda87a7a22ea7aac5083ac1eac8c82f656fc Mon Sep 17 00:00:00 2001 From: Bobby Lat Date: Tue, 23 Sep 2025 08:41:46 +0700 Subject: [PATCH 2/4] fix: configure js and py package managers before bootstrap call to fix `Input is not a terminal` error thrown by tests --- tests/test_templates.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_templates.py b/tests/test_templates.py index e37d715..9736249 100644 --- a/tests/test_templates.py +++ b/tests/test_templates.py @@ -22,6 +22,8 @@ BUILD_ARGS = ["algokit", "project", "run", "build"] TEST_ARGS = ["algokit", "project", "run", "test"] LINT_ARGS = ["algokit", "project", "run", "lint"] +JS_PKG_MGR_ARGS = ["algokit", "config", "js-package-manager", "npm"] +PY_PKG_MGR_ARGS = ["algokit", "config", "py-package-manager", "poetry"] BOOTSTRAP_ARGS = ["algokit", "project", "bootstrap", "all", "--no-ci"] @@ -121,7 +123,7 @@ def run_init( content = src_path_pattern.sub("_src_path: ", content) copier_answers.write_text(content, "utf-8") - check_args = [BOOTSTRAP_ARGS, BUILD_ARGS] + check_args = [JS_PKG_MGR_ARGS, PY_PKG_MGR_ARGS, BOOTSTRAP_ARGS, BUILD_ARGS] processed_questions = _load_copier_yaml(copier_answers) if processed_questions["preset_name"] == "production": From 6264e5b3111d8f5f8362f356b7f39449d945b67c Mon Sep 17 00:00:00 2001 From: Neil Campbell Date: Tue, 28 Oct 2025 10:37:44 +0800 Subject: [PATCH 3/4] chore: adding language server enable config --- examples/production/.vscode/settings.json | 1 + examples/starter/.vscode/settings.json | 1 + .../{% if ide_vscode %}.vscode{% endif %}/settings.json.jinja | 1 + 3 files changed, 3 insertions(+) diff --git a/examples/production/.vscode/settings.json b/examples/production/.vscode/settings.json index 13edad9..e2a31a2 100644 --- a/examples/production/.vscode/settings.json +++ b/examples/production/.vscode/settings.json @@ -1,5 +1,6 @@ { "files.eol": "\n", + "algorandTypeScript.languageServer.enable": true, "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.codeActionsOnSave": { diff --git a/examples/starter/.vscode/settings.json b/examples/starter/.vscode/settings.json index 2810014..ccf1564 100644 --- a/examples/starter/.vscode/settings.json +++ b/examples/starter/.vscode/settings.json @@ -1,3 +1,4 @@ { "files.eol": "\n", + "algorandTypeScript.languageServer.enable": true, } diff --git a/template_content/{% if ide_vscode %}.vscode{% endif %}/settings.json.jinja b/template_content/{% if ide_vscode %}.vscode{% endif %}/settings.json.jinja index a1e8109..d263afc 100644 --- a/template_content/{% if ide_vscode %}.vscode{% endif %}/settings.json.jinja +++ b/template_content/{% if ide_vscode %}.vscode{% endif %}/settings.json.jinja @@ -1,5 +1,6 @@ { "files.eol": "\n", + "algorandTypeScript.languageServer.enable": true, {% if use_prettier -%} "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", From e5fdb1fbc537475d6eadb9b700238eb61f6453ac Mon Sep 17 00:00:00 2001 From: Neil Campbell Date: Thu, 30 Oct 2025 16:00:34 +0800 Subject: [PATCH 4/4] chore: update puya-ts versions --- examples/production/package.json | 6 +++--- examples/starter/package.json | 4 ++-- template_content/package.json.jinja | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/production/package.json b/examples/production/package.json index db64278..5ab70fb 100644 --- a/examples/production/package.json +++ b/examples/production/package.json @@ -20,13 +20,13 @@ "npm": ">=9.0" }, "dependencies": { - "@algorandfoundation/algorand-typescript": ">=1.0.0-alpha <1.0.0-alpha0" + "@algorandfoundation/algorand-typescript": "^1.0.1" }, "devDependencies": { "@algorandfoundation/algokit-client-generator": "^6.0.0", "@algorandfoundation/algokit-utils": "^9.0.0", "@algorandfoundation/algokit-utils-debug": "^1.0.4", - "@algorandfoundation/puya-ts": ">=1.0.0-alpha <1.0.0-alpha0", + "@algorandfoundation/puya-ts": "^1.0.1", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node22": "^22.0.0", "algosdk": "^3.0.0", @@ -37,7 +37,7 @@ "typescript-eslint": "^8.19.1", "prettier": "^3.4.2", "ts-node-dev": "^2.0.0", - "@algorandfoundation/algorand-typescript-testing": ">=1.0.0-alpha <1.0.0-alpha0", + "@algorandfoundation/algorand-typescript-testing": "^1.0.1", "vitest": "^2.1.8", "@vitest/coverage-v8": "^2.1.8", "typescript": "^5.7.3" diff --git a/examples/starter/package.json b/examples/starter/package.json index d22e8e2..ce7ecfb 100644 --- a/examples/starter/package.json +++ b/examples/starter/package.json @@ -14,13 +14,13 @@ "npm": ">=9.0" }, "dependencies": { - "@algorandfoundation/algorand-typescript": ">=1.0.0-alpha <1.0.0-alpha0" + "@algorandfoundation/algorand-typescript": "^1.0.1" }, "devDependencies": { "@algorandfoundation/algokit-client-generator": "^6.0.0", "@algorandfoundation/algokit-utils": "^9.0.0", "@algorandfoundation/algokit-utils-debug": "^1.0.4", - "@algorandfoundation/puya-ts": ">=1.0.0-alpha <1.0.0-alpha0", + "@algorandfoundation/puya-ts": "^1.0.1", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node22": "^22.0.0", "algosdk": "^3.0.0", diff --git a/template_content/package.json.jinja b/template_content/package.json.jinja index b716ccc..8913bf8 100644 --- a/template_content/package.json.jinja +++ b/template_content/package.json.jinja @@ -28,13 +28,13 @@ "npm": ">=9.0" }, "dependencies": { - "@algorandfoundation/algorand-typescript": ">=1.0.0-alpha <1.0.0-alpha0" + "@algorandfoundation/algorand-typescript": "^1.0.1" }, "devDependencies": { "@algorandfoundation/algokit-client-generator": "^6.0.0", "@algorandfoundation/algokit-utils": "^9.0.0", "@algorandfoundation/algokit-utils-debug": "^1.0.4", - "@algorandfoundation/puya-ts": ">=1.0.0-alpha <1.0.0-alpha0", + "@algorandfoundation/puya-ts": "^1.0.1", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node22": "^22.0.0", "algosdk": "^3.0.0", @@ -52,7 +52,7 @@ {%- endif %} "ts-node-dev": "^2.0.0", {%- if use_vitest %} - "@algorandfoundation/algorand-typescript-testing": ">=1.0.0-alpha <1.0.0-alpha0", + "@algorandfoundation/algorand-typescript-testing": "^1.0.1", "vitest": "^2.1.8", "@vitest/coverage-v8": "^2.1.8", {%- endif %}