Upgrade typescript to 5.6.2 and fix license for typescript

apache · Sep 16, 2024 · 75e26fe · 75e26fe
1 parent a05a4b9
commit 75e26fe
Show file tree

Hide file tree

Showing 5 changed files with 417 additions and 11 deletions.
diff --git a/nbbuild/licenses/Apache-2.0-typescript b/nbbuild/licenses/Apache-2.0-typescript
diff --git a/webcommon/typescript.editor/bundles/package/package.json b/webcommon/typescript.editor/bundles/package/package.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
         "typescript-language-server": "4.3.3",
-        "typescript": "5.4.5"
+        "typescript": "5.6.2"
     }
 }
diff --git a/...r/bundles/prepare/src/main/java/org/netbeans/modules/learning/prepare/PrepareBundles.java b/...r/bundles/prepare/src/main/java/org/netbeans/modules/learning/prepare/PrepareBundles.java
@@ -58,6 +58,10 @@ public class PrepareBundles {
         "License.txt",
         "LICENSE.md"
     };
+    private static final String[] SECONDARY_LICENSE_FILE_NAMES = {
+        "thirdpartynotices.txt",
+        "ThirdPartyNoticeText.txt"
+    };
     private static final String nl = "\n";
 
     public static void main(String... args) throws IOException, InterruptedException, NoSuchAlgorithmException {
@@ -119,7 +123,15 @@ public static void main(String... args) throws IOException, InterruptedException
                     throw new IllegalStateException("Cannot find license for: " + module.getFileName());
                 }
 
-                Path thirdpartynoticestxt = module.resolve("thirdpartynotices.txt");
+                Path thirdpartynoticestxt = null;
+
+                for(String l: SECONDARY_LICENSE_FILE_NAMES) {
+                    if (Files.isReadable(module.resolve(l))) {
+                        thirdpartynoticestxt = module.resolve(l);
+                        break;
+                    }
+                }
+
                 String packageJsonText = readFileIntoString(packageJson);
                 Map<String, Object> packageJsonData = new Gson().fromJson(packageJsonText, HashMap.class);
                 String name = (String) packageJsonData.get("name");
@@ -129,12 +141,12 @@ public static void main(String... args) throws IOException, InterruptedException
                 String licenseKey = (String) packageJsonData.get("license");
                 String licenseText;
 
-                if (Files.isReadable(thirdpartynoticestxt)) {
-                    licenseText = "Parts of this work are licensed:\n" +
-                                  readFileIntoString(license) +
-                                  "\n\n" +
-                                  "Parts of this work are licensed:\n" +
-                                  readFileIntoString(thirdpartynoticestxt);
+                if (thirdpartynoticestxt != null) {
+                    licenseText = "Parts of this work are licensed:\n"
+                            + readFileIntoString(license)
+                            + "\n\n"
+                            + "Parts of this work are licensed:\n"
+                            + readFileIntoString(thirdpartynoticestxt);
                 } else {
                     licenseText = readFileIntoString(license);
                 }

diff --git a/webcommon/typescript.editor/external/binaries-list b/webcommon/typescript.editor/external/binaries-list
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-7F6F800B048B5FA6AA8E1671F43F5D07B4692224 https://doppel-helix.eu/test-typescript-update/typescript-5.4.5.zip typescript-5.4.5.zip
+48304CC9611D4F3B4ACD5A6ABB88689913BFA7A0 https://doppel-helix.eu/test-typescript-update/48304CC9611D4F3B4ACD5A6ABB88689913BFA7A0-typescript-5.6.2.zip typescript-5.6.2.zip
 6895F0456E4B0FE3D857AA7D3F399932A026D060 https://doppel-helix.eu/test-typescript-update/typescript-language-server-4.3.3.zip typescript-language-server-4.3.3.zip
diff --git a/webcommon/typescript.editor/external/typescript-5.4.5-license.txt b/webcommon/typescript.editor/external/typescript-5.4.5-license.txt