Skip to content

Commit bb040bc

Browse files
overlookmoteloverlookmotel
committed
refactor(parser, linter): replace .mjs files with .js (#14045)
Now that `apps/oxlint` and `napi/parser` are both ESM packages (#13723 and #14042), we can use `.js` file extensions for all ESM files, rather than the mix of `.js` and `.mjs` file we had previously. It's less confusing having to remember what's `.js` and what's `.mjs`, and avoids ugly workarounds like #14038 (`.d.mts`??).
1 parent b1da5d5 commit bb040bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+155
-156
lines changed

‎.github/generated/ast_changes_watch_list.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
src:
55
- '.github/generated/ast_changes_watch_list.yml'
6-
- 'apps/oxlint/src-js/generated/constants.mjs'
6+
- 'apps/oxlint/src-js/generated/constants.js'
77
- 'apps/oxlint/src/generated/raw_transfer_constants.rs'
88
- 'crates/oxc_allocator/src/generated/assert_layouts.rs'
99
- 'crates/oxc_allocator/src/generated/fixed_size_constants.rs'
@@ -66,16 +66,16 @@ src:
6666
- 'crates/oxc_syntax/src/serialize.rs'
6767
- 'crates/oxc_syntax/src/symbol.rs'
6868
- 'crates/oxc_traverse/src/generated/scopes_collector.rs'
69-
- 'napi/parser/generated/constants.mjs'
70-
- 'napi/parser/generated/deserialize/js.mjs'
71-
- 'napi/parser/generated/deserialize/ts.mjs'
72-
- 'napi/parser/generated/lazy/constructors.mjs'
73-
- 'napi/parser/generated/lazy/types.mjs'
74-
- 'napi/parser/generated/lazy/walk.mjs'
75-
- 'napi/parser/generated/visit/keys.mjs'
76-
- 'napi/parser/generated/visit/types.mjs'
77-
- 'napi/parser/generated/visit/visitor.d.mts'
78-
- 'napi/parser/generated/visit/walk.mjs'
69+
- 'napi/parser/generated/constants.js'
70+
- 'napi/parser/generated/deserialize/js.js'
71+
- 'napi/parser/generated/deserialize/ts.js'
72+
- 'napi/parser/generated/lazy/constructors.js'
73+
- 'napi/parser/generated/lazy/types.js'
74+
- 'napi/parser/generated/lazy/walk.js'
75+
- 'napi/parser/generated/visit/keys.js'
76+
- 'napi/parser/generated/visit/types.js'
77+
- 'napi/parser/generated/visit/visitor.d.ts'
78+
- 'napi/parser/generated/visit/walk.js'
7979
- 'napi/parser/src/generated/assert_layouts.rs'
8080
- 'napi/parser/src/generated/derive_estree.rs'
8181
- 'napi/parser/src/generated/raw_transfer_constants.rs'

‎.github/workflows/release_oxlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212

213213
- name: Generate npm packages
214214
run: |
215-
node npm/oxlint/scripts/generate-packages.mjs
215+
node npm/oxlint/scripts/generate-packages.js
216216
cat npm/oxlint/package.json
217217
for package in npm/oxlint*; do cat $package/package.json ; echo ; done
218218

‎apps/oxlint/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "oxlint",
33
"version": "1.16.0",
4+
"type": "module",
45
"main": "dist/index.js",
56
"bin": "dist/cli.js",
6-
"type": "module",
77
"scripts": {
88
"build": "pnpm run build-napi-release && pnpm run build-js",
99
"build-dev": "pnpm run build-napi && pnpm run build-js",

‎apps/oxlint/scripts/build.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ console.log('Copying files from parser...');
2626
const parserFilePaths = [
2727
// Lazy implementation
2828
/*
29-
'src-js/raw-transfer/lazy-common.mjs',
30-
'src-js/raw-transfer/node-array.mjs',
31-
'generated/lazy/constructors.mjs',
32-
'generated/lazy/types.mjs',
33-
'generated/lazy/walk.mjs',
29+
'src-js/raw-transfer/lazy-common.js',
30+
'src-js/raw-transfer/node-array.js',
31+
'generated/lazy/constructors.js',
32+
'generated/lazy/types.js',
33+
'generated/lazy/walk.js',
3434
*/
35-
'generated/deserialize/ts.mjs',
36-
'generated/visit/types.mjs',
37-
'generated/visit/visitor.d.mts',
38-
'generated/visit/walk.mjs',
35+
'generated/deserialize/ts.js',
36+
'generated/visit/types.js',
37+
'generated/visit/visitor.d.ts',
38+
'generated/visit/walk.js',
3939
];
4040

4141
for (const parserFilePath of parserFilePaths) {

apps/oxlint/src-js/generated/constants.mjs renamed to apps/oxlint/src-js/generated/constants.js

File renamed without changes.

‎apps/oxlint/src-js/plugins/lint.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
SOURCE_LEN_OFFSET,
44
// TODO(camc314): we need to generate `.d.ts` file for this module.
55
// @ts-expect-error
6-
} from '../generated/constants.mjs';
6+
} from '../generated/constants.js';
77
import { diagnostics, setupContextForFile } from './context.js';
88
import { registeredRules } from './load.js';
99
import { assertIs } from './utils.js';
@@ -12,15 +12,15 @@ import { addVisitorToCompiled, compiledVisitor, finalizeCompiledVisitor, initCom
1212
// Lazy implementation
1313
/*
1414
// @ts-expect-error we need to generate `.d.ts` file for this module.
15-
import { TOKEN } from '../../dist/src-js/raw-transfer/lazy-common.mjs';
15+
import { TOKEN } from '../../dist/src-js/raw-transfer/lazy-common.js';
1616
// @ts-expect-error we need to generate `.d.ts` file for this module.
17-
import { walkProgram } from '../../dist/generated/lazy/walk.mjs';
17+
import { walkProgram } from '../../dist/generated/lazy/walk.js';
1818
*/
1919

2020
// @ts-expect-error we need to generate `.d.ts` file for this module
21-
import { deserializeProgramOnly } from '../../dist/generated/deserialize/ts.mjs';
21+
import { deserializeProgramOnly } from '../../dist/generated/deserialize/ts.js';
2222
// @ts-expect-error we need to generate `.d.ts` file for this module
23-
import { walkProgram } from '../../dist/generated/visit/walk.mjs';
23+
import { walkProgram } from '../../dist/generated/visit/walk.js';
2424

2525
import type { AfterHook } from './types.ts';
2626

‎apps/oxlint/src-js/plugins/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface Visitor {
66
}
77
*/
88

9-
import type { VisitorObject as Visitor } from '../../dist/generated/visit/visitor.d.mts';
9+
import type { VisitorObject as Visitor } from '../../dist/generated/visit/visitor.d.ts';
1010
export type { Visitor };
1111

1212
// Hook function that runs before traversal.

‎apps/oxlint/src-js/plugins/visitor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@
7575
// Lazy implementation
7676
/*
7777
// TODO(camc314): we need to generate `.d.ts` file for this module.
78-
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../dist/generated/lazy/types.mjs';
78+
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../dist/generated/lazy/types.js';
7979
*/
8080

8181
// TODO(camc314): we need to generate `.d.ts` file for this module.
8282
// @ts-expect-error
83-
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../dist/generated/visit/types.mjs';
83+
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../dist/generated/visit/types.js';
8484
import { assertIs } from './utils.js';
8585

8686
import type { CompiledVisitorEntry, EnterExit, Node, VisitFn, Visitor } from './types.ts';

‎apps/oxlint/test/compile-visitor.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
33
/*
44
// TODO(camc314): we need to generate `.d.ts` file for this module.
55
// @ts-expect-error
6-
import { NODE_TYPE_IDS_MAP } from '../dist/generated/lazy/types.mjs';
6+
import { NODE_TYPE_IDS_MAP } from '../dist/generated/lazy/types.js';
77
*/
88
// TODO(camc314): we need to generate `.d.ts` file for this module
99
// @ts-expect-error
10-
import { NODE_TYPE_IDS_MAP } from '../dist/generated/visit/types.mjs';
10+
import { NODE_TYPE_IDS_MAP } from '../dist/generated/visit/types.js';
1111
import {
1212
addVisitorToCompiled,
1313
compiledVisitor,

apps/oxlint/vitest.config.mts renamed to apps/oxlint/vitest.config.ts

File renamed without changes.

0 commit comments

Comments
 (0)