chore(*): update references to master

chore(deps): [security] bump npm from 6.14.5 to 6.14.6

.github/workflows/npmpublish.yml

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

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Contributions to SASjs are very welcome!  When making a PR, test cases should be included.  To help in unit testing, be sure to run the following when making changes:
+Contributions to SASjs are very welcome! When making a PR, test cases should be included. To help in unit testing, be sure to run the following when making changes:
 
 ```
 # the following creates a tarball in the build folder of SASjs
@@ -10,12 +10,13 @@ npm run-script package:lib
 npm install ../sasjs/build/<tarball filename>
 ```
 
-Tests are run using cypress.  Before running tests, you need to define the following backend services:
+Tests are run using cypress. Before running tests, you need to define the following backend services:
 
 # SAS 9
+
 ```
 
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas?_=1";
+filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas?_=1";
 %inc mc;
 filename ft15f001 temp;
 parmcards4;
@@ -37,8 +38,9 @@ parmcards4;
 ```
 
 # Viya
+
 ```
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas";
 %inc mc;
 
 filename ft15f001 temp;
@@ -77,4 +79,4 @@ parmcards4;
 %mv_createwebservice(path=/Public/app/common,name=sendArr)
 ```
 
-The above services will return anything you send.  To run the tests simply launch `npm run cypress`.
+The above services will return anything you send. To run the tests simply launch `npm run cypress`.

README.md

@@ -1,31 +1,29 @@
-[![](https://data.jsdelivr.com/v1/package/npm/sasjs/badge)](https://www.jsdelivr.com/package/npm/sasjs)
+[![](https://data.jsdelivr.com/v1/package/npm/@sasjs/adapter/badge)](https://www.jsdelivr.com/package/npm/@sasjs/adapter)
 
-# SASjs
+# @sasjs/adapter
 
 SASjs is a open-source framework for building Web Apps on SAS® platforms. You can use as much or as little of it as you like. This repository contains the JS adapter, the part that handles the to/from SAS communication on the client side. There are 3 ways to install it:
 
-1 - `npm install sasjs` - for use in a node project
+1 - `npm install @sasjs/adapter` - for use in a node project
 
-2 - [Download](https://cdn.jsdelivr.net/npm/sasjs/index.js) and use a copy of the latest JS file
+2 - [Download](https://cdn.jsdelivr.net/npm/@sasjs/adapter@1/index.js) and use a copy of the latest JS file
 
-3 - Reference directly from the CDN - in which case click [here](https://www.jsdelivr.com/package/npm/sasjs?tab=collection) and select "SRI" to get the script tag with the integrity hash.
+3 - Reference directly from the CDN - in which case click [here](https://www.jsdelivr.com/package/npm/@sasjs/adapter?tab=collection) and select "SRI" to get the script tag with the integrity hash.
 
 If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/macropeople/react-seed-app) which provides some boilerplate.
 
 For more information on building web apps with SAS, check out [sasjs.io](https://sasjs.io)
 
+## None of this makes sense. How do I build an app with it?
 
-## None of this makes sense.  How do I build an app with it?
+Ok ok. Deploy this [example.html](https://github.com/sasjs/adapter/blob/main/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.
-
-Ok ok.  Deploy this [example.html](https://github.com/macropeople/sasjs/blob/master/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.
 
 The backend part can be deployed as follows:
 
 ```
-%let appLoc=/Public/app/readme;  /* Metadata or Viya Folder location as per SASjs config */
+%let appLoc=/Public/app/readme;  /* Metadata or Viya Folder per SASjs config */
-/* compile macros (can also be downloaded & compiled seperately) */
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+%inc mc; /* compile macros (can also be downloaded & compiled seperately) */
-%inc mc; 
 filename ft15f001 temp;
 parmcards4;
   %webout(FETCH) /* receive all data as SAS datasets */
@@ -45,6 +43,6 @@ You now have a simple web app with a backend service!
 
 # More resources
 
-For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation. 
+For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
 
-For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.
+For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

example.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-    <script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/sasjs@2.11.0"></script> 
+    <script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1"></script> 
     <script>
       var sasJs = new SASjs.default({appLoc: "/Products/demo/readme"
         ,serverType:"SAS9", debug: "false"

package.json

@@ -22,6 +22,9 @@
       {
         "pkgRoot": "/build"
       }
+    ],
+    "branches": [
+      "main"
     ]
   },
   "keywords": [
@@ -36,11 +39,9 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "@cypress/webpack-preprocessor": "^4.1.5",
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.3",
+    "@types/jest": "^26.0.4",
     "cp": "^0.2.0",
-    "cypress": "^4.9.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
     "prettier": "^2.0.5",
@@ -51,7 +52,7 @@
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.17.8",
-    "typedoc-neo-theme": "^1.0.8",
+    "typedoc-neo-theme": "^1.0.9",
     "typedoc-plugin-external-module-name": "^4.0.3",
     "typescript": "^3.9.6",
     "uglifyjs-webpack-plugin": "^2.2.0",

typedoc.json

@@ -24,7 +24,7 @@
   "links": [
     {
       "label": "SASjs on Github",
-      "url": "https://github.com/macropeople/sasjs"
+      "url": "https://github.com/sasjs/adapter"
     },
     {
       "label": "SASjs.io",
@@ -32,11 +32,11 @@
     },
     {
       "label": "SASjs CLI",
-      "url": "https://github.com/macropeople/sasjs-cli"
+      "url": "https://github.com/sasjs/cli"
     },
     {
       "label": "React Seed App",
-      "url": "https://github.com/macropeople/react-seed-app"
+      "url": "https://github.com/sasjs/react-seed-app"
     }
   ]
 }