diff --git a/CHANGELOG.md b/CHANGELOG.md index d0cb34db79..7b897cc7dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # UNRELEASED +### chore: Update Azle templates to `0.31.0` + ### chore: update bitcoin regtest configuration to be same as the bitcoin mainnet Update bitcoin `regtest` configuration to be same as the bitcoin `mainnet`. @@ -4945,4 +4947,4 @@ FLAGS: ## Agents -## Canister Development Kit (CDK) +## Canister Development Kit (CDK) \ No newline at end of file diff --git a/src/dfx/assets/project_templates/any_js/tsconfig.json b/src/dfx/assets/project_templates/any_js/tsconfig.json index f4629166d9..af4fb3e0cd 100644 --- a/src/dfx/assets/project_templates/any_js/tsconfig.json +++ b/src/dfx/assets/project_templates/any_js/tsconfig.json @@ -1,11 +1,10 @@ { "compilerOptions": { "strict": true, - "target": "ES2020", - "experimentalDecorators": true, - "strictPropertyInitialization": false, - "moduleResolution": "node", + "target": "ES2024", + "module": "ES2022", + "moduleResolution": "bundler", "allowJs": true, - "outDir": "HACK_BECAUSE_OF_ALLOW_JS" + "noEmit": true } } diff --git a/src/dfx/assets/project_templates/azle/dfx.json-patch b/src/dfx/assets/project_templates/azle/dfx.json-patch index 5965afc59f..b405cbee59 100644 --- a/src/dfx/assets/project_templates/azle/dfx.json-patch +++ b/src/dfx/assets/project_templates/azle/dfx.json-patch @@ -3,21 +3,8 @@ "path": "/canisters/__backend_name__", "op": "add", "value": { - "type": "custom", - "main": "src/__backend_name__/src/index.ts", - "candid": "src/__backend_name__/__backend_name__.did", - "build": "npx azle __backend_name__", - "wasm": ".azle/__backend_name__/__backend_name__.wasm", - "gzip": true, - "tech_stack": { - "language": { - "javascript": {}, - "typescript": {} - }, - "cdk": { - "azle": {} - } - } + "type": "azle", + "main": "src/__backend_name__/src/index.ts" } } ] diff --git a/src/dfx/assets/project_templates/azle/src/__backend_name__/__backend_name__.did b/src/dfx/assets/project_templates/azle/src/__backend_name__/__backend_name__.did deleted file mode 100644 index b971bf69eb..0000000000 --- a/src/dfx/assets/project_templates/azle/src/__backend_name__/__backend_name__.did +++ /dev/null @@ -1,3 +0,0 @@ -service : { - "greet" : (text) -> (text) query; -} diff --git a/src/dfx/assets/project_templates/azle/src/__backend_name__/package.json b/src/dfx/assets/project_templates/azle/src/__backend_name__/package.json index 63bbb83d7f..2a6c4fe22a 100644 --- a/src/dfx/assets/project_templates/azle/src/__backend_name__/package.json +++ b/src/dfx/assets/project_templates/azle/src/__backend_name__/package.json @@ -4,6 +4,6 @@ "private": true, "type": "module", "dependencies": { - "azle": "^0.19.0" + "azle": "^0.31.0" } -} \ No newline at end of file +} diff --git a/src/dfx/assets/project_templates/azle/src/__backend_name__/src/index.ts b/src/dfx/assets/project_templates/azle/src/__backend_name__/src/index.ts index 87c3d05729..6c21469ba1 100644 --- a/src/dfx/assets/project_templates/azle/src/__backend_name__/src/index.ts +++ b/src/dfx/assets/project_templates/azle/src/__backend_name__/src/index.ts @@ -1,7 +1,8 @@ -import { Canister, query, text } from 'azle'; +import { IDL, query } from 'azle'; -export default Canister({ - greet: query([text], text, (name) => { +export default class { + @query([IDL.Text], IDL.Text) + greet(name: string): string { return `Hello, ${name}!`; - }) -}) + } +} diff --git a/src/dfx/src/lib/project/templates.rs b/src/dfx/src/lib/project/templates.rs index 217adf4c50..d174a746b7 100644 --- a/src/dfx/src/lib/project/templates.rs +++ b/src/dfx/src/lib/project/templates.rs @@ -73,9 +73,9 @@ pub fn builtin_templates() -> Vec { get_archive_fn: assets::new_project_svelte_files, }, category: ProjectTemplateCategory::Frontend, - post_create: vec![NPM_INSTALL.to_string()], - post_create_failure_warning: Some(NPM_INSTALL_FAILURE_WARNING.to_string()), - post_create_spinner_message: Some(NPM_INSTALL_SPINNER_MESSAGE.to_string()), + post_create: vec![], + post_create_failure_warning: None, + post_create_spinner_message: None, requirements: vec![ProjectTemplateName("dfx_js_base".to_string())], sort_order: 0, }; @@ -87,9 +87,9 @@ pub fn builtin_templates() -> Vec { get_archive_fn: assets::new_project_react_files, }, category: ProjectTemplateCategory::Frontend, - post_create: vec![NPM_INSTALL.to_string()], - post_create_failure_warning: Some(NPM_INSTALL_FAILURE_WARNING.to_string()), - post_create_spinner_message: Some(NPM_INSTALL_SPINNER_MESSAGE.to_string()), + post_create: vec![], + post_create_failure_warning: None, + post_create_spinner_message: None, requirements: vec![ProjectTemplateName("dfx_js_base".to_string())], sort_order: 1, }; @@ -101,9 +101,9 @@ pub fn builtin_templates() -> Vec { get_archive_fn: assets::new_project_vue_files, }, category: ProjectTemplateCategory::Frontend, - post_create: vec![NPM_INSTALL.to_string()], - post_create_failure_warning: Some(NPM_INSTALL_FAILURE_WARNING.to_string()), - post_create_spinner_message: Some(NPM_INSTALL_SPINNER_MESSAGE.to_string()), + post_create: vec![], + post_create_failure_warning: None, + post_create_spinner_message: None, requirements: vec![ProjectTemplateName("dfx_js_base".to_string())], sort_order: 2, }; @@ -115,9 +115,9 @@ pub fn builtin_templates() -> Vec { get_archive_fn: assets::new_project_vanillajs_files, }, category: ProjectTemplateCategory::Frontend, - post_create: vec![NPM_INSTALL.to_string()], - post_create_failure_warning: Some(NPM_INSTALL_FAILURE_WARNING.to_string()), - post_create_spinner_message: Some(NPM_INSTALL_SPINNER_MESSAGE.to_string()), + post_create: vec![], + post_create_failure_warning: None, + post_create_spinner_message: None, requirements: vec![ProjectTemplateName("dfx_js_base".to_string())], sort_order: 3, }; @@ -227,9 +227,9 @@ pub fn builtin_templates() -> Vec { get_archive_fn: assets::new_project_js_files, }, category: ProjectTemplateCategory::Support, - post_create: vec![], - post_create_failure_warning: None, - post_create_spinner_message: None, + post_create: vec![NPM_INSTALL.to_string()], + post_create_failure_warning: Some(NPM_INSTALL_FAILURE_WARNING.to_string()), + post_create_spinner_message: Some(NPM_INSTALL_SPINNER_MESSAGE.to_string()), requirements: vec![], sort_order: 2, };