Skip to content

Commit

Permalink
updpatch: typescript 5.7.2-1
Browse files Browse the repository at this point in the history
Refresh patches and make them rot less.
  • Loading branch information
hack3ric committed Dec 14, 2024
1 parent 87480fc commit 04fd1d1
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 323 deletions.
299 changes: 0 additions & 299 deletions typescript/0001-Remove-dprint.patch
Original file line number Diff line number Diff line change
Expand Up @@ -30,305 +30,6 @@ index 7939e5eafbd..bf1ac9693be 100644
});

export const knip = task({
diff --git a/package-lock.json b/package-lock.json
index 254a9502002..aced684a0b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,8 +13,6 @@
"tsserver": "bin/tsserver"
},
"devDependencies": {
- "@dprint/formatter": "^0.4.1",
- "@dprint/typescript": "0.91.6",
"@esfx/canceltoken": "^1.0.0",
"@eslint/js": "^9.9.0",
"@octokit/rest": "^21.0.1",
@@ -35,7 +33,6 @@
"chalk": "^4.1.2",
"chokidar": "^3.6.0",
"diff": "^5.2.0",
- "dprint": "^0.47.2",
"esbuild": "^0.23.0",
"eslint": "^9.9.0",
"eslint-formatter-autolinkable-stylish": "^1.4.0",
@@ -69,122 +66,6 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
- "node_modules/@dprint/darwin-arm64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.47.2.tgz",
- "integrity": "sha512-mVPFBJsXxGDKHHCAY8wbqOyS4028g1bN15H9tivCnPAjwaZhkUimZHXWejXADjhGn+Xm2SlakugY9PY/68pH3Q==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "darwin"
- ]
- },
- "node_modules/@dprint/darwin-x64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.47.2.tgz",
- "integrity": "sha512-T7wzlc+rBV+6BRRiBjoqoy5Hj4TR2Nv2p2s9+ycyPGs10Kj/JXOWD8dnEHeBgUr2r4qe/ZdcxmsFQ5Hf2n0WuA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "darwin"
- ]
- },
- "node_modules/@dprint/formatter": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/@dprint/formatter/-/formatter-0.4.1.tgz",
- "integrity": "sha512-IB/GXdlMOvi0UhQQ9mcY15Fxcrc2JPadmo6tqefCNV0bptFq7YBpggzpqYXldBXDa04CbKJ+rDwO2eNRPE2+/g==",
- "dev": true
- },
- "node_modules/@dprint/linux-arm64-glibc": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.47.2.tgz",
- "integrity": "sha512-B0m1vT5LdVtrNOVdkqpLPrSxuCD+l5bTIgRzPaDoIB1ChWQkler9IlX8C+RStpujjPj6SYvwo5vTzjQSvRdQkA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@dprint/linux-arm64-musl": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.47.2.tgz",
- "integrity": "sha512-zID6wZZqpg2/Q2Us+ERQkbhLwlW3p3xaeEr00MPf49bpydmEjMiPuSjWPkNv+slQSIyIsVovOxF4lbNZjsdtvw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@dprint/linux-x64-glibc": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.47.2.tgz",
- "integrity": "sha512-rB3WXMdINnRd33DItIp7mObS7dzHW90ZzeJSsoKJLPp+Z7wXjjb27UUowfqVI4baa/1pd7sdbX54DPohMtfu/A==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@dprint/linux-x64-musl": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.47.2.tgz",
- "integrity": "sha512-E0+TNbzYdTXJ/jCVjUctVxkda/faw++aDQLfyWGcmdMJnbM7NZz+W4fUpDXzMPsjy+zTWxXcPK7/q2DZz2gnbg==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@dprint/typescript": {
- "version": "0.91.6",
- "resolved": "https://registry.npmjs.org/@dprint/typescript/-/typescript-0.91.6.tgz",
- "integrity": "sha512-rbgODMD0hsQJ6w32eMELqt+KnkzxVVLT4qRMcvlz8PsFwSPyIfBslpZcFhmJWdyurVKKNcUPNC6Aq9PcUIX13w==",
- "dev": true
- },
- "node_modules/@dprint/win32-arm64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/win32-arm64/-/win32-arm64-0.47.2.tgz",
- "integrity": "sha512-K1EieTCFjfOCmyIhw9zFSduE6qVCNHEveupqZEfbSkVGw5T9MJQ1I9+n7MDb3RIDYEUk0enJ58/w82q8oDKCyA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ]
- },
- "node_modules/@dprint/win32-x64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.47.2.tgz",
- "integrity": "sha512-LhizWr8VrhHvq4ump8HwOERyFmdLiE8C6A42QSntGXzKdaa2nEOq20x/o56ZIiDcesiV+1TmosMKimPcOZHa+Q==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ]
- },
"node_modules/@esbuild/aix-ppc64": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
@@ -2034,26 +1915,6 @@
"node": ">=8"
}
},
- "node_modules/dprint": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.47.2.tgz",
- "integrity": "sha512-geUcVIIrmLaY+YtuOl4gD7J/QCjsXZa5gUqre9sO6cgH0X/Fa9heBN3l/AWVII6rKPw45ATuCSDWz1pyO+HkPQ==",
- "dev": true,
- "hasInstallScript": true,
- "bin": {
- "dprint": "bin.js"
- },
- "optionalDependencies": {
- "@dprint/darwin-arm64": "0.47.2",
- "@dprint/darwin-x64": "0.47.2",
- "@dprint/linux-arm64-glibc": "0.47.2",
- "@dprint/linux-arm64-musl": "0.47.2",
- "@dprint/linux-x64-glibc": "0.47.2",
- "@dprint/linux-x64-musl": "0.47.2",
- "@dprint/win32-arm64": "0.47.2",
- "@dprint/win32-x64": "0.47.2"
- }
- },
"node_modules/eastasianwidth": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -4855,74 +4716,6 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
- "@dprint/darwin-arm64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.47.2.tgz",
- "integrity": "sha512-mVPFBJsXxGDKHHCAY8wbqOyS4028g1bN15H9tivCnPAjwaZhkUimZHXWejXADjhGn+Xm2SlakugY9PY/68pH3Q==",
- "dev": true,
- "optional": true
- },
- "@dprint/darwin-x64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.47.2.tgz",
- "integrity": "sha512-T7wzlc+rBV+6BRRiBjoqoy5Hj4TR2Nv2p2s9+ycyPGs10Kj/JXOWD8dnEHeBgUr2r4qe/ZdcxmsFQ5Hf2n0WuA==",
- "dev": true,
- "optional": true
- },
- "@dprint/formatter": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/@dprint/formatter/-/formatter-0.4.1.tgz",
- "integrity": "sha512-IB/GXdlMOvi0UhQQ9mcY15Fxcrc2JPadmo6tqefCNV0bptFq7YBpggzpqYXldBXDa04CbKJ+rDwO2eNRPE2+/g==",
- "dev": true
- },
- "@dprint/linux-arm64-glibc": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.47.2.tgz",
- "integrity": "sha512-B0m1vT5LdVtrNOVdkqpLPrSxuCD+l5bTIgRzPaDoIB1ChWQkler9IlX8C+RStpujjPj6SYvwo5vTzjQSvRdQkA==",
- "dev": true,
- "optional": true
- },
- "@dprint/linux-arm64-musl": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.47.2.tgz",
- "integrity": "sha512-zID6wZZqpg2/Q2Us+ERQkbhLwlW3p3xaeEr00MPf49bpydmEjMiPuSjWPkNv+slQSIyIsVovOxF4lbNZjsdtvw==",
- "dev": true,
- "optional": true
- },
- "@dprint/linux-x64-glibc": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.47.2.tgz",
- "integrity": "sha512-rB3WXMdINnRd33DItIp7mObS7dzHW90ZzeJSsoKJLPp+Z7wXjjb27UUowfqVI4baa/1pd7sdbX54DPohMtfu/A==",
- "dev": true,
- "optional": true
- },
- "@dprint/linux-x64-musl": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.47.2.tgz",
- "integrity": "sha512-E0+TNbzYdTXJ/jCVjUctVxkda/faw++aDQLfyWGcmdMJnbM7NZz+W4fUpDXzMPsjy+zTWxXcPK7/q2DZz2gnbg==",
- "dev": true,
- "optional": true
- },
- "@dprint/typescript": {
- "version": "0.91.6",
- "resolved": "https://registry.npmjs.org/@dprint/typescript/-/typescript-0.91.6.tgz",
- "integrity": "sha512-rbgODMD0hsQJ6w32eMELqt+KnkzxVVLT4qRMcvlz8PsFwSPyIfBslpZcFhmJWdyurVKKNcUPNC6Aq9PcUIX13w==",
- "dev": true
- },
- "@dprint/win32-arm64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/win32-arm64/-/win32-arm64-0.47.2.tgz",
- "integrity": "sha512-K1EieTCFjfOCmyIhw9zFSduE6qVCNHEveupqZEfbSkVGw5T9MJQ1I9+n7MDb3RIDYEUk0enJ58/w82q8oDKCyA==",
- "dev": true,
- "optional": true
- },
- "@dprint/win32-x64": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.47.2.tgz",
- "integrity": "sha512-LhizWr8VrhHvq4ump8HwOERyFmdLiE8C6A42QSntGXzKdaa2nEOq20x/o56ZIiDcesiV+1TmosMKimPcOZHa+Q==",
- "dev": true,
- "optional": true
- },
"@esbuild/aix-ppc64": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
@@ -6148,22 +5941,6 @@
"path-type": "^4.0.0"
}
},
- "dprint": {
- "version": "0.47.2",
- "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.47.2.tgz",
- "integrity": "sha512-geUcVIIrmLaY+YtuOl4gD7J/QCjsXZa5gUqre9sO6cgH0X/Fa9heBN3l/AWVII6rKPw45ATuCSDWz1pyO+HkPQ==",
- "dev": true,
- "requires": {
- "@dprint/darwin-arm64": "0.47.2",
- "@dprint/darwin-x64": "0.47.2",
- "@dprint/linux-arm64-glibc": "0.47.2",
- "@dprint/linux-arm64-musl": "0.47.2",
- "@dprint/linux-x64-glibc": "0.47.2",
- "@dprint/linux-x64-musl": "0.47.2",
- "@dprint/win32-arm64": "0.47.2",
- "@dprint/win32-x64": "0.47.2"
- }
- },
"eastasianwidth": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
diff --git a/package.json b/package.json
index 673cadfb05e..70c15434489 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,6 @@
"!**/.gitattributes"
],
"devDependencies": {
- "@dprint/formatter": "^0.4.1",
- "@dprint/typescript": "0.91.6",
"@esfx/canceltoken": "^1.0.0",
"@eslint/js": "^9.9.0",
"@octokit/rest": "^21.0.1",
@@ -61,7 +59,6 @@
"chalk": "^4.1.2",
"chokidar": "^3.6.0",
"diff": "^5.2.0",
- "dprint": "^0.47.2",
"esbuild": "^0.23.0",
"eslint": "^9.9.0",
"eslint-formatter-autolinkable-stylish": "^1.4.0",
@@ -99,7 +96,7 @@
"gulp": "hereby",
"lint": "hereby lint",
"knip": "hereby knip",
- "format": "dprint fmt",
+ "format": ":",
"setup-hooks": "node scripts/link-hooks.mjs"
},
"browser": {
diff --git a/scripts/dtsBundler.mjs b/scripts/dtsBundler.mjs
index ade134287fe..398aedf541a 100644
--- a/scripts/dtsBundler.mjs
Expand Down
45 changes: 25 additions & 20 deletions typescript/0003-Remove-typescript.d.ts-baseline-check.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
From 8a80022158ff8e7d5c6997a4e631066921b1cbb6 Mon Sep 17 00:00:00 2001
From: Eric Long <[email protected]>
Date: Mon, 18 Nov 2024 11:37:09 +0800
Subject: [PATCH 3/3] Remove typescript.d.ts baseline check

---
src/testRunner/unittests/publicApi.ts | 4 ----
1 file changed, 4 deletions(-)

diff --git a/src/testRunner/unittests/publicApi.ts b/src/testRunner/unittests/publicApi.ts
index 011f32ae285..9e5f6ca8abd 100644
index 7b7b4ecc507..a6ca3e8918f 100644
--- a/src/testRunner/unittests/publicApi.ts
+++ b/src/testRunner/unittests/publicApi.ts
@@ -23,10 +23,6 @@ describe("unittests:: Public APIs", () => {
});
}
@@ -6,27 +6,6 @@ import * as vfs from "../_namespaces/vfs.js";
import { jsonToReadableText } from "./helpers.js";
import { TestServerHost } from "./helpers/virtualFileSystemWithWatch.js";

- describe("for the language service and compiler", () => {
-describe("unittests:: Public APIs", () => {
- function verifyApi(fileName: string) {
- const builtFile = `built/local/${fileName}`;
- const api = `api/${fileName}`;
- let fileContent: string;
- before(() => {
- fileContent = Harness.IO.readFile(builtFile)!;
- if (!fileContent) throw new Error(`File ${fileName} was not present in built/local`);
- fileContent = fileContent.replace(/\r\n/g, "\n");
- });
-
- it("should be acknowledged when they change", () => {
- Harness.Baseline.runBaseline(api, fileContent, { PrintDiff: true });
- });
- }
-
- describe("for typescript.d.ts", () => {
- verifyApi("typescript.d.ts");
- });
-});
-
describe("for the language server", () => {
verifyApi("tsserverlibrary.d.ts");
});
--
2.47.0

describe("unittests:: Public APIs:: token to string", () => {
function assertDefinedTokenToString(initial: ts.SyntaxKind, last: ts.SyntaxKind) {
for (let t = initial; t <= last; t++) {
9 changes: 5 additions & 4 deletions typescript/riscv64.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- PKGBUILD
+++ PKGBUILD
@@ -21,6 +21,19 @@ b2sums=('d2e131993d301e5ef623fe3f87e999f8514e060cf52583003ecc2247bb416d3aad4798d
@@ -21,6 +21,20 @@ b2sums=('c0361e8140820040a5a10adc43dbd2aaf29bff8a1da04993a33c967b11b9ac841b7c3ff

prepare() {
cd $_name
Expand All @@ -9,6 +9,7 @@
+ # dprint itself requires prebuilt binary available, and some of its plugins uses prebuilts as well
+ # Building dprint from source from NPM package is upstreamed to https://github.com/dprint/dprint/pull/820
+ patch -Np1 -i ../0001-Remove-dprint.patch
+ sed -i -e 's/dprint fmt/:/' -e '/dprint/ d' package.json
+
+ # Increase test timeout from 40s to 4000s
+ patch -Np1 -i ../0002-Increase-test-timeout.patch
Expand All @@ -20,14 +21,14 @@
npm ci
}

@@ -46,3 +59,10 @@ package() {
@@ -46,3 +60,10 @@ package() {
install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname \
ThirdPartyNoticeText.txt
}
+
+source+=("0001-Remove-dprint.patch"
+ "0002-Increase-test-timeout.patch"
+ "0003-Remove-typescript.d.ts-baseline-check.patch")
+b2sums+=('d33e1a50820247890f96bcdc94d670e52a9fbb4e765cb6740aef14c84f13e5490ad44b5e8d212b982c84eaf39d97da9d863e7a9597a66f73d92fa8f439de306a'
+b2sums+=('ccdf17199b8e5ea2b0c16750e73666609712d2bb6df2d662a4324e1ce157ec5125a544b2b72ee2532db9feb89df30c046c74fdf3f5e618b95847e0bb3e9aef8c'
+ '1d42d2d94803fcec7665b98a70f502cdd90d0bb89aeb52e516bb1615c6f3d24deb79d05b6821908be408dbf63043ef59c8a34ec1426d80898d2f4f14cd985a13'
+ 'd1b9786699d3861bacc4bf8ff8022fbc75c79a6598cb5209dc5024714870d6a6c9132b2e53a876b68a6812c062ecff65d6e158962f397aa332eb019d24907164')
+ '8b4542a9bc35bc7927a757ca6653b4a1640424424d94a2fc32bee67984269d7f128550063998211bda3602d3fb9afebee4a1add48dd98d678e384f9e6f4606e6')

0 comments on commit 04fd1d1

Please sign in to comment.