Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/parser/gjs-gts-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ module.exports = {

let result = null;
const filePath = options.filePath;
if (options.project) {
if (options.project || options.projectService) {
jsCode = replaceExtensions(jsCode);
}

Expand Down
9 changes: 8 additions & 1 deletion test-projects/configs/flat-ts/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ import n from 'eslint-plugin-n';
import globals from 'globals';
import ts from 'typescript-eslint';


import { createRequire } from 'node:module';
const require = createRequire(import.meta.url);
const manifestPath = require.resolve('@typescript-eslint/parser/package.json');
const manifest = require(manifestPath);
const isV8 = parseInt(manifest.version[0]) >= 8;

const parserOptions = {
esm: {
js: {
Expand All @@ -29,7 +36,7 @@ const parserOptions = {
},
ts: {
projectService: true,
project: true,
...(isV8 ? {} : { project: true }),
tsconfigRootDir: import.meta.dirname,
},
},
Expand Down
1 change: 0 additions & 1 deletion test-projects/configs/flat-ts/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"include": ["src/**/*", "unpublished-development-types/**/*"],
"compilerOptions": {
"allowJs": true,
"declarationDir": "declarations",
Expand Down
14 changes: 11 additions & 3 deletions test-projects/gjs-types/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,24 @@
const path = require('path');

const parserOptions = {};
if (process.env.PROJECT_SERVICE) {
// if (process.env.PROJECT_SERVICE) {
parserOptions.projectService = {
defaultProject: process.env.DEFAULT_PROJECT || 'tsconfig.json',
defaultProject: process.env.DEFAULT_PROJECT || process.env.PROJECT || 'tsconfig.json',
allowDefaultProject: process.env.ALLOW_DEFAULT_PROJECT === 'true' ? ['**/*.js'] : []
};
}
// }

parserOptions.tsconfigRootDir = process.env.TSCONFIG_ROOT_DIR || __dirname;
parserOptions.project = process.env.PROJECT === undefined ? true : process.env.PROJECT;

const manifestPath = require.resolve('@typescript-eslint/parser/package.json');
const manifest = require(manifestPath);
const isV8 = parseInt(manifest.version[0]) >= 8;

if (isV8) {
delete parserOptions.project;
}

module.exports = {
root: true,
parserOptions,
Expand Down
6 changes: 5 additions & 1 deletion test-projects/gts/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
'use strict';

const manifestPath = require.resolve('@typescript-eslint/parser/package.json');
const manifest = require(manifestPath);
const isV8 = parseInt(manifest.version[0]) >= 8;

module.exports = {
root: true,
parserOptions: {
project: true,
...(isV8 ? {} : { project: true }),
projectService: true,
tsconfigRootDir: __dirname
},
Expand Down