@@ -75,11 +75,7 @@ const { values: rawOptions } = parseArgs({
7575
7676// We can't use parseArgs' strict mode as it errors on hereby's --tasks flag.
7777/**
78- * @typedef {{ [K in keyof T as {} extends Record<K, 1> ? never : K]: T[K] } } RemoveIndex<T>
79- * @template T
80- */
81- /**
82- * @typedef {RemoveIndex<typeof rawOptions> } Options
78+ * @typedef {{ [K in keyof typeof rawOptions as {} extends Record<K, 1> ? never : K]: typeof rawOptions[K] } } Options
8379 */
8480const options = /** @type {Options } */ ( rawOptions ) ;
8581
@@ -107,9 +103,12 @@ const goBuildFlags = [
107103] ;
108104
109105/**
110- * @type {<T>(fn: () => T) => (() => T) }
106+ * @template T
107+ * @param {() => T } fn
108+ * @returns {() => T }
111109 */
112110function memoize ( fn ) {
111+ /** @type {T } */
113112 let value ;
114113 return ( ) => {
115114 if ( fn !== undefined ) {
@@ -842,21 +841,20 @@ const mainNativePreviewPackage = {
842841 * @typedef {"win32" | "linux" | "darwin" } OS
843842 * @typedef {"x64" | "arm" | "arm64" } Arch
844843 * @typedef {"Microsoft400" | "LinuxSign" | "MacDeveloperHarden" | "8020" | "VSCodePublisher" } Cert
845- * @typedef {`${OS}-${Exclude<Arch, "arm"> | "armhf"}` } VSCodeTarget
844+ * @typedef {`${OS | "alpine" }-${Exclude<Arch, "arm"> | "armhf"}` } VSCodeTarget
846845 */
847846void 0 ;
848847
849848const nativePreviewPlatforms = memoize ( ( ) => {
850- /** @type {[OS, Arch, Cert][] } */
849+ /** @type {[os: OS, arch: Arch, cert: Cert, alpine?: boolean ][] } */
851850 let supportedPlatforms = [
852851 [ "win32" , "x64" , "Microsoft400" ] ,
853852 [ "win32" , "arm64" , "Microsoft400" ] ,
854- [ "linux" , "x64" , "LinuxSign" ] ,
853+ [ "linux" , "x64" , "LinuxSign" , true ] ,
855854 [ "linux" , "arm" , "LinuxSign" ] ,
856- [ "linux" , "arm64" , "LinuxSign" ] ,
855+ [ "linux" , "arm64" , "LinuxSign" , true ] ,
857856 [ "darwin" , "x64" , "MacDeveloperHarden" ] ,
858857 [ "darwin" , "arm64" , "MacDeveloperHarden" ] ,
859- // Alpine?
860858 // Wasm?
861859 ] ;
862860
@@ -865,17 +863,32 @@ const nativePreviewPlatforms = memoize(() => {
865863 assert . equal ( supportedPlatforms . length , 1 , "No supported platforms found" ) ;
866864 }
867865
868- return supportedPlatforms . map ( ( [ os , arch , cert ] ) => {
866+ return supportedPlatforms . map ( ( [ os , arch , cert , alpine ] ) => {
869867 const npmDirName = `native-preview-${ os } ${ arch } ;
870868 const npmDir = path . join ( builtNpm , npmDirName ) ;
871869 const npmTarball = `${ npmDir } ;
872870 const npmPackageName = `@typescript/${ npmDirName } ;
873- /** @type {VSCodeTarget } */
874- const vscodeTarget = `${ os } ${ arch === "arm" ? "armhf" : arch } ;
875- const extensionDir = path . join ( builtVsix , `typescript-native-preview-${ vscodeTarget } ) ;
876- const vsixPath = extensionDir + ".vsix" ;
877- const vsixManifestPath = extensionDir + ".manifest" ;
878- const vsixSignaturePath = extensionDir + ".signature.p7s" ;
871+
872+ /** @type {VSCodeTarget[] } */
873+ const vscodeTargets = [ `${ os } ${ arch === "arm" ? "armhf" : arch } ] ;
874+ if ( alpine ) {
875+ vscodeTargets . push ( `alpine-${ arch === "arm" ? "armhf" : arch } ) ;
876+ }
877+
878+ const extensions = vscodeTargets . map ( vscodeTarget => {
879+ const extensionDir = path . join ( builtVsix , `typescript-native-preview-${ vscodeTarget } ) ;
880+ const vsixPath = extensionDir + ".vsix" ;
881+ const vsixManifestPath = extensionDir + ".manifest" ;
882+ const vsixSignaturePath = extensionDir + ".signature.p7s" ;
883+ return {
884+ vscodeTarget,
885+ extensionDir,
886+ vsixPath,
887+ vsixManifestPath,
888+ vsixSignaturePath,
889+ } ;
890+ } ) ;
891+
879892 return {
880893 nodeOs : os ,
881894 nodeArch : arch ,
@@ -885,11 +898,7 @@ const nativePreviewPlatforms = memoize(() => {
885898 npmDirName,
886899 npmDir,
887900 npmTarball,
888- vscodeTarget,
889- extensionDir,
890- vsixPath,
891- vsixManifestPath,
892- vsixSignaturePath,
901+ extensions,
893902 cert,
894903 } ;
895904 } ) ;
@@ -1040,6 +1049,7 @@ export const signNativePreviewPackages = task({
10401049 SignFileRecordList : [ ] ,
10411050 } ;
10421051
1052+ /** @type {{ path: string; unsignedZipPath: string; signedZipPath: string; notarizedZipPath: string; }[] } */
10431053 const macZips = [ ] ;
10441054
10451055 // First, sign the files.
@@ -1175,8 +1185,9 @@ export const packNativePreviewExtensions = task({
11751185 console . log ( "Version:" , version ) ;
11761186
11771187 const platforms = nativePreviewPlatforms ( ) ;
1188+ const extensions = platforms . flatMap ( ( { npmDir, extensions } ) => extensions . map ( e => ( { npmDir, ...e } ) ) ) ;
11781189
1179- await Promise . all ( platforms . map ( async ( { npmDir, vscodeTarget, extensionDir : thisExtensionDir , vsixPath, vsixManifestPath, vsixSignaturePath } ) => {
1190+ await Promise . all ( extensions . map ( async ( { npmDir, vscodeTarget, extensionDir : thisExtensionDir , vsixPath, vsixManifestPath, vsixSignaturePath } ) => {
11801191 const npmLibDir = path . join ( npmDir , "lib" ) ;
11811192 const extensionLibDir = path . join ( thisExtensionDir , "lib" ) ;
11821193 await fs . promises . mkdir ( extensionLibDir , { recursive : true } ) ;
@@ -1192,7 +1203,7 @@ export const packNativePreviewExtensions = task({
11921203
11931204 await fs . promises . copyFile ( "NOTICE.txt" , path . join ( thisExtensionDir , "NOTICE.txt" ) ) ;
11941205
1195- await $ ( { cwd : thisExtensionDir } ) `vsce package ${ version } pre-release -- no-update-package-json --no-dependencies --out ${ vsixPath } ${ vscodeTarget } ;
1206+ await $ ( { cwd : thisExtensionDir } ) `vsce package ${ version } ${ vsixPath } ${ vscodeTarget } ;
11961207
11971208 if ( options . forRelease ) {
11981209 await $ ( { cwd : thisExtensionDir } ) `vsce generate-manifest --packagePath ${ vsixPath } ${ vsixManifestPath } ;
@@ -1211,10 +1222,12 @@ export const signNativePreviewExtensions = task({
12111222 }
12121223
12131224 const platforms = nativePreviewPlatforms ( ) ;
1225+ const extensions = platforms . flatMap ( ( { npmDir, extensions } ) => extensions . map ( e => ( { npmDir, ...e } ) ) ) ;
1226+
12141227 await sign ( {
12151228 SignFileRecordList : [
12161229 {
1217- SignFileList : platforms . map ( ( { vsixSignaturePath } ) => ( { SrcPath : vsixSignaturePath , DstPath : null } ) ) ,
1230+ SignFileList : extensions . map ( ( { vsixSignaturePath } ) => ( { SrcPath : vsixSignaturePath , DstPath : null } ) ) ,
12181231 Certs : "VSCodePublisher" ,
12191232 } ,
12201233 ] ,
@@ -1244,7 +1257,7 @@ export const installExtension = task({
12441257 throw new Error ( `No platform found for ${ process . platform } ${ process . arch } ) ;
12451258 }
12461259
1247- await $ `${ options . insiders ? "code-insiders" : "code" } ${ myPlatform . vsixPath } ;
1260+ await $ `${ options . insiders ? "code-insiders" : "code" } ${ myPlatform . extensions [ 0 ] . vsixPath } ;
12481261 console . log ( pc . yellowBright ( "\nExtension installed. " ) + "To enable this extension, set:\n" ) ;
12491262 console . log ( pc . whiteBright ( ` "typescript.experimental.useTsgo": true\n` ) ) ;
12501263 console . log ( "To configure the extension to use built/local instead of its bundled tsgo, set:\n" ) ;
0 commit comments