Merge pull request #62 from functional-jslib/issue-#61-types_simplifi…

…cation

Issue #61 types simplification

.eslintrc → .eslintrc.json

@@ -5,7 +5,7 @@
   "parser": "@typescript-eslint/parser",
 
   "parserOptions": {
-    "ecmaVersion": 2019,
+    "ecmaVersion": 2020,
     "sourceType": "module",
     "project": "./tsconfig.json",
     "ecmaFeatures": {
@@ -34,6 +34,8 @@
     "@typescript-eslint/no-use-before-define": 0,
     "@typescript-eslint/consistent-type-assertions": 0,
     "@typescript-eslint/no-explicit-any": 0,
+    "@typescript-eslint/no-var-requires": 0,
+    "@typescript-eslint/ban-ts-comment": 1,
     "no-sequences": "off"
   }
 }

.github/workflows/monorepo-build-and-test.yml → .github/workflows/monorepo-build.yml

@@ -1,7 +1,7 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Monorepo Build and Test
+name: monorepo-build
 
 on:
   push:
@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

.github/workflows/publish.yml

@@ -0,0 +1,39 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+# and https://docs.github.com/en/actions/guides/publishing-nodejs-packages#publishing-packages-to-the-npm-registry .
+
+name: Publish
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build-test-publish-to-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+
+  build-test-publish-to-github-pkgs:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          registry-url: https://npm.pkg.github.com/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -13,3 +13,5 @@
 *.log
 #**/src/**/*.js
 **/src/**/*.js.map
+
+**/.local*

.node-version

@@ -0,0 +1 @@
+v18

.npmignore

@@ -5,6 +5,8 @@
 **/.eslint*
 **/.travis*
 **/.git*
+**/.node-version
+**/.npmrc
 
 # Dirs
 **/markdown-fragments*

.npmrc

@@ -0,0 +1 @@
+version=true

jest.config.js

@@ -1,7 +1,7 @@
 const path = require('path'),
   testMatch = [
-    '**/tests/**/*@(.test|_test|.spec).ts',
-    '**/tests/**/test-*.ts',
+    '**/tests/**/*@(.test|_test|.spec).@(ts|js)',
+    '**/tests/**/test-*.@(ts|js)',
   ],
   transform = {
     '\\.ts$': 'ts-jest'
@@ -14,6 +14,7 @@ module.exports = {
   projects: [
     'fjl',
     'fjl-validator',
+    // 'fjl-validator-recaptcha',
     'fjl-inputfilter'
   ]
     .map(packageName => {