Merge pull request #242 from mvdbeek/pnpm

Use pnpm on 26.0

Author: mvdbeek

tasks/_inc_client_build_steps.yml

@@ -5,11 +5,21 @@
 
 - name: Install packages with yarn
   yarn:
-    executable: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack ', '') }}yarn --network-timeout 300000 --check-files"
+    executable: "yarn --network-timeout 300000 --check-files"
     path: "{{ galaxy_server_dir }}/client"
   environment:
     PATH: "{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
     VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+  when: __galaxy_major_version is version('26.0', '<')
+
+- name: Install packages with pnpm
+  command: "pnpm install"
+  args:
+    chdir: "{{ galaxy_server_dir }}/client"
+  environment:
+    PATH: "{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
+    VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+  when: __galaxy_major_version is version('26.0', '>=')
 
 - name: Ensure deconstructed build is supported
   assert:
@@ -19,29 +29,52 @@
     fail_msg: "Deconstructed client build is not supported for Galaxy version {{ __galaxy_major_version }}, please set 'galaxy_client_make_target'"
 
 - name: Run gulp  # noqa no-changed-when
-  command: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack ', '') }}yarn run gulp {{ item }}"
+  command: "yarn run gulp {{ item }}"
   args:
     chdir: "{{ galaxy_server_dir }}/client"
   with_items: "{{ galaxy_client_build_steps[__galaxy_major_version] | default(galaxy_client_build_steps.default) }}"
   environment:
     PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
     VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
     NODE_ENV: "{{ galaxy_client_node_env }}"
+  when: __galaxy_major_version is version('26.0', '<')
+
+- name: Build plugins  # noqa no-changed-when
+  command: "pnpm run plugins"
+  args:
+    chdir: "{{ galaxy_server_dir }}/client"
+  environment:
+    PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
+    VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+    NODE_ENV: "{{ galaxy_client_node_env }}"
+  when: __galaxy_major_version is version('26.0', '>=')
 
 - name: Run webpack  # noqa no-changed-when
-  command: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack ', '') }}yarn run webpack{{ (galaxy_client_node_env == 'production') | ternary('-production', '') }}"
+  command: "yarn run webpack{{ (galaxy_client_node_env == 'production') | ternary('-production', '') }}"
+  args:
+    chdir: "{{ galaxy_server_dir }}/client"
+  environment:
+    PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
+    VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+    NODE_OPTIONS: --max_old_space_size=8192
+  when: __galaxy_major_version is version('26.0', '<')
+
+- name: Run client build  # noqa no-changed-when
+  command: "pnpm run build-production"
   args:
     chdir: "{{ galaxy_server_dir }}/client"
   environment:
     PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
     VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
     NODE_OPTIONS: --max_old_space_size=8192
+    SKIP_VIZ: "1"
+  when: __galaxy_major_version is version('26.0', '>=')
 
 - name: Stage built client
-  command: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack ', '') }}yarn run stage-build"
+  command: "yarn run stage-build"
   args:
     chdir: "{{ galaxy_server_dir }}/client"
   environment:
     PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
     VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
-  when: "__galaxy_major_version is version('23.0', '>=')"
+  when: __galaxy_major_version is version('23.0', '>=') and __galaxy_major_version is version('26.0', '<')

tasks/_inc_client_install_tools.yml

@@ -3,6 +3,14 @@
   include_tasks: _inc_galaxy_version.yml
   when: __galaxy_major_version is undefined
 
+- name: Enable corepack shims  # noqa no-changed-when
+  command: "corepack enable --install-directory {{ galaxy_venv_dir }}/bin"
+  environment:
+    PATH: "{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
+    VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+    COREPACK_ENABLE_DOWNLOAD_PROMPT: "0"
+  when: __galaxy_major_version is version('25.1', '>=')
+
 - name: Install client build tools
   when: __galaxy_major_version is version('25.1', '<')
   block:

tasks/client.yml

@@ -80,15 +80,35 @@
         VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
       register: __yarn_install
       changed_when: "'already up-to-date' not in __yarn_install.out | lower"
+      when: __galaxy_major_version is version('26.0', '<')
 
-    - name: Stage prebuilt client # noqa no-changed-when
+    - name: Install prebuilt client with pnpm
+      command: "pnpm install"
+      args:
+        chdir: "{{ galaxy_server_dir }}"
+      environment:
+        PATH: "{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
+        VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+      register: __pnpm_install
+      when: __galaxy_major_version is version('26.0', '>=')
+
+    - name: Stage prebuilt client (yarn) # noqa no-changed-when
       command: "yarn run stage"
       args:
         chdir: "{{ galaxy_server_dir }}"
       environment:
         PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
         VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
-      when: __yarn_install.changed
+      when: __galaxy_major_version is version('26.0', '<') and __yarn_install.changed
+
+    - name: Stage prebuilt client (pnpm) # noqa no-changed-when
+      command: "pnpm run stage"
+      args:
+        chdir: "{{ galaxy_server_dir }}"
+      environment:
+        PATH: "{{ galaxy_server_dir }}/client/node_modules/.bin:{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
+        VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+      when: __galaxy_major_version is version('26.0', '>=') and __pnpm_install.changed
 
   remote_user: "{{ galaxy_remote_users.privsep | default(__galaxy_remote_user) }}"
   become: "{{ true if galaxy_become_users.privsep is defined else __galaxy_become }}"