Merge pull request #17 from onaio/monorepoSupport

Modify path where .env file is created

Author: peterMuriuki

defaults/main.yml

@@ -23,12 +23,15 @@ react_node_version: 10.x
 
 # app
 react_remote_js_build: true
-react_local_checkout_path: "/tmp/{{ react_local_user }}/reveal"
+react_local_checkout_path: "/tmp/react/{{ ansible_date_time['epoch'] }}"
+react_local_app_path: "{{ react_local_checkout_path }}"
 react_env_name: "prod"
 react_app_name: "{{ react_system_user }}"
 react_codebase_path: "{{ react_system_user_home }}/app"
 react_versioned_path: "{{ react_codebase_path }}-versioned"
+# where the repository is cloned
 react_checkout_path: "{{ react_versioned_path }}/{{ ansible_date_time['epoch'] }}"
+# where the actual app package is
 react_app_path: "{{ react_checkout_path }}"
 react_log_path: "/var/log/{{ react_app_name }}"
 react_max_versioned_folders: 10

molecule/default/converge.yml

@@ -8,9 +8,11 @@
         react_system_group: "www-data"
         react_system_user_home: "/home/{{ react_system_user }}"
         react_node_version: 10.x
-        react_git_url: "https://github.com/onaio/reveal-frontend"
-        react_git_version: "v0.6.2-rc1"
+        react_git_url: "https://github.com/OpenSRP/web.git"
+        react_git_version: "master"
         react_app_settings:
           GENERATE_SOURCEMAP: "false"
           SKIP_PREFLIGHT_CHECK: "true"
         react_remote_js_build: false
+        react_local_app_path: "{{ react_local_checkout_path }}/client"
+        react_app_path: "{{ react_checkout_path }}/client"

tasks/configure.yml

@@ -4,7 +4,7 @@
     - name: Copy environment variables file locally
       template:
         src: env.j2
-        dest: "{{ react_local_checkout_path }}/.env"
+        dest: "{{ react_local_app_path }}/.env"
         mode: 0644
       delegate_to: localhost
       become: true
@@ -27,12 +27,23 @@
       become_user: "{{ react_local_user }}"
 
     - name: Remove node_modules before compression
-      file:
-        path: "{{ react_local_checkout_path }}/node_modules"
-        state: absent
-      delegate_to: localhost
-      become: true
-      become_user: "{{ react_local_user }}"
+      block:
+        - name: Remove node_modules using lerna where possible
+          command: yarn lerna clean -y
+          args:
+            chdir: "{{ react_local_checkout_path }}"
+          ignore_errors: true
+          delegate_to: localhost
+          become: true
+          become_user: "{{ react_local_user }}"
+
+        - name: remove node_modules manually
+          file:
+            path: "{{ react_checkout_path }}/node_modules"
+            state: absent
+          delegate_to: localhost
+          become: true
+          become_user: "{{ react_local_user }}"
 
     - name: Compress Build folder locally
       archive:
@@ -55,7 +66,7 @@
     - name: Copy environment variables file
       template:
         src: env.j2
-        dest: "{{ react_checkout_path }}/.env"
+        dest: "{{ react_app_path }}/.env"
         mode: 0644
 
     - name: Install Javascript requirements