chore: reafactoring makefile and packaging

.config.local.yml

@@ -0,0 +1,34 @@
+imports:
+  - { resource: common.yml }
+
+parameters:
+  # In case you need to override with environment variables, you can follow this example :
+  # env(PS_ACCOUNTS_SENTRY_CREDENTIALS): 'https://[email protected]/5354585'
+  # sentry.credentials: '%env(string:PS_ACCOUNTS_SENTRY_CREDENTIALS)%'
+  #
+  # In order to manage multiple config files you can use PS_ACCOUNTS_ENV=[myenv] environment variable
+  # to load a specific services_[myenv].yml
+
+  ps_accounts.accounts_api_url: "https://accounts-api.prestashop.localhost/"
+  ps_accounts.accounts_ui_url: "https://accounts.prestashop.localhost"
+  ps_accounts.sso_api_url: "https://auth-preprod.prestashop.com/api/v1/"
+  ps_accounts.sso_account_url: "https://authv2-preprod.prestashop.com/login"
+  ps_accounts.sso_resend_verification_email_url: "https://auth-preprod.prestashop.com/account/send-verification-email"
+  ps_accounts.billing_api_url: "https://billing-api.psessentials-integration.net"
+  ps_accounts.indirect_channel_api_url: "https://indirect-channel-api-integration.prestashop.net"
+  ps_accounts.sentry_credentials: "https://[email protected]/5354585"
+  ps_accounts.segment_write_key: "UITzSdsFTgYsXaiJG09hsCiupUPwgJQB"
+  ps_accounts.check_api_ssl_cert: false
+  ps_accounts.verify_account_tokens: false
+  ps_accounts.accounts_vue_cdn_url: "https://unpkg.com/prestashop_accounts_vue_components@3/dist/psaccountsVue.umd.min.js"
+  ps_accounts.accounts_cdn_url: "https://unpkg.com/prestashop_accounts_vue_components@4/dist/psaccountsVue.umd.min.js"
+  ps_accounts.environment: "development"
+
+  # a page to display "Update Your Module" message
+  ps_accounts.svc_accounts_ui_url: "https://accounts.psessentials-integration.net"
+
+  # OAuth2 configuration url
+  ps_accounts.oauth2_url: "https://oauth.prestashop.localhost"
+
+  # Login page testimonials url
+  ps_accounts.testimonials_url: "https://assets.prestashop3.com/dst/accounts/assets/testimonials.json"

.config.preprod.yml

@@ -0,0 +1,37 @@
+imports:
+  - { resource: common.yml }
+
+parameters:
+  # In case you need to override with environment variables, you can follow this example :
+  # env(PS_ACCOUNTS_SENTRY_CREDENTIALS): 'https://[email protected]/5354585'
+  # sentry.credentials: '%env(string:PS_ACCOUNTS_SENTRY_CREDENTIALS)%'
+  #
+  # In order to manage multiple config files you can use PS_ACCOUNTS_ENV=[myenv] environment variable
+  # to load a specific services_[myenv].yml
+  # prestashop-ready-integration.firebaseapp.com
+  ps_accounts.segment_write_key: "eYODaH20rT1lMRTTUtAa15BKBlV1XUXQ"
+  ps_accounts.accounts_api_url: "https://accounts-api.distribution-preprod.prestashop.net/"
+  ps_accounts.accounts_ui_url: "https://accounts.distribution-preprod.prestashop.net"
+  ps_accounts.billing_api_url: "https://billing-api.distribution-preprod.prestashop.net/"
+  ps_accounts.sso_api_url: "https://auth-preprod.prestashop.com/api/v1/"
+  ps_accounts.sso_account_url: "https://authv2-preprod.prestashop.com/login"
+  ps_accounts.indirect_channel_api_url: "https://indirect-channel-api-preprod.prestashop.net"
+  ps_accounts.segment_api_key: "yO1sKx3Xe9upW4bRDoRXEB0TZEXQm2y3"
+  ps_accounts.sso_resend_verification_email_url: "https://auth-preprod.prestashop.com/account/send-verification-email"
+  ps_accounts.sentry_credentials: "https://[email protected]/5354585"
+  ps_accounts.accounts_vue_cdn_url: "https://unpkg.com/prestashop_accounts_vue_components/dist/psaccountsVue.js"
+  ps_accounts.accounts_cdn_url: "https://unpkg.com/prestashop_accounts_vue_components/dist/psaccountsVue.js"
+
+  ps_accounts.environment: "preprod"
+
+  # whether to check ssl certificate when calling external api
+  ps_accounts.check_api_ssl_cert: true
+  # whether to verify tokens while storing link account
+  ps_accounts.verify_account_tokens: true
+
+  # a page to display "Update Your Module" message
+  ps_accounts.svc_accounts_ui_url: "https://accounts.psessentials-integration.net"
+
+  ps_accounts.oauth2_url: "https://oauth-preprod.prestashop.com"
+
+  ps_accounts.testimonials_url: "https://assets.prestashop3.com/dst/accounts/assets/testimonials.json"

.config.prod.yml

@@ -0,0 +1,20 @@
+imports:
+  - { resource: common.yml }
+parameters:
+  ps_accounts.environment: "production"
+  ps_accounts.accounts_api_url: "https://accounts-api.distribution.prestashop.net/"
+  ps_accounts.accounts_ui_url: "https://accounts.distribution.prestashop.net"
+  ps_accounts.sso_api_url: "https://auth.prestashop.com/api/v1/"
+  ps_accounts.sso_account_url: "https://auth.prestashop.com/login"
+  ps_accounts.sso_resend_verification_email_url: "https://auth.prestashop.com/account/send-verification-email"
+  ps_accounts.billing_api_url: "https://billing-api.distribution.prestashop.net/"
+  ps_accounts.indirect_channel_api_url: "https://indirect-channel-api.prestashop.net"
+  ps_accounts.sentry_credentials: "https://[email protected]/5354585"
+  ps_accounts.segment_write_key: "pEJGnRxw47CU01efFjMyl1S7YcxshLxl"
+  ps_accounts.check_api_ssl_cert: true
+  ps_accounts.verify_account_tokens: true
+  ps_accounts.accounts_vue_cdn_url: "https://unpkg.com/prestashop_accounts_vue_components@3/dist/psaccountsVue.umd.min.js"
+  ps_accounts.accounts_cdn_url: "https://unpkg.com/prestashop_accounts_vue_components@5"
+  ps_accounts.svc_accounts_ui_url: "https://accounts.psessentials.net"
+  ps_accounts.oauth2_url: "https://oauth.prestashop.com"
+  ps_accounts.testimonials_url: "https://assets.prestashop3.com/dst/accounts/assets/testimonials.json"

.editorconfig

@@ -1,13 +1,13 @@
 ; top-most EditorConfig file
 root = true
 
-; Unix-style newlines
 [*]
 charset = utf-8
-end_of_line = LF
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-indent_size = 2
 
 [*.{php,tpl}]
 indent_style = space
@@ -16,6 +16,6 @@ indent_size = 4
 [*.md]
 trim_trailing_whitespace = false
 
-[Makefile]
-indent_style = tabs
-indent_size = 8
+[{Makefile,makefile,**.mk}]
+indent_style = tab
+indent_size = 4

.github/workflows/build-release-publish.yml

@@ -4,6 +4,10 @@ on:
   release:
     types: [released, prereleased]
 
+env:
+  NODE_VERSION: 20
+  PNPM_VERSION: 9
+
 jobs:
   build:
     name: Build the base artifact
@@ -15,11 +19,15 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup node env 🏗
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
-          registry-url: 'https://registry.npmjs.org'
-          scope: '@prestashopcorp'
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: "https://registry.npmjs.org"
+          scope: "@prestashopcorp"
+          cache: "pnpm"
+
+      - name: Install pnpm 🏗
+        run: npm install -g pnpm@${{ env.PNPM_VERSION }}
 
       - name: Set version
         id: set_version
@@ -31,45 +39,24 @@ jobs:
           VERSION=${{ steps.set_version.outputs.version }} \
           make version
 
-#      - name: Install composer dependencies
-#        run: composer install --no-dev -o
+      #      - name: Install composer dependencies
+      #        run: composer install --no-dev -o
 
       - name: Scoped dependencies
         run: make php-scoper
 
-      - name: Get yarn cache directory path 🛠
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Install _dev dependencies
         working-directory: ./_dev
-
-      - name: Cache node_modules 📦
-        uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install _dev dependencies 👨🏻‍💻
-        working-directory: ./_dev
-        run: yarn --frozen-lockfile --silent
+        run: pnpm install
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_RO }}
 
       - name: Build apps
         working-directory: ./_dev
-        run: yarn build
-
-#      - name: Clean-up project
-#        uses: PrestaShopCorp/[email protected]
-      - name: Clean-up project 🧹
-        run: |
-          rm -rf .git
-          rm -rf _dev
+        run: pnpm build
 
       - name: Create & upload artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}
           path: ../
@@ -81,37 +68,13 @@ jobs:
     outputs:
       zip_file: ${{ steps.set_zip_file.outputs.zip_file }}
     steps:
-      - name: Set the zip file
-        id: set_zip_file
-        run: |
-          echo "zip_file=${{ github.event.repository.name }}-${{ needs.build.outputs.version }}.zip" >> "$GITHUB_ENV"
-          echo "zip_file=${{ github.event.repository.name }}-${{ needs.build.outputs.version }}.zip" >> "$GITHUB_OUTPUT"
-
       - name: Download artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: ${{ github.event.repository.name }}
 
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v0
-        with:
-          project_id: ${{ secrets.GCLOUD_PROJECT_PRODUCTION }}
-          service_account_key: ${{ secrets.G_CREDENTIAL_PRODUCTION }}
-          export_default_credentials: true
-
-      - name: Copy env files
-        run: |
-          gcloud components install beta
-          gcloud beta secrets versions access latest --secret="accounts-module-config" > ps_accounts/ps_accounts/config/config.yml
-        env:
-          GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.G_CREDENTIAL_PRODUCTION }}
-
-      - name: Prepare the production zip
-        run: |
-          cd ${{ github.event.repository.name }}/${{ github.event.repository.name }}
-          sh ./scripts/bundle-module.sh ${{ env.zip_file }}
-        env:
-          ENV_FILE: ${{ secrets.PS_ACCOUNTS_ENV_PROD }}
+      - name: Make the zip for production
+        run: make zip:prod
 
       - name: Publish the production zip
         uses: actions/[email protected]
@@ -128,34 +91,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - name: Set the zip file
-        id: set_zip_file
-        run: |
-          echo "zip_file=${{ github.event.repository.name }}_preprod-${{ needs.build.outputs.version }}.zip" >> "$GITHUB_ENV"
-
       - name: Download artifact
         uses: actions/download-artifact@v1
         with:
           name: ${{ github.event.repository.name }}
 
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v0
-        with:
-          project_id: ${{ secrets.GCLOUD_PROJECT_PREPROD }}
-          service_account_key: ${{ secrets.G_CREDENTIAL_PREPROD }}
-          export_default_credentials: true
-
-      - name: Copy env files
-        run: |
-          gcloud components install beta
-          gcloud beta secrets versions access latest --secret="accounts-module-config" > ps_accounts/ps_accounts/config/config.yml
-        env:
-          GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.G_CREDENTIAL_PREPROD }}
-
-      - name: Prepare the preprod zip
-        run: |
-          cd ${{ github.event.repository.name }}/${{ github.event.repository.name }}
-          sh ./scripts/bundle-module.sh ${{ env.zip_file }}
+      - name: Make the zip for pre-production
+        run: make zip:preprod
 
       - name: Publish the preprod zip
         uses: actions/[email protected]

.github/workflows/build-staging.yml

@@ -0,0 +1,48 @@
+---
+name: Build staging module
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+  workflow_call:
+
+env:
+  PHP_BUILDER_VERSION: "8.3"
+
+jobs:
+  update_staging_release:
+    name: Build and update staging assets
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ env.PHP_BUILDER_VERSION }}
+
+      - name: Bundle zips
+        run: make zip
+        env:
+          VERSION: staging
+
+      - name: Move the staging tag
+        run: |
+          git tag -d staging | true
+          git tag staging
+          git push origin :refs/tags/staging
+          git push origin staging
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: staging
+          tag_name: staging
+          prerelease: true
+          files: |
+            ./dist/ps_accounts-staging.zip
+            ./dist/ps_accounts-staging_e2e.zip
+            ./dist/ps_accounts-staging_preproduction.zip

.gitignore

@@ -7,25 +7,34 @@ app.js
 ### IDE ###
 .idea
 .vscode
+*.bak
 
 ### Composer ###
 composer.phar
-/vendor/
-node_modules/
+vendor/
 .php_cs.cache
 .php_cs
 install.lock
 composer-dev.json
 composer-dev.lock
-.env
+.env*
+!.env.dist
+!.env.example
+
+### PHP Scoper ###
+php-scoper.phar
+
+# Mac OS
+.DS_Store
+
+# Node.js
+node_modules/
 
 ### PHPUnit ###
 .phpunit.result.cache
 
 ### Configuration ###
-config/config*.yml
 config/**/services_*.yml
-!config/config.yml.dist
 !config/admin/services.yml
 !config/front/services.yml
 
@@ -52,8 +61,12 @@ views/files/*
 /views/favicon.ico
 /views/index.html
 ./_dev/.npmrc
+.npmrc
 
 # Log files
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# PrestaShop sources
+/prestashop