fix(build): switch default branch to master

Merge main into master

.github/workflows/npmpublish.yml

@@ -6,7 +6,7 @@ name: SASjs Build and Publish
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:

CONTRIBUTING.md

@@ -16,7 +16,7 @@ Tests are run using cypress. Before running tests, you need to define the follow
 
 ```
 
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas?_=1";
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
 filename ft15f001 temp;
 parmcards4;
@@ -40,18 +40,13 @@ parmcards4;
 # Viya
 
 ```
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas";
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
-
 filename ft15f001 temp;
 parmcards4;
+  %webout(FETCH)
   %webout(OPEN)
-  %global sasjs_tables;
-  %let sasjs_tables=&sasjs_tables;
-  %put &=sasjs_tables;
-  %let sasjs_tables=&sasjs_tables;
   %macro x();
-  %global sasjs_tables;
   %do i=1 %to %sysfunc(countw(&sasjs_tables));
     %let table=%scan(&sasjs_tables,&i);
     %webout(OBJ,&table)
@@ -60,13 +55,11 @@ parmcards4;
   %x()
   %webout(CLOSE)
 ;;;;
-%mv_createwebservice(path=/Public/app/common,name=sendObj)
+%mp_createwebservice(path=/Public/app/common,name=sendObj)
 filename ft15f001 temp;
 parmcards4;
+  %webout(FETCH)
   %webout(OPEN)
-  %global sasjs_tables;
-  %let sasjs_tables=&sasjs_tables;
-  %put &=sasjs_tables;
   %macro x();
   %do i=1 %to %sysfunc(countw(&sasjs_tables));
     %let table=%scan(&sasjs_tables,&i);
@@ -76,7 +69,7 @@ parmcards4;
   %x()
   %webout(CLOSE)
 ;;;;
-%mv_createwebservice(path=/Public/app/common,name=sendArr)
+%mp_createwebservice(path=/Public/app/common,name=sendArr)
 ```
 
 The above services will return anything you send. To run the tests simply launch `npm run cypress`.

package-lock.json

@@ -14874,9 +14874,9 @@
       }
     },
     "ts-loader": {
-      "version": "7.0.5",
+      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-7.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz",
-      "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==",
+      "integrity": "sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.3.0",

package.json

@@ -22,9 +22,6 @@
       {
         "pkgRoot": "/build"
       }
-    ],
-    "branches": [
-      "main"
     ]
   },
   "keywords": [
@@ -48,7 +45,7 @@
     "rimraf": "^3.0.2",
     "semantic-release": "^17.1.1",
     "ts-jest": "^25.5.1",
-    "ts-loader": "^7.0.5",
+    "ts-loader": "^8.0.1",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.17.8",

sasjs-tests/package-lock.json

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.0.4",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.5.tgz",
-      "integrity": "sha512-wjABkVqPQ0AaSoizCrLInG3HX1o+4f98UsHRGDHLHvlQzIIOUtUNElIAPYoy5Xxu+CPk030jXkgCls7n0k/3cw==",
+      "integrity": "sha512-54gQZD7QdNmQu77axOqr0vMS7hUVXO5hPbUtwXXocMIi3kRQDbROYjC3kuiFM9FrxqiZWbLRcyOqmFv3W/N36w==",
       "requires": {
         "es6-promise": "^4.2.8",
         "form-data": "^3.0.0",

sasjs-tests/package.json

@@ -4,7 +4,7 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "*",
+    "@sasjs/adapter": "^1.0.5",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",