chore: update dependencies (714e6818) · Commits · e / tools / webadb

apps/demo/package.json

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		"@fluentui/react-hooks": "^8.5.4",
		"@fluentui/react-icons": "^2.0.166-rc.3",
		"@fluentui/style-utilities": "^8.6.5",
		"@griffel/react": "^1.0.3",
		"@griffel/react": "^1.0.4",
		"@yume-chan/adb": "^0.0.15",
		"@yume-chan/adb-backend-direct-sockets": "^0.0.9",
		"@yume-chan/adb-backend-webusb": "^0.0.15",
		@@ -27,8 +27,8 @@
		"@yume-chan/scrcpy": "^0.0.15",
		"@yume-chan/struct": "^0.0.15",
		"mobx": "^6.5.0",
		"mobx-react-lite": "^3.3.0",
		"next": "12.1.5",
		"mobx-react-lite": "^3.4.0",
		"next": "12.1.6",
		"react": "^17.0.2",
		"react-dom": "^17.0.2",
		"streamsaver": "^2.0.5",
		@@ -42,7 +42,7 @@
		"@next/mdx": "^11.1.2",
		"@types/react": "17.0.27",
		"eslint": "8.8.0",
		"eslint-config-next": "12.1.5",
		"eslint-config-next": "12.1.6",
		"source-map-loader": "^3.0.1",
		"typescript": "4.7.1-rc"
		}

common/config/rush/pnpm-lock.yaml

+152 −259

File changed.

Preview size limit exceeded, changes collapsed.

common/config/rush/repo-state.json

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
		{
		"pnpmShrinkwrapHash": "f68c7829c3e62c659a0c4f27bda4e6c7d5a0c188"
		}

common/scripts/install-run-rush.js

+33 −8

Original line number	Diff line number	Diff line
		@@ -3,7 +3,11 @@
		// See the @microsoft/rush package's LICENSE file for license information.
		var __createBinding = (this && this.__createBinding) \|\| (Object.create ? (function(o, m, k, k2) {
		if (k2 === undefined) k2 = k;
		Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
		var desc = Object.getOwnPropertyDescriptor(m, k);
		if (!desc \|\| ("get" in desc ? !m.__esModule : desc.writable \|\| desc.configurable)) {
		desc = { enumerable: true, get: function() { return m[k]; } };
		}
		Object.defineProperty(o, k2, desc);
		}) : (function(o, m, k, k2) {
		if (k2 === undefined) k2 = k;
		o[k2] = m[k];
		@@ -36,10 +40,10 @@ const fs = __importStar(require("fs"));
		const install_run_1 = require("./install-run");
		const PACKAGE_NAME = '@microsoft/rush';
		const RUSH_PREVIEW_VERSION = 'RUSH_PREVIEW_VERSION';
		function _getRushVersion() {
		function _getRushVersion(logger) {
		const rushPreviewVersion = process.env[RUSH_PREVIEW_VERSION];
		if (rushPreviewVersion !== undefined) {
		console.log(`Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`);
		logger.info(`Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`);
		return rushPreviewVersion;
		}
		const rushJsonFolder = (0, install_run_1.findRushJsonFolder)();
		@@ -66,7 +70,28 @@ function _run() {
		if (!nodePath \|\| !scriptPath) {
		throw new Error('Unexpected exception: could not detect node path or script path');
		}
		if (process.argv.length < 3) {
		let commandFound = false;
		let logger = { info: console.log, error: console.error };
		for (const arg of packageBinArgs) {
		if (arg === '-q' \|\| arg === '--quiet') {
		// The -q/--quiet flag is supported by both `rush` and `rushx`, and will suppress
		// any normal informational/diagnostic information printed during startup.
		//
		// To maintain the same user experience, the install-run* scripts pass along this
		// flag but also use it to suppress any diagnostic information normally printed
		// to stdout.
		logger = {
		info: () => { },
		error: console.error
		};
		}
		else if (!arg.startsWith('-') \|\| arg === '-h' \|\| arg === '--help') {
		// We either found something that looks like a command (i.e. - doesn't start with a "-"),
		// or we found the -h/--help flag, which can be run without a command
		commandFound = true;
		}
		}
		if (!commandFound) {
		console.log(`Usage: ${scriptName} <command> [args...]`);
		if (scriptName === 'install-run-rush.js') {
		console.log(`Example: ${scriptName} build --to myproject`);
		@@ -76,10 +101,10 @@ function _run() {
		}
		process.exit(1);
		}
		(0, install_run_1.runWithErrorAndStatusCode)(() => {
		const version = _getRushVersion();
		console.log(`The rush.json configuration requests Rush version ${version}`);
		return (0, install_run_1.installAndRun)(PACKAGE_NAME, version, bin, packageBinArgs);
		(0, install_run_1.runWithErrorAndStatusCode)(logger, () => {
		const version = _getRushVersion(logger);
		logger.info(`The rush.json configuration requests Rush version ${version}`);
		return (0, install_run_1.installAndRun)(logger, PACKAGE_NAME, version, bin, packageBinArgs);
		});
		}
		_run();

common/scripts/install-run.js

+26 −21

Original line number	Diff line number	Diff line
		@@ -3,7 +3,11 @@
		// See the @microsoft/rush package's LICENSE file for license information.
		var __createBinding = (this && this.__createBinding) \|\| (Object.create ? (function(o, m, k, k2) {
		if (k2 === undefined) k2 = k;
		Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
		var desc = Object.getOwnPropertyDescriptor(m, k);
		if (!desc \|\| ("get" in desc ? !m.__esModule : desc.writable \|\| desc.configurable)) {
		desc = { enumerable: true, get: function() { return m[k]; } };
		}
		Object.defineProperty(o, k2, desc);
		}) : (function(o, m, k, k2) {
		if (k2 === undefined) k2 = k;
		o[k2] = m[k];
		@@ -79,9 +83,9 @@ function _parsePackageSpecifier(rawPackageSpecifier) {
		*
		* IMPORTANT: THIS CODE SHOULD BE KEPT UP TO DATE WITH Utilities.copyAndTrimNpmrcFile()
		*/
		function _copyAndTrimNpmrcFile(sourceNpmrcPath, targetNpmrcPath) {
		console.log(`Transforming ${sourceNpmrcPath}`); // Verbose
		console.log(` --> "${targetNpmrcPath}"`);
		function _copyAndTrimNpmrcFile(logger, sourceNpmrcPath, targetNpmrcPath) {
		logger.info(`Transforming ${sourceNpmrcPath}`); // Verbose
		logger.info(` --> "${targetNpmrcPath}"`);
		let npmrcFileLines = fs.readFileSync(sourceNpmrcPath).toString().split('\n');
		npmrcFileLines = npmrcFileLines.map((line) => (line \|\| '').trim());
		const resultLines = [];
		@@ -125,16 +129,16 @@ function _copyAndTrimNpmrcFile(sourceNpmrcPath, targetNpmrcPath) {
		*
		* IMPORTANT: THIS CODE SHOULD BE KEPT UP TO DATE WITH Utilities._syncNpmrc()
		*/
		function _syncNpmrc(sourceNpmrcFolder, targetNpmrcFolder, useNpmrcPublish) {
		function _syncNpmrc(logger, sourceNpmrcFolder, targetNpmrcFolder, useNpmrcPublish) {
		const sourceNpmrcPath = path.join(sourceNpmrcFolder, !useNpmrcPublish ? '.npmrc' : '.npmrc-publish');
		const targetNpmrcPath = path.join(targetNpmrcFolder, '.npmrc');
		try {
		if (fs.existsSync(sourceNpmrcPath)) {
		_copyAndTrimNpmrcFile(sourceNpmrcPath, targetNpmrcPath);
		_copyAndTrimNpmrcFile(logger, sourceNpmrcPath, targetNpmrcPath);
		}
		else if (fs.existsSync(targetNpmrcPath)) {
		// If the source .npmrc doesn't exist and there is one in the target, delete the one in the target
		console.log(`Deleting ${targetNpmrcPath}`); // Verbose
		logger.info(`Deleting ${targetNpmrcPath}`); // Verbose
		fs.unlinkSync(targetNpmrcPath);
		}
		}
		@@ -215,7 +219,7 @@ function _getRushTempFolder(rushCommonFolder) {
		/**
		* Resolve a package specifier to a static version
		*/
		function _resolvePackageVersion(rushCommonFolder, { name, version }) {
		function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) {
		if (!version) {
		version = '*'; // If no version is specified, use the latest version
		}
		@@ -229,7 +233,7 @@ function _resolvePackageVersion(rushCommonFolder, { name, version }) {
		try {
		const rushTempFolder = _getRushTempFolder(rushCommonFolder);
		const sourceNpmrcFolder = path.join(rushCommonFolder, 'config', 'rush');
		_syncNpmrc(sourceNpmrcFolder, rushTempFolder);
		_syncNpmrc(logger, sourceNpmrcFolder, rushTempFolder);
		const npmPath = getNpmPath();
		// This returns something that looks like:
		// @microsoft/rush@3.0.0 '3.0.0'
		@@ -350,9 +354,9 @@ function _createPackageJson(packageInstallFolder, name, version) {
		/**
		* Run "npm install" in the package install folder.
		*/
		function _installPackage(packageInstallFolder, name, version) {
		function _installPackage(logger, packageInstallFolder, name, version) {
		try {
		console.log(`Installing ${name}...`);
		logger.info(`Installing ${name}...`);
		const npmPath = getNpmPath();
		const result = childProcess.spawnSync(npmPath, ['install'], {
		stdio: 'inherit',
		@@ -362,7 +366,7 @@ function _installPackage(packageInstallFolder, name, version) {
		if (result.status !== 0) {
		throw new Error('"npm install" encountered an error');
		}
		console.log(`Successfully installed ${name}@${version}`);
		logger.info(`Successfully installed ${name}@${version}`);
		}
		catch (e) {
		throw new Error(`Unable to install package: ${e}`);
		@@ -388,7 +392,7 @@ function _writeFlagFile(packageInstallFolder) {
		throw new Error(`Unable to create installed.flag file in ${packageInstallFolder}`);
		}
		}
		function installAndRun(packageName, packageVersion, packageBinName, packageBinArgs) {
		function installAndRun(logger, packageName, packageVersion, packageBinName, packageBinArgs) {
		const rushJsonFolder = findRushJsonFolder();
		const rushCommonFolder = path.join(rushJsonFolder, 'common');
		const rushTempFolder = _getRushTempFolder(rushCommonFolder);
		@@ -397,14 +401,14 @@ function installAndRun(packageName, packageVersion, packageBinName, packageBinAr
		// The package isn't already installed
		_cleanInstallFolder(rushTempFolder, packageInstallFolder);
		const sourceNpmrcFolder = path.join(rushCommonFolder, 'config', 'rush');
		_syncNpmrc(sourceNpmrcFolder, packageInstallFolder);
		_syncNpmrc(logger, sourceNpmrcFolder, packageInstallFolder);
		_createPackageJson(packageInstallFolder, packageName, packageVersion);
		_installPackage(packageInstallFolder, packageName, packageVersion);
		_installPackage(logger, packageInstallFolder, packageName, packageVersion);
		_writeFlagFile(packageInstallFolder);
		}
		const statusMessage = `Invoking "${packageBinName} ${packageBinArgs.join(' ')}"`;
		const statusMessageLine = new Array(statusMessage.length + 1).join('-');
		console.log(os.EOL + statusMessage + os.EOL + statusMessageLine + os.EOL);
		logger.info(os.EOL + statusMessage + os.EOL + statusMessageLine + os.EOL);
		const binPath = _getBinPath(packageInstallFolder, packageBinName);
		const binFolderPath = path.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin');
		// Windows environment variables are case-insensitive. Instead of using SpawnSyncOptions.env, we need to
		@@ -436,14 +440,14 @@ function installAndRun(packageName, packageVersion, packageBinName, packageBinAr
		}
		}
		exports.installAndRun = installAndRun;
		function runWithErrorAndStatusCode(fn) {
		function runWithErrorAndStatusCode(logger, fn) {
		process.exitCode = 1;
		try {
		const exitCode = fn();
		process.exitCode = exitCode;
		}
		catch (e) {
		console.error(os.EOL + os.EOL + e.toString() + os.EOL + os.EOL);
		logger.error(os.EOL + os.EOL + e.toString() + os.EOL + os.EOL);
		}
		}
		exports.runWithErrorAndStatusCode = runWithErrorAndStatusCode;
		@@ -462,16 +466,17 @@ function _run() {
		console.log('Example: install-run.js qrcode@1.2.2 qrcode https://rushjs.io');
		process.exit(1);
		}
		runWithErrorAndStatusCode(() => {
		const logger = { info: console.log, error: console.error };
		runWithErrorAndStatusCode(logger, () => {
		const rushJsonFolder = findRushJsonFolder();
		const rushCommonFolder = _ensureAndJoinPath(rushJsonFolder, 'common');
		const packageSpecifier = _parsePackageSpecifier(rawPackageSpecifier);
		const name = packageSpecifier.name;
		const version = _resolvePackageVersion(rushCommonFolder, packageSpecifier);
		const version = _resolvePackageVersion(logger, rushCommonFolder, packageSpecifier);
		if (packageSpecifier.version !== version) {
		console.log(`Resolved to ${name}@${version}`);
		}
		return installAndRun(name, version, packageBinName, packageBinArgs);
		return installAndRun(logger, name, version, packageBinName, packageBinArgs);
		});
		}
		_run();