Make pyinstaller work with standalone CLI

Author: silv-io

Makefile

@@ -26,13 +26,10 @@ dist-bin/localstack build: $(VENV_ACTIVATE) main.py
 		$(PYINSTALLER_ARGS) -n localstack \
 		--hidden-import cookiecutter.main \
 		--hidden-import cookiecutter.extensions \
-		--hidden-import localstack.dev.run.configurators \
-		--hidden-import localstack.pro.core.plugins \
-		--hidden-import localstack.pro.core.cli.localstack \
-		--hidden-import localstack.pro.core.extensions.plugins \
+		--hidden-import localstack_cli.cli.core_plugin \
+		--hidden-import localstack_cli.pro.core.cli.localstack \
 		--collect-all=rich \
-		--copy-metadata localstack_ext \
-		--collect-data localstack.pro.core \
+		--copy-metadata localstack \
 		--additional-hooks-dir hooks
 
 dist-dir/localstack: PYINSTALLER_ARGS=--distpath=dist-dir
@@ -47,4 +44,3 @@ clean-venv:
 	rm -rf $(VENV_DIR)
 
 .PHONY: all build clean clean-venv
-

hooks/hook-localstack.py

@@ -0,0 +1,4 @@
+from PyInstaller.utils.hooks import copy_metadata
+
+# make sure to add the entrypoints data for localstack (for plux plugin discovery)
+datas = copy_metadata('localstack')

hooks/hook-localstack_core.py

@@ -3,7 +3,7 @@
 freeze_support()
 
 os.environ["SKIP_PATCH_MOTO_ACCOUNT_ID"] = "1"
-from localstack.cli import main
+from localstack_cli.cli import main
 
 if __name__ == '__main__':
 	main.main()