diff --git a/src/dfx/assets/project_templates/any_js/tsconfig.json b/src/dfx/assets/project_templates/any_js/tsconfig.json index f4629166d9..61d9e891a9 100644 --- a/src/dfx/assets/project_templates/any_js/tsconfig.json +++ b/src/dfx/assets/project_templates/any_js/tsconfig.json @@ -2,8 +2,7 @@ "compilerOptions": { "strict": true, "target": "ES2020", - "experimentalDecorators": true, - "strictPropertyInitialization": false, + "module": "ES2020", "moduleResolution": "node", "allowJs": true, "outDir": "HACK_BECAUSE_OF_ALLOW_JS" 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..81e8dca849 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.25.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..01690668bd 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,15 @@ -import { Canister, query, text } from 'azle'; +import { IDL, query, update } from 'azle'; -export default Canister({ - greet: query([text], text, (name) => { - return `Hello, ${name}!`; - }) -}) +export default class { + message: string = 'Hello world!'; + + @query([], IDL.Text) + getMessage(): string { + return this.message; + } + + @update([IDL.Text]) + setMessage(message: string): void { + this.message = message; + } +} diff --git a/src/dfx/src/lib/project/templates.rs b/src/dfx/src/lib/project/templates.rs index 8f52cc8ec9..c7b0a1c9c4 100644 --- a/src/dfx/src/lib/project/templates.rs +++ b/src/dfx/src/lib/project/templates.rs @@ -72,9 +72,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, }; @@ -86,9 +86,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, }; @@ -100,9 +100,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, }; @@ -114,9 +114,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, }; @@ -226,9 +226,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, };