bump deps and upgrade typescript to 5.0

zCloak-Network · Mar 15, 2023 · 3032930 · 3032930
1 parent 8f7de10
commit 3032930
Show file tree

Hide file tree

Showing 23 changed files with 5,498 additions and 6,224 deletions.
diff --git a/.changeset/spicy-months-bake.md b/.changeset/spicy-months-bake.md
@@ -0,0 +1,6 @@
+---
+"@zcloak/lint": minor
+"@zcloak/dev": minor
+---
+
+bump deps, upgrade typescript to 5.0
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-version.cjs b/.yarn/plugins/@yarnpkg/plugin-version.cjs
diff --git a/.yarn/releases/yarn-3.3.0.cjs b/.yarn/releases/yarn-3.3.0.cjs
diff --git a/.yarn/releases/yarn-4.0.0-rc.40.cjs b/.yarn/releases/yarn-4.0.0-rc.40.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -4,10 +4,4 @@ enableProgressBars: false
 
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: "@yarnpkg/plugin-version"
-
-yarnPath: .yarn/releases/yarn-3.3.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.0-rc.40.cjs
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "homepage": "https://github.com/zCloak-Network/toolkit#readme",
   "license": "Apache-2.0",
   "name": "zcloak-toolkit",
-  "packageManager": "yarn@3.3.0",
+  "packageManager": "yarn@4.0.0-rc.40",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/packages/dev/package.json b/packages/dev/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.0",
+    "@babel/core": "^7.21.3",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-numeric-separator": "^7.18.6",
     "@babel/plugin-proposal-optional-chaining": "^7.21.0",
@@ -61,8 +61,8 @@
     "@changesets/cli": "^2.26.0",
     "@manypkg/get-packages": "^2.1.0",
     "@rushstack/eslint-patch": "^1.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^5.54.1",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
     "@zcloak/lint": "workspace:^",
     "babel-jest": "^29.5.0",
     "babel-plugin-module-extension-resolver": "^1.0.0",
@@ -72,7 +72,7 @@
     "conventional-changelog": "^3.1.25",
     "conventional-recommended-bump": "^6.1.0",
     "coveralls": "^3.1.1",
-    "eslint": "^8.35.0",
+    "eslint": "^8.36.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-import-resolver-node": "^0.3.7",
@@ -91,7 +91,7 @@
     "fs-extra": "^11.1.0",
     "gh-pages": "^5.0.0",
     "gh-release": "^7.0.2",
-    "glob": "^9.2.1",
+    "glob": "^9.3.0",
     "glob2base": "^0.0.12",
     "jest": "^29.5.0",
     "jest-cli": "^29.5.0",
@@ -104,19 +104,19 @@
     "mkdirp": "^2.1.5",
     "prettier": "^2.8.4",
     "rimraf": "^4.4.0",
-    "typescript": "^4.9.5",
-    "webpack": "^5.76.0",
+    "typescript": "^5.0.1-rc",
+    "webpack": "^5.76.1",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack-dev-server": "^4.12.0",
     "webpack-merge": "^5.8.0",
     "webpack-subresource-integrity": "^5.2.0-rc.1",
     "yargs": "^17.7.1"
   },
   "devDependencies": {
     "@types/conventional-changelog": "^3.1.1",
     "@types/conventional-recommended-bump": "^6.1.0",
-    "@types/jest": "^29.4.0",
-    "@types/node": "^18.14.6",
+    "@types/jest": "^29.4.2",
+    "@types/node": "^18.15.3",
     "@types/react": "^18.0.28",
     "@types/yargs": "^17.0.22",
     "react": "^18.2.0"

diff --git a/packages/dev/src/index.spec.ts b/packages/dev/src/index.spec.ts
@@ -1,8 +1,8 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { adder, blah } from './test1';
-import { echo } from '.';
+import { adder, blah } from './test1/index.js';
+import { echo } from './index.js';
 
 describe('index', () => {
   it('runs the echo function', () => {

diff --git a/packages/dev/src/index.ts b/packages/dev/src/index.ts
@@ -1,12 +1,12 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { BlahType } from '@zcloak/dev/types';
-import type { EchoString } from './types';
+import type { BlahType } from '@zcloak/dev/types.js';
+import type { EchoString } from './types.js';
 
-import { foo } from './test1/foo';
-import { adder, blah } from './test1';
-import { addThree } from './util';
+import { foo } from './test1/foo.js';
+import { adder, blah } from './test1/index.js';
+import { addThree } from './util.js';
 
 const SOMETHING = {
   a: 1,

diff --git a/packages/dev/src/test1/circ1.ts b/packages/dev/src/test1/circ1.ts
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { circ2 } from './circ2';
+import { circ2 } from './circ2.js';
 
 // we leave this as a warning... just a test
 export function circ1(): number {

diff --git a/packages/dev/src/test1/circ2.ts b/packages/dev/src/test1/circ2.ts
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { circ1 } from './circ1';
+import { circ1 } from './circ1.js';
 
 export function circ2(): void {
   circ1();

diff --git a/packages/dev/src/test1/index.spec.ts b/packages/dev/src/test1/index.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import index, { blah } from '.';
+import index, { blah } from './index.js';
 
 describe('index', () => {
   it('runs the test', () => {

diff --git a/packages/dev/src/test1/index.ts b/packages/dev/src/test1/index.ts
@@ -1,8 +1,8 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { circ1 } from './circ1';
-export { circ2 } from './circ2';
+export { circ1 } from './circ1.js';
+export { circ2 } from './circ2.js';
 
 /**
  * Some first test link

diff --git a/packages/dev/src/test2/index.ts b/packages/dev/src/test2/index.ts
@@ -1,6 +1,6 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import bar from './bar';
+import bar from './bar.js';
 
 export { bar };
diff --git a/packages/dev/src/testRoot.ts b/packages/dev/src/testRoot.ts
diff --git a/packages/dev/src/tester.ts b/packages/dev/src/tester.ts
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { tester } from '.';
+import { tester } from './index.js';
 
 tester();
 

diff --git a/packages/lint/package.json b/packages/lint/package.json
@@ -20,13 +20,13 @@
   "version": "0.21.0",
   "dependencies": {
     "chalk": "^5.2.0",
-    "glob": "^9.2.1",
+    "glob": "^9.3.0",
     "parse-imports-ts": "^1.0.3",
     "throat": "^6.0.2"
   },
   "devDependencies": {
     "@types/glob": "^8.1.0",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.4.2",
     "react": "^18.2.0"
   }
 }
diff --git a/packages/lint/src/index.ts b/packages/lint/src/index.ts
@@ -1,4 +1,4 @@
 // Copyright 2021-2023 zcloak authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export * from './lintDependencies';
+export * from './lintDependencies.js';
diff --git a/packages/lint/src/lintDependencies.ts b/packages/lint/src/lintDependencies.ts
@@ -7,12 +7,12 @@ import { ImportedPackageType, parse as parseTs } from 'parse-imports-ts';
 import { join } from 'path';
 import throatFactory from 'throat';
 
-import { error } from './feedback';
-import { readFileAsync } from './fs';
-import { PackageJson, readPackageJson } from './package-json';
+import { error } from './feedback.js';
+import { readFileAsync } from './fs.js';
+import { PackageJson, readPackageJson } from './package-json.js';
 
 const MAX_NUMBER_OF_FILES_CONCURENTLY_OPENED = 50;
-const throat = throatFactory(MAX_NUMBER_OF_FILES_CONCURENTLY_OPENED);
+const throat = throatFactory.default(MAX_NUMBER_OF_FILES_CONCURENTLY_OPENED);
 
 const ignoredDependencies = [
   // node

diff --git a/packages/lint/src/package-json.ts b/packages/lint/src/package-json.ts
@@ -3,7 +3,7 @@
 
 import { resolve } from 'path';
 
-import { readFileAsync } from './fs';
+import { readFileAsync } from './fs.js';
 
 export interface PackageJson {
   name: string;

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -2,12 +2,14 @@
   "extends": "@zcloak/dev/config/tsconfig.json",
   "compilerOptions": {
     "composite": true,
+    "moduleResolution": "nodenext",
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
     "paths": {
       "@zcloak/dev": ["dev/src"],
       "@zcloak/dev/*": ["dev/src/*"],
       "@zcloak/lint": ["lint/src"],
       "@zcloak/lint/*": ["lint/src/*"]
-    },
-    "skipLibCheck": true
+    }
   }
 }