Fix/backward compatibility errors

Author: Maksim P

.gitignore

@@ -10,7 +10,9 @@ package-lock.json
 .env
 .cache
 test.log
+builds/
 build/
+dists/
 dist/
 es/
 index.js

aliases.js

@@ -14,6 +14,8 @@ function getAxiosAlias() {
   switch (v) {
   case 'v10':
     return 'axios/dist/node/axios.cjs';
+  case 'v11':
+    return 'axios/dist/node/axios.cjs';
   default:
     return 'axios';
   }

changelog.md

@@ -1,3 +1,8 @@
+7.1.2
+ - refactored file structure for backward compatibility
+ - fixed support for Node.js v13.x.x
+ - fixed build for Node.js v11.x.x.
+
 7.1.1
  - fix merge conflict
 

package.json

@@ -41,7 +41,7 @@
     "type": "git",
     "url": "https://github.com/agiliumtrade-ai/copyfactory-javascript-sdk.git"
   },
-  "version": "7.1.1",
+  "version": "7.1.2",
   "dependencies": {
     "@log4js-node/log4js-api": "~1.0.2",
     "axios": "~1.3.6",
@@ -84,31 +84,35 @@
     "net": false,
     "os": false
   },
-  "module": "./dist/esm/index.js",
-  "unpkg": "./dist/umd/index.js",
-  "main": "./dist/cjs/index.js",
+  "module": "./dists/esm/index.js",
+  "unpkg": "./dists/umd/index.js",
+  "main": "./dists/cjs/index.js",
   "scripts": {
+    "test-win": "cross-env SWC=true mocha --exit --require @swc-node/register --require ./aliases.js lib/*/*/*/*.spec.es6 lib/*/*/*.spec.es6 lib/*/*.spec.es6 lib/*.spec.es6",
     "test": "SWC=true mocha --exit --require @swc-node/register --require ./aliases.js lib/*/*/*/*.spec.es6 lib/*/*/*.spec.es6 lib/*/*.spec.es6 lib/*.spec.es6",
     "lint:fix": "eslint --ext es6 ./lib --fix",
     "lint": "eslint --ext es6 ./lib",
     "build-win": "npm run clean-win | npm run build:optimized && npm run build:transpile && npm run build:types",
-    "build": "npm run clean; npm run build:optimized && npm run build:transpile && npm run build:types",
+    "build": "npm run clean; npm run build:optimized && npm run build:transpile && npm run build:types && npm run build:backward-compatiibility",
     "build:optimized": "npx webpack --config webpack.config.js",
     "build:transpile": "node ./swc/swc.transform.cjs.js && node ./swc/swc.transform.esm.js ",
-    "build:types": "copyfiles -u 1 \"lib/**/*.d.ts\" build/esm && copyfiles -u 1 \"lib/**/*.d.ts\" build/cjs && copyfiles -u 1 \"lib/**/*.d.ts\" dist/cjs && copyfiles -u 1 \"lib/**/*.d.ts\" dist/esm && copyfiles -u 1 \"lib/**/*.d.ts\" dist/umd",
-    "clean-win": "rmdir /Q /S dist | rmdir /Q /S build",
-    "clean": "rm -rf build; rm -rf dist;"
+    "build:types": "copyfiles -u 1 \"lib/**/*.d.ts\" build/esm && copyfiles -u 1 \"lib/**/*.d.ts\" build/cjs && copyfiles -u 1 \"lib/**/*.d.ts\" dists/cjs && copyfiles -u 1 \"lib/**/*.d.ts\" dists/esm && copyfiles -u 1 \"lib/**/*.d.ts\" dists/umd",
+    "build:backward-compatiibility": "copyfiles -u 2 \"build/cjs/**/*\" dist/",
+    "clean-win": "(if exist dist rmdir /Q /S dist) && (if exist build rmdir /Q /S build) && (if exist dists rmdir /Q /S dists)",
+    "clean": "rm -rf build; rm -rf dist; rm -rf dists;"
   },
   "exports": {
     ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
+      "import": "./dists/esm/index.js",
+      "require": "./dists/cjs/index.js"
     },
+    "./dist/*": "./dist/*.js",
+    "./dist/": "./dist/",
     "./cjs": "./build/cjs/index.js",
     "./esm": "./build/esm/index.js",
-    "./browser": "./dist/umd/index.js",
-    "./node": "./dist/cjs/index.js",
-    "./web": "./dist/esm/index.js"
+    "./browser": "./dists/umd/index.js",
+    "./node": "./dists/cjs/index.js",
+    "./web": "./dists/esm/index.js"
   },
   "typings": "./lib/index.d.ts",
   "types": "./lib/index.d.ts"

swc/swc.transform.cjs.js

@@ -4,18 +4,6 @@ const path = require('path');
 const { transformSync } = require('@swc/core');
 const swcCJS = require('./swcrc.cjs');
 
-function getAxiosAlias() {
-  const { version } = process;
-  const [v] = version.split('.');
-
-  switch (v) {
-  case 'v10':
-    return 'axios/dist/node/axios.cjs';
-  default:
-    return 'axios';
-  }
-}
-
 const aliases = {
   '@axios': getAxiosAlias()
 };
@@ -69,3 +57,17 @@ function walkAndTranspileFiles(dir) {
     }
   }
 }
+
+function getAxiosAlias() {
+  const { version } = process;
+  const [v] = version.split('.');
+
+  switch (v) {
+  case 'v10':
+    return 'axios/dist/node/axios.cjs';
+  case 'v11':
+    return 'axios/dist/node/axios.cjs';
+  default:
+    return 'axios';
+  }
+}

webpack.config.js

@@ -48,7 +48,7 @@ const webESM = {
 
   output: {
     filename: 'index.js',
-    path: path.resolve(__dirname, './dist/esm/'),
+    path: path.resolve(__dirname, './dists/esm/'),
     library: {
       type: 'module',
     }
@@ -86,7 +86,7 @@ const webUMD = {
 
   output: {
     filename: 'index.js',
-    path: path.resolve(__dirname, './dist/umd/'),
+    path: path.resolve(__dirname, './dists/umd/'),
     globalObject: 'this',
     library: {
       name: 'CopyFactory',
@@ -123,7 +123,7 @@ const nodeCJS = {
 
   output: {
     filename: 'index.js',
-    path: path.resolve(__dirname, './dist/cjs/'),
+    path: path.resolve(__dirname, './dists/cjs/'),
     library: {
       type: 'commonjs'
     }