fix: handle weird monorepo setup; some more tweaks

Signed-off-by: Charlike Mike Reagent <[email protected]>

Author: tunnckoCore

@tunnckocore/utils/dist/main/index.js

@@ -1,14 +1,13 @@
 {
   "version": "0.5.1",
   "name": "@tunnckocore/utils",
-  "description": "Thin layer on top of `execa` that allows executing multiple commands in parallel or in sequence with control for concurrency",
+  "description": "Utility functions and helpers for internal usage and monorepos",
   "author": "Charlike Mike Reagent <[email protected]>",
   "homepage": "https://github.com/tunnckoCore/opensource",
   "license": "MPL-2.0",
   "licenseStart": 2019,
   "main": "src/index.js",
-  "module": "src/index.js",
-  "types": "dist/types/index.d.ts",
+  "types": "src/index.d.ts",
   "scripts": {},
   "publishConfig": {
     "access": "public",
@@ -23,30 +22,17 @@
     "directory": "@tunnckocore/utils"
   },
   "files": [
-    "dist"
+    "src"
   ],
   "keywords": [
     "tunnckocorehq",
     "develop",
-    "parallel",
-    "series",
-    "concurrency",
-    "sequence",
-    "exec",
-    "child",
-    "process",
-    "execute",
-    "fork",
-    "execfile",
-    "execa",
-    "spawn",
-    "file",
-    "shell",
-    "bin",
-    "binary",
-    "binaries",
-    "npm",
-    "path",
-    "local"
+    "hela",
+    "tunnckocore",
+    "monorepo",
+    "monorepo helpers",
+    "helpers",
+    "utils",
+    "utilities"
   ]
 }

@tunnckocore/utils/dist/module/index.js

@@ -35,7 +35,9 @@ function createAliases(cwd = process.cwd(), sourceDirectory) {
 
       const packages = fs
         .readdirSync(workspace)
+        .filter((x) => !result.workspaces.find((z) => z.endsWith(x)))
         .map((directory) => {
+          // console.log(workspace);
           const pkgDirectory = path.join(workspace, directory);
           const pkgJsonPath = path.join(pkgDirectory, 'package.json');
 
@@ -47,15 +49,17 @@ function createAliases(cwd = process.cwd(), sourceDirectory) {
 
           /* istanbul ignore next */
           if (Object.keys(packageJson).length === 0) {
-            throw new Error(
-              `Cannot find package.json or cannot parse it: ${pkgJsonPath}`,
-            );
+            return null;
+            // throw new Error(
+            //   `Cannot find package.json or cannot parse it: ${pkgJsonPath}`,
+            // );
           }
           return [pkgDirectory, packageJson];
         });
 
-      return acc.concat(packages);
+      return acc.concat(packages).filter(Boolean);
     }, [])
+    .filter(Boolean)
     .reduce((acc, [pkgDirectory, packageJson]) => {
       if (typeof sourceDirectory === 'string') {
         acc[packageJson.name] = path.join(pkgDirectory, sourceDirectory);
@@ -86,7 +90,7 @@ function getWorkspacesAndExtensions(cwd = process.cwd()) {
     .filter(Boolean)
     .reduce((acc, ws) => acc.concat(ws.split(',')), [])
     .map((ws) => path.dirname(ws));
-
+  // console.log('workspaces', workspaces);
   let exts = [].concat(pkg.extensions).filter(Boolean);
 
   if (exts.length === 0) {

@tunnckocore/utils/package.json

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const utils = require('@tunnckocore/utils');
+const utils = require('./@tunnckocore/utils/src');
 
 const { alias, exts } = utils.createAliases();
 
@@ -17,6 +16,7 @@ module.exports = {
     /.+\/support\/.+/.toString(),
     /.+\/__support__\/.+/.toString(),
     /.+\/__shared__\/.+/.toString(),
+    /.+\/@tunnckocore\/utils\/.+/.toString(),
   ],
   moduleNameMapper: alias,
   moduleFileExtensions: exts,

@tunnckocore/utils/src/index.js

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const utils = require('@tunnckocore/utils');
+const utils = require('./@tunnckocore/utils/src');
 
 const { alias, exts } = utils.createAliases();
 

jest.build.config.js

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const utils = require('@tunnckocore/utils');
+const utils = require('./@tunnckocore/utils/src');
 
 const { alias, exts } = utils.createAliases();
 

jest.lint.config.js

@@ -3,7 +3,6 @@
   "name": "@tunnckocore/opensource",
   "homepage": "https://github.com/tunnckocore/opensource",
   "workspaces": [
-    "shared/*",
     "packages/*",
     "@tunnckocore/*"
   ],
@@ -22,7 +21,9 @@
     "@commitlint/cli": "^8.2.0",
     "@commitlint/config-conventional": "^8.2.0",
     "@tunnckocore/babel-preset": "^0.2.1",
-    "@tunnckocore/eslint-config": "^4.1.4",
+    "@tunnckocore/eslint-config": "^4.1.5",
+    "@tunnckocore/jest-runner-babel": "^3.1.0",
+    "@tunnckocore/jest-runner-eslint": "^0.3.1",
     "@tunnckocore/prettier-config": "^0.2.2",
     "@tunnckocore/typescript-config": "^0.3.1",
     "babel-plugin-add-module-exports": "^1.0.2",

jest.test.config.js

@@ -2254,11 +2254,12 @@
     babel-plugin-transform-react-remove-prop-types "^0.4.24"
     babel-preset-proposal-typescript "^1.4.1"
 
-"@tunnckocore/eslint-config@^4.1.4":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@tunnckocore/eslint-config/-/eslint-config-4.1.4.tgz#e6a58d6c9620579d1a55be2db28cd119d1a54e2a"
-  integrity sha512-0HJQ8AapHTvOq0erg3bzCLddqHe7/DNhCvaniXQg1Xr/lC3T7ew6zooIRQ1eDQ6VMRuyxVu5sQFZFR3/b3DuLQ==
+"@tunnckocore/eslint-config@^4.1.5":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@tunnckocore/eslint-config/-/eslint-config-4.1.5.tgz#ea6e63b60f8e9b0f088274ab0c3f74ccfc68b9ac"
+  integrity sha512-xLuXLQt9GLrcBJefdBucTdbFEZSgPXSRatXe7OrqoKYwGZEnC27jOB2TrfU8fB7cHIloP5ATx+r0Mp4BGaA2jA==
   dependencies:
+    "@tunnckocore/utils" "^0.5.1"
     "@typescript-eslint/eslint-plugin" "^2.3.0"
     "@typescript-eslint/parser" "^2.3.0"
     babel-eslint "^10.0.3"