From 519e5b081a6ab9d70a4aefb8a1d341f500f67064 Mon Sep 17 00:00:00 2001
From: Nizar Mahmoud <nizarmah@hotmail.com>
Date: Mon, 12 Oct 2020 01:48:28 +0300
Subject: [PATCH 1/4] Removes npm dependencies installation to use existing
 node modules

---
 playbooks/roles/tinymce_adsk_plugin/tasks/main.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
index c60756f5c2b..78684940bca 100644
--- a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
+++ b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
@@ -26,10 +26,6 @@
         src: "{{ edx_jake_package }}"
         dest: "{{ tinymce_dir }}"
         remote_src: yes
-    - name: Installs npm dependencies from archive
-      shell: "npm install"
-      args:
-        chdir: "{{ tinymce_dir }}"
     - name: Build tinymce with jake
       shell: "npx jake minify bundle[themes:{{ tinymce_themes | join(',') }},plugins:{{ tinymce_plugins | join(',') }}]"
       args:

From b10be1e8ce749a1eb2171ca03a20f392c38e9ab8 Mon Sep 17 00:00:00 2001
From: Nizar Mahmoud <nizarmah@hotmail.com>
Date: Mon, 12 Oct 2020 05:29:59 +0300
Subject: [PATCH 2/4] Cleans TinyMCE files using Jake before Re-Building Them

---
 playbooks/roles/tinymce_adsk_plugin/defaults/main.yml | 2 --
 playbooks/roles/tinymce_adsk_plugin/tasks/main.yml    | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

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 78684940bca..ceffa9cd2b8 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,6 +22,10 @@
         src: "{{ edx_jake_package }}"
         dest: "{{ tinymce_dir }}"
         remote_src: yes
+    - name: Clean existing tinymce files with jake
+      shell: "npx jake clean"
+      args:
+        chdir: "{{ tinymce_dir }}"
     - name: Build tinymce with jake
       shell: "npx jake minify bundle[themes:{{ tinymce_themes | join(',') }},plugins:{{ tinymce_plugins | join(',') }}]"
       args:

From f359e614026d2a70147f57a1853396eab879b7c3 Mon Sep 17 00:00:00 2001
From: Nizar Mahmoud <nizarmah@hotmail.com>
Date: Mon, 12 Oct 2020 10:01:51 +0300
Subject: [PATCH 3/4] Cleans existing node modules and re-installs npm
 dependencies

---
 playbooks/roles/tinymce_adsk_plugin/tasks/main.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
index ceffa9cd2b8..26ef8a40f42 100644
--- a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
+++ b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
@@ -22,6 +22,14 @@
         src: "{{ edx_jake_package }}"
         dest: "{{ tinymce_dir }}"
         remote_src: yes
+    - 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 files with jake
       shell: "npx jake clean"
       args:

From 923d0260b794a6411b2f0f85480b1c846b353542 Mon Sep 17 00:00:00 2001
From: Nizar Mahmoud <nizarmah@hotmail.com>
Date: Tue, 13 Oct 2020 11:28:05 +0300
Subject: [PATCH 4/4] Cleans TinyMCE JS Files before Building TinyMCE

---
 playbooks/roles/tinymce_adsk_plugin/tasks/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
index 26ef8a40f42..a33555e6c2a 100644
--- a/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
+++ b/playbooks/roles/tinymce_adsk_plugin/tasks/main.yml
@@ -30,8 +30,8 @@
       shell: "npm install"
       args:
         chdir: "{{ tinymce_dir }}"
-    - name: Clean existing tinymce files with jake
-      shell: "npx jake clean"
+    - name: Clean existing tinymce js files with jake
+      shell: "npx jake clean-js"
       args:
         chdir: "{{ tinymce_dir }}"
     - name: Build tinymce with jake