Skip to content

Commit f098d29

Browse files
committedMay 8, 2022
fix: known Windows issues
1 parent 4d8b081 commit f098d29

10 files changed

+11249
-11154
lines changed
 

‎.changeset/pink-ladybugs-prove.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'synckit': patch
3+
---
4+
5+
fix: known Windows issues

‎.changeset/silent-badgers-raise.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
---
44

55
feat: use workerPath as URL for Windows
6-
6+
77
related mdx-js/eslint-mdx#389

‎.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
coverage
22
lib
33
CHANGELOG.md
4-
!/.*.js
4+
!/.*.cjs

‎.eslintrc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
{
2-
"extends": "@1stg",
3-
"rules": {
4-
"unicorn/require-post-message-target-origin": 0
5-
}
2+
"extends": "@1stg"
63
}

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

‎.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ jobs:
4343
PARSER_NO_WATCH: true
4444

4545
- name: Benchmark
46+
if: ${{ matrix.os != 'windows-latest' || matrix.node != '14' }}
4647
run: yarn benchmark
4748

4849
- name: Codecov
50+
if: matrix.os != 'windows-latest'
4951
run: |
5052
yarn global add codecov codacy-coverage
5153
codecov

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
"lint": "run-p lint:*",
4545
"lint:es": "eslint . --cache -f friendly --max-warnings 10",
4646
"lint:tsc": "tsc --noEmit",
47-
"prepare": "simple-git-hooks && yarn-deduplicate --strategy fewer || exit 0",
47+
"prepare": "patch-package && simple-git-hooks && yarn-deduplicate --strategy fewer || exit 0",
4848
"prerelease": "npm run build",
4949
"pretest": "yarn build",
5050
"release": "clean-publish && changeset publish",
51-
"test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
51+
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
5252
"typecov": "type-coverage"
5353
},
5454
"dependencies": {
@@ -63,6 +63,7 @@
6363
"@types/node": "^17.0.31",
6464
"clean-publish": "^4.0.0",
6565
"deasync": "^0.1.26",
66+
"patch-package": "^6.4.7",
6667
"sync-threads": "^1.0.1",
6768
"ts-expect": "^1.3.0",
6869
"ts-jest": "^28.0.1",

‎patches/eslint-mdx+2.0.0-next.2.patch

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/node_modules/eslint-mdx/lib/worker.js b/node_modules/eslint-mdx/lib/worker.js
2+
index 7dd21a5..adaabcc 100644
3+
--- a/node_modules/eslint-mdx/lib/worker.js
4+
+++ b/node_modules/eslint-mdx/lib/worker.js
5+
@@ -8,6 +8,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
6+
const cosmiconfig_1 = require("cosmiconfig");
7+
const synckit_1 = require("synckit");
8+
const helpers_1 = require("./helpers");
9+
+const { pathToFileURL } = require("url");
10+
let acorn;
11+
let tokTypes;
12+
let jsxTokTypes;
13+
@@ -129,7 +130,7 @@ exports.getRemarkProcessor = getRemarkProcessor;
14+
})(acorn.Parser).acornJsx.tokTypes;
15+
}
16+
if (!TokenTranslator) {
17+
- TokenTranslator = (yield (0, helpers_1.loadEsmModule)(path_1.default.resolve(require.resolve('espree/package.json'), '../lib/token-translator.js'))).default;
18+
+ TokenTranslator = (yield (0, helpers_1.loadEsmModule)(pathToFileURL(path_1.default.resolve(require.resolve('espree/package.json'), '../lib/token-translator.js')))).default;
19+
}
20+
const tokenTranslator = new TokenTranslator(Object.assign(Object.assign({}, tokTypes), jsxTokTypes), fileOptions.value);
21+
const root = processor.parse(fileOptions);

‎src/index.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@ function startWorkerThread<R, T extends AnyAsyncFn<R>>(
164164
isTs
165165
? tsUseEsm
166166
? dataUrl(`import '${String(pathToFileURL(finalWorkerPath))}'`)
167-
: `require('ts-node/register');require('${finalWorkerPath}')`
167+
: `require('ts-node/register');require('${finalWorkerPath.replace(
168+
/\\/g,
169+
'\\\\',
170+
)}')`
168171
: pathToFileURL(finalWorkerPath),
169172
{
170173
eval: isTs && !tsUseEsm,

‎yarn.lock

+11,210-11,145
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.