Fixes (#1978)

remusao · Mar 7, 2024 · dfb3a36 · dfb3a36
1 parent d4687da
commit dfb3a36
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 65 deletions.
diff --git a/.mocharc.js → .mocharc.cjs b/.mocharc.js → .mocharc.cjs
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "packages/*"
   ],
   "scripts": {
+    "postinstall": "patch-package",
     "bootstrap": "yarn install --frozen-lock",
     "build": "tsc --build ./tsconfig.project.json && lerna run build",
     "watch": "tsc --build ./tsconfig.project.json --watch",
@@ -50,11 +51,12 @@
   "devDependencies": {
     "@types/node": "^20.2.3",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/parser": "^7.1.1",
     "auto": "^11.1.1",
     "benchmark": "^2.1.4",
     "eslint": "^8.45.0",
     "lerna": "^8.1.2",
+    "patch-package": "^8.0.0",
     "ts-node": "^10.0.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/tldts-core/package.json b/packages/tldts-core/package.json
@@ -48,15 +48,15 @@
     "build": "tsc --build ./tsconfig.json",
     "bundle": "tsc --build ./tsconfig.bundle.json && rollup --config ./rollup.config.ts --configPlugin typescript",
     "prepack": "yarn run bundle",
-    "test": "nyc mocha --config ../../.mocharc.js"
+    "test": "nyc mocha --config ../../.mocharc.cjs"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-typescript": "^11.0.0",
     "@types/chai": "^4.2.18",
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.2.3",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "mocha": "^10.1.0",
     "nyc": "^15.0.1",
     "rimraf": "^5.0.1",

diff --git a/packages/tldts-experimental/package.json b/packages/tldts-experimental/package.json
@@ -48,7 +48,7 @@
     "build": "tsc --build ./tsconfig.json",
     "bundle": "tsc --build ./tsconfig.bundle.json && rollup --config ./rollup.config.mjs",
     "prepack": "yarn run bundle",
-    "test": "mocha --config ../../.mocharc.js"
+    "test": "mocha --config ../../.mocharc.cjs"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -57,7 +57,7 @@
     "@types/chai": "^4.2.18",
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.2.3",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "mocha": "^10.1.0",
     "nyc": "^15.0.1",
     "rimraf": "^5.0.1",

diff --git a/packages/tldts-icann/package.json b/packages/tldts-icann/package.json
@@ -48,7 +48,7 @@
     "build": "tsc --build ./tsconfig.json",
     "bundle": "tsc --build ./tsconfig.bundle.json && rollup --config ./rollup.config.mjs",
     "prepack": "yarn run bundle",
-    "test": "nyc mocha --config ../../.mocharc.js"
+    "test": "nyc mocha --config ../../.mocharc.cjs"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -57,7 +57,7 @@
     "@types/chai": "^4.2.18",
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.2.3",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "mocha": "^10.1.0",
     "nyc": "^15.0.1",
     "rimraf": "^5.0.1",

diff --git a/packages/tldts-tests/package.json b/packages/tldts-tests/package.json
@@ -50,10 +50,6 @@
     "prepack": "yarn run bundle"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.11",
-    "@types/mocha": "^10.0.0",
-    "chai": "^4.2.0",
-    "nyc": "^15.0.1",
     "rimraf": "^5.0.1",
     "tldts-utils": "^6.1.12",
     "ts-node": "^10.0.0",
@@ -62,7 +58,7 @@
   "dependencies": {
     "@types/chai": "^4.2.18",
     "@types/mocha": "^10.0.0",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "mocha": "^10.1.0"
   }
 }
diff --git a/packages/tldts-utils/package.json b/packages/tldts-utils/package.json
@@ -34,7 +34,7 @@
     "build": "tsc --build ./tsconfig.json",
     "bundle": "tsc --build ./tsconfig.bundle.json && rollup --config ./rollup.config.ts --configPlugin typescript",
     "prepack": "yarn run bundle",
-    "test": "nyc mocha --config ../../.mocharc.js"
+    "test": "nyc mocha --config ../../.mocharc.cjs"
   },
   "dependencies": {
     "punycode": "^2.3.1"
@@ -46,7 +46,7 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.2.3",
     "@types/punycode": "^2.1.3",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "nyc": "^15.0.1",
     "rimraf": "^5.0.1",
     "rollup": "^4.1.0",

diff --git a/packages/tldts/package.json b/packages/tldts/package.json
@@ -51,7 +51,7 @@
     "build": "tsc --build ./tsconfig.json",
     "bundle": "tsc --build ./tsconfig.bundle.json && rollup --config ./rollup.config.mjs",
     "prepack": "yarn run bundle",
-    "test": "nyc mocha --config ../../.mocharc.js"
+    "test": "nyc mocha --config ../../.mocharc.cjs"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -60,7 +60,7 @@
     "@types/chai": "^4.2.18",
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.2.3",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "mocha": "^10.1.0",
     "nyc": "^15.0.1",
     "rimraf": "^5.0.1",

diff --git a/patches/get-monorepo-packages+1.2.0.patch b/patches/get-monorepo-packages+1.2.0.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/get-monorepo-packages/index.js b/node_modules/get-monorepo-packages/index.js
+index aacacb1..fea1161 100644
+--- a/node_modules/get-monorepo-packages/index.js
++++ b/node_modules/get-monorepo-packages/index.js
+@@ -33,7 +33,7 @@ const getPackages = directory => {
+   const lernaJsonPath = path.join(directory, 'lerna.json');
+   if (fs.existsSync(lernaJsonPath)) {
+     const lernaJson = loadJsonFile.sync(lernaJsonPath);
+-    if (!lernaJson.useWorkspaces) {
++    if (false) {
+       return findPackages(lernaJson.packages, directory);
+     }
+   }