diff --git a/playbooks/roles/tinymce_adsk_plugin/defaults/main.yml b/playbooks/roles/tinymce_adsk_plugin/defaults/main.yml index 02a30b16408..8fab717a6c5 100644 --- a/playbooks/roles/tinymce_adsk_plugin/defaults/main.yml +++ b/playbooks/roles/tinymce_adsk_plugin/defaults/main.yml @@ -8,8 +8,6 @@ tinymce_adsk_plugin_temp_dir: "{{ edxapp_code_dir }}/.temp_tinymce_adsk_plugin" tinymce_dir: "{{ edxapp_code_dir }}/common/static/js/vendor/tinymce" tinymce_plugins_dir: "{{ tinymce_dir }}/js/tinymce/plugins" -tinymce_adsk_plugin_minified_js_path: "{{ tinymce_plugins_dir }}/{{ tinymce_adsk_plugin_dir_name }}/plugin.min.js" - edx_jake_package: "{{ edxapp_code_dir }}/vendor_extra/tinymce/JakePackage.zip" tinymce_themes: diff --git a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml index c60756f5c2b..a33555e6c2a 100644 --- a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml +++ b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml @@ -13,10 +13,6 @@ file: state: absent path: "{{ tinymce_adsk_plugin_temp_dir }}" - - name: Remove minified plugin javascript - file: - state: absent - path: "{{ tinymce_adsk_plugin_minified_js_path }}" become_user: "{{ edxapp_user }}" - name: Minify tinymce plugin files @@ -26,10 +22,18 @@ src: "{{ edx_jake_package }}" dest: "{{ tinymce_dir }}" remote_src: yes - - name: Installs npm dependencies from archive + - name: Clean existing node modules + file: + state: absent + path: "{{ tinymce_dir }}/node_modules" + - name: Install npm dependencies from archive shell: "npm install" args: chdir: "{{ tinymce_dir }}" + - name: Clean existing tinymce js files with jake + shell: "npx jake clean-js" + args: + chdir: "{{ tinymce_dir }}" - name: Build tinymce with jake shell: "npx jake minify bundle[themes:{{ tinymce_themes | join(',') }},plugins:{{ tinymce_plugins | join(',') }}]" args: