Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/schematics/angular/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ts_project(
":node_modules/@angular-devkit/schematics",
":node_modules/jsonc-parser",
"//:node_modules/@types/node",
"//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
"//packages/schematics/angular/third_party/typescript",
],
)

Expand Down Expand Up @@ -142,7 +142,7 @@ ts_project(
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/prettier",
"//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
"//packages/schematics/angular/third_party/typescript",
],
)

Expand Down Expand Up @@ -173,8 +173,6 @@ npm_package(
":README.md",
":angular",
":license",
"//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript:LICENSE",
# Force typescript library to be included.
"//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript:lib/typescript.js",
"//packages/schematics/angular/third_party/typescript",
],
)
2 changes: 1 addition & 1 deletion packages/schematics/angular/app-shell/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
schematic,
} from '@angular-devkit/schematics';
import { dirname, join } from 'node:path/posix';
import ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../third_party/typescript';
import {
findNode,
findNodes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../third_party/typescript';

export interface RequireInfo {
module: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/module/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
} from '@angular-devkit/schematics';
import { join } from 'node:path/posix';
import { Schema as ComponentOptions } from '../component/schema';
import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import * as ts from '../third_party/typescript';
import { addImportToModule, addRouteDeclarationToModule } from '../utility/ast-utils';
import { InsertChange } from '../utility/change';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* blank line preservation, and reporting of transformation details.
*/

import ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../third_party/typescript';
import {
transformDoneCallback,
transformFocusedAndSkippedTests,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* operations that use the `done` callback.
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { createPropertyAccess } from '../utils/ast-helpers';
import { addTodoComment } from '../utils/comment-helpers';
import { RefactorContext } from '../utils/refactor-context';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* `toHaveBeenCalledOnceWith` and `arrayWithExactContents`.
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import {
addVitestValueImport,
createExpectCallExpression,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* includes logic to identify and add TODO comments for unsupported Jasmine features.
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { addVitestValueImport, createViCallExpression } from '../utils/ast-helpers';
import { getJasmineMethodName, isJasmineCallExpression } from '../utils/ast-validation';
import { addTodoComment } from '../utils/comment-helpers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* and the inspection of spy calls (`spy.calls.reset`, `spy.calls.mostRecent`).
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import {
addVitestValueImport,
createPropertyAccess,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* necessary `vitest` imports are added to the file.
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { addVitestTypeImport } from '../utils/ast-helpers';
import { RefactorContext } from '../utils/refactor-context';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';

export function addVitestValueImport(imports: Set<string>, importName: string): void {
imports.add(importName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* TypeScript AST nodes, particularly for identifying specific patterns in Jasmine tests.
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';

/**
* If a node is a `jasmine.method()` call, returns the method name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { TODO_NOTES, TodoCategory, TodoContextMap } from './todo-notes';

// A helper type to find all `TodoCategory` keys that do not require a context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { addTodoComment } from './comment-helpers';

describe('addTodoComment', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { RefactorReporter } from './refactor-reporter';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { TodoCategory } from './todo-notes';

export class RefactorReporter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { logging } from '@angular-devkit/core';
import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../../../third_party/typescript';
import { RefactorReporter } from './refactor-reporter';

describe('RefactorReporter', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/server/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
import { parse as parseJson } from 'jsonc-parser';
import { Schema as ApplicationOptions, Style } from '../application/schema';
import { CompilerOptions } from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import { CompilerOptions } from '../third_party/typescript';
import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
import { Builders } from '../utility/workspace-models';
import { Schema as WorkspaceOptions } from '../workspace/schema';
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/service-worker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
url,
} from '@angular-devkit/schematics';
import { join } from 'node:path/posix';
import ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import ts from '../third_party/typescript';
import { addDependency, addRootProvider, writeWorkspace } from '../utility';
import { addSymbolToNgModuleMetadata, insertImport } from '../utility/ast-utils';
import { applyToUpdateRecorder } from '../utility/change';
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading