Skip to content

Use typescript.js as source for typescriptServices #3344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Use typescript.js as source for typescriptServices #3344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 3 additions & 11 deletions build/importTypescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'src/language/typescript
export const typescriptVersion = "${typeScriptDependencyVersion}";\n`
);

let tsServices = fs
.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.js'))
.toString();
let tsServices = fs.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescript.js')).toString();

// Ensure we never run into the node system...
// (this also removes require calls that trick webpack into shimming those modules...)
Expand Down Expand Up @@ -149,14 +147,8 @@ export var typescript = ts;
stripSourceMaps(tsServices_esm)
);

let dtsServices = fs
.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.d.ts'))
.toString();
dtsServices += `
// MONACOCHANGE
export = ts;
// END MONACOCHANGE
`;
let dtsServices = fs.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescript.d.ts')).toString();

fs.writeFileSync(
path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServices.d.ts'),
generatedNote + dtsServices
Expand Down
1 change: 1 addition & 0 deletions src/language/typescript/lib/typescriptServices-amd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163529,6 +163529,7 @@ var ts;




// MONACOCHANGE
// Defining the entire module name because r.js has an issue and cannot bundle this file
// correctly with an anonymous define call
Expand Down
4 changes: 1 addition & 3 deletions src/language/typescript/lib/typescriptServices.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7594,6 +7594,4 @@ declare namespace ts {
const isIdentifierOrPrivateIdentifier: (node: Node) => node is MemberName;
}

// MONACOCHANGE
export = ts;
// END MONACOCHANGE
export = ts;
1 change: 1 addition & 0 deletions src/language/typescript/lib/typescriptServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163529,6 +163529,7 @@ var ts;




// MONACOCHANGE
export var createClassifier = ts.createClassifier;
export var createLanguageService = ts.createLanguageService;
Expand Down