From db578564ba2096ba13c3dff9c4165ea8d5b5c1ec Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Tue, 13 Jul 2021 17:11:49 +0500 Subject: [PATCH 1/5] fix: removed url package --- package-lock.json | 20 ++++++++++---------- package.json | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 059a16c..2432dd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,7 @@ "axios-cookiejar-support": "^1.0.1", "form-data": "^4.0.0", "https": "^1.0.0", - "tough-cookie": "^4.0.0", - "url": "^0.11.0" + "tough-cookie": "^4.0.0" }, "devDependencies": { "@types/jest": "^26.0.23", @@ -11155,11 +11154,6 @@ "safer-buffer": "^2.0.2", "tweetnacl": "~0.14.0" }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, "engines": { "node": ">=0.10.0" } @@ -12113,6 +12107,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -14171,6 +14166,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -14185,7 +14181,8 @@ "node_modules/url/node_modules/punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true }, "node_modules/use": { "version": "3.1.1", @@ -24130,7 +24127,8 @@ "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true }, "querystring-es3": { "version": "0.2.1", @@ -25781,6 +25779,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -25789,7 +25788,8 @@ "punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true } } }, diff --git a/package.json b/package.json index 65fd231..64900d3 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,6 @@ "axios-cookiejar-support": "^1.0.1", "form-data": "^4.0.0", "https": "^1.0.0", - "tough-cookie": "^4.0.0", - "url": "^0.11.0" + "tough-cookie": "^4.0.0" } } From f6cb2c4faca482edf8643e25df03baf697547432 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 15 Jul 2021 10:41:10 +0200 Subject: [PATCH 2/5] chore: sasjs-tests windows --- sasjs-tests/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/sasjs-tests/package.json b/sasjs-tests/package.json index 737ab7b..004e3eb 100644 --- a/sasjs-tests/package.json +++ b/sasjs-tests/package.json @@ -24,6 +24,7 @@ "eject": "react-scripts eject", "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz", "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH", + "deploy:tests-win": "scp %DEPLOY_PATH% ./build/*", "deploy": "npm run update:adapter && npm run build && npm run deploy:tests" }, "eslintConfig": { From 8a0f14b780dd85940572ac41e87f4a4ac1a6dba2 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 15 Jul 2021 10:43:30 +0200 Subject: [PATCH 3/5] chore: windows fallback --- sasjs-tests/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sasjs-tests/package.json b/sasjs-tests/package.json index 004e3eb..64d2331 100644 --- a/sasjs-tests/package.json +++ b/sasjs-tests/package.json @@ -23,7 +23,7 @@ "test": "react-scripts test", "eject": "react-scripts eject", "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz", - "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH", + "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH || npm run deploy:tests-win", "deploy:tests-win": "scp %DEPLOY_PATH% ./build/*", "deploy": "npm run update:adapter && npm run build && npm run deploy:tests" }, From d2a90c77fdb1f773769b3ccf137df4729714730c Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 15 Jul 2021 10:57:44 +0200 Subject: [PATCH 4/5] chore: readme update --- sasjs-tests/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sasjs-tests/README.md b/sasjs-tests/README.md index 9ae629f..471dcf4 100644 --- a/sasjs-tests/README.md +++ b/sasjs-tests/README.md @@ -41,6 +41,15 @@ So you can run the script like so: SSH_ACCOUNT=me@my-sas-server.com DEPLOY_PATH=/var/www/html/my-folder/sasjs-tests npm run deploy ``` +If you are on `WINDOWS`, you will first need to install one dependency: +```bash +npm i -g copyfiles +``` +and then run: +```bash +npm run deploy --DEPLOY_PATH me@my-sas-server.com:/var/www/html/my-folder/sasjs-tests +``` + If you'd like to deploy just `sasjs-tests` without changing the adapter version, you can use the `deploy:tests` script, while also setting the same environment variables as above. ## 3. Creating the required SAS services From d38d032309961f17d9af84de87002d794c09d730 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 15 Jul 2021 13:01:12 +0200 Subject: [PATCH 5/5] chore: readme updates --- sasjs-tests/README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sasjs-tests/README.md b/sasjs-tests/README.md index 471dcf4..6296cfe 100644 --- a/sasjs-tests/README.md +++ b/sasjs-tests/README.md @@ -45,9 +45,13 @@ If you are on `WINDOWS`, you will first need to install one dependency: ```bash npm i -g copyfiles ``` -and then run: +and then run to build: ```bash -npm run deploy --DEPLOY_PATH me@my-sas-server.com:/var/www/html/my-folder/sasjs-tests +npm run update:adapter && npm run build +``` +when it finishes run to deploy: +```bash +scp -rp ./build/* me@my-sas-server.com:/var/www/html/my-folder/sasjs-tests ``` If you'd like to deploy just `sasjs-tests` without changing the adapter version, you can use the `deploy:tests` script, while also setting the same environment variables as above.