mirror of
https://github.com/sasjs/adapter.git
synced 2026-01-14 07:30:05 +00:00
chore(merge): pull in changes from master
This commit is contained in:
3
package-lock.json
generated
3
package-lock.json
generated
@@ -12,8 +12,7 @@
|
|||||||
"axios-cookiejar-support": "^1.0.1",
|
"axios-cookiejar-support": "^1.0.1",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
"https": "^1.0.0",
|
"https": "^1.0.0",
|
||||||
"tough-cookie": "^4.0.0",
|
"tough-cookie": "^4.0.0"
|
||||||
"url": "^0.11.0"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/axios": "^0.14.0",
|
"@types/axios": "^0.14.0",
|
||||||
|
|||||||
@@ -72,7 +72,6 @@
|
|||||||
"axios-cookiejar-support": "^1.0.1",
|
"axios-cookiejar-support": "^1.0.1",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
"https": "^1.0.0",
|
"https": "^1.0.0",
|
||||||
"tough-cookie": "^4.0.0",
|
"tough-cookie": "^4.0.0"
|
||||||
"url": "^0.11.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,19 @@ 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
|
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 to build:
|
||||||
|
```bash
|
||||||
|
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.
|
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
|
## 3. Creating the required SAS services
|
||||||
|
|||||||
@@ -23,7 +23,8 @@
|
|||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"eject": "react-scripts eject",
|
"eject": "react-scripts eject",
|
||||||
"update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
|
"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"
|
"deploy": "npm run update:adapter && npm run build && npm run deploy:tests"
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
|
|||||||
Reference in New Issue
Block a user