move lib folder to src, install @babel/register for mocha

TUSCNetwork · Feb 16, 2019 · 8702ebc · 8702ebc
1 parent abf8dd6
commit 8702ebc
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ es
 browser-test/browser-test.js
 build
 package-lock.json
+lib
diff --git a/.npmignore b/.npmignore
@@ -1,4 +1,6 @@
-lib
+src
 test
 examples
 build
+browser-test
+tools
diff --git a/lib/index.js b/lib/index.js
diff --git a/package.json b/package.json
@@ -1,25 +1,24 @@
 {
   "name": "bitsharesjs-ws",
-  "version": "1.5.5",
+  "version": "1.6.5",
   "description": "Pure JavaScript Bitshares/Graphene websocket interface for node.js and browsers.",
   "browser": {
     "ws": false
   },
   "scripts": {
-    "test": "BABEL_ENV=test mocha --compilers js:babel-core/register --recursive",
+    "test": "BABEL_ENV=test mocha --compilers js:@babel/register --recursive",
     "test:watch": "npm test -- --watch",
-    "test:connection": "BABEL_ENV=test mocha --compilers js:babel-core/register ./test/Connection --watch",
-    "test:api": "BABEL_ENV=test mocha --compilers js:babel-core/register ./test/Api --watch",
-    "test:manager": "BABEL_ENV=test mocha --compilers js:babel-core/register ./test/Manager --watch",
+    "test:connection": "BABEL_ENV=test mocha --compilers js:@babel/register ./test/Connection --watch",
+    "test:api": "BABEL_ENV=test mocha --compilers js:@babel/register ./test/Api --watch",
+    "test:manager": "BABEL_ENV=test mocha --compilers js:@babel/register ./test/Manager --watch",
     "pretest:browser": "NODE_ENV=dev browserify test/*.js -o browser-test/browser-test.js -t [ babelify ]",
     "test:browser": "BABEL_ENV=test http-server ./browser-test",
-    "clean": "rm -rf ./cjs/* & rm -rf ./build/* & rm -rf ./es/*",
+    "clean": "rm -rf ./lib/* & rm -rf ./build/*",
     "prebuild": "npm run clean",
-    "build": "BABEL_ENV=cjs babel lib --out-dir cjs",
-    "build-es": "BABEL_ENV=es babel ./lib -d es",
-    "postbuild": "npm run browserify && npm run build-es",
+    "build": "babel src -d lib",
+    "postbuild": "npm run browserify",
     "prepublish": "npm run build",
-    "browserify": "NODE_ENV=production browserify cjs/index.js --standalone bitshares_ws -o build/bitsharesjs-ws.js -d",
+    "browserify": "NODE_ENV=production browserify lib/index.js --standalone bitshares_ws -o build/bitsharesjs-ws.js -d",
     "postbrowserify": "NODE_ENV=production uglifyjs --compress --mangle --sequences --drop_console --mangle-props --screw-ie8 --output build/bitsharesjs-ws.min.js -- build/bitsharesjs-ws.js"
   },
   "repository": {
@@ -37,8 +36,7 @@
   "engines": {
     "node": ">= 10.0.0"
   },
-  "main": "cjs/index.js",
-  "jsnext:main": "es/index.js",
+  "main": "lib/index.js",
   "dependencies": {
     "ws": "4.1.0"
   },
@@ -47,6 +45,7 @@
     "@babel/core": "^7.3.3",
     "@babel/plugin-proposal-class-properties": "^7.3.3",
     "@babel/preset-env": "^7.3.1",
+    "@babel/register": "^7.0.0",
     "assert": "^1.3.0",
     "browserify": "^16.2.3",
     "http-server": "^0.11.1",

diff --git a/lib/src/ApiInstances.js → src/ApiInstances.js b/lib/src/ApiInstances.js → src/ApiInstances.js
diff --git a/lib/src/ChainConfig.js → src/ChainConfig.js b/lib/src/ChainConfig.js → src/ChainConfig.js
diff --git a/lib/src/ChainWebSocket.js → src/ChainWebSocket.js b/lib/src/ChainWebSocket.js → src/ChainWebSocket.js
diff --git a/lib/src/ConnectionManager.js → src/ConnectionManager.js b/lib/src/ConnectionManager.js → src/ConnectionManager.js
diff --git a/lib/src/GrapheneApi.js → src/GrapheneApi.js b/lib/src/GrapheneApi.js → src/GrapheneApi.js
diff --git a/src/index.js b/src/index.js
@@ -0,0 +1,5 @@
+import Apis from "./ApiInstances";
+import Manager from "./ConnectionManager";
+import ChainConfig from "./ChainConfig";
+
+export { Apis, ChainConfig, Manager };
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ es @@
     browser-test/browser-test.js
     build
     package-lock.json
+    lib