fix: yarn pnp with patch for demo

JounQin · JounQin · commit 5ef37f10bf27 · 2022-07-05T12:45:40.000+08:00
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,5 @@
 dist
 lib
 CHANGELOG.md
-!/.*.cjs
-/.pnp.*
+.pnp.*
+!.*.cjs
diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,8 @@
 {
   "root": true,
+  "env": {
+    "node": true
+  },
   "parserOptions": {
     "ecmaVersion": "latest"
   },
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,11 @@
 .type-coverage
-.yarn
 lib
 node_modules
 *.log
 .eslintcache
-!/.yarn/plugins
-!/.yarn/releases
-!/.yarn/versions
-!/.pnp.*
+!.pnp.*
+.yarn
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,7 @@
+.type-coverage
+dist
 lib
 node_modules
 CHANGELOG.md
+.pnp.*
+.yarn
diff --git a/.yarn/patches/get-tsconfig-npm-4.1.0-625beb501f.patch b/.yarn/patches/get-tsconfig-npm-4.1.0-625beb501f.patch
diff --git a/dummy.js/package.json b/dummy.js/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "dummy.js",
-    "version": "1.0.0",
-    "main": "index.js",
-    "private": true
+  "name": "dummy.js",
+  "version": "1.0.0",
+  "private": true,
+  "main": "index.js"
 }
diff --git a/package.json b/package.json
@@ -115,19 +115,21 @@
     "@types/node": "^18.0.0",
     "@types/unist": "^2.0.6",
     "commitlint": "^17.0.3",
+    "cross-env": "^7.0.3",
     "dummy.js": "link:dummy.js",
     "eslint": "^8.19.0",
     "eslint-import-resolver-typescript": "link:.",
     "eslint-plugin-import": "^2.26.0",
-    "esprima": "^4.0.1",
     "lint-staged": "^13.0.3",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.7.1",
     "react": "^18.2.0",
     "simple-git-hooks": "^2.8.0",
     "type-coverage": "^2.21.2",
     "typescript": "^4.7.4"
   },
   "resolutions": {
+    "get-tsconfig": "patch:get-tsconfig@npm:4.1.0#.yarn/patches/get-tsconfig-npm-4.1.0-625beb501f.patch",
     "prettier": "^2.7.1"
   },
   "dependenciesMeta": {
diff --git a/src/index.ts b/src/index.ts
@@ -265,7 +265,7 @@ const isFile = (path?: string | undefined): path is string => {
 function getMappedPath(
   source: string,
   file: string,
-  extensions = defaultExtensions,
+  extensions: string[] = defaultExtensions,
   retry?: boolean,
 ): string | undefined {
   const originalExtensions = extensions
diff --git a/tests/baseEslintConfig.cjs b/tests/baseEslintConfig.cjs
@@ -34,4 +34,12 @@ module.exports = project => ({
     'node/no-extraneous-import': 0,
     'node/no-missing-import': 0,
   },
+  overrides: [
+    {
+      files: '**/.*.cjs',
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+      },
+    },
+  ],
 })
diff --git a/tests/multipleEslintrcs/module-a/.eslintrc.cjs b/tests/multipleEslintrcs/module-a/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../baseEslintConfig.cjs')(__dirname)
diff --git a/tests/multipleEslintrcs/module-a/.eslintrc.js b/tests/multipleEslintrcs/module-a/.eslintrc.js
diff --git a/tests/multipleEslintrcs/module-b/.eslintrc.cjs b/tests/multipleEslintrcs/module-b/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../baseEslintConfig.cjs')(__dirname)
diff --git a/tests/multipleEslintrcs/module-b/.eslintrc.js b/tests/multipleEslintrcs/module-b/.eslintrc.js
diff --git a/tests/multipleTsconfigs/.eslintrc.cjs b/tests/multipleTsconfigs/.eslintrc.cjs
@@ -0,0 +1,8 @@
+const path = require('path')
+
+const globPattern = './packages/*/tsconfig.json'
+
+// in normal cases this is not needed because the __dirname would be the root
+const absoluteGlobPath = path.join(__dirname, globPattern)
+
+module.exports = require('../baseEslintConfig.cjs')(absoluteGlobPath)
diff --git a/tests/multipleTsconfigs/.eslintrc.js b/tests/multipleTsconfigs/.eslintrc.js
diff --git a/tests/withJsExtension/.eslintrc.cjs b/tests/withJsExtension/.eslintrc.cjs
@@ -1,6 +1,6 @@
 /* eslint-env node */
 /* eslint-disable @typescript-eslint/no-var-requires */
-const config = require('../baseEslintConfig')(__dirname)
+const config = require('../baseEslintConfig.cjs')(__dirname)
 
 module.exports = {
   ...config,
diff --git a/tests/withJsExtension/test.js b/tests/withJsExtension/test.js
@@ -124,7 +124,7 @@ assertResolve('bar', 'bar/index.tsx')
 
 assertResolve(
   'typescript/lib/typescript.js',
-  '../../node_modules/typescript/lib/typescript.js',
+  path.relative(__dirname, require.resolve('typescript/lib/typescript.js')),
 )
 
 // resolves symlinks by default
diff --git a/tests/withPaths/.eslintrc.cjs b/tests/withPaths/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../baseEslintConfig.cjs')(__dirname)
diff --git a/tests/withPaths/.eslintrc.js b/tests/withPaths/.eslintrc.js
diff --git a/tests/withPathsAndNestedBaseUrl/.eslintrc.cjs b/tests/withPathsAndNestedBaseUrl/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../baseEslintConfig.cjs')(__dirname)
diff --git a/tests/withPathsAndNestedBaseUrl/.eslintrc.js b/tests/withPathsAndNestedBaseUrl/.eslintrc.js
diff --git a/tests/withQuerystring/.eslintrc.cjs b/tests/withQuerystring/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../baseEslintConfig.cjs')(__dirname)
diff --git a/tests/withQuerystring/.eslintrc.js b/tests/withQuerystring/.eslintrc.js
diff --git a/tests/withoutPaths/.eslintrc.cjs b/tests/withoutPaths/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../baseEslintConfig.cjs')(__dirname)
diff --git a/tests/withoutPaths/.eslintrc.js b/tests/withoutPaths/.eslintrc.js
diff --git a/yarn.lock b/yarn.lock
@@ -6399,19 +6399,20 @@ __metadata:
     "@types/node": ^18.0.0
     "@types/unist": ^2.0.6
     commitlint: ^17.0.3
+    cross-env: ^7.0.3
     debug: ^4.3.4
     dummy.js: "link:dummy.js"
     enhanced-resolve: ^5.10.0
     eslint: ^8.19.0
     eslint-import-resolver-typescript: "link:."
     eslint-plugin-import: ^2.26.0
-    esprima: ^4.0.1
     get-tsconfig: ^4.1.0
     globby: ^13.1.2
     is-core-module: ^2.9.0
     is-glob: ^4.0.3
     lint-staged: ^13.0.3
     npm-run-all: ^4.1.5
+    prettier: ^2.7.1
     react: ^18.2.0
     simple-git-hooks: ^2.8.0
     synckit: ^0.7.1
@@ -7624,13 +7625,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-tsconfig@npm:^4.1.0":
+"get-tsconfig@npm:4.1.0":
   version: 4.1.0
   resolution: "get-tsconfig@npm:4.1.0"
   checksum: a1a29cdf53609a1e9e111bf863ea209494c03e425964ed2603e3a2657ed1d38213d4a8e3efbfd945f2ec908fe99b76d3ee87422fac5d8ec4fdd858bbb502efbf
   languageName: node
   linkType: hard
 
+"get-tsconfig@patch:get-tsconfig@npm:4.1.0#.yarn/patches/get-tsconfig-npm-4.1.0-625beb501f.patch::locator=eslint-import-resolver-typescript%40workspace%3A.":
+  version: 4.1.0
+  resolution: "get-tsconfig@patch:get-tsconfig@npm%3A4.1.0#.yarn/patches/get-tsconfig-npm-4.1.0-625beb501f.patch::version=4.1.0&hash=2ea638&locator=eslint-import-resolver-typescript%40workspace%3A."
+  checksum: 2906b7505f3a322f2d30e80cc08ba86d6d28c38f3df02c96ea0d6afb5d247a8a0f5dbd36f5ad23771d90e7800780fac8dfa0c6f5dc5672a6388667d10043a842
+  languageName: node
+  linkType: hard
+
 "git-raw-commits@npm:^2.0.0":
   version: 2.0.11
   resolution: "git-raw-commits@npm:2.0.11"

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 dist
 lib
 CHANGELOG.md
 -!/.*.cjs
 -/.pnp.*
 +.pnp.*
 +!.*.cjs
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"root": true,`
	`3`	`+ "env": {`
	`4`	`+ "node": true`
	`5`	`+ },`
`3`	`6`	`"parserOptions": {`
`4`	`7`	`"ecmaVersion": "latest"`
`5`	`8`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "name": "dummy.js",`
`3`		`- "version": "1.0.0",`
`4`		`- "main": "index.js",`
`5`		`- "private": true`
	`2`	`+ "name": "dummy.js",`
	`3`	`+ "version": "1.0.0",`
	`4`	`+ "private": true,`
	`5`	`+ "main": "index.js"`
`6`	`6`	`}`