fix(build): switch default branch to master

Merge pull request #10 from sasjs/main
Merge main into master
2026-01-03 10:40:06 +00:00 · 2020-07-15 12:25:20 +01:00 · 2020-07-15 12:21:45 +01:00 · 2020-07-15 12:20:08 +01:00 · 2020-07-15 12:18:46 +01:00 · 2020-07-15 12:18:22 +01:00
6 changed files with 15 additions and 25 deletions
--- a/.github/workflows/npmpublish.yml
+++ b/.github/workflows/npmpublish.yml
@@ -6,7 +6,7 @@ name: SASjs Build and Publish
 on:
  push:
    branches:
-      - main
+      - master

 jobs:
  build:
--- a/CONTRIBUTING.md
+++ b/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`.
--- a/package-lock.json
+++ b/package-lock.json
@@ -14874,9 +14874,9 @@
      }
    },
    "ts-loader": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-7.0.5.tgz",
-      "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz",
+      "integrity": "sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ==",
      "dev": true,
      "requires": {
        "chalk": "^2.3.0",
--- a/package.json
+++ b/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",
--- a/sasjs-tests/package-lock.json
+++ b/sasjs-tests/package-lock.json
@@ -1357,9 +1357,9 @@
      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
    },
    "@sasjs/adapter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.4.tgz",
-      "integrity": "sha512-wjABkVqPQ0AaSoizCrLInG3HX1o+4f98UsHRGDHLHvlQzIIOUtUNElIAPYoy5Xxu+CPk030jXkgCls7n0k/3cw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.5.tgz",
+      "integrity": "sha512-54gQZD7QdNmQu77axOqr0vMS7hUVXO5hPbUtwXXocMIi3kRQDbROYjC3kuiFM9FrxqiZWbLRcyOqmFv3W/N36w==",
      "requires": {
        "es6-promise": "^4.2.8",
        "form-data": "^3.0.0",
--- a/sasjs-tests/package.json
+++ b/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",
Author	SHA1	Message	Date
Krishna Acondy	0ac7f8892e	fix(build): switch default branch to master	2020-07-15 12:25:20 +01:00
Krishna Acondy	68f5e5bec5	Merge pull request #10 from sasjs/main Merge main into master	2020-07-15 12:21:45 +01:00
Krishna Acondy	69a14ff6d7	Merge branch 'master' into main	2020-07-15 12:20:08 +01:00
Krishna Acondy	70e461224a	Merge pull request #8 from sasjs/allanbowe-patch-1 Update npmpublish.yml	2020-07-15 12:18:46 +01:00
Krishna Acondy	4da22ee6b4	Merge pull request #9 from sasjs/dependabot/npm_and_yarn/ts-loader-8.0.1 chore(deps-dev): bump ts-loader from 7.0.5 to 8.0.1	2020-07-15 12:18:22 +01:00
Allan Bowe	2c8ba09578	docs: viya test routine in CONTRIBUTING.md	2020-07-15 11:12:46 +02:00
dependabot-preview[bot]	c12d6f1c9c	chore(deps-dev): bump ts-loader from 7.0.5 to 8.0.1 Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 7.0.5 to 8.0.1. - [Release notes](https://github.com/TypeStrong/ts-loader/releases) - [Changelog](https://github.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/TypeStrong/ts-loader/compare/v7.0.5...v8.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-07-15 08:35:48 +00:00
Allan Bowe	e5fb7a7698	Update npmpublish.yml	2020-07-11 18:23:19 +02:00
Krishna Acondy	c22b9066d8	chore(sasjs-tests): update package version	2020-07-11 11:39:59 +01:00