Merge pull request #417 from casper-ecosystem/update/mocha-config

Update rollup config and register chai global

.mocharc.json

@@ -0,0 +1,10 @@
+{
+  "spec": "src/**/*.test.ts",
+  "require": [
+    "ts-node/register",
+    "chai/register-assert.js",
+    "chai/register-expect.js",
+    "chai/register-should.js"
+  ],
+  "recursive": true
+}

codecov.yml

@@ -18,10 +18,10 @@ component_management:
         target: 80%
 
   individual_components:
-    - component_id: '@casper-js-sdk/types'
+    - component_id: 'casper-js-types'
       paths:
         - /packages/types/src/
-    - component_id: '@casper-js-sdk/keys'
+    - component_id: 'casper-js-keys'
       paths:
         - /packages/keys/src/
 

packages/keys/.mocharc.json

@@ -0,0 +1 @@
+../../.mocharc.json

packages/keys/package.json

@@ -9,7 +9,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "run -T rollup -c",
-    "test": "run -T cross-env NODE_ENV=test TS_NODE_FILES=true mocha -r ts-node/register \"src/**/*.test.ts\"",
+    "test": "run -T cross-env NODE_ENV=test TS_NODE_FILES=true mocha",
     "test:coverage": "run -T nyc --reporter=lcov yarn test",
     "coverage": "run -T codecov"
   },

packages/keys/src/Ed25519.test.ts

@@ -4,7 +4,6 @@ import {
   decodeBase16,
   decodeBase64
 } from 'casper-js-types';
-import { expect } from 'chai';
 import sinon from 'sinon';
 
 import { Ed25519 } from './Ed25519';

packages/keys/src/Secp256k1.test.ts

@@ -1,5 +1,4 @@
 import { CLPublicKey, byteHash, decodeBase16 } from 'casper-js-types';
-import { expect } from 'chai';
 
 import { Secp256K1 } from './Secp256k1';
 

packages/keys/src/typings/global.d.ts

@@ -0,0 +1,2 @@
+declare const expect: Chai.ExpectStatic;
+declare const assert: Chai.AssertStatic;

packages/keys/src/utils.test.ts

@@ -1,5 +1,4 @@
 import { SignatureAlgorithm } from 'casper-js-types';
-import { expect } from 'chai';
 
 import { accountHashHelper } from './utils';
 

packages/keys/tsconfig.build.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist/"
+  },
+  "include": ["src"],
+  "exclude": ["*/**/*.test.ts"]
+}

packages/keys/tsconfig.json

@@ -1,8 +1,4 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./dist/",
-  },
-  "include": ["src"],
-  "exclude": ["*/**/*.test.ts"]
+  "include": ["src"]
 }

packages/types/.mocharc.json

@@ -0,0 +1 @@
+../../.mocharc.json

packages/types/package.json

@@ -9,7 +9,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "run -T rollup -c",
-    "test": "run -T cross-env NODE_ENV=test TS_NODE_FILES=true mocha -r ts-node/register \"src/**/*.test.ts\"",
+    "test": "run -T cross-env NODE_ENV=test TS_NODE_FILES=true mocha",
     "test:coverage": "run -T nyc --reporter=lcov yarn test",
     "coverage": "run -T codecov"
   }

packages/types/src/ByteConverters.test.ts

@@ -1,4 +1,3 @@
-import { expect } from 'chai';
 import { Some } from 'ts-results';
 
 import {

packages/types/src/CLValue/AccountHash.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { CLAccountHash } from './AccountHash';
 import { CLAccountHashType, CLValueParsers } from './index';
 

packages/types/src/CLValue/Bool.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import {
   CLBool,
   CLBoolType,

packages/types/src/CLValue/ByteArray.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { CLByteArray, CLByteArrayType, CLValueParsers } from './index';
 
 describe('CLByteArray', () => {

packages/types/src/CLValue/Key.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { decodeBase16 } from '../Conversions';
 import {
   AccessRights,

packages/types/src/CLValue/List.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import {
   CLBool,
   CLBoolType,

packages/types/src/CLValue/Map.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import {
   CLBool,
   CLI32,

packages/types/src/CLValue/Numeric.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import {
   CLI32,
   CLI32Type,

packages/types/src/CLValue/Option.test.ts

@@ -1,4 +1,3 @@
-import { expect } from 'chai';
 import { None, Some } from 'ts-results';
 
 import {

packages/types/src/CLValue/PublicKey.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { SignatureAlgorithm } from '../types';
 import {
   CLPublicKey,

packages/types/src/CLValue/Result.test.ts

@@ -1,4 +1,3 @@
-import { expect } from 'chai';
 import { Err, Ok, Some } from 'ts-results';
 
 import {

packages/types/src/CLValue/String.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { CLString, CLStringType, CLValueParsers } from './index';
 
 describe('CLString', () => {

packages/types/src/CLValue/Tuple.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import {
   CLBool,
   CLBoolType,

packages/types/src/CLValue/URef.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { decodeBase16 } from '../Conversions';
 import { AccessRights, CLURef, CLURefType, CLValueParsers } from './index';
 

packages/types/src/CLValue/Unit.test.ts

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { CLUnit, CLValueParsers } from './index';
 
 describe('Unit implementation tests', () => {

packages/types/src/ChecksummedHex.test.ts

@@ -1,16 +1,10 @@
-import chai from 'chai';
-
 import {
   encode,
   isChecksummed,
   isSamecase,
   SMALL_BYTES_COUNT
 } from './ChecksummedHex';
 
-chai.should();
-
-const { assert } = chai;
-
 describe('ChecksumedHex', () => {
   it('should decode empty input', () => {
     const empty = '';

packages/types/src/StoredValue.test.ts

@@ -1,4 +1,3 @@
-import { expect } from 'chai';
 import camelCase from 'lodash/camelCase';
 import mapKeys from 'lodash/mapKeys';
 import { TypedJSON } from 'typedjson';

packages/types/src/typings/global.d.ts

@@ -0,0 +1,2 @@
+declare const expect: Chai.ExpectStatic;
+declare const assert: Chai.AssertStatic;

packages/types/tsconfig.build.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist/"
+  },
+  "include": ["src"],
+  "exclude": ["*/**/*.test.ts"]
+}

packages/types/tsconfig.json

@@ -1,8 +1,4 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./dist/",
-  },
-  "include": ["src"],
-  "exclude": ["*/**/*.test.ts"]
+  "include": ["src"]
 }

rollup.config.js

@@ -1,4 +1,5 @@
 const typescript = require('@rollup/plugin-typescript');
+const commonjs = require('@rollup/plugin-commonjs');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const json = require('@rollup/plugin-json');
 const nodePolyfills = require('rollup-plugin-polyfill-node');
@@ -30,7 +31,8 @@ function getConfig(opts) {
 
   const plugins = [
     json(),
-    typescript({ tsconfig: './tsconfig.json' }),
+    commonjs(),
+    typescript({ tsconfig: './tsconfig.build.json' }),
     nodeResolve({
       exportConditions,
       mainFields,

tsconfig.base.json

@@ -19,5 +19,7 @@
     "target": "ES6",
     "lib": ["es2015", "dom"],
     "skipLibCheck": true
-  }
+  },
+  "typeRoots": ["node_modules/@types", "./typings"],
+  "types": ["mocha", "chai", "node", "global"]
 }