Merge branch 'feature/npm-publish' of github.com:bytesonus/juno-node into feature/npm-publish

Author: sauravhiremath

package-lock.json

@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"description": "",
 	"keywords": [],
-	"main": "dist/juno-node.umd.js",
+	"main": "dist/juno-node.cjs.js",
 	"module": "dist/juno-node.es5.js",
 	"typings": "dist/types/juno-node.d.ts",
 	"files": [
@@ -21,9 +21,9 @@
 	"scripts": {
 		"lint": "tslint  --project tsconfig.json -t codeFrame 'src/**/*.ts' 'test/**/*.ts'",
 		"prebuild": "rimraf dist",
-		"build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
+		"build": "rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
 		"start": "rollup -c rollup.config.ts -w",
-		"test": "ts-mocha -p ./tsconfig.json test/**/*.test.ts",
+		"test": "ts-mocha -p ./tsconfig/tsconfig.test.json test/**/*.test.ts",
 		"test:coverage": "nyc --reporter=html --reporter=text --reporter=text-summary npm test",
 		"test:prod": "npm run lint && npm run test",
 		"deploy-docs": "ts-node tools/gh-pages-publish",
@@ -61,7 +61,6 @@
 		"@types/chai-as-promised": "^7.1.2",
 		"@types/expect": "^24.3.0",
 		"@types/mocha": "^7.0.2",
-		"@types/node": "^13.13.4",
 		"@types/sinon": "^9.0.0",
 		"@types/sinon-chai": "^3.2.4",
 		"chai": "^4.2.0",

package.json

@@ -12,19 +12,19 @@ const libraryName = 'juno-node'
 export default {
   input: `src/${libraryName}.ts`,
   output: [
-    { file: pkg.main, name: camelCase(libraryName), format: 'umd', sourcemap: true },
+    { file: pkg.main, name: camelCase(libraryName), format: 'cjs', sourcemap: true },
     { file: pkg.module, format: 'es', sourcemap: true },
   ],
   // Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
-  external: [],
+  external: ['net'],
   watch: {
     include: 'src/**',
   },
   plugins: [
     // Allow json resolution
     json(),
     // Compile TypeScript files
-    typescript({ useTsconfigDeclarationDir: true }),
+    typescript({ useTsconfigDeclarationDir: true, tsconfig:"tsconfig/tsconfig.module.json" }),
     // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
     commonjs(),
     // Allow node_modules resolution, so you can use 'external' to control

rollup.config.ts

@@ -1,13 +1,10 @@
 {
 	"compilerOptions": {
 		"moduleResolution": "node",
-		"target": "es5",
-		"module": "es2015",
 		"lib": [
 			"es2015",
 			"es2016",
 			"es2017",
-			"dom"
 		],
 		"strict": true,
 		"sourceMap": true,
@@ -16,14 +13,9 @@
 		"esModuleInterop": true,
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,
-		"declarationDir": "dist/types",
-		"outDir": "dist/lib",
-		"typeRoots": [
-			"node_modules/@types",
-			"types"
-		]
-	},
-	"include": [
-		"src"
-	]
+        "typeRoots": [
+            "./typings",
+            "../node_modules/@types"
+        ]
+	}
 }

tsconfig.json tsconfig/tsconfig.base.jsontsconfig.json renamed to tsconfig/tsconfig.base.json

@@ -0,0 +1,11 @@
+{
+    "extends": "./tsconfig.base",
+	"compilerOptions": {
+		"module": "es2015",
+		"declarationDir": "../dist/types",
+		"outDir": "../dist/lib",
+	},
+	"include": [
+		"../src"
+	]
+}

tsconfig/tsconfig.module.json

@@ -0,0 +1,9 @@
+{
+    "extends": "./tsconfig.base.json",
+    "compilerOptions": {
+        "module": "commonjs"
+    },
+    "include": [
+        "../test"
+    ]
+}

tsconfig/tsconfig.test.json

@@ -0,0 +1,17 @@
+import BaseConnection from "../../src/connection/base-connection";
+import { DummyJunoConnection } from "../../test/helpers";
+import JunoModule from "../../src/juno-node";
+import { SinonSpy } from "sinon";
+
+interface JunoTest {
+	connection: BaseConnection;
+}
+
+declare module 'mocha' {
+	interface Runnable {
+		conn: DummyJunoConnection;
+		module: JunoModule;
+		sendFunc: SinonSpy;
+		getLatestSent: Function
+	}
+}