From 438daea20866753ae7776309c4526dec6f6885a9 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 10:47:34 -0800 Subject: [PATCH 01/11] Add flutter_dependencies --- cookiecutter.json | 1 + {{cookiecutter.out_dir}}/lib/main.dart | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/cookiecutter.json b/cookiecutter.json index e147a53..6c06820 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,6 +7,7 @@ "org_name": "com.flet", "company_name": "Your Company", "copyright": "Copyright (c) 2023 Your Company", + "flutter_dependencies": [], "sep": "/", "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}", "hide_loading_animation": true, diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index cf61a02..5951ebe 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -9,6 +9,10 @@ import 'package:path/path.dart' as path; import 'package:serious_python/serious_python.dart'; import 'package:url_strategy/url_strategy.dart'; +{% for dep in cookiecutter.flutter_dependencies %} +import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }}; +{% endfor %} + const bool isProduction = bool.fromEnvironment('dart.vm.product'); const assetPath = "app/app.zip"; @@ -19,6 +23,12 @@ final hideLoadingPage = const outLogFilename = "out.log"; const errorExitCode = 100; +const createControlFactories = [ +{% for dep in cookiecutter.flutter_dependencies %} +{{ dep }}.createControl, +{% endfor %} +]; + const pythonScript = """ import certifi, os, runpy, socket, sys, traceback From 3d3a54c4868a98bb62377060211831ffb5809937 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 10:51:54 -0800 Subject: [PATCH 02/11] Fix cookiecutter.flutter.dependencies --- cookiecutter.json | 4 +++- {{cookiecutter.out_dir}}/lib/main.dart | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index 6c06820..268a7d4 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,7 +7,9 @@ "org_name": "com.flet", "company_name": "Your Company", "copyright": "Copyright (c) 2023 Your Company", - "flutter_dependencies": [], + "flutter": { + "dependencies": [] + }, "sep": "/", "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}", "hide_loading_animation": true, diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index 5951ebe..b6e9ba9 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -9,7 +9,7 @@ import 'package:path/path.dart' as path; import 'package:serious_python/serious_python.dart'; import 'package:url_strategy/url_strategy.dart'; -{% for dep in cookiecutter.flutter_dependencies %} +{% for dep in cookiecutter.flutter.dependencies %} import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }}; {% endfor %} @@ -24,7 +24,7 @@ const outLogFilename = "out.log"; const errorExitCode = 100; const createControlFactories = [ -{% for dep in cookiecutter.flutter_dependencies %} +{% for dep in cookiecutter.flutter.dependencies %} {{ dep }}.createControl, {% endfor %} ]; From 417ae1c0c79bd247a6ce735a1a2db19d1b1851fd Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 10:52:58 -0800 Subject: [PATCH 03/11] Remove from cookiecutter.json --- cookiecutter.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index 268a7d4..e147a53 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,9 +7,6 @@ "org_name": "com.flet", "company_name": "Your Company", "copyright": "Copyright (c) 2023 Your Company", - "flutter": { - "dependencies": [] - }, "sep": "/", "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}", "hide_loading_animation": true, From 31dca2b5e558dd99224df4dffb2c045dde543d74 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 10:54:27 -0800 Subject: [PATCH 04/11] "flutter": null --- cookiecutter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cookiecutter.json b/cookiecutter.json index e147a53..c629ec8 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,6 +7,7 @@ "org_name": "com.flet", "company_name": "Your Company", "copyright": "Copyright (c) 2023 Your Company", + "flutter": null, "sep": "/", "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}", "hide_loading_animation": true, From aadcfb3baa9c6c681dda119dced3909aeb57833c Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 10:57:49 -0800 Subject: [PATCH 05/11] Back flutter_dependencies --- cookiecutter.json | 2 +- {{cookiecutter.out_dir}}/lib/main.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index c629ec8..2bae6d9 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,7 +7,7 @@ "org_name": "com.flet", "company_name": "Your Company", "copyright": "Copyright (c) 2023 Your Company", - "flutter": null, + "flutter_dependencies": null, "sep": "/", "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}", "hide_loading_animation": true, diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index b6e9ba9..5951ebe 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -9,7 +9,7 @@ import 'package:path/path.dart' as path; import 'package:serious_python/serious_python.dart'; import 'package:url_strategy/url_strategy.dart'; -{% for dep in cookiecutter.flutter.dependencies %} +{% for dep in cookiecutter.flutter_dependencies %} import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }}; {% endfor %} @@ -24,7 +24,7 @@ const outLogFilename = "out.log"; const errorExitCode = 100; const createControlFactories = [ -{% for dep in cookiecutter.flutter.dependencies %} +{% for dep in cookiecutter.flutter_dependencies %} {{ dep }}.createControl, {% endfor %} ]; From 4fa29e6f5d34cdfdef0afd1d7b8f950ce6ecf033 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 10:59:23 -0800 Subject: [PATCH 06/11] flutter_dependencies didn't work --- cookiecutter.json | 2 +- {{cookiecutter.out_dir}}/lib/main.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index 2bae6d9..c629ec8 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,7 +7,7 @@ "org_name": "com.flet", "company_name": "Your Company", "copyright": "Copyright (c) 2023 Your Company", - "flutter_dependencies": null, + "flutter": null, "sep": "/", "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}", "hide_loading_animation": true, diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index 5951ebe..b6e9ba9 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -9,7 +9,7 @@ import 'package:path/path.dart' as path; import 'package:serious_python/serious_python.dart'; import 'package:url_strategy/url_strategy.dart'; -{% for dep in cookiecutter.flutter_dependencies %} +{% for dep in cookiecutter.flutter.dependencies %} import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }}; {% endfor %} @@ -24,7 +24,7 @@ const outLogFilename = "out.log"; const errorExitCode = 100; const createControlFactories = [ -{% for dep in cookiecutter.flutter_dependencies %} +{% for dep in cookiecutter.flutter.dependencies %} {{ dep }}.createControl, {% endfor %} ]; From 52ebf165078b0b27c8522a7c867187ba4b8670ab Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 23 Jan 2024 11:19:11 -0800 Subject: [PATCH 07/11] var createControlFactories --- {{cookiecutter.out_dir}}/lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index b6e9ba9..7de2401 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -23,7 +23,7 @@ final hideLoadingPage = const outLogFilename = "out.log"; const errorExitCode = 100; -const createControlFactories = [ +var createControlFactories = [ {% for dep in cookiecutter.flutter.dependencies %} {{ dep }}.createControl, {% endfor %} From 5a1fc38804d13e8f4198b56be04cc254dd373cf2 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Sun, 4 Feb 2024 09:44:50 -0800 Subject: [PATCH 08/11] Pyodide v0.25.0 --- {{cookiecutter.out_dir}}/web/python-worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/web/python-worker.js b/{{cookiecutter.out_dir}}/web/python-worker.js index 130690b..7e4e4eb 100644 --- a/{{cookiecutter.out_dir}}/web/python-worker.js +++ b/{{cookiecutter.out_dir}}/web/python-worker.js @@ -1,4 +1,4 @@ -importScripts("https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"); +importScripts("https://cdn.jsdelivr.net/pyodide/v0.25.0/full/pyodide.js"); self.pythonModuleName = null; self.initialized = false; From 2546c20766be73675dbd7bb00bd7b0d9d2a71cd2 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Fri, 9 Feb 2024 12:47:09 -0800 Subject: [PATCH 09/11] {{ dep }}.ensureInitialized() --- {{cookiecutter.out_dir}}/lib/main.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index 7de2401..b7cae11 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -29,6 +29,10 @@ var createControlFactories = [ {% endfor %} ]; +{% for dep in cookiecutter.flutter.dependencies %} +{{ dep }}.ensureInitialized(); +{% endfor %} + const pythonScript = """ import certifi, os, runpy, socket, sys, traceback From 6c78ea8471bdc163407946bf57c8faaedef91acb Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Fri, 9 Feb 2024 12:53:58 -0800 Subject: [PATCH 10/11] Move ensureInitialized --- {{cookiecutter.out_dir}}/lib/main.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index b7cae11..21095ce 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -29,10 +29,6 @@ var createControlFactories = [ {% endfor %} ]; -{% for dep in cookiecutter.flutter.dependencies %} -{{ dep }}.ensureInitialized(); -{% endfor %} - const pythonScript = """ import certifi, os, runpy, socket, sys, traceback @@ -93,6 +89,10 @@ void main() async { debugPrint = (String? message, {int? wrapWidth}) => null; } + {% for dep in cookiecutter.flutter.dependencies %} + {{ dep }}.ensureInitialized(); + {% endfor %} + runApp(FutureBuilder( future: prepareApp(), builder: (BuildContext context, AsyncSnapshot snapshot) { From bd9285b831497c499910e95d9a449329e6ff3048 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 14 Feb 2024 18:06:36 -0800 Subject: [PATCH 11/11] Use Flet 0.20.0 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 95094c7..6e8deab 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # path: src/serious_python # ref: 'd059aef' - flet: ^0.19.0 + flet: ^0.20.0 # flet: # git: # url: https://github.com/flet-dev/flet.git