mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
Alex Rickabaugh
4f9ee3c056
Replace specific file patches applied during google3 sync with generic comment-based mechanisms. By adding `// g3-only` prefix comments to g3-specific exports and declarations, and appending `// 3p-only` context to `@internal` tags, we enable generic tooling to handle these modifications during the sync process. Additionally, wrap 3rd-party-only imports and exports (which should be stripped in google3) with `// 3p-only-start` and `// 3p-only-end` comment markers. This reduces the need for maintaining custom file-specific patches in google3. Also, add a comprehensive guide to these sync comment markers in `contributing-docs/google-markers.md` to assist external contributors. Specifically: - Add `// 3p-only` context to `@internal` in `directives.ts` for `foreignImports` and `deferredImports`. - Add `// g3-only` commented exports in `core.ts`. - Add `// g3-only-start`/`// g3-only-end` commented global declaration block in `zone.ts`. - Wrap 3p-only imports in `fake_navigation.ts` with `// 3p-only-start` and `// 3p-only-end`. - Wrap 3p-only exports in `compiler-cli/index.ts` with `// 3p-only-start` and `// 3p-only-end`. - Add `// g3-only` and `// 3p-only` markers to `shared.ts` for `setDisabledStateDefault` configuration. - Add `// g3-only` and `// 3p-only` markers to `feature_detection.ts` for semver dependency. - Add `// g3-only` and `// 3p-only` markers to `domino_adapter.ts` for domino import path. - Add `// 3p-only` marker to `ng_dev_mode` import in `event_dispatcher.ts`. - Add `// g3-only` and `// 3p-only` markers to `MOUSE_SPECIAL_SUPPORT` in `event_contract_defines.ts`. - Add `// g3-only` and `// 3p-only` markers to `BrowserModule` imports in `module.ts` (animations) and `browser.ts` (testing). - Add `// 3p-only` marker to `goog.d.ts` reference tags in `util.ts` (platform-browser), `types.d.ts`, `ng_i18n_closure_mode.ts`, `tokens.ts`, and `global_utils.ts`. - Wrap `Default` enum value of `ChangeDetectionStrategy` in `constants.ts` with `// 3p-only-start` and `// 3p-only-end`. - Add `// g3-only` and `// 3p-only` markers to `LEGACY_OPTIONAL_CHAINING_DEFAULT` in `legacy_optional_chaining_default.ts` and `legacyOptionalChaining` in `directive.ts`. - Add `// g3-only` and `// 3p-only` markers to `DEFAULT_PARAMS_INHERITANCE_STRATEGY` in `router_state.ts`. - Add `// g3-only` and `// 3p-only` (and block variants) markers to `@mcp-b/webmcp-types` imports in `declare_tool.ts`, `provide_tools.ts`, and `types.ts`. - Add `contributing-docs/google-markers.md` guide. TAG=agy CONV=cd09a4f3-869a-4f41-949b-c91f1b8f1c51
90 lines
2.6 KiB
TypeScript
90 lines
2.6 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright Google LLC All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
* found in the LICENSE file at https://angular.dev/license
|
|
*/
|
|
|
|
import {
|
|
__symbol__,
|
|
EventTask as _EventTask,
|
|
HasTaskState as _HasTaskState,
|
|
initZone,
|
|
MacroTask as _MacroTask,
|
|
MicroTask as _MicroTask,
|
|
PatchFn,
|
|
Task as _Task,
|
|
TaskData as _TaskData,
|
|
TaskState as _TaskState,
|
|
TaskType as _TaskType,
|
|
UncaughtPromiseError as _UncaughtPromiseError,
|
|
Zone as _Zone,
|
|
ZoneDelegate as _ZoneDelegate,
|
|
ZoneFrame,
|
|
ZonePrivate,
|
|
ZoneSpec as _ZoneSpec,
|
|
ZoneType as _ZoneType,
|
|
} from './zone-impl';
|
|
|
|
declare global {
|
|
const Zone: ZoneType;
|
|
type Zone = _Zone;
|
|
type ZoneType = _ZoneType;
|
|
|
|
// g3-only-start
|
|
// /** This local mod is kept in place so Zone can check the NodeJS `global` variable. */
|
|
// var global: {};
|
|
// g3-only-end
|
|
type _PatchFn = PatchFn;
|
|
type _ZonePrivate = ZonePrivate;
|
|
type _ZoneFrame = ZoneFrame;
|
|
type UncaughtPromiseError = _UncaughtPromiseError;
|
|
type ZoneSpec = _ZoneSpec;
|
|
type ZoneDelegate = _ZoneDelegate;
|
|
type HasTaskState = _HasTaskState;
|
|
type TaskType = _TaskType;
|
|
type TaskState = _TaskState;
|
|
type TaskData = _TaskData;
|
|
type Task = _Task;
|
|
type MicroTask = _MicroTask;
|
|
type MacroTask = _MacroTask;
|
|
type EventTask = _EventTask;
|
|
|
|
/**
|
|
* Extend the Error with additional fields for rewritten stack frames
|
|
*/
|
|
interface Error {
|
|
/**
|
|
* Stack trace where extra frames have been removed and zone names added.
|
|
*/
|
|
zoneAwareStack?: string;
|
|
|
|
/**
|
|
* Original stack trace with no modifications
|
|
*/
|
|
originalStack?: string;
|
|
}
|
|
}
|
|
|
|
export function loadZone(): ZoneType {
|
|
// if global['Zone'] already exists (maybe zone.js was already loaded or
|
|
// some other lib also registered a global object named Zone), we may need
|
|
// to throw an error, but sometimes user may not want this error.
|
|
// For example,
|
|
// we have two web pages, page1 includes zone.js, page2 doesn't.
|
|
// and the 1st time user load page1 and page2, everything work fine,
|
|
// but when user load page2 again, error occurs because global['Zone'] already exists.
|
|
// so we add a flag to let user choose whether to throw this error or not.
|
|
// By default, if existing Zone is from zone.js, we will not throw the error.
|
|
const global = globalThis as any;
|
|
const checkDuplicate = global[__symbol__('forceDuplicateZoneCheck')] === true;
|
|
if (global['Zone'] && (checkDuplicate || typeof global['Zone'].__symbol__ !== 'function')) {
|
|
throw new Error('Zone already loaded.');
|
|
}
|
|
|
|
// Initialize global `Zone` constant.
|
|
global['Zone'] ??= initZone();
|
|
return global['Zone'];
|
|
}
|