From 85873277048cb7348a18f5e8ae0f546ed63cc6d4 Mon Sep 17 00:00:00 2001 From: Jonas Termansen Date: Mon, 13 Nov 2023 15:53:06 +0100 Subject: [PATCH 1/3] Clean up after renaming the be channel to main. Bug: b/299435467 --- lib/main.dart | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 23dc299..d40282f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -71,14 +71,7 @@ Future _impl(List args) async { channel = sdk; version = raw ? 'latest' : (await latestPublishedVersion(channel, flavor)); } else if (sdk == 'main') { - // Check for `main` first and fall back to `be`. This handles the channel - // rename from `be` to `main` (also tracked as b/299435467). - try { - channel = 'main'; - await latestPublishedVersion(channel, flavor); - } catch (_) { - channel = 'be'; - } + channel = 'main'; version = 'latest'; } else { version = sdk; From 446787fec070383d36e012aad60832ed331c5ae7 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 13 Nov 2023 13:16:10 -0800 Subject: [PATCH 2/3] recompile the javascript code (#116) recompile the javascript code; normalize sig generation --- dist/index.mjs | 200 +++++++++++++-------------- dist/main.cjs | 364 +++++++++++++++++++++---------------------------- dist/sig.txt | 2 +- tool/sig.dart | 32 ++--- 4 files changed, 270 insertions(+), 328 deletions(-) diff --git a/dist/index.mjs b/dist/index.mjs index ddcecd2..bb3d0c2 100644 --- a/dist/index.mjs +++ b/dist/index.mjs @@ -1,7 +1,7 @@ import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "module"; /******/ var __webpack_modules__ = ({ -/***/ 2690: +/***/ 3551: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -27,7 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.issue = exports.issueCommand = void 0; const os = __importStar(__nccwpck_require__(2037)); -const utils_1 = __nccwpck_require__(353); +const utils_1 = __nccwpck_require__(2139); /** * Commands * @@ -99,7 +99,7 @@ function escapeProperty(s) { /***/ }), -/***/ 9935: +/***/ 2606: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -133,12 +133,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0; -const command_1 = __nccwpck_require__(2690); -const file_command_1 = __nccwpck_require__(5898); -const utils_1 = __nccwpck_require__(353); +const command_1 = __nccwpck_require__(3551); +const file_command_1 = __nccwpck_require__(3682); +const utils_1 = __nccwpck_require__(2139); const os = __importStar(__nccwpck_require__(2037)); const path = __importStar(__nccwpck_require__(1017)); -const oidc_utils_1 = __nccwpck_require__(7901); +const oidc_utils_1 = __nccwpck_require__(7539); /** * The code to exit an action */ @@ -423,17 +423,17 @@ exports.getIDToken = getIDToken; /** * Summary exports */ -var summary_1 = __nccwpck_require__(9050); +var summary_1 = __nccwpck_require__(2586); Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } })); /** * @deprecated use core.summary */ -var summary_2 = __nccwpck_require__(9050); +var summary_2 = __nccwpck_require__(2586); Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } })); /** * Path exports */ -var path_utils_1 = __nccwpck_require__(1341); +var path_utils_1 = __nccwpck_require__(5228); Object.defineProperty(exports, "toPosixPath", ({ enumerable: true, get: function () { return path_utils_1.toPosixPath; } })); Object.defineProperty(exports, "toWin32Path", ({ enumerable: true, get: function () { return path_utils_1.toWin32Path; } })); Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: function () { return path_utils_1.toPlatformPath; } })); @@ -441,7 +441,7 @@ Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: funct /***/ }), -/***/ 5898: +/***/ 3682: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -471,8 +471,8 @@ exports.prepareKeyValueMessage = exports.issueFileCommand = void 0; /* eslint-disable @typescript-eslint/no-explicit-any */ const fs = __importStar(__nccwpck_require__(7147)); const os = __importStar(__nccwpck_require__(2037)); -const uuid_1 = __nccwpck_require__(1368); -const utils_1 = __nccwpck_require__(353); +const uuid_1 = __nccwpck_require__(5941); +const utils_1 = __nccwpck_require__(2139); function issueFileCommand(command, message) { const filePath = process.env[`GITHUB_${command}`]; if (!filePath) { @@ -505,7 +505,7 @@ exports.prepareKeyValueMessage = prepareKeyValueMessage; /***/ }), -/***/ 7901: +/***/ 7539: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -520,9 +520,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.OidcClient = void 0; -const http_client_1 = __nccwpck_require__(3658); -const auth_1 = __nccwpck_require__(2660); -const core_1 = __nccwpck_require__(9935); +const http_client_1 = __nccwpck_require__(4215); +const auth_1 = __nccwpck_require__(885); +const core_1 = __nccwpck_require__(2606); class OidcClient { static createHttpClient(allowRetry = true, maxRetry = 10) { const requestOptions = { @@ -588,7 +588,7 @@ exports.OidcClient = OidcClient; /***/ }), -/***/ 1341: +/***/ 5228: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -652,7 +652,7 @@ exports.toPlatformPath = toPlatformPath; /***/ }), -/***/ 9050: +/***/ 2586: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -941,7 +941,7 @@ exports.summary = _summary; /***/ }), -/***/ 353: +/***/ 2139: /***/ ((__unused_webpack_module, exports) => { @@ -987,7 +987,7 @@ exports.toCommandProperties = toCommandProperties; /***/ }), -/***/ 3409: +/***/ 69: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1022,7 +1022,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", ({ value: true })); exports.getExecOutput = exports.exec = void 0; const string_decoder_1 = __nccwpck_require__(1576); -const tr = __importStar(__nccwpck_require__(1139)); +const tr = __importStar(__nccwpck_require__(5029)); /** * Exec a command. * Output will be streamed to the live console. @@ -1096,7 +1096,7 @@ exports.getExecOutput = getExecOutput; /***/ }), -/***/ 1139: +/***/ 5029: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1134,8 +1134,8 @@ const os = __importStar(__nccwpck_require__(2037)); const events = __importStar(__nccwpck_require__(2361)); const child = __importStar(__nccwpck_require__(2081)); const path = __importStar(__nccwpck_require__(1017)); -const io = __importStar(__nccwpck_require__(2725)); -const ioUtil = __importStar(__nccwpck_require__(573)); +const io = __importStar(__nccwpck_require__(96)); +const ioUtil = __importStar(__nccwpck_require__(375)); const timers_1 = __nccwpck_require__(9512); /* eslint-disable @typescript-eslint/unbound-method */ const IS_WINDOWS = process.platform === 'win32'; @@ -1720,7 +1720,7 @@ class ExecState extends events.EventEmitter { /***/ }), -/***/ 2660: +/***/ 885: /***/ (function(__unused_webpack_module, exports) { @@ -1807,7 +1807,7 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand /***/ }), -/***/ 3658: +/***/ 4215: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1844,8 +1844,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0; const http = __importStar(__nccwpck_require__(3685)); const https = __importStar(__nccwpck_require__(5687)); -const pm = __importStar(__nccwpck_require__(9697)); -const tunnel = __importStar(__nccwpck_require__(7477)); +const pm = __importStar(__nccwpck_require__(6695)); +const tunnel = __importStar(__nccwpck_require__(5306)); var HttpCodes; (function (HttpCodes) { HttpCodes[HttpCodes["OK"] = 200] = "OK"; @@ -2431,7 +2431,7 @@ const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCa /***/ }), -/***/ 9697: +/***/ 6695: /***/ ((__unused_webpack_module, exports) => { @@ -2519,7 +2519,7 @@ function isLoopbackAddress(host) { /***/ }), -/***/ 573: +/***/ 375: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2708,7 +2708,7 @@ exports.getCmdPath = getCmdPath; /***/ }), -/***/ 2725: +/***/ 96: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2744,7 +2744,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.findInPath = exports.which = exports.mkdirP = exports.rmRF = exports.mv = exports.cp = void 0; const assert_1 = __nccwpck_require__(9491); const path = __importStar(__nccwpck_require__(1017)); -const ioUtil = __importStar(__nccwpck_require__(573)); +const ioUtil = __importStar(__nccwpck_require__(375)); /** * Copies a file or folder. * Based off of shelljs - https://github.com/shelljs/shelljs/blob/9237f66c52e5daa40458f94f9565e18e8132f5a6/src/cp.js @@ -3013,7 +3013,7 @@ function copyFile(srcFile, destFile, force) { /***/ }), -/***/ 7936: +/***/ 2033: /***/ (function(module, exports, __nccwpck_require__) { @@ -3047,8 +3047,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports._readLinuxVersionFile = exports._getOsVersion = exports._findMatch = void 0; -const semver = __importStar(__nccwpck_require__(7163)); -const core_1 = __nccwpck_require__(9935); +const semver = __importStar(__nccwpck_require__(537)); +const core_1 = __nccwpck_require__(2606); // needs to be require for core node modules to be mocked /* eslint @typescript-eslint/no-require-imports: 0 */ const os = __nccwpck_require__(2037); @@ -3147,7 +3147,7 @@ exports._readLinuxVersionFile = _readLinuxVersionFile; /***/ }), -/***/ 721: +/***/ 2182: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -3181,7 +3181,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.RetryHelper = void 0; -const core = __importStar(__nccwpck_require__(9935)); +const core = __importStar(__nccwpck_require__(2606)); /** * Internal class for retries */ @@ -3236,7 +3236,7 @@ exports.RetryHelper = RetryHelper; /***/ }), -/***/ 2275: +/***/ 1994: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -3273,20 +3273,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.evaluateVersions = exports.isExplicitVersion = exports.findFromManifest = exports.getManifestFromRepo = exports.findAllVersions = exports.find = exports.cacheFile = exports.cacheDir = exports.extractZip = exports.extractXar = exports.extractTar = exports.extract7z = exports.downloadTool = exports.HTTPError = void 0; -const core = __importStar(__nccwpck_require__(9935)); -const io = __importStar(__nccwpck_require__(2725)); +const core = __importStar(__nccwpck_require__(2606)); +const io = __importStar(__nccwpck_require__(96)); const fs = __importStar(__nccwpck_require__(7147)); -const mm = __importStar(__nccwpck_require__(7936)); +const mm = __importStar(__nccwpck_require__(2033)); const os = __importStar(__nccwpck_require__(2037)); const path = __importStar(__nccwpck_require__(1017)); -const httpm = __importStar(__nccwpck_require__(3658)); -const semver = __importStar(__nccwpck_require__(7163)); +const httpm = __importStar(__nccwpck_require__(4215)); +const semver = __importStar(__nccwpck_require__(537)); const stream = __importStar(__nccwpck_require__(2781)); const util = __importStar(__nccwpck_require__(3837)); const assert_1 = __nccwpck_require__(9491); -const v4_1 = __importDefault(__nccwpck_require__(4559)); -const exec_1 = __nccwpck_require__(3409); -const retry_helper_1 = __nccwpck_require__(721); +const v4_1 = __importDefault(__nccwpck_require__(6651)); +const exec_1 = __nccwpck_require__(69); +const retry_helper_1 = __nccwpck_require__(2182); class HTTPError extends Error { constructor(httpStatusCode) { super(`Unexpected HTTP response: ${httpStatusCode}`); @@ -3907,7 +3907,7 @@ function _unique(values) { /***/ }), -/***/ 6993: +/***/ 5792: /***/ ((module) => { /** @@ -3940,7 +3940,7 @@ module.exports = bytesToUuid; /***/ }), -/***/ 3480: +/***/ 7553: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { // Unique ID creation requires a high quality random # generator. In node.js @@ -3955,11 +3955,11 @@ module.exports = function nodeRNG() { /***/ }), -/***/ 4559: +/***/ 6651: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { -var rng = __nccwpck_require__(3480); -var bytesToUuid = __nccwpck_require__(6993); +var rng = __nccwpck_require__(7553); +var bytesToUuid = __nccwpck_require__(5792); function v4(options, buf, offset) { var i = buf && offset || 0; @@ -3991,7 +3991,7 @@ module.exports = v4; /***/ }), -/***/ 7163: +/***/ 537: /***/ ((module, exports) => { exports = module.exports = SemVer @@ -5641,15 +5641,15 @@ function coerce (version, options) { /***/ }), -/***/ 7477: +/***/ 5306: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { -module.exports = __nccwpck_require__(8162); +module.exports = __nccwpck_require__(1998); /***/ }), -/***/ 8162: +/***/ 1998: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -5920,7 +5920,7 @@ exports.debug = debug; // for test /***/ }), -/***/ 1368: +/***/ 5941: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -5983,29 +5983,29 @@ Object.defineProperty(exports, "parse", ({ } })); -var _v = _interopRequireDefault(__nccwpck_require__(3258)); +var _v = _interopRequireDefault(__nccwpck_require__(7174)); -var _v2 = _interopRequireDefault(__nccwpck_require__(2559)); +var _v2 = _interopRequireDefault(__nccwpck_require__(5714)); -var _v3 = _interopRequireDefault(__nccwpck_require__(2872)); +var _v3 = _interopRequireDefault(__nccwpck_require__(6142)); -var _v4 = _interopRequireDefault(__nccwpck_require__(5034)); +var _v4 = _interopRequireDefault(__nccwpck_require__(3946)); -var _nil = _interopRequireDefault(__nccwpck_require__(6051)); +var _nil = _interopRequireDefault(__nccwpck_require__(9687)); -var _version = _interopRequireDefault(__nccwpck_require__(6630)); +var _version = _interopRequireDefault(__nccwpck_require__(4312)); -var _validate = _interopRequireDefault(__nccwpck_require__(6879)); +var _validate = _interopRequireDefault(__nccwpck_require__(2644)); -var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); +var _stringify = _interopRequireDefault(__nccwpck_require__(8551)); -var _parse = _interopRequireDefault(__nccwpck_require__(3783)); +var _parse = _interopRequireDefault(__nccwpck_require__(1728)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } /***/ }), -/***/ 1102: +/***/ 7802: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6034,7 +6034,7 @@ exports["default"] = _default; /***/ }), -/***/ 6051: +/***/ 9687: /***/ ((__unused_webpack_module, exports) => { @@ -6048,7 +6048,7 @@ exports["default"] = _default; /***/ }), -/***/ 3783: +/***/ 1728: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6058,7 +6058,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(6879)); +var _validate = _interopRequireDefault(__nccwpck_require__(2644)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6099,7 +6099,7 @@ exports["default"] = _default; /***/ }), -/***/ 4557: +/***/ 808: /***/ ((__unused_webpack_module, exports) => { @@ -6113,7 +6113,7 @@ exports["default"] = _default; /***/ }), -/***/ 160: +/***/ 406: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6143,7 +6143,7 @@ function rng() { /***/ }), -/***/ 4850: +/***/ 2683: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6172,7 +6172,7 @@ exports["default"] = _default; /***/ }), -/***/ 2992: +/***/ 8551: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6182,7 +6182,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(6879)); +var _validate = _interopRequireDefault(__nccwpck_require__(2644)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6217,7 +6217,7 @@ exports["default"] = _default; /***/ }), -/***/ 3258: +/***/ 7174: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6227,9 +6227,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(160)); +var _rng = _interopRequireDefault(__nccwpck_require__(406)); -var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); +var _stringify = _interopRequireDefault(__nccwpck_require__(8551)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6330,7 +6330,7 @@ exports["default"] = _default; /***/ }), -/***/ 2559: +/***/ 5714: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6340,9 +6340,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(810)); +var _v = _interopRequireDefault(__nccwpck_require__(1130)); -var _md = _interopRequireDefault(__nccwpck_require__(1102)); +var _md = _interopRequireDefault(__nccwpck_require__(7802)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6352,7 +6352,7 @@ exports["default"] = _default; /***/ }), -/***/ 810: +/***/ 1130: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6363,9 +6363,9 @@ Object.defineProperty(exports, "__esModule", ({ exports["default"] = _default; exports.URL = exports.DNS = void 0; -var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); +var _stringify = _interopRequireDefault(__nccwpck_require__(8551)); -var _parse = _interopRequireDefault(__nccwpck_require__(3783)); +var _parse = _interopRequireDefault(__nccwpck_require__(1728)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6436,7 +6436,7 @@ function _default(name, version, hashfunc) { /***/ }), -/***/ 2872: +/***/ 6142: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6446,9 +6446,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(160)); +var _rng = _interopRequireDefault(__nccwpck_require__(406)); -var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); +var _stringify = _interopRequireDefault(__nccwpck_require__(8551)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6479,7 +6479,7 @@ exports["default"] = _default; /***/ }), -/***/ 5034: +/***/ 3946: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6489,9 +6489,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(810)); +var _v = _interopRequireDefault(__nccwpck_require__(1130)); -var _sha = _interopRequireDefault(__nccwpck_require__(4850)); +var _sha = _interopRequireDefault(__nccwpck_require__(2683)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6501,7 +6501,7 @@ exports["default"] = _default; /***/ }), -/***/ 6879: +/***/ 2644: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6511,7 +6511,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _regex = _interopRequireDefault(__nccwpck_require__(4557)); +var _regex = _interopRequireDefault(__nccwpck_require__(808)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6524,7 +6524,7 @@ exports["default"] = _default; /***/ }), -/***/ 6630: +/***/ 4312: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6534,7 +6534,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(6879)); +var _validate = _interopRequireDefault(__nccwpck_require__(2644)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6670,7 +6670,7 @@ module.exports = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("util"); /***/ }), -/***/ 8405: +/***/ 3247: /***/ ((__webpack_module__, __unused_webpack___webpack_exports__, __nccwpck_require__) => { var _actions_core__WEBPACK_IMPORTED_MODULE_0___namespace_cache; @@ -6679,10 +6679,10 @@ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_3___namespace_cache; var fs__WEBPACK_IMPORTED_MODULE_4___namespace_cache; var os__WEBPACK_IMPORTED_MODULE_6___namespace_cache; __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try { -/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(9935); -/* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(3409); -/* harmony import */ var _actions_http_client__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(3658); -/* harmony import */ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(2275); +/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(2606); +/* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(69); +/* harmony import */ var _actions_http_client__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(4215); +/* harmony import */ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(1994); /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(7147); /* harmony import */ var module__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(8188); /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(2037); @@ -6903,6 +6903,6 @@ __webpack_async_result__(); /******/ // startup /******/ // Load entry module and return exports /******/ // This entry module used 'module' so it can't be inlined -/******/ var __webpack_exports__ = __nccwpck_require__(8405); +/******/ var __webpack_exports__ = __nccwpck_require__(3247); /******/ __webpack_exports__ = await __webpack_exports__; /******/ diff --git a/dist/main.cjs b/dist/main.cjs index 5d205e3..34a42c7 100644 --- a/dist/main.cjs +++ b/dist/main.cjs @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.3.0-5.0.dev. +// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.3.0-120.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -1137,14 +1137,11 @@ t1.toString; $prototype = isStatic ? Object.create(new A.StaticClosure().constructor.prototype) : Object.create(new A.BoundClosure(null, null).constructor.prototype); $prototype.$initialize = $prototype.constructor; - if (isStatic) - $constructor = function static_tear_off() { - this.$initialize(); - }; - else - $constructor = function tear_off(a, b) { - this.$initialize(a, b); - }; + $constructor = isStatic ? function static_tear_off() { + this.$initialize(); + } : function tear_off(a, b) { + this.$initialize(a, b); + }; $prototype.constructor = $constructor; $constructor.prototype = $prototype; $prototype.$_name = $name; @@ -1242,12 +1239,9 @@ } }, Closure_forwardCallTo(stubName, $function, isIntercepted, needsDirectAccess) { - var arity, t1; if (isIntercepted) return A.Closure_forwardInterceptedCallTo(stubName, $function, needsDirectAccess); - arity = $function.length; - t1 = A.Closure_cspForwardCall(arity, needsDirectAccess, stubName, $function); - return t1; + return A.Closure_cspForwardCall($function.length, needsDirectAccess, stubName, $function); }, Closure_cspForwardInterceptedCall(arity, needsDirectAccess, stubName, $function) { var getReceiver = A.BoundClosure_receiverOf, @@ -1719,12 +1713,6 @@ var future = rti._precomputed1; return future == null ? rti._precomputed1 = A._Universe__lookupInterfaceRti(universe, "Future", [rti._primary]) : future; }, - Rti__getIsSubtypeCache(rti) { - var probe = rti._isSubtypeCache; - if (probe != null) - return probe; - return rti._isSubtypeCache = new Map(); - }, Rti__isUnionOfFunctionType(rti) { var kind = rti._kind; if (kind === 6 || kind === 7 || kind === 8) @@ -1857,13 +1845,11 @@ return target; }, closureFunctionType(closure) { - var t1, - signature = closure.$signature; + var signature = closure.$signature; if (signature != null) { if (typeof signature == "number") return A.getTypeFromTypesTable(signature); - t1 = closure.$signature(); - return t1; + return closure.$signature(); } return null; }, @@ -1955,7 +1941,7 @@ var t1, unstarred, unstarredKind, isFn, $name, predicate, testRti = this; if (testRti === type$.Object) return A._finishIsFn(testRti, object, A._isObject); - if (!A.isStrongTopType(testRti)) + if (!A.isSoundTopType(testRti)) if (!(testRti === type$.legacy_Object)) t1 = false; else @@ -1985,7 +1971,7 @@ return A._finishIsFn(testRti, object, isFn); if (unstarredKind === 9) { $name = unstarred._primary; - if (unstarred._rest.every(A.isTopType)) { + if (unstarred._rest.every(A.isDefinitelyTopType)) { testRti._specializedTestResource = "$is" + $name; if ($name === "List") return A._finishIsFn(testRti, object, A._isListTestViaProperty); @@ -2004,7 +1990,7 @@ _installSpecializedAsCheck(object) { var t1, testRti = this, asFn = A._generalAsCheckImplementation; - if (!A.isStrongTopType(testRti)) + if (!A.isSoundTopType(testRti)) if (!(testRti === type$.legacy_Object)) t1 = false; else @@ -2026,7 +2012,7 @@ _nullIs(testRti) { var t1, kind = testRti._kind; - if (!A.isStrongTopType(testRti)) + if (!A.isSoundTopType(testRti)) if (!(testRti === type$.legacy_Object)) if (!(testRti === type$.legacy_Never)) if (kind !== 7) @@ -2078,10 +2064,9 @@ return !!J.getInterceptor$(object)[tag]; }, _generalAsCheckImplementation(object) { - var t1, testRti = this; + var testRti = this; if (object == null) { - t1 = A.isNullable(testRti); - if (t1) + if (A.isNullable(testRti)) return object; } else if (testRti._is(object)) return object; @@ -2337,7 +2322,7 @@ return typeParametersText + "(" + argumentsText + ") => " + returnTypeText; }, _rtiToString(rti, genericContext) { - var s, questionArgument, argumentKind, $name, $arguments, t1, t2, + var questionArgument, s, argumentKind, $name, $arguments, t1, t2, kind = rti._kind; if (kind === 5) return "erased"; @@ -2349,10 +2334,8 @@ return "Never"; if (kind === 4) return "any"; - if (kind === 6) { - s = A._rtiToString(rti._primary, genericContext); - return s; - } + if (kind === 6) + return A._rtiToString(rti._primary, genericContext); if (kind === 7) { questionArgument = rti._primary; s = A._rtiToString(questionArgument, genericContext); @@ -2484,7 +2467,7 @@ var baseKind, t1, rti; if (normalize) { baseKind = baseType._kind; - if (!A.isStrongTopType(baseType)) + if (!A.isSoundTopType(baseType)) t1 = baseType === type$.Null || baseType === type$.JSNull || baseKind === 7 || baseKind === 6; else t1 = true; @@ -2511,7 +2494,7 @@ var baseKind, t1, starArgument, rti; if (normalize) { baseKind = baseType._kind; - if (!A.isStrongTopType(baseType)) + if (!A.isSoundTopType(baseType)) if (!(baseType === type$.Null || baseType === type$.JSNull)) if (baseKind !== 7) t1 = baseKind === 8 && A.isNullable(baseType._primary); @@ -2550,17 +2533,10 @@ return t1; }, _Universe__createFutureOrRti(universe, baseType, key, normalize) { - var t1, t2, rti; + var t1, rti; if (normalize) { t1 = baseType._kind; - if (!A.isStrongTopType(baseType)) - if (!(baseType === type$.legacy_Object)) - t2 = false; - else - t2 = true; - else - t2 = true; - if (t2 || baseType === type$.Object) + if (A.isSoundTopType(baseType) || baseType === type$.Object || baseType === type$.legacy_Object) return baseType; else if (t1 === 1) return A._Universe__lookupInterfaceRti(universe, "Future", [baseType]); @@ -3009,19 +2985,25 @@ }, isSubtype(universe, s, t) { var result, - sCache = A.Rti__getIsSubtypeCache(s), - probe = sCache.get(t); - if (probe != null) - return probe; - result = A._isSubtype(universe, s, null, t, null); - sCache.set(t, result); - return result; + sCache = s._isSubtypeCache; + if (sCache == null) + sCache = s._isSubtypeCache = new Map(); + result = sCache.get(t); + if (result == null) { + result = A._isSubtype(universe, s, null, t, null, false) ? 1 : 0; + sCache.set(t, result); + } + if (0 === result) + return false; + if (1 === result) + return true; + return true; }, - _isSubtype(universe, s, sEnv, t, tEnv) { + _isSubtype(universe, s, sEnv, t, tEnv, isLegacy) { var t1, sKind, leftTypeVariable, tKind, t2, sBounds, tBounds, sLength, i, sBound, tBound; if (s === t) return true; - if (!A.isStrongTopType(t)) + if (!A.isSoundTopType(t)) if (!(t === type$.legacy_Object)) t1 = false; else @@ -3033,7 +3015,7 @@ sKind = s._kind; if (sKind === 4) return true; - if (A.isStrongTopType(s)) + if (A.isSoundTopType(s)) return false; if (s._kind !== 1) t1 = false; @@ -3043,45 +3025,45 @@ return true; leftTypeVariable = sKind === 14; if (leftTypeVariable) - if (A._isSubtype(universe, sEnv[s._primary], sEnv, t, tEnv)) + if (A._isSubtype(universe, sEnv[s._primary], sEnv, t, tEnv, false)) return true; tKind = t._kind; t1 = s === type$.Null || s === type$.JSNull; if (t1) { if (tKind === 8) - return A._isSubtype(universe, s, sEnv, t._primary, tEnv); + return A._isSubtype(universe, s, sEnv, t._primary, tEnv, false); return t === type$.Null || t === type$.JSNull || tKind === 7 || tKind === 6; } if (t === type$.Object) { if (sKind === 8) - return A._isSubtype(universe, s._primary, sEnv, t, tEnv); + return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false); if (sKind === 6) - return A._isSubtype(universe, s._primary, sEnv, t, tEnv); + return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false); return sKind !== 7; } if (sKind === 6) - return A._isSubtype(universe, s._primary, sEnv, t, tEnv); + return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false); if (tKind === 6) { t1 = A.Rti__getQuestionFromStar(universe, t); - return A._isSubtype(universe, s, sEnv, t1, tEnv); + return A._isSubtype(universe, s, sEnv, t1, tEnv, false); } if (sKind === 8) { - if (!A._isSubtype(universe, s._primary, sEnv, t, tEnv)) + if (!A._isSubtype(universe, s._primary, sEnv, t, tEnv, false)) return false; - return A._isSubtype(universe, A.Rti__getFutureFromFutureOr(universe, s), sEnv, t, tEnv); + return A._isSubtype(universe, A.Rti__getFutureFromFutureOr(universe, s), sEnv, t, tEnv, false); } if (sKind === 7) { - t1 = A._isSubtype(universe, type$.Null, sEnv, t, tEnv); - return t1 && A._isSubtype(universe, s._primary, sEnv, t, tEnv); + t1 = A._isSubtype(universe, type$.Null, sEnv, t, tEnv, false); + return t1 && A._isSubtype(universe, s._primary, sEnv, t, tEnv, false); } if (tKind === 8) { - if (A._isSubtype(universe, s, sEnv, t._primary, tEnv)) + if (A._isSubtype(universe, s, sEnv, t._primary, tEnv, false)) return true; - return A._isSubtype(universe, s, sEnv, A.Rti__getFutureFromFutureOr(universe, t), tEnv); + return A._isSubtype(universe, s, sEnv, A.Rti__getFutureFromFutureOr(universe, t), tEnv, false); } if (tKind === 7) { - t1 = A._isSubtype(universe, s, sEnv, type$.Null, tEnv); - return t1 || A._isSubtype(universe, s, sEnv, t._primary, tEnv); + t1 = A._isSubtype(universe, s, sEnv, type$.Null, tEnv, false); + return t1 || A._isSubtype(universe, s, sEnv, t._primary, tEnv, false); } if (leftTypeVariable) return false; @@ -3106,30 +3088,30 @@ for (i = 0; i < sLength; ++i) { sBound = sBounds[i]; tBound = tBounds[i]; - if (!A._isSubtype(universe, sBound, sEnv, tBound, tEnv) || !A._isSubtype(universe, tBound, tEnv, sBound, sEnv)) + if (!A._isSubtype(universe, sBound, sEnv, tBound, tEnv, false) || !A._isSubtype(universe, tBound, tEnv, sBound, sEnv, false)) return false; } - return A._isFunctionSubtype(universe, s._primary, sEnv, t._primary, tEnv); + return A._isFunctionSubtype(universe, s._primary, sEnv, t._primary, tEnv, false); } if (tKind === 12) { if (s === type$.JavaScriptFunction) return true; if (t1) return false; - return A._isFunctionSubtype(universe, s, sEnv, t, tEnv); + return A._isFunctionSubtype(universe, s, sEnv, t, tEnv, false); } if (sKind === 9) { if (tKind !== 9) return false; - return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv); + return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv, false); } if (t2 && tKind === 11) - return A._isRecordSubtype(universe, s, sEnv, t, tEnv); + return A._isRecordSubtype(universe, s, sEnv, t, tEnv, false); return false; }, - _isFunctionSubtype(universe, s, sEnv, t, tEnv) { + _isFunctionSubtype(universe, s, sEnv, t, tEnv, isLegacy) { var sParameters, tParameters, sRequiredPositional, tRequiredPositional, sRequiredPositionalLength, tRequiredPositionalLength, requiredPositionalDelta, sOptionalPositional, tOptionalPositional, sOptionalPositionalLength, tOptionalPositionalLength, i, t1, sNamed, tNamed, sNamedLength, tNamedLength, sIndex, tIndex, tName, sName, sIsRequired; - if (!A._isSubtype(universe, s._primary, sEnv, t._primary, tEnv)) + if (!A._isSubtype(universe, s._primary, sEnv, t._primary, tEnv, false)) return false; sParameters = s._rest; tParameters = t._rest; @@ -3148,17 +3130,17 @@ return false; for (i = 0; i < sRequiredPositionalLength; ++i) { t1 = sRequiredPositional[i]; - if (!A._isSubtype(universe, tRequiredPositional[i], tEnv, t1, sEnv)) + if (!A._isSubtype(universe, tRequiredPositional[i], tEnv, t1, sEnv, false)) return false; } for (i = 0; i < requiredPositionalDelta; ++i) { t1 = sOptionalPositional[i]; - if (!A._isSubtype(universe, tRequiredPositional[sRequiredPositionalLength + i], tEnv, t1, sEnv)) + if (!A._isSubtype(universe, tRequiredPositional[sRequiredPositionalLength + i], tEnv, t1, sEnv, false)) return false; } for (i = 0; i < tOptionalPositionalLength; ++i) { t1 = sOptionalPositional[requiredPositionalDelta + i]; - if (!A._isSubtype(universe, tOptionalPositional[i], tEnv, t1, sEnv)) + if (!A._isSubtype(universe, tOptionalPositional[i], tEnv, t1, sEnv, false)) return false; } sNamed = sParameters._named; @@ -3184,7 +3166,7 @@ if (sIsRequired && !t1) return false; t1 = sNamed[sIndex - 1]; - if (!A._isSubtype(universe, tNamed[tIndex + 2], tEnv, t1, sEnv)) + if (!A._isSubtype(universe, tNamed[tIndex + 2], tEnv, t1, sEnv, false)) return false; break; } @@ -3196,8 +3178,8 @@ } return true; }, - _isInterfaceSubtype(universe, s, sEnv, t, tEnv) { - var rule, recipes, $length, supertypeArgs, i, t1, t2, + _isInterfaceSubtype(universe, s, sEnv, t, tEnv, isLegacy) { + var rule, recipes, $length, supertypeArgs, i, sName = s._primary, tName = t._primary; for (; sName !== tName;) { @@ -3215,24 +3197,19 @@ supertypeArgs = $length > 0 ? new Array($length) : init.typeUniverse.sEA; for (i = 0; i < $length; ++i) supertypeArgs[i] = A._Universe_evalInEnvironment(universe, s, recipes[i]); - return A._areArgumentsSubtypes(universe, supertypeArgs, null, sEnv, t._rest, tEnv); + return A._areArgumentsSubtypes(universe, supertypeArgs, null, sEnv, t._rest, tEnv, false); } - t1 = s._rest; - t2 = t._rest; - return A._areArgumentsSubtypes(universe, t1, null, sEnv, t2, tEnv); + return A._areArgumentsSubtypes(universe, s._rest, null, sEnv, t._rest, tEnv, false); }, - _areArgumentsSubtypes(universe, sArgs, sVariances, sEnv, tArgs, tEnv) { - var i, t1, t2, + _areArgumentsSubtypes(universe, sArgs, sVariances, sEnv, tArgs, tEnv, isLegacy) { + var i, $length = sArgs.length; - for (i = 0; i < $length; ++i) { - t1 = sArgs[i]; - t2 = tArgs[i]; - if (!A._isSubtype(universe, t1, sEnv, t2, tEnv)) + for (i = 0; i < $length; ++i) + if (!A._isSubtype(universe, sArgs[i], sEnv, tArgs[i], tEnv, false)) return false; - } return true; }, - _isRecordSubtype(universe, s, sEnv, t, tEnv) { + _isRecordSubtype(universe, s, sEnv, t, tEnv, isLegacy) { var i, sFields = s._rest, tFields = t._rest, @@ -3242,7 +3219,7 @@ if (s._primary !== t._primary) return false; for (i = 0; i < sCount; ++i) - if (!A._isSubtype(universe, sFields[i], sEnv, tFields[i], tEnv)) + if (!A._isSubtype(universe, sFields[i], sEnv, tFields[i], tEnv, false)) return false; return true; }, @@ -3250,7 +3227,7 @@ var t1, kind = t._kind; if (!(t === type$.Null || t === type$.JSNull)) - if (!A.isStrongTopType(t)) + if (!A.isSoundTopType(t)) if (kind !== 7) if (!(kind === 6 && A.isNullable(t._primary))) t1 = kind === 8 && A.isNullable(t._primary); @@ -3264,9 +3241,9 @@ t1 = true; return t1; }, - isTopType(t) { + isDefinitelyTopType(t) { var t1; - if (!A.isStrongTopType(t)) + if (!A.isSoundTopType(t)) if (!(t === type$.legacy_Object)) t1 = false; else @@ -3275,7 +3252,7 @@ t1 = true; return t1; }, - isStrongTopType(t) { + isSoundTopType(t) { var kind = t._kind; return kind === 2 || kind === 3 || kind === 4 || kind === 5 || t === type$.nullable_Object; }, @@ -3295,7 +3272,7 @@ var _ = this; _._as = t0; _._is = t1; - _._cachedRuntimeType = _._specializedTestResource = _._unsoundIsSubtypeCache = _._isSubtypeCache = _._precomputed1 = null; + _._cachedRuntimeType = _._specializedTestResource = _._isSubtypeCache = _._precomputed1 = null; _._kind = 0; _._canonicalRecipe = _._bindCache = _._evalCache = _._rest = _._primary = null; }, @@ -5843,12 +5820,10 @@ _impl(args) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), - $async$returnValue, $async$handler = 2, $async$currentError, flavor, channel, raw, os, architecture, version, exception, url, toolName, sdkPath, t3, archivePath, extractedFolder, t4, pubCache, versionFilePath, t1, t2, sdk, $async$exception, $async$temp1; + $async$returnValue, flavor, raw, os, architecture, version, channel, url, toolName, sdkPath, t3, archivePath, extractedFolder, t4, pubCache, versionFilePath, t1, t2, sdk, $async$temp1; var $async$_impl = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { - if ($async$errorCode === 1) { - $async$currentError = $async$result; - $async$goto = $async$handler; - } + if ($async$errorCode === 1) + return A._asyncRethrow($async$result, $async$completer); while (true) switch ($async$goto) { case 0: @@ -5861,30 +5836,29 @@ if (A.Primitives_parseInt(sdk, null) != null && !B.JSString_methods.contains$1(sdk, ".")) sdk += ".0"; flavor = A._asString(t2._as(t1.core).getInput("flavor")); - if (J.get$length$asx(flavor) === 0) + if (flavor.length === 0) flavor = sdk === "main" ? "raw" : "release"; - else if (!J.$eq$(flavor, "raw") && !J.$eq$(flavor, "release")) { - A._fail("Unrecognized build flavor '" + A.S(flavor) + "'."); + else if (flavor !== "raw" && flavor !== "release") { + A._fail("Unrecognized build flavor '" + flavor + "'."); // goto return $async$goto = 1; break; } - raw = J.$eq$(flavor, "raw"); + raw = flavor === "raw"; os = A.getPlatform(); architecture = A._asString(t2._as(t1.core).getInput("architecture")); if (architecture.length === 0) architecture = B.JSArray_methods.contains$1(B.List_x64_ia32_arm_arm64, A._asString(t2._as(t1.os).arch())) ? A._asString(t2._as(t1.os).arch()) : "x64"; - channel = null; $async$goto = sdk.split(".").length === 2 ? 3 : 5; break; case 3: // then - channel = "stable"; $async$goto = 6; return A._asyncAwait(A.findLatestSdkForRelease(sdk), $async$_impl); case 6: // returning from await. version = $async$result; + channel = "stable"; // goto join $async$goto = 4; break; @@ -5894,7 +5868,6 @@ break; case 7: // then - channel = sdk; $async$goto = raw ? 10 : 12; break; case 10: @@ -5906,103 +5879,74 @@ case 12: // else $async$goto = 13; - return A._asyncAwait(A.latestPublishedVersion(channel, flavor), $async$_impl); + return A._asyncAwait(A.latestPublishedVersion(sdk, flavor), $async$_impl); case 13: // returning from await. case 11: // join version = $async$result; + channel = sdk; // goto join $async$goto = 8; break; case 9: // else - $async$goto = sdk === "main" ? 14 : 16; - break; - case 14: - // then - $async$handler = 18; - channel = "main"; - $async$goto = 21; - return A._asyncAwait(A.latestPublishedVersion(channel, flavor), $async$_impl); - case 21: - // returning from await. - $async$handler = 2; - // goto after finally - $async$goto = 20; - break; - case 18: - // catch - $async$handler = 17; - $async$exception = $async$currentError; - channel = "be"; - // goto after finally - $async$goto = 20; - break; - case 17: - // uncaught - // goto rethrow - $async$goto = 2; - break; - case 20: - // after finally - version = "latest"; - // goto join - $async$goto = 15; - break; - case 16: - // else - if (B.JSString_methods.contains$1(sdk, "dev")) - channel = "dev"; - else if (B.JSString_methods.contains$1(sdk, "beta")) - channel = "beta"; - else if (B.JSString_methods.contains$1(sdk, "main")) { - A._fail("Versions cannot be specified for main channel builds."); - // goto return - $async$goto = 1; - break; - } else - channel = "stable"; - version = sdk; - case 15: - // join + if (sdk === "main") { + version = "latest"; + channel = "main"; + } else { + if (B.JSString_methods.contains$1(sdk, "dev")) + channel = "dev"; + else if (B.JSString_methods.contains$1(sdk, "beta")) + channel = "beta"; + else { + if (B.JSString_methods.contains$1(sdk, "main")) { + A._fail("Versions cannot be specified for main channel builds."); + // goto return + $async$goto = 1; + break; + } + channel = "stable"; + } + version = sdk; + } case 8: // join case 4: // join - t2._as(t1.core).info("Installing the " + os + "-" + architecture + " Dart SDK version " + version + " from the " + A.S(channel) + " (" + A.S(flavor) + ") channel."); - url = string$.https_ + A.S(channel) + "/" + A.S(flavor) + "/" + version + "/sdk/dartsdk-" + os + "-" + architecture + "-release.zip"; + t2._as(t1.core).info("Installing the " + os + "-" + architecture + " Dart SDK version " + version + " from the " + channel + " (" + flavor + ") channel."); + url = string$.https_ + channel + "/" + flavor + "/" + version + "/sdk/dartsdk-" + os + "-" + architecture + "-release.zip"; toolName = raw ? "dart_raw" : "dart"; sdkPath = !raw ? A._asString(t2._as(t1.toolCache).find(toolName, version, architecture)) : ""; - $async$goto = sdkPath.length !== 0 ? 22 : 24; + $async$goto = sdkPath.length !== 0 ? 14 : 16; break; - case 22: + case 14: // then t2._as(t1.core).info("Using cached sdk from " + sdkPath + "."); // goto join - $async$goto = 23; + $async$goto = 15; break; - case 24: + case 16: // else t2._as(t1.core).info(url + " ..."); t3 = type$.String; - $async$goto = 25; + $async$goto = 17; return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.toolCache).downloadTool(url)), t3), $async$_impl); - case 25: + case 17: // returning from await. archivePath = $async$result; $async$temp1 = A; - $async$goto = 26; + $async$goto = 18; return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.toolCache).extractZip(archivePath)), t3), $async$_impl); - case 26: + case 18: // returning from await. extractedFolder = $async$temp1.join($async$result, "dart-sdk"); - $async$goto = 27; + $async$goto = 19; return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.toolCache).cacheDir(extractedFolder, toolName, version, architecture)), t3), $async$_impl); - case 27: + case 19: // returning from await. sdkPath = $async$result; - case 23: + case 15: // join t3 = t2._as(t1.process); t4 = os === "windows" ? "USERPROFILE" : "HOME"; @@ -6013,23 +5957,20 @@ t2._as(t1.core).addPath(A.join(sdkPath, "bin")); t2._as(t1.core).exportVariable("PUB_CACHE", pubCache); t2._as(t1.core).addPath(A.join(pubCache, "bin")); - $async$goto = 28; + $async$goto = 20; return A._asyncAwait(A.createPubOIDCToken(), $async$_impl); - case 28: + case 20: // returning from await. t4 = t2._as(t1.core); versionFilePath = A.join(sdkPath, "version"); t4.setOutput("dart-version", B.JSString_methods.trim$0(A._asString(t2._as(t1.fs).readFileSync(versionFilePath, "utf8")))); - $async$goto = 29; + $async$goto = 21; return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.exec).exec("dart", A._setArrayType(["--version"], type$.JSArray_String))), type$.void), $async$_impl); - case 29: + case 21: // returning from await. case 1: // return return A._asyncReturn($async$returnValue, $async$completer); - case 2: - // rethrow - return A._asyncRethrow($async$currentError, $async$completer); } }); return A._asyncStartSync($async$_impl, $async$completer); @@ -9644,7 +9585,7 @@ })(); var init = { typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []}, - mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List"}, + mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map"}, mangledNames: {}, types: ["~()", "~(@)", "~(~())", "Null(@)", "Null()", "@()", "~(Uint8List,String,int)", "String(String)", "@(@)", "@(@,String)", "@(String)", "Null(~())", "Null(@,StackTrace)", "~(int,@)", "Null(Object,StackTrace)", "_Future<@>(@)", "~(Object?,Object?)", "~(String,int)", "~(String,int?)", "int(int,int)", "Uint8List(@,@)", "Object?(Object?)", "bool(String)", "String(String?)", "Object(String)", "int(@,@)", "Version(String)"], interceptorsByTag: null, @@ -9766,7 +9707,7 @@ } } function getUnknownTagGenericBrowser(object, tag) { - if (self.HTMLElement && object instanceof HTMLElement) return "HTMLElement"; + if (object instanceof HTMLElement) return "HTMLElement"; return getUnknownTag(object, tag); } function prototypeForTag(tag) { @@ -9777,7 +9718,7 @@ return constructor.prototype; } function discriminator(tag) { return null; } - var isBrowser = typeof navigator == "object"; + var isBrowser = typeof HTMLElement == "function"; return { getTag: getTag, getUnknownTag: isBrowser ? getUnknownTagGenericBrowser : getUnknownTag, @@ -9787,9 +9728,10 @@ B.C_JS_CONST6 = function(getTagFallback) { return function(hooks) { if (typeof navigator != "object") return hooks; - var ua = navigator.userAgent; - if (ua.indexOf("DumpRenderTree") >= 0) return hooks; - if (ua.indexOf("Chrome") >= 0) { + var userAgent = navigator.userAgent; + if (typeof userAgent != "string") return hooks; + if (userAgent.indexOf("DumpRenderTree") >= 0) return hooks; + if (userAgent.indexOf("Chrome") >= 0) { function confirm(p) { return typeof window == "object" && window[p] && window[p].name == p; } @@ -9801,27 +9743,11 @@ B.C_JS_CONST1 = function(hooks) { if (typeof dartExperimentalFixupGetTag != "function") return hooks; hooks.getTag = dartExperimentalFixupGetTag(hooks.getTag); -}; - B.C_JS_CONST2 = function(hooks) { - var getTag = hooks.getTag; - var prototypeForTag = hooks.prototypeForTag; - function getTagFixed(o) { - var tag = getTag(o); - if (tag == "Document") { - if (!!o.xmlVersion) return "!Document"; - return "!HTMLDocument"; - } - return tag; - } - function prototypeForTagFixed(tag) { - if (tag == "Document") return null; - return prototypeForTag(tag); - } - hooks.getTag = getTagFixed; - hooks.prototypeForTag = prototypeForTagFixed; }; B.C_JS_CONST5 = function(hooks) { - var userAgent = typeof navigator == "object" ? navigator.userAgent : ""; + if (typeof navigator != "object") return hooks; + var userAgent = navigator.userAgent; + if (typeof userAgent != "string") return hooks; if (userAgent.indexOf("Firefox") == -1) return hooks; var getTag = hooks.getTag; var quickMap = { @@ -9838,7 +9764,9 @@ hooks.getTag = getTagFirefox; }; B.C_JS_CONST4 = function(hooks) { - var userAgent = typeof navigator == "object" ? navigator.userAgent : ""; + if (typeof navigator != "object") return hooks; + var userAgent = navigator.userAgent; + if (typeof userAgent != "string") return hooks; if (userAgent.indexOf("Trident/") == -1) return hooks; var getTag = hooks.getTag; var quickMap = { @@ -9865,6 +9793,24 @@ } hooks.getTag = getTagIE; hooks.prototypeForTag = prototypeForTagIE; +}; + B.C_JS_CONST2 = function(hooks) { + var getTag = hooks.getTag; + var prototypeForTag = hooks.prototypeForTag; + function getTagFixed(o) { + var tag = getTag(o); + if (tag == "Document") { + if (!!o.xmlVersion) return "!Document"; + return "!HTMLDocument"; + } + return tag; + } + function prototypeForTagFixed(tag) { + if (tag == "Document") return null; + return prototypeForTag(tag); + } + hooks.getTag = getTagFixed; + hooks.prototypeForTag = prototypeForTagFixed; }; B.C_JS_CONST3 = function(hooks) { return hooks; } ; diff --git a/dist/sig.txt b/dist/sig.txt index 898731d..e8a34ea 100644 --- a/dist/sig.txt +++ b/dist/sig.txt @@ -1 +1 @@ -753FFE376D98E81DAB70B208671C19C2 +46eaeff23d36eff012b8b95892a67285 diff --git a/tool/sig.dart b/tool/sig.dart index 3e05646..4973f53 100644 --- a/tool/sig.dart +++ b/tool/sig.dart @@ -2,13 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'dart:convert'; import 'dart:io'; import 'package:args/args.dart'; import 'package:crypto/crypto.dart'; -void main(List args) async { +void main(List args) { var argsParser = ArgParser() ..addFlag( 'generate', @@ -32,7 +31,7 @@ void main(List args) async { exit(1); } - var sig = await calcSig(); + var sig = calcSig(); if (generate) { File('lib/sig.txt').writeAsStringSync('$sig\n'); @@ -48,27 +47,24 @@ void main(List args) async { } } -Future calcSig() async { - final digest = - await _fileLines().transform(utf8.encoder).transform(md5).single; - - return digest.bytes - .map((byte) => byte.toRadixString(16).padLeft(2, '0').toUpperCase()) - .join(); +String calcSig() { + final bytes = []; + for (var file in _files()) { + print(file.path); + bytes.addAll(file.readAsBytesSync()); + } + return md5.convert(bytes).toString(); } -Stream _fileLines() async* { +List _files() { // Collect lib/ Dart files. final files = Directory('lib') .listSync(recursive: true) .whereType() .where((file) => file.path.endsWith('.dart')) - .toList() - ..sort((a, b) => a.path.toLowerCase().compareTo(b.path.toLowerCase())); + .toList(); + files.add(File('pubspec.yaml')); + files.sort((a, b) => a.path.toLowerCase().compareTo(b.path.toLowerCase())); - for (var file in [File('pubspec.yaml'), ...files]) { - for (var line in file.readAsLinesSync()) { - yield line; - } - } + return files; } From b0af63412856508060c546ec6cd9ea1d265f8f6e Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 9 Jan 2024 11:13:49 -0800 Subject: [PATCH 3/3] Update tool/sig.dart Co-authored-by: Jacob MacDonald --- tool/sig.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/tool/sig.dart b/tool/sig.dart index 4973f53..a7fa620 100644 --- a/tool/sig.dart +++ b/tool/sig.dart @@ -50,7 +50,6 @@ void main(List args) { String calcSig() { final bytes = []; for (var file in _files()) { - print(file.path); bytes.addAll(file.readAsBytesSync()); } return md5.convert(bytes).toString();