From 71ded1ce22ea022ab1cd28c5a5bc6db5a6e033a9 Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 10 May 2024 17:29:22 -0400 Subject: [PATCH 1/7] Readd platform specific dependencies to npm-shrinkwrap.json (#7162) --- npm-shrinkwrap.json | 483 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 483 insertions(+) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index de90c1756ba..1188a292365 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -980,6 +980,54 @@ "node": ">=16" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.16.tgz", + "integrity": "sha512-baLqRpLe4JnKrUXLJChoTN0iXZH7El/mu58GE3WIA6/H834k0XWvLRmGLG8y8arTRS9hJJibPnF0tiGhmWeZgw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.16.tgz", + "integrity": "sha512-QX48qmsEZW+gcHgTmAj+x21mwTz8MlYQBnzF6861cNdQGvj2jzzFjqH0EBabrIa/WVZ2CHolwMoqxVryqKt8+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.16.tgz", + "integrity": "sha512-G4wfHhrrz99XJgHnzFvB4UwwPxAWZaZBOFXh+JH1Duf1I4vIVfuYY9uVLpx4eiV2D/Jix8LJY+TAdZ3i40tDow==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/darwin-arm64": { "version": "0.17.16", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.16.tgz", @@ -996,6 +1044,294 @@ "node": ">=12" } }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.16.tgz", + "integrity": "sha512-SzBQtCV3Pdc9kyizh36Ol+dNVhkDyIrGb/JXZqFq8WL37LIyrXU0gUpADcNV311sCOhvY+f2ivMhb5Tuv8nMOQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.16.tgz", + "integrity": "sha512-ZqftdfS1UlLiH1DnS2u3It7l4Bc3AskKeu+paJSfk7RNOMrOxmeFDhLTMQqMxycP1C3oj8vgkAT6xfAuq7ZPRA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.16.tgz", + "integrity": "sha512-rHV6zNWW1tjgsu0dKQTX9L0ByiJHHLvQKrWtnz8r0YYJI27FU3Xu48gpK2IBj1uCSYhJ+pEk6Y0Um7U3rIvV8g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.16.tgz", + "integrity": "sha512-n4O8oVxbn7nl4+m+ISb0a68/lcJClIbaGAoXwqeubj/D1/oMMuaAXmJVfFlRjJLu/ZvHkxoiFJnmbfp4n8cdSw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.16.tgz", + "integrity": "sha512-8yoZhGkU6aHu38WpaM4HrRLTFc7/VVD9Q2SvPcmIQIipQt2I/GMTZNdEHXoypbbGao5kggLcxg0iBKjo0SQYKA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.16.tgz", + "integrity": "sha512-9ZBjlkdaVYxPNO8a7OmzDbOH9FMQ1a58j7Xb21UfRU29KcEEU3VTHk+Cvrft/BNv0gpWJMiiZ/f4w0TqSP0gLA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.16.tgz", + "integrity": "sha512-TIZTRojVBBzdgChY3UOG7BlPhqJz08AL7jdgeeu+kiObWMFzGnQD7BgBBkWRwOtKR1i2TNlO7YK6m4zxVjjPRQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.16.tgz", + "integrity": "sha512-UPeRuFKCCJYpBbIdczKyHLAIU31GEm0dZl1eMrdYeXDH+SJZh/i+2cAmD3A1Wip9pIc5Sc6Kc5cFUrPXtR0XHA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.16.tgz", + "integrity": "sha512-io6yShgIEgVUhExJejJ21xvO5QtrbiSeI7vYUnr7l+v/O9t6IowyhdiYnyivX2X5ysOVHAuyHW+Wyi7DNhdw6Q==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.16.tgz", + "integrity": "sha512-WhlGeAHNbSdG/I2gqX2RK2gfgSNwyJuCiFHMc8s3GNEMMHUI109+VMBfhVqRb0ZGzEeRiibi8dItR3ws3Lk+cA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.16.tgz", + "integrity": "sha512-gHRReYsJtViir63bXKoFaQ4pgTyah4ruiMRQ6im9YZuv+gp3UFJkNTY4sFA73YDynmXZA6hi45en4BGhNOJUsw==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.16.tgz", + "integrity": "sha512-mfiiBkxEbUHvi+v0P+TS7UnA9TeGXR48aK4XHkTj0ZwOijxexgMF01UDFaBX7Q6CQsB0d+MFNv9IiXbIHTNd4g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.16.tgz", + "integrity": "sha512-n8zK1YRDGLRZfVcswcDMDM0j2xKYLNXqei217a4GyBxHIuPMGrrVuJ+Ijfpr0Kufcm7C1k/qaIrGy6eG7wvgmA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.16.tgz", + "integrity": "sha512-lEEfkfsUbo0xC47eSTBqsItXDSzwzwhKUSsVaVjVji07t8+6KA5INp2rN890dHZeueXJAI8q0tEIfbwVRYf6Ew==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.16.tgz", + "integrity": "sha512-jlRjsuvG1fgGwnE8Afs7xYDnGz0dBgTNZfgCK6TlvPH3Z13/P5pi6I57vyLE8qZYLrGVtwcm9UbUx1/mZ8Ukag==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.16.tgz", + "integrity": "sha512-TzoU2qwVe2boOHl/3KNBUv2PNUc38U0TNnzqOAcgPiD/EZxT2s736xfC2dYQbszAwo4MKzzwBV0iHjhfjxMimg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.16.tgz", + "integrity": "sha512-B8b7W+oo2yb/3xmwk9Vc99hC9bNolvqjaTZYEfMQhzdpBsjTvZBlXQ/teUE55Ww6sg//wlcDjOaqldOKyigWdA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.16.tgz", + "integrity": "sha512-xJ7OH/nanouJO9pf03YsL9NAFQBHd8AqfrQd7Pf5laGyyTt/gToul6QYOA/i5i/q8y9iaM5DQFNTgpi995VkOg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -19582,6 +19918,27 @@ "jsdoc-type-pratt-parser": "~4.0.0" } }, + "@esbuild/android-arm": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.16.tgz", + "integrity": "sha512-baLqRpLe4JnKrUXLJChoTN0iXZH7El/mu58GE3WIA6/H834k0XWvLRmGLG8y8arTRS9hJJibPnF0tiGhmWeZgw==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.16.tgz", + "integrity": "sha512-QX48qmsEZW+gcHgTmAj+x21mwTz8MlYQBnzF6861cNdQGvj2jzzFjqH0EBabrIa/WVZ2CHolwMoqxVryqKt8+Q==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.16.tgz", + "integrity": "sha512-G4wfHhrrz99XJgHnzFvB4UwwPxAWZaZBOFXh+JH1Duf1I4vIVfuYY9uVLpx4eiV2D/Jix8LJY+TAdZ3i40tDow==", + "dev": true, + "optional": true + }, "@esbuild/darwin-arm64": { "version": "0.17.16", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.16.tgz", @@ -19589,6 +19946,132 @@ "dev": true, "optional": true }, + "@esbuild/darwin-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.16.tgz", + "integrity": "sha512-SzBQtCV3Pdc9kyizh36Ol+dNVhkDyIrGb/JXZqFq8WL37LIyrXU0gUpADcNV311sCOhvY+f2ivMhb5Tuv8nMOQ==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.16.tgz", + "integrity": "sha512-ZqftdfS1UlLiH1DnS2u3It7l4Bc3AskKeu+paJSfk7RNOMrOxmeFDhLTMQqMxycP1C3oj8vgkAT6xfAuq7ZPRA==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.16.tgz", + "integrity": "sha512-rHV6zNWW1tjgsu0dKQTX9L0ByiJHHLvQKrWtnz8r0YYJI27FU3Xu48gpK2IBj1uCSYhJ+pEk6Y0Um7U3rIvV8g==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.16.tgz", + "integrity": "sha512-n4O8oVxbn7nl4+m+ISb0a68/lcJClIbaGAoXwqeubj/D1/oMMuaAXmJVfFlRjJLu/ZvHkxoiFJnmbfp4n8cdSw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.16.tgz", + "integrity": "sha512-8yoZhGkU6aHu38WpaM4HrRLTFc7/VVD9Q2SvPcmIQIipQt2I/GMTZNdEHXoypbbGao5kggLcxg0iBKjo0SQYKA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.16.tgz", + "integrity": "sha512-9ZBjlkdaVYxPNO8a7OmzDbOH9FMQ1a58j7Xb21UfRU29KcEEU3VTHk+Cvrft/BNv0gpWJMiiZ/f4w0TqSP0gLA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.16.tgz", + "integrity": "sha512-TIZTRojVBBzdgChY3UOG7BlPhqJz08AL7jdgeeu+kiObWMFzGnQD7BgBBkWRwOtKR1i2TNlO7YK6m4zxVjjPRQ==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.16.tgz", + "integrity": "sha512-UPeRuFKCCJYpBbIdczKyHLAIU31GEm0dZl1eMrdYeXDH+SJZh/i+2cAmD3A1Wip9pIc5Sc6Kc5cFUrPXtR0XHA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.16.tgz", + "integrity": "sha512-io6yShgIEgVUhExJejJ21xvO5QtrbiSeI7vYUnr7l+v/O9t6IowyhdiYnyivX2X5ysOVHAuyHW+Wyi7DNhdw6Q==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.16.tgz", + "integrity": "sha512-WhlGeAHNbSdG/I2gqX2RK2gfgSNwyJuCiFHMc8s3GNEMMHUI109+VMBfhVqRb0ZGzEeRiibi8dItR3ws3Lk+cA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.16.tgz", + "integrity": "sha512-gHRReYsJtViir63bXKoFaQ4pgTyah4ruiMRQ6im9YZuv+gp3UFJkNTY4sFA73YDynmXZA6hi45en4BGhNOJUsw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.16.tgz", + "integrity": "sha512-mfiiBkxEbUHvi+v0P+TS7UnA9TeGXR48aK4XHkTj0ZwOijxexgMF01UDFaBX7Q6CQsB0d+MFNv9IiXbIHTNd4g==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.16.tgz", + "integrity": "sha512-n8zK1YRDGLRZfVcswcDMDM0j2xKYLNXqei217a4GyBxHIuPMGrrVuJ+Ijfpr0Kufcm7C1k/qaIrGy6eG7wvgmA==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.16.tgz", + "integrity": "sha512-lEEfkfsUbo0xC47eSTBqsItXDSzwzwhKUSsVaVjVji07t8+6KA5INp2rN890dHZeueXJAI8q0tEIfbwVRYf6Ew==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.16.tgz", + "integrity": "sha512-jlRjsuvG1fgGwnE8Afs7xYDnGz0dBgTNZfgCK6TlvPH3Z13/P5pi6I57vyLE8qZYLrGVtwcm9UbUx1/mZ8Ukag==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.16.tgz", + "integrity": "sha512-TzoU2qwVe2boOHl/3KNBUv2PNUc38U0TNnzqOAcgPiD/EZxT2s736xfC2dYQbszAwo4MKzzwBV0iHjhfjxMimg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.16.tgz", + "integrity": "sha512-B8b7W+oo2yb/3xmwk9Vc99hC9bNolvqjaTZYEfMQhzdpBsjTvZBlXQ/teUE55Ww6sg//wlcDjOaqldOKyigWdA==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.17.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.16.tgz", + "integrity": "sha512-xJ7OH/nanouJO9pf03YsL9NAFQBHd8AqfrQd7Pf5laGyyTt/gToul6QYOA/i5i/q8y9iaM5DQFNTgpi995VkOg==", + "dev": true, + "optional": true + }, "@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", From b998cbab232b8682845bf1e43d41ee186558ab10 Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 10 May 2024 18:52:12 -0400 Subject: [PATCH 2/7] Change default dataconnect port back to 9399. (#7163) * Back to 9399 * changelog --- CHANGELOG.md | 1 + src/emulator/constants.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb2d..c1068b55926 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Internal bug fixes. diff --git a/src/emulator/constants.ts b/src/emulator/constants.ts index c738c5d272f..5731ae2cb72 100644 --- a/src/emulator/constants.ts +++ b/src/emulator/constants.ts @@ -13,7 +13,7 @@ export const DEFAULT_PORTS: { [s in Emulators]: number } = { auth: 9099, storage: 9199, eventarc: 9299, - dataconnect: 9509, + dataconnect: 9399, }; export const FIND_AVAILBLE_PORT_BY_DEFAULT: Record = { From 98456ce5ed01dc7334e1f125172c9d7ed4b8448e Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 10 May 2024 23:03:51 +0000 Subject: [PATCH 3/7] 13.8.3 --- npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1188a292365..8f95235881a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "firebase-tools", - "version": "13.8.2", + "version": "13.8.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "firebase-tools", - "version": "13.8.2", + "version": "13.8.3", "license": "MIT", "dependencies": { "@google-cloud/cloud-sql-connector": "^1.2.3", diff --git a/package.json b/package.json index 0e9af1be1f2..d20dccfcddd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-tools", - "version": "13.8.2", + "version": "13.8.3", "description": "Command-Line Interface for Firebase", "main": "./lib/index.js", "bin": { From 24b60413b1d6408893452d9cd9b4a0e06a0d861b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 10 May 2024 23:04:05 +0000 Subject: [PATCH 4/7] [firebase-release] Removed change log and reset repo after 13.8.3 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1068b55926..e69de29bb2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Internal bug fixes. From 80e47a7016ada04a71cb04c969c148fd42817050 Mon Sep 17 00:00:00 2001 From: Harold Shen Date: Sat, 11 May 2024 14:13:55 -0400 Subject: [PATCH 5/7] Fix login in idx (#7166) * Fix login in idx * remove console log * prevent project selection from showing up in monospace/service account mode --------- Co-authored-by: joehan --- firebase-vscode/common/messaging/protocol.ts | 3 + firebase-vscode/package.json | 8 +- firebase-vscode/scripts/swap-pkg.js | 38 +---- firebase-vscode/src/cli.ts | 6 +- firebase-vscode/src/core/project.ts | 42 +---- firebase-vscode/src/core/user.ts | 15 +- firebase-vscode/src/data-connect/index.ts | 2 + firebase-vscode/src/data-connect/terminal.ts | 54 +++++- firebase-vscode/webviews/SidebarApp.tsx | 8 +- .../webviews/components/AccountSection.tsx | 21 ++- .../webviews/components/ProjectSection.tsx | 16 +- src/monospace/index.ts | 158 ------------------ src/monospace/interfaces.ts | 33 ---- src/requireAuth.ts | 9 - 14 files changed, 115 insertions(+), 298 deletions(-) delete mode 100644 src/monospace/index.ts delete mode 100644 src/monospace/interfaces.ts diff --git a/firebase-vscode/common/messaging/protocol.ts b/firebase-vscode/common/messaging/protocol.ts index 837e81db46b..c6cd978cb67 100644 --- a/firebase-vscode/common/messaging/protocol.ts +++ b/firebase-vscode/common/messaging/protocol.ts @@ -113,6 +113,9 @@ export interface WebviewToExtensionParamsMap { // Initialize "result" tab. getDataConnectResults: void; + + // execute terminal tasks + executeLogin: void; } export interface DataConnectResults { diff --git a/firebase-vscode/package.json b/firebase-vscode/package.json index 6376d3b52cb..c5b883cbb5e 100644 --- a/firebase-vscode/package.json +++ b/firebase-vscode/package.json @@ -13,7 +13,9 @@ "categories": [ "Other" ], - "extensionDependencies": ["graphql.vscode-graphql-syntax"], + "extensionDependencies": [ + "graphql.vscode-graphql-syntax" + ], "activationEvents": [ "onStartupFinished", "onLanguage:graphql", @@ -55,12 +57,12 @@ "properties": { "firebase.debug": { "type": "boolean", - "default": false, + "default": true, "description": "Enable writing debug-level messages to the file provided in firebase.debugLogPath (requires restart)" }, "firebase.debugLogPath": { "type": "string", - "default": "", + "default": "/tmp/firebase-plugin.log", "description": "If firebase.debug is true, appends debug-level messages to the provided file (requires restart)" }, "firebase.npmPath": { diff --git a/firebase-vscode/scripts/swap-pkg.js b/firebase-vscode/scripts/swap-pkg.js index 8a2ad521664..4c428799793 100644 --- a/firebase-vscode/scripts/swap-pkg.js +++ b/firebase-vscode/scripts/swap-pkg.js @@ -2,42 +2,10 @@ const { writeFileSync } = require("fs"); const path = require("path"); const pkg = require(path.join(__dirname, "../package.json")); -// Swaps package.json config as appropriate for packaging for -// Monospace or VSCE marketplace. -// TODO(chholland): Don't overwrite the real package.json file and -// create a generated one in dist/ - redo .vscodeignore to package -// dist/ - -let target = "vsce"; - -process.argv.forEach((arg) => { - if (arg === "vsce" || arg === "monospace") { - target = arg; - } -}); - -if (target === "vsce") { - delete pkg.extensionDependencies; - console.log( - "Removing google.monospace extensionDependency for VSCE packaging." - ); - pkg.contributes.configuration.properties["firebase.debug"].default = false; - pkg.contributes.configuration.properties["firebase.debugLogPath"].default = - ""; - console.log("Setting default debug log settings to off for VSCE packaging."); -} else if (target === "monospace") { - pkg.extensionDependencies = ["google.monospace"]; - console.log( - "Adding google.monospace extensionDependency for Monospace packaging." - ); - pkg.contributes.configuration.properties["firebase.debug"].default = true; - pkg.contributes.configuration.properties["firebase.debugLogPath"].default = - "/tmp/firebase-plugin.log"; - console.log( - "Setting default debug log settings to on for Monospace packaging." - ); -} +pkg.contributes.configuration.properties["firebase.debug"].default = true; +pkg.contributes.configuration.properties["firebase.debugLogPath"].default = + "/tmp/firebase-plugin.log"; writeFileSync( path.join(__dirname, "../package.json"), diff --git a/firebase-vscode/src/cli.ts b/firebase-vscode/src/cli.ts index 3a008fed6cc..61bb4810c5c 100644 --- a/firebase-vscode/src/cli.ts +++ b/firebase-vscode/src/cli.ts @@ -100,9 +100,9 @@ async function getServiceAccount() { */ async function requireAuthWrapper(showError: boolean = true): Promise { // Try to get global default from configstore. For some reason this is - // often overwritten when restarting the extension. pluginLogger.debug("requireAuthWrapper"); let account = getGlobalDefaultAccount(); + // often overwritten when restarting the extension. if (!account) { // If nothing in configstore top level, grab the first "additionalAccount" const accounts = getAllAccounts(); @@ -153,7 +153,7 @@ async function requireAuthWrapper(showError: boolean = true): Promise { // "error". Usually set on user-triggered actions such as // init hosting and deploy. pluginLogger.error( - `requireAuth error: ${e.original?.message || e.message}` + `requireAuth error: ${e.original?.message || e.message}`, ); vscode.window.showErrorMessage("Not logged in", { modal: true, @@ -164,7 +164,7 @@ async function requireAuthWrapper(showError: boolean = true): Promise { // but we should log it for debugging purposes. pluginLogger.debug( "requireAuth error output: ", - e.original?.message || e.message + e.original?.message || e.message, ); } return false; diff --git a/firebase-vscode/src/core/project.ts b/firebase-vscode/src/core/project.ts index d14c5fe7294..6d9f65977e5 100644 --- a/firebase-vscode/src/core/project.ts +++ b/firebase-vscode/src/core/project.ts @@ -6,14 +6,13 @@ import { FirebaseProjectMetadata } from "../types/project"; import { currentUser, isServiceAccount } from "./user"; import { listProjects } from "../cli"; import { pluginLogger } from "../logger-wrapper"; -import { selectProjectInMonospace } from "../../../src/monospace"; import { currentOptions } from "../options"; import { globalSignal } from "../utils/globals"; import { firstWhereDefined } from "../utils/signal"; /** Available projects */ export const projects = globalSignal>( - {} + {}, ); /** Currently selected project ID */ @@ -22,7 +21,7 @@ export const currentProjectId = globalSignal(""); const userScopedProjects = computed( () => { return projects.value[currentUser.value?.email ?? ""]; - } + }, ); /** Gets the currently selected project, fallback to first default project in RC file */ @@ -41,7 +40,7 @@ export const currentProject = computed( } return userScopedProjects.value?.find((p) => p.projectId === wantProjectId); - } + }, ); export function registerProject(broker: ExtensionBrokerImpl): Disposable { @@ -87,32 +86,7 @@ export function registerProject(broker: ExtensionBrokerImpl): Disposable { const command = vscode.commands.registerCommand( "firebase.selectProject", async () => { - if (process.env.MONOSPACE_ENV) { - pluginLogger.debug( - "selectProject: found MONOSPACE_ENV, " + - "prompting user using external flow" - ); - /** - * Monospace case: use Monospace flow - */ - const monospaceExtension = - vscode.extensions.getExtension("google.monospace"); - process.env.MONOSPACE_DAEMON_PORT = - monospaceExtension.exports.getMonospaceDaemonPort(); - try { - const projectId = await selectProjectInMonospace({ - projectRoot: currentOptions.value.cwd, - project: undefined, - isVSCE: true, - }); - - if (projectId) { - currentProjectId.value = projectId; - } - } catch (e) { - pluginLogger.error(e); - } - } else if (isServiceAccount.value) { + if (isServiceAccount.value) { return; } else { try { @@ -124,11 +98,11 @@ export function registerProject(broker: ExtensionBrokerImpl): Disposable { vscode.window.showErrorMessage(e.message); } } - } + }, ); const sub6 = broker.on("selectProject", () => - vscode.commands.executeCommand("firebase.selectProject") + vscode.commands.executeCommand("firebase.selectProject"), ); return vscode.Disposable.from( @@ -138,7 +112,7 @@ export function registerProject(broker: ExtensionBrokerImpl): Disposable { { dispose: sub3 }, { dispose: sub4 }, { dispose: sub5 }, - { dispose: sub6 } + { dispose: sub6 }, ); } @@ -149,7 +123,7 @@ export function registerProject(broker: ExtensionBrokerImpl): Disposable { */ export async function _promptUserForProject( projects: Thenable, - token?: vscode.CancellationToken + token?: vscode.CancellationToken, ): Promise { const items = projects.then((projects) => { return projects.map((p) => ({ diff --git a/firebase-vscode/src/core/user.ts b/firebase-vscode/src/core/user.ts index ad4c1773981..4c5f2349e07 100644 --- a/firebase-vscode/src/core/user.ts +++ b/firebase-vscode/src/core/user.ts @@ -23,7 +23,16 @@ export const isServiceAccount = computed(() => { return (currentUser.value as ServiceAccountUser)?.type === "service_account"; }); +export async function checkLogin() { + const accounts = await getAccounts(); + users.value = accounts.reduce( + (cumm, curr) => ({ ...cumm, [curr.user.email]: curr.user }), + {} + ); +} + export function registerUser(broker: ExtensionBrokerImpl): Disposable { + const sub1 = effect(() => { broker.send("notifyUsers", { users: Object.values(users.value) }); }); @@ -33,11 +42,7 @@ export function registerUser(broker: ExtensionBrokerImpl): Disposable { }); const sub3 = broker.on("getInitialData", async () => { - const accounts = await getAccounts(); - users.value = accounts.reduce( - (cumm, curr) => ({ ...cumm, [curr.user.email]: curr.user }), - {} - ); + checkLogin(); }); const sub4 = broker.on("addUser", async () => { diff --git a/firebase-vscode/src/data-connect/index.ts b/firebase-vscode/src/data-connect/index.ts index f3fdf8febd0..d3e494f2f15 100644 --- a/firebase-vscode/src/data-connect/index.ts +++ b/firebase-vscode/src/data-connect/index.ts @@ -28,6 +28,7 @@ import { runDataConnectCompiler } from "./core-compiler"; import { Result } from "../result"; import { runEmulatorIssuesStream } from "./emulator-stream"; import { LanguageClient } from "vscode-languageclient/node"; +import { registerTerminalTasks } from "./terminal"; class CodeActionsProvider implements vscode.CodeActionProvider { constructor( @@ -223,6 +224,7 @@ export function registerFdc( registerAdHoc(), registerConnectors(context, broker, fdcService), registerFdcDeploy(broker), + registerTerminalTasks(broker), operationCodeLensProvider, vscode.languages.registerCodeLensProvider( // **Hack**: For testing purposes, enable code lenses on all graphql files diff --git a/firebase-vscode/src/data-connect/terminal.ts b/firebase-vscode/src/data-connect/terminal.ts index 2411042d2af..b45adcc7d8b 100644 --- a/firebase-vscode/src/data-connect/terminal.ts +++ b/firebase-vscode/src/data-connect/terminal.ts @@ -1,6 +1,7 @@ import { TerminalOptions } from "vscode"; -import * as vscode from "vscode"; - +import { ExtensionBrokerImpl } from "../extension-broker"; +import vscode, { Disposable } from "vscode"; +import { checkLogin } from "../core/user"; const environmentVariables = {}; const terminalOptions: TerminalOptions = { @@ -17,3 +18,52 @@ export function runCommand(command: string) { terminal.show(); terminal.sendText(command); } + +export function runTerminalTask( + taskName: string, + command: string, +): Promise { + const type = "firebase-" + Date.now(); + return new Promise(async (resolve, reject) => { + vscode.tasks.onDidEndTaskProcess(async (e) => { + if (e.execution.task.definition.type === type) { + e.execution.terminate(); + + if (e.exitCode === 0) { + resolve(`Successfully executed ${taskName} with command: ${command}`); + } else { + reject( + new Error(`Failed to execute ${taskName} with command: ${command}`), + ); + } + } + }); + vscode.tasks.executeTask( + new vscode.Task( + { type }, + vscode.TaskScope.Workspace, + taskName, + "firebase", + new vscode.ShellExecution(command), + ), + ); + }); +} + +export function registerTerminalTasks(broker: ExtensionBrokerImpl): Disposable { + const loginTaskBroker = broker.on("executeLogin", () => { + runTerminalTask("firebase login", "firebase login --no-localhost").then(() => { + checkLogin(); + }); + }); + + return Disposable.from( + { dispose: loginTaskBroker }, + vscode.commands.registerCommand( + "firebase.dataConnect.runTerminalTask", + (taskName, command) => { + runTerminalTask(taskName, command); + }, + ), + ); +} diff --git a/firebase-vscode/webviews/SidebarApp.tsx b/firebase-vscode/webviews/SidebarApp.tsx index 55704eb5a6c..2351820aeaf 100644 --- a/firebase-vscode/webviews/SidebarApp.tsx +++ b/firebase-vscode/webviews/SidebarApp.tsx @@ -13,6 +13,7 @@ import { ValueOrError } from "./messaging/protocol"; import { FirebaseConfig } from "../../src/firebaseConfig"; import { RCData } from "../../src/rc"; import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"; +import { ServiceAccountUser } from "../common/types"; export function SidebarApp() { const env = useBroker("notifyEnv")?.env; @@ -158,9 +159,10 @@ function SidebarContent(props: { {accountSection} {!!user && ( - + )} - {hostingInitState === "success" && + { // TODO: disable hosting completely + /* {hostingInitState === "success" && !!user && !!projectId && env?.isMonospace && ( @@ -184,7 +186,7 @@ function SidebarContent(props: { hostingInitState={hostingInitState} setHostingInitState={setHostingInitState} /> - )} + )} */} { // disable emulator panel for now, as we have an individual emulator panel in the FDC section } diff --git a/firebase-vscode/webviews/components/AccountSection.tsx b/firebase-vscode/webviews/components/AccountSection.tsx index 79726e1061a..82f798d7ba0 100644 --- a/firebase-vscode/webviews/components/AccountSection.tsx +++ b/firebase-vscode/webviews/components/AccountSection.tsx @@ -34,9 +34,11 @@ export function AccountSection({ if (usersLoaded && (!allUsers.length || !user)) { // Users loaded but no user was found if (isMonospace) { - // Monospace: this is an error, should have found a workspace - // service account - currentUserElement = TEXT.MONOSPACE_LOGIN_FAIL; + currentUserElement = ( + broker.send("executeLogin")}> + {TEXT.GOOGLE_SIGN_IN} + + ); } else { // VS Code: prompt user to log in with Google account currentUserElement = ( @@ -49,7 +51,11 @@ export function AccountSection({ // Users loaded, at least one user was found if (user.type === "service_account") { if (isMonospace) { - currentUserElement = TEXT.MONOSPACE_LOGGED_IN; + currentUserElement = ( + broker.send("executeLogin")}> + {TEXT.GOOGLE_SIGN_IN} + + ); } else { currentUserElement = TEXT.VSCE_SERVICE_ACCOUNT_LOGGED_IN; } @@ -63,13 +69,6 @@ export function AccountSection({ {currentUserElement} ); - if (user?.type === "service_account" && isMonospace) { - userBoxElement = ( - - ); - } return (
{userBoxElement} diff --git a/firebase-vscode/webviews/components/ProjectSection.tsx b/firebase-vscode/webviews/components/ProjectSection.tsx index 34c6e4b3d30..5b4d01e3489 100644 --- a/firebase-vscode/webviews/components/ProjectSection.tsx +++ b/firebase-vscode/webviews/components/ProjectSection.tsx @@ -7,14 +7,26 @@ import React from "react"; import styles from "./AccountSection.scss"; import { ExternalLink } from "./ui/ExternalLink"; import { TEXT } from "../globals/ux-text"; +import { User } from "../types/auth"; +import { ServiceAccountUser } from "../types"; +interface UserWithType extends User { + type?: string; +} export function ProjectSection({ - userEmail, + user, projectId, + isMonospace, }: { - userEmail: string | null; + user: UserWithType | ServiceAccountUser | null; projectId: string | null | undefined; + isMonospace: boolean; }) { + const userEmail = user.email; + + if (isMonospace && user?.type === "service_account") { + return; + } return (