Try to fix tests

plone · May 20, 2024 · fabc672 · fabc672
1 parent 0296737
commit fabc672
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/project/cookiecutter.json b/project/cookiecutter.json
@@ -36,6 +36,7 @@
     "1",
     "0"
   ],
+  "__npm_package_name": "{{ cookiecutter.frontend_addon_name }}",
   "__folder_name": "{{ cookiecutter.project_slug }}",
   "__python_package_name_upper": "{{ cookiecutter.python_package_name | pascal_case }}",
   "__node_version": "{{ cookiecutter.volto_version | node_version_for_volto }}",

diff --git a/project/{{ cookiecutter.__folder_name }}/.github/workflows/frontend.yml b/project/{{ cookiecutter.__folder_name }}/.github/workflows/frontend.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       BASE_TAG: {{"${{ steps.vars.outputs.BASE_TAG }}"}}
-      VOLTO_VERSION: {{ "${{ steps.vars.outputs.VOLTO_VERSION }}" }}
+      VOLTO_VERSION: {{"${{ steps.vars.outputs.VOLTO_VERSION }}"}}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/sub/project_settings/cookiecutter.json b/sub/project_settings/cookiecutter.json
@@ -9,6 +9,7 @@
   "language_code": "en",
   "volto_version": "{{ 'Yes' | latest_volto }}",
   "github_organization": "collective",
+  "__npm_package_name": "{{ cookiecutter.frontend_addon_name }}",
   "__folder_name": "{{ cookiecutter.project_slug }}",
   "__package_name": "{{ cookiecutter.python_package_name | package_name }}",
   "__package_namespace": "{{ cookiecutter.python_package_name | package_namespace }}",
@@ -17,8 +18,7 @@
   "__profile_language": "{{ cookiecutter.language_code|gs_language_code }}",
   "__locales_language": "{{ cookiecutter.language_code|locales_language_code }}",
   "__node_version": "{{ cookiecutter.volto_version | node_version_for_volto }}",
-  "_copy_without_render": [
-  ],
+  "_copy_without_render": [],
   "_extensions": [
     "cookieplone.filters.use_prerelease_versions",
     "cookieplone.filters.node_version_for_volto",

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Makefile b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Makefile
@@ -23,7 +23,7 @@ PLONE_VERSION=6
 DOCKER_IMAGE=plone/server-dev:${PLONE_VERSION}
 DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:${PLONE_VERSION}
 
-ADDON_NAME='{{ cookiecutter.npm_package_name }}'
+ADDON_NAME='{{ cookiecutter.__npm_package_name }}'
 IMAGE_NAME={{cookiecutter.__container_image_prefix}}-frontend
 IMAGE_TAG=latest
 VOLTO_VERSION = $(shell cat ./mrs.developer.json | python -c "import sys, json; print(json.load(sys.stdin)['core']['tag'])")