feat(BREAKING): upgrade to TypeScript 5.4 (#1516)

dsherret · Mar 9, 2024 · e7799eb · e7799eb
1 parent 92962aa
commit e7799eb
Show file tree

Hide file tree

Showing 14 changed files with 5,498 additions and 2,867 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2023 David Sherret
+Copyright (c) 2017 David Sherret
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/deno/common/typescript.d.ts b/deno/common/typescript.d.ts
diff --git a/deno/common/typescript.js b/deno/common/typescript.js
diff --git a/deno/ts_morph.js b/deno/ts_morph.js
@@ -1,7 +1,7 @@
 import { errors, SyntaxKind, ts, NewLineKind, EmitHint, ScriptTarget, ScriptKind, SettingsContainer, KeyValueCache, getCompilerOptionsFromTsConfig as getCompilerOptionsFromTsConfig$1, StringUtils, getSyntaxKindName, ArrayUtils, nameof, ObjectUtils, EventContainer, FileUtils, libFolderInMemoryPath, Memoize, SymbolFlags, TypeFormatFlags, getEmitModuleResolutionKind, createHosts, ObjectFlags, TypeFlags, matchGlobs, ModuleResolutionKind, SortedKeyValueArray, LocaleStringComparer, WeakCache, DocumentRegistry, createModuleResolutionHost, TransactionalFileSystem, TsConfigResolver, CompilerOptionsContainer, InMemoryFileSystemHost, RealFileSystemHost, IterableUtils, runtime } from './common/mod.ts';
 export { CompilerOptionsContainer, DiagnosticCategory, EmitHint, InMemoryFileSystemHost, LanguageVariant, ModuleKind, ModuleResolutionKind, NewLineKind, NodeFlags, ObjectFlags, ResolutionHosts, ScriptKind, ScriptTarget, SettingsContainer, SymbolFlags, SyntaxKind, TypeFlags, TypeFormatFlags, ts } from './common/mod.ts';
-import CodeBlockWriter from 'https://deno.land/x/code_block_writer@12.0.0/mod.ts';
-export { default as CodeBlockWriter } from 'https://deno.land/x/code_block_writer@12.0.0/mod.ts';
+import CodeBlockWriter from 'https://deno.land/x/code_block_writer@13.0.1/mod.ts';
+export { default as CodeBlockWriter } from 'https://deno.land/x/code_block_writer@13.0.1/mod.ts';
 
 class AdvancedIterator {
     #iterator;

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bootstrap/LICENSE b/packages/bootstrap/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2023 David Sherret
+Copyright (c) 2017 David Sherret
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -27,18 +27,18 @@
     "@ts-morph/common": "~0.22.0"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^11.1.5",
-    "@types/chai": "^4.3.11",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/chai": "^4.3.12",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.11.25",
     "chai": "^4.3.10",
     "cross-env": "^7.0.3",
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "rimraf": "^5.0.5",
-    "rollup": "=4.5.2",
-    "ts-node": "^10.9.1",
+    "rollup": "=4.12.1",
+    "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "~5.3.2"
+    "typescript": "~5.4.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/common/LICENSE b/packages/common/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2023 David Sherret
+Copyright (c) 2017 David Sherret
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/packages/common/lib/typescript.d.ts b/packages/common/lib/typescript.d.ts
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -25,18 +25,18 @@
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^11.1.5",
-    "@types/chai": "^4.3.11",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/chai": "^4.3.12",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.11.25",
     "chai": "^4.3.10",
     "cross-env": "^7.0.3",
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "rimraf": "^5.0.5",
-    "rollup": "=4.5.2",
-    "ts-node": "^10.9.1",
+    "rollup": "=4.12.1",
+    "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "5.3.2"
+    "typescript": "5.4.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/common/scripts/buildDeno.ts b/packages/common/scripts/buildDeno.ts
@@ -45,7 +45,10 @@ fileSystem.mkdirSync(`${copyDirPath}/data`);
 fileSystem.copySync(`${folderPath}/ts-morph-common.js`, `${copyDirPath}/ts_morph_common.js`);
 fileSystem.copySync(`${folderPath}/DenoRuntime.ts`, `${copyDirPath}/DenoRuntime.ts`);
 
-const tsNodeModulesLibDir = path.join(folders.root, "node_modules/typescript/lib/");
+const localTsLibFolder = path.join(folders.common, "node_modules/typescript/lib");
+const tsNodeModulesLibDir = fileSystem.directoryExistsSync(localTsLibFolder)
+  ? localTsLibFolder
+  : path.join(folders.root, "node_modules/typescript/lib");
 const typeScriptSourceFile = fileSystem.readFileSync(path.join(tsNodeModulesLibDir, "typescript.js"));
 fileSystem.writeFileSync(`${copyDirPath}/typescript.js`, typeScriptSourceFile + "\nexport { ts };\n");
 fileSystem.copySync(path.join(tsNodeModulesLibDir, "typescript.d.ts"), `${copyDirPath}/typescript.d.ts`);

diff --git a/packages/common/scripts/bundleLocalTs.ts b/packages/common/scripts/bundleLocalTs.ts
@@ -19,7 +19,10 @@ for (const varDecl of commonFile.getVariableDeclarations()) {
 
 commonFile.saveSync();
 
-const typescriptLibFolderPath = path.join(folders.root, "node_modules/typescript/lib");
+const localTypescriptLibFolderPath = path.join(folders.common, "node_modules/typescript/lib");
+const typescriptLibFolderPath = fileSystem.directoryExistsSync(localTypescriptLibFolderPath)
+  ? localTypescriptLibFolderPath
+  : path.join(folders.root, "node_modules/typescript/lib");
 fileSystem.copySync(path.join(typescriptLibFolderPath, "typescript.js"), "./dist/typescript.js");
 fileSystem.copySync(path.join(typescriptLibFolderPath, "typescript.d.ts"), "./lib/typescript.d.ts");
 

diff --git a/packages/ts-morph/LICENSE b/packages/ts-morph/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2023 David Sherret
+Copyright (c) 2017 David Sherret
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/packages/ts-morph/package.json b/packages/ts-morph/package.json
@@ -45,22 +45,22 @@
   "homepage": "https://github.com/dsherret/ts-morph#readme",
   "dependencies": {
     "@ts-morph/common": "~0.22.0",
-    "code-block-writer": "^12.0.0"
+    "code-block-writer": "^13.0.1"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^11.1.5",
-    "@types/chai": "^4.3.11",
-    "@types/diff": "^5.0.8",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/chai": "^4.3.12",
+    "@types/diff": "^5.0.9",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.11.25",
     "chai": "^4.3.10",
     "conditional-type-checks": "^1.0.6",
     "cross-env": "^7.0.3",
-    "diff": "^5.1.0",
-    "mocha": "10.2.0",
+    "diff": "^5.2.0",
+    "mocha": "10.3.0",
     "rimraf": "^5.0.5",
-    "rollup": "=4.5.2",
-    "ts-node": "10.9.1",
+    "rollup": "=4.12.1",
+    "ts-node": "10.9.2",
     "typescript": "~5.3.2"
   },
   "standard-version": {