Merge pull request #4 from kollhof/upgrade

upgrade

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     - name: setup nodejs
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 15.x
 
     - name: install dependencies
       env:

babel.config.js → babel.config.cjs

@@ -1,5 +1,9 @@
 module.exports = {
-  plugins: [],
+  plugins: [
+    ['@babel/plugin-transform-react-jsx', {
+      runtime: 'automatic'
+    }],
+  ],
 
   presets: ['@babel/preset-react'],
 

jest.config.js

@@ -1,14 +1,15 @@
 
-module.exports = {
+export default {
   testEnvironment: 'jsdom',
   setupFiles: [],
   moduleFileExtensions: ['js', 'fnk'],
   transform: {
-    '^.+\\.fnk$': ['@fink/jest/transform']
+    '^.+\\.fnk$': ['@fink/jest/transform.js']
   },
   transformIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/build/'],
 
-  snapshotResolver: '@fink/jest/snapshot-resolver',
+  resolver: '@fink/jest/cjs/module-resolver.js',
+  snapshotResolver: '@fink/jest/snapshot-resolver.js',
 
   modulePathIgnorePatterns: ['<rootDir>/build/'],
 

package-cjs.json

@@ -0,0 +1 @@
+{"type": "commonjs"}

package.json

@@ -5,6 +5,13 @@
   "engines": {
     "node": ">=14.0.0"
   },
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./index.js",
+      "require": "./cjs/index.js"
+    }
+  },
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -20,7 +27,9 @@
     "clean": "rimraf ./build",
     "build": "run build:*",
     "build:dir": "mkdir -p ./build/pkg/",
-    "build:fnk": "fnk --src ./src --module-type mjs --out-dir build/pkg --ignore './src/**/*.test.fnk'",
+    "build:fnk-esm": "fnk --module-type esm --src ./src --out-dir build/pkg/ --ignore './src/**/*.test.fnk'",
+    "build:fnk-cjs": "fnk --module-type cjs --src ./src --out-dir build/pkg/cjs --ignore './src/**/*.test.fnk'",
+    "build:pkg-cjs": "cp ./package-cjs.json build/pkg/cjs/package.json",
     "build:files": "cp ./package.json ./README.md ./LICENSE ./build/pkg/",
     "test": "run jest",
     "jest": "jest --verbose --runInBand --no-cache ",
@@ -32,19 +41,20 @@
     "redux": ">=4.0.0"
   },
   "devDependencies": {
+    "@babel/plugin-transform-react-jsx": "^7.12.1",
     "@babel/preset-env": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
-    "@fink/cli": "^6.0.0",
-    "@fink/jest": "^5.0.0",
-    "@fink/larix": "^12.2.0",
-    "@fink/loxia": "^12.2.0",
+    "@fink/cli": "^8.1.0",
+    "@fink/jest": "^7.1.0",
+    "@fink/larix": "^15.1.0",
+    "@fink/loxia": "^17.1.0",
     "@testing-library/react": "^11.0.0",
     "commitizen": "^4.0.5",
     "cz-conventional-changelog": "^3.1.0",
     "jest-cli": "^26.1.0",
     "npx-run": "^2.1.2",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.1",
     "redux": "^4.0.5",
     "semantic-release": "^17.1.1"
   },
@@ -54,7 +64,7 @@
     }
   },
   "dependencies": {
-    "@fink/js-interop": "^1.1.1",
-    "@fink/std-lib": "^4.0.0"
+    "@fink/js-interop": "^2.0.1",
+    "@fink/std-lib": "^6.0.0"
   }
 }

src/index.fnk

@@ -1,6 +1,5 @@
-React = import 'react'
-{createContext, useContext, useEffect, useState, Fragment} = import 'react'
-{undefined} = import '@fink/js-interop/nullish'
+{createContext, useContext, useEffect, useState} = import 'react'
+{undefined} = import '@fink/js-interop/nullish.fnk'
 
 
 process_reducers = fn registry, state, action:
@@ -102,7 +101,7 @@ Reducer = fn {path, reducer, children}:
 
     [path, reducer, dispatch]
 
-  <Fragment>{children}</Fragment>
+  <>{children}</>
 
 
 

src/index.test.fnk

@@ -1,12 +1,13 @@
-{describe, it, expect, to_equal} = import '@fink/jest'
+{describe, it, expect, to_equal} = import '@fink/jest/test.fnk'
 
 React = import 'react'
 {Fragment} = import 'react'
 {createStore} = import 'redux'
 {render, fireEvent} = import '@testing-library/react'
-{rx} = import '@fink/std-lib/regex'
+{rx} = import '@fink/std-lib/regex.fnk'
 
-{Redux, Reducer, reducer, use_dispatch, use_state, lazy_store_reducer} = import '.'
+
+{Redux, Reducer, reducer, use_dispatch, use_state, lazy_store_reducer} = import './index.fnk'
 
 
 test_reducer = reducer {count: 0}, dict: