From 156fee0c3a504218d5cbe6c35d85c84b539d454f Mon Sep 17 00:00:00 2001 From: vedhav Date: Tue, 26 Sep 2023 05:31:43 +0530 Subject: [PATCH] fix: move the npm dependencies inside the test directory --- .github/workflows/deploy.yaml | 9 +--- RNA-seq/{js => tests}/.gitignore | 0 .../js => RNA-seq/tests}/package-lock.json | 0 RNA-seq/{js => tests}/package.json | 0 basic-teal/{js => tests}/.gitignore | 0 .../js => basic-teal/tests}/package-lock.json | 0 basic-teal/{js => tests}/package.json | 0 efficacy/{js => tests}/.gitignore | 0 .../js => efficacy/tests}/package-lock.json | 0 efficacy/{js => tests}/package.json | 0 exploratory/{js => tests}/.gitignore | 0 .../tests}/package-lock.json | 0 exploratory/{js => tests}/package.json | 0 longitudinal/{js => tests}/.gitignore | 0 .../tests}/package-lock.json | 0 longitudinal/{js => tests}/package.json | 0 patient-profile/{js => tests}/.gitignore | 0 .../tests}/package-lock.json | 0 patient-profile/{js => tests}/package.json | 0 safety/{js => tests}/.gitignore | 0 .../js => safety/tests}/package-lock.json | 42 +++++++++---------- safety/{js => tests}/package.json | 0 22 files changed, 21 insertions(+), 30 deletions(-) rename RNA-seq/{js => tests}/.gitignore (100%) rename {basic-teal/js => RNA-seq/tests}/package-lock.json (100%) rename RNA-seq/{js => tests}/package.json (100%) rename basic-teal/{js => tests}/.gitignore (100%) rename {efficacy/js => basic-teal/tests}/package-lock.json (100%) rename basic-teal/{js => tests}/package.json (100%) rename efficacy/{js => tests}/.gitignore (100%) rename {exploratory/js => efficacy/tests}/package-lock.json (100%) rename efficacy/{js => tests}/package.json (100%) rename exploratory/{js => tests}/.gitignore (100%) rename {longitudinal/js => exploratory/tests}/package-lock.json (100%) rename exploratory/{js => tests}/package.json (100%) rename longitudinal/{js => tests}/.gitignore (100%) rename {patient-profile/js => longitudinal/tests}/package-lock.json (100%) rename longitudinal/{js => tests}/package.json (100%) rename patient-profile/{js => tests}/.gitignore (100%) rename {safety/js => patient-profile/tests}/package-lock.json (100%) rename patient-profile/{js => tests}/package.json (100%) rename safety/{js => tests}/.gitignore (100%) rename {RNA-seq/js => safety/tests}/package-lock.json (99%) rename safety/{js => tests}/package.json (100%) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index a90fb270..2c770eb7 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -76,12 +76,6 @@ jobs: with: node-version: 16 - - name: Setup npm packages - if: steps.find-cypress.outputs.has-cypress-tests == 'true' - working-directory: ${{ matrix.directory }}/js - run: | - npm i - - name: Restore renv from cache uses: actions/cache@v3 env: @@ -124,11 +118,10 @@ jobs: uses: cypress-io/github-action@v6 with: build: npm install cypress --save-dev - working-directory: ${{ matrix.directory }}/js + working-directory: ${{ matrix.directory }}/tests start: npm run run-app wait-on: "http://localhost:3333" wait-on-timeout: 500 - project: ../tests - name: Install deploy R package dependencies shell: Rscript {0} diff --git a/RNA-seq/js/.gitignore b/RNA-seq/tests/.gitignore similarity index 100% rename from RNA-seq/js/.gitignore rename to RNA-seq/tests/.gitignore diff --git a/basic-teal/js/package-lock.json b/RNA-seq/tests/package-lock.json similarity index 100% rename from basic-teal/js/package-lock.json rename to RNA-seq/tests/package-lock.json diff --git a/RNA-seq/js/package.json b/RNA-seq/tests/package.json similarity index 100% rename from RNA-seq/js/package.json rename to RNA-seq/tests/package.json diff --git a/basic-teal/js/.gitignore b/basic-teal/tests/.gitignore similarity index 100% rename from basic-teal/js/.gitignore rename to basic-teal/tests/.gitignore diff --git a/efficacy/js/package-lock.json b/basic-teal/tests/package-lock.json similarity index 100% rename from efficacy/js/package-lock.json rename to basic-teal/tests/package-lock.json diff --git a/basic-teal/js/package.json b/basic-teal/tests/package.json similarity index 100% rename from basic-teal/js/package.json rename to basic-teal/tests/package.json diff --git a/efficacy/js/.gitignore b/efficacy/tests/.gitignore similarity index 100% rename from efficacy/js/.gitignore rename to efficacy/tests/.gitignore diff --git a/exploratory/js/package-lock.json b/efficacy/tests/package-lock.json similarity index 100% rename from exploratory/js/package-lock.json rename to efficacy/tests/package-lock.json diff --git a/efficacy/js/package.json b/efficacy/tests/package.json similarity index 100% rename from efficacy/js/package.json rename to efficacy/tests/package.json diff --git a/exploratory/js/.gitignore b/exploratory/tests/.gitignore similarity index 100% rename from exploratory/js/.gitignore rename to exploratory/tests/.gitignore diff --git a/longitudinal/js/package-lock.json b/exploratory/tests/package-lock.json similarity index 100% rename from longitudinal/js/package-lock.json rename to exploratory/tests/package-lock.json diff --git a/exploratory/js/package.json b/exploratory/tests/package.json similarity index 100% rename from exploratory/js/package.json rename to exploratory/tests/package.json diff --git a/longitudinal/js/.gitignore b/longitudinal/tests/.gitignore similarity index 100% rename from longitudinal/js/.gitignore rename to longitudinal/tests/.gitignore diff --git a/patient-profile/js/package-lock.json b/longitudinal/tests/package-lock.json similarity index 100% rename from patient-profile/js/package-lock.json rename to longitudinal/tests/package-lock.json diff --git a/longitudinal/js/package.json b/longitudinal/tests/package.json similarity index 100% rename from longitudinal/js/package.json rename to longitudinal/tests/package.json diff --git a/patient-profile/js/.gitignore b/patient-profile/tests/.gitignore similarity index 100% rename from patient-profile/js/.gitignore rename to patient-profile/tests/.gitignore diff --git a/safety/js/package-lock.json b/patient-profile/tests/package-lock.json similarity index 100% rename from safety/js/package-lock.json rename to patient-profile/tests/package-lock.json diff --git a/patient-profile/js/package.json b/patient-profile/tests/package.json similarity index 100% rename from patient-profile/js/package.json rename to patient-profile/tests/package.json diff --git a/safety/js/.gitignore b/safety/tests/.gitignore similarity index 100% rename from safety/js/.gitignore rename to safety/tests/.gitignore diff --git a/RNA-seq/js/package-lock.json b/safety/tests/package-lock.json similarity index 99% rename from RNA-seq/js/package-lock.json rename to safety/tests/package-lock.json index 227e5d0b..2b123633 100644 --- a/RNA-seq/js/package-lock.json +++ b/safety/tests/package-lock.json @@ -741,13 +741,12 @@ } }, "node_modules/enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", "dev": true, "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" + "ansi-colors": "^4.1.1" }, "engines": { "node": ">=8.6" @@ -1253,9 +1252,9 @@ "dev": true }, "node_modules/joi": { - "version": "17.10.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.0.tgz", - "integrity": "sha512-hrazgRSlhzacZ69LdcKfhi3Vu13z2yFfoAzmEov3yFIJlatTdVGUW6vle1zjH8qkzdCn/qGw8rapjqsObbYXAg==", + "version": "17.9.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz", + "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==", "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0", @@ -2073,9 +2072,9 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "node_modules/tunnel-agent": { @@ -2805,13 +2804,12 @@ } }, "enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", "dev": true, "requires": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" + "ansi-colors": "^4.1.1" } }, "escape-string-regexp": { @@ -3170,9 +3168,9 @@ "dev": true }, "joi": { - "version": "17.10.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.0.tgz", - "integrity": "sha512-hrazgRSlhzacZ69LdcKfhi3Vu13z2yFfoAzmEov3yFIJlatTdVGUW6vle1zjH8qkzdCn/qGw8rapjqsObbYXAg==", + "version": "17.9.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz", + "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==", "dev": true, "requires": { "@hapi/hoek": "^9.0.0", @@ -3788,9 +3786,9 @@ } }, "tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "tunnel-agent": { diff --git a/safety/js/package.json b/safety/tests/package.json similarity index 100% rename from safety/js/package.json rename to safety/tests/package.json