upgrade mkdirp and rimraf

hoangdv2429 · Apr 11, 2023 · 6a2ee8e · 6a2ee8e
1 parent 6ef31af
commit 6a2ee8e
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 30 deletions.
diff --git a/packages/ast/package.json b/packages/ast/package.json
@@ -78,10 +78,10 @@
     "glob": "8.0.3",
     "jest": "^29.5.0",
     "jest-in-case": "^1.0.2",
-    "mkdirp": "1.0.4",
+    "mkdirp": "3.0.0",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/babel/package.json b/packages/babel/package.json
@@ -71,7 +71,7 @@
     "jest-in-case": "^1.0.2",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/lcd/package.json b/packages/lcd/package.json
@@ -73,7 +73,7 @@
     "jest-in-case": "^1.0.2",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -64,7 +64,7 @@
     "long": "^5.2.1",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },
@@ -75,6 +75,6 @@
     "dotty": "0.1.2",
     "glob": "8.0.3",
     "minimatch": "5.1.0",
-    "mkdirp": "1.0.4"
+    "mkdirp": "3.0.0"
   }
 }
diff --git a/packages/telescope/README.md b/packages/telescope/README.md
@@ -131,7 +131,7 @@ Install helpers and cosmjs [dependencies listed here](#dependencies)
 ```js
 import { join } from 'path';
 import telescope from '@osmonauts/telescope';
-import { sync as rimraf } from 'rimraf';
+import { rimrafSync as rimraf } from 'rimraf';
 
 const protoDirs = [join(__dirname, '/../proto')];
 const outPath = join(__dirname, '../src/codegen');

diff --git a/packages/telescope/package.json b/packages/telescope/package.json
@@ -99,9 +99,9 @@
     "long": "^5.2.1",
     "minimatch": "5.1.0",
     "minimist": "1.2.8",
-    "mkdirp": "1.0.4",
+    "mkdirp": "3.0.0",
     "parse-package-name": "1.0.0",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "shelljs": "0.8.5"
   }
 }
diff --git a/packages/telescope/src/commands/install.ts b/packages/telescope/src/commands/install.ts
@@ -1,7 +1,7 @@
 import { resolve, join, dirname, basename, extname } from 'path';
-import { sync as mkdirp } from 'mkdirp';
+import { mkdirp } from 'mkdirp';
 import { sync as glob } from 'glob';
-import { sync as rimraf } from 'rimraf';
+import { rimrafSync as rimraf } from 'rimraf';
 import { exec } from 'shelljs';
 import { prompt } from '../prompt';
 import { parse } from 'parse-package-name';
@@ -130,7 +130,7 @@ export default async (argv) => {
     for (const [src, dst, pkg] of cmds) {
         rimraf(dst);
         console.log(`installing ${pkg}...`);
-        mkdirp(dirname(dst));
+        mkdirp.sync(dirname(dst));
         exec(`mv ${src} ${dst}`);
     }
 

diff --git a/packages/telescope/src/contracts/install.ts b/packages/telescope/src/contracts/install.ts
@@ -1,7 +1,7 @@
 import { resolve, join, dirname, basename, extname } from 'path';
-import { sync as mkdirp } from 'mkdirp';
 import { sync as glob } from 'glob';
-import { sync as rimraf } from 'rimraf';
+import { mkdirp } from 'mkdirp';
+import { rimrafSync as rimraf } from 'rimraf';
 import { exec } from 'shelljs';
 import { prompt } from '../prompt';
 import { parse } from 'parse-package-name';
@@ -66,7 +66,7 @@ export default async (argv) => {
     // install
     if (!Array.isArray(pkg)) pkg = [pkg];
     const tmp = join(TMPDIR, rnd());
-    mkdirp(tmp);
+    mkdirp.sync(tmp);
     process.chdir(tmp);
     exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`);
 
@@ -95,7 +95,7 @@ export default async (argv) => {
     for (const [src, dst, pkg] of cmds) {
         rimraf(dst);
         console.log(`installing ${pkg}...`);
-        mkdirp(dirname(dst));
+        mkdirp.sync(dirname(dst));
         exec(`mv ${src} ${dst}`);
     }
 

diff --git a/packages/telescope/src/generators/create-helpers.ts b/packages/telescope/src/generators/create-helpers.ts
@@ -1,5 +1,5 @@
 import { join, dirname } from 'path';
-import { sync as mkdirp } from 'mkdirp';
+import { mkdirp } from 'mkdirp';
 import { TelescopeBuilder } from '../builder';
 import pkg from '../../package.json';
 import { writeContentToFile } from '../utils/files';
@@ -19,14 +19,14 @@ const write = (
   content: string
 ) => {
   const indexOutFile = join(builder.outPath, indexFile);
-  mkdirp(dirname(indexOutFile));
+  mkdirp.sync(dirname(indexOutFile));
   writeContentToFile(builder.outPath, builder.options, header + content, indexOutFile);
 }
 
 export const plugin = (
   builder: TelescopeBuilder
 ) => {
-  write(builder, 'helpers.ts', builder.options.prototypes.typingsFormat.longLibrary === 'bigint' ? internalForBigInt :internal);
+  write(builder, 'helpers.ts', builder.options.prototypes.typingsFormat.longLibrary === 'bigint' ? internalForBigInt : internal);
 
   // should be exported
   if (builder.options.includeExternalHelpers || builder.options.reactQuery?.enabled) {

diff --git a/packages/telescope/src/generators/create-index.ts b/packages/telescope/src/generators/create-index.ts
@@ -1,6 +1,6 @@
 import { getRelativePath } from '../utils';
 import { join, dirname } from 'path';
-import { sync as mkdirp } from 'mkdirp';
+import { mkdirp } from 'mkdirp';
 import { TelescopeBuilder } from '../builder';
 import * as t from '@babel/types';
 import generate from '@babel/generator';
@@ -27,7 +27,7 @@ export const plugin = (
     );
     const finalAst = t.program(stmts);
     const indexContent = generate(finalAst).code;
-    mkdirp(dirname(indexOutFile));
+    mkdirp.sync(dirname(indexOutFile));
 
     const header = `/**
   * This file and any referenced files were automatically generated by ${pkg.name}@${version}

diff --git a/packages/telescope/src/generators/create-types.ts b/packages/telescope/src/generators/create-types.ts
@@ -5,7 +5,7 @@ import { buildAllImports } from '../imports';
 import { parse } from '../parse';
 import { writeFileSync } from 'fs';
 import { dirname } from 'path';
-import { sync as mkdirp } from 'mkdirp';
+import { mkdirp } from 'mkdirp';
 import { ProtoRef } from '@osmonauts/types';
 import { getNestedProto, isRefExcluded } from '@osmonauts/proto-parser';
 import { createRpcClientClass, createRpcClientInterface, createRpcQueryExtension } from '@osmonauts/ast';
@@ -75,7 +75,7 @@ export const plugin = (
         if (context.body.length > 0) {
             bundler.writeAst(prog, filename);
         } else {
-            mkdirp(dirname(filename));
+            mkdirp.sync(dirname(filename));
             writeFileSync(filename, `export {}`);
         }
 

diff --git a/packages/telescope/src/utils/files.ts b/packages/telescope/src/utils/files.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { parse, ParserPlugin } from '@babel/parser';
 import { TelescopeOptions } from '@osmonauts/types';
-import { sync as mkdirp } from 'mkdirp';
+import { mkdirp } from 'mkdirp';
 import { writeFileSync } from 'fs';
 import { dirname } from 'path';
 import minimatch from 'minimatch';
@@ -73,6 +73,6 @@ export const writeContentToFile = (
     }
 
     const text = tsLintPrefix + esLintPrefix + content;
-    mkdirp(dirname(filename));
+    mkdirp.sync(dirname(filename));
     writeFileSync(filename, text);
 }
diff --git a/packages/test/package.json b/packages/test/package.json
@@ -81,11 +81,11 @@
     "glob": "8.0.3",
     "jest": "^29.5.0",
     "jest-in-case": "^1.0.2",
-    "mkdirp": "1.0.4",
+    "mkdirp": "3.0.0",
     "mobx": "6.9.0",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/test/scripts/codegen.js b/packages/test/scripts/codegen.js
@@ -1,6 +1,6 @@
 import { join } from 'path';
 import telescope from '@osmonauts/telescope';
-import { sync as rimraf } from 'rimraf';
+import { rimrafSync as rimraf } from 'rimraf';
 
 const protoDirs = [join(__dirname, '/../../../__fixtures__/chain1')];
 const outPath = join(__dirname, '/../src/codegen');

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -69,7 +69,7 @@
     "jest-in-case": "^1.0.2",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -74,7 +74,7 @@
     "jest-in-case": "^1.0.2",
     "prettier": "^2.8.7",
     "regenerator-runtime": "^0.13.11",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -6329,6 +6329,16 @@ [email protected]:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+glob@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.npmjs.org/glob/-/glob-10.0.0.tgz#034ab2e93644ba702e769c3e0558143d3fbd1612"
+  integrity sha512-zmp9ZDC6NpDNLujV2W2n+3lH+BafIVZ4/ct+Yj3BMZTH/+bgm/eVjHzeFLwxJrrIGgjjS2eiQLlpurHsNlEAtQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    minimatch "^9.0.0"
+    minipass "^5.0.0"
+    path-scurry "^1.6.4"
+
 glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -7879,6 +7889,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.1.tgz#ac061ed291f8b9adaca2b085534bb1d3b61bef83"
+  integrity sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg==
+
 lru-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -8084,6 +8099,13 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56"
+  integrity sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 [email protected]:
   version "4.1.0"
   resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -8165,6 +8187,11 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -8199,6 +8226,11 @@ [email protected], mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+[email protected]:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.0.tgz#758101231418bda24435c0888a91d9bd91f1372d"
+  integrity sha512-7+JDnNsyCvZXoUJdkMR0oUE2AmAdsNXGTmRbiOjYIwQ6q+bL6NwrozGQdPcmYaNcrhH37F50HHBUzoaBV6FITQ==
+
 mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -8822,6 +8854,14 @@ path-parse@^1.0.7:
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.6.4:
+  version "1.6.4"
+  resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.4.tgz#020a9449e5382a4acb684f9c7e1283bc5695de66"
+  integrity sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg==
+  dependencies:
+    lru-cache "^9.0.0"
+    minipass "^5.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -9434,6 +9474,13 @@ [email protected], rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+[email protected]:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.0.tgz#5bda14e410d7e4dd522154891395802ce032c2cb"
+  integrity sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==
+  dependencies:
+    glob "^10.0.0"
+
 rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"