Merge pull request #208 from smartprocure/feature/misc-fixes

Misc fixes and cleanup

Author: stellarhoof

.gitignore

@@ -1,69 +1,15 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directories
 node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
 
+# Build output
 dist/*
 
+# Duti stuff
 test-results.json
 lint-results.json
 
-# yarn stuff
-# see https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+# Yarn stuff: https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
 .yarn/*
 !.yarn/patches
 !.yarn/plugins

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.49.7
+
+- Misc fixes and cleanup
+
 # 2.49.6
 
 - Format source with prettier

jest.config.js

@@ -1,6 +1,6 @@
 /* https://jestjs.io/docs/configuration */
 export default {
-  testMatch: ['<rootDir>/test/**/*.js'],
+  testMatch: ['<rootDir>/src/**/*.test.js'],
   transform: {
     '^.+\\.js?$': ['esbuild-jest', { sourcemap: true, target: 'es2022' }],
   },

package.json

@@ -1,10 +1,15 @@
 {
   "name": "contexture-client",
-  "version": "2.49.6",
+  "version": "2.49.7",
   "description": "The Contexture (aka ContextTree) Client",
   "type": "module",
   "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    }
+  },
   "files": [
     "./dist"
   ],

test/_mobx.js renamed to src/_mobx.test.js

@@ -1,11 +1,11 @@
 // DO NOT RENAME THIS FILE... because we need it to run before the other tests...
 // No, we don't know why. We're sorry. #hackathon
 
-import { Tree } from '../src/util/tree.js'
+import { Tree } from './util/tree.js'
 import F from 'futil'
 import _ from 'lodash/fp.js'
-import ContextureClient from '../src/index.js'
-import mockService from '../src/mockService.js'
+import ContextureClient from './index.js'
+import mockService from './mockService.js'
 import { observable, reaction, autorun, toJS, set } from 'mobx'
 
 let mobxAdapter = { snapshot: toJS, extend: set, initObject: observable }

test/index.js renamed to src/index.test.js

@@ -1,8 +1,8 @@
 import _ from 'lodash/fp.js'
-import ContextureClient, { encode, exampleTypes } from '../src/index.js'
+import ContextureClient, { encode, exampleTypes } from './index.js'
 import Promise from 'bluebird'
-import mockService from '../src/mockService.js'
-import wrap from '../src/actions/wrap.js'
+import mockService from './mockService.js'
+import wrap from './actions/wrap.js'
 import { observable, toJS, set } from 'mobx'
 
 let mobxAdapter = { snapshot: toJS, extend: set, initObject: observable }

test/listeners.js renamed to src/listeners.test.js

@@ -1,6 +1,6 @@
 import _ from 'lodash/fp.js'
-import ContextureClient from '../src/index.js'
-import mockService from '../src/mockService.js'
+import ContextureClient from './index.js'
+import mockService from './mockService.js'
 import { observable, toJS, set } from 'mobx'
 
 let mobxAdapter = { snapshot: toJS, extend: set, initObject: observable }

test/tree.js renamed to src/util/tree.test.js

@@ -1,4 +1,4 @@
-import { flatten, encode, isParent } from '../src/util/tree.js'
+import { flatten, encode, isParent } from './tree.js'
 
 describe('tree', () => {
   let tree = {