Merge pull request #127 from gitKrystan/upgrade-typescript

Author: gitKrystan

.eslintrc.js

@@ -16,7 +16,7 @@ module.exports = {
     project: './tsconfig.lint.json',
     allowAutomaticSingleRunInference: true,
   },
-  plugins: ['@typescript-eslint', 'jsdoc', 'unicorn'],
+  plugins: ['@typescript-eslint', 'jsdoc', 'unicorn', 'simple-import-sort'],
   root: true,
   reportUnusedDisableDirectives: true,
   rules: {
@@ -30,13 +30,7 @@ module.exports = {
     ],
     '@typescript-eslint/consistent-type-assertions': 'error',
     '@typescript-eslint/consistent-type-definitions': 'error',
-    '@typescript-eslint/consistent-type-imports': [
-      'error',
-      {
-        prefer: 'type-imports',
-        fixStyle: 'inline-type-imports',
-      },
-    ],
+    '@typescript-eslint/consistent-type-imports': 'error',
     '@typescript-eslint/explicit-function-return-type': [
       'error',
       { allowExpressions: true },
@@ -76,6 +70,8 @@ module.exports = {
     'jsdoc/require-param': 'off',
     'jsdoc/require-param-type': 'off',
     'jsdoc/tag-lines': 'off',
+    'simple-import-sort/imports': 'error',
+    'simple-import-sort/exports': 'error',
     'unicorn/consistent-function-scoping': [
       'error',
       { checkArrowFunctions: false },

.vscode/settings.json

@@ -10,7 +10,6 @@
   // Turn off this formatter so Prettier will be the only formatter and the user won't have to pick.
   "javascript.format.enable": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll": true,
-    "source.organizeImports": true
+    "source.fixAll": true
   }
 }

package.json

@@ -32,8 +32,8 @@
     "build": "tsc && vite build",
     "preexample": "vite build",
     "example": "pnpm preexample && cd examples && pnpm example",
-    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
-    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
+    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\" --prefix-colors auto",
+    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\" --prefix-colors auto",
     "lint:eslint": "eslint . --cache",
     "lint:eslint:fix": "eslint . --fix",
     "lint:prettier": "prettier --check .",
@@ -42,7 +42,7 @@
     "release": "release-it",
     "release:ci": "release-it --ci",
     "release:debug": "release-it --verbose --dry-run",
-    "test:all": "concurrently \"pnpm:test:run\" \"pnpm:test:example\"",
+    "test:all": "concurrently \"pnpm:test:run\" \"pnpm:test:example\" --prefix-colors auto",
     "test": "vitest",
     "test:example": "pnpm preexample && cd examples && pnpm test",
     "test:ui": "vitest --ui",
@@ -53,7 +53,7 @@
     "@glimmer/syntax": "^0.84.3",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-template-imports": "^3.4.2",
-    "prettier": "^3.0.0"
+    "prettier": "^3.0.3"
   },
   "devDependencies": {
     "@babel/types": "^7.22.11",
@@ -72,11 +72,12 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-jsdoc": "^46.5.1",
     "eslint-plugin-n": "^16.0.2",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unicorn": "^48.0.1",
     "eslint-plugin-vitest": "^0.3.1",
     "prettier-plugin-jsdoc": "^1.0.1",
     "release-it": "^16.1.5",
-    "typescript": "^5.1.6",
+    "typescript": "^5.2.2",
     "vite": "^4.4.9",
     "vitest": "^0.34.3"
   },

pnpm-lock.yaml

@@ -1,5 +1,5 @@
 // @ts-expect-error FIXME: TS7016 Get ETI to export these + types
-import * as util from 'ember-template-imports/src/util';
+import * as util from 'ember-template-imports/src/util.js';
 
 export const PARSER_NAME = 'ember-template-tag';
 export const PRINTER_NAME = 'ember-template-tag-estree';

src/config.ts

@@ -1,9 +1,10 @@
 import type { Node } from '@babel/types';
 import type { Parser, Plugin, Printer, SupportLanguage } from 'prettier';
-import { PARSER_NAME, PRINTER_NAME } from './config';
-import { options } from './options';
-import { parser } from './parse';
-import { printer } from './print/index';
+
+import { PARSER_NAME, PRINTER_NAME } from './config.js';
+import { options } from './options.js';
+import { parser } from './parse.js';
+import { printer } from './print/index.js';
 
 const languages: SupportLanguage[] = [
   {

src/main.ts

@@ -7,15 +7,16 @@ import {
   isTaggedTemplateExpression,
 } from '@babel/types';
 import { getTemplateLocals } from '@glimmer/syntax';
-import { preprocessEmbeddedTemplates } from 'ember-template-imports/lib/preprocess-embedded-templates';
+import { preprocessEmbeddedTemplates } from 'ember-template-imports/lib/preprocess-embedded-templates.js';
 import type { Parser } from 'prettier';
-import { parsers as babelParsers } from 'prettier/plugins/babel';
+import { parsers as babelParsers } from 'prettier/plugins/babel.js';
+
 import {
   PRINTER_NAME,
   TEMPLATE_TAG_NAME,
   TEMPLATE_TAG_PLACEHOLDER,
 } from './config';
-import type { Options } from './options';
+import type { Options } from './options.js';
 import type {
   GlimmerExpressionExtra,
   GlimmerTemplateExtra,
@@ -36,8 +37,8 @@ import {
   isRawGlimmerCallExpression,
   isRawGlimmerClassProperty,
 } from './types/raw';
-import { hasAmbiguousNextLine } from './utils/ambiguity';
-import { assert, squish } from './utils/index';
+import { hasAmbiguousNextLine } from './utils/ambiguity.js';
+import { assert, squish } from './utils/index.js';
 
 const typescript = babelParsers['babel-ts'] as Parser<Node | undefined>;