浏览代码

Update import TS

Orta 4 年之前
父节点
当前提交
417b141df9
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      scripts/importTypescript.js

+ 7 - 2
scripts/importTypescript.js

@@ -59,6 +59,11 @@ export const typescriptVersion = "${typeScriptDependencyVersion}";\n`
 		'$1// MONACOCHANGE\n$1var result = undefined;\n$1// END MONACOCHANGE'
 		'$1// MONACOCHANGE\n$1var result = undefined;\n$1// END MONACOCHANGE'
 	);
 	);
 
 
+	tsServices = tsServices.replace(
+		/^( +)fs = require\("fs"\);$/m,
+		'$1// MONACOCHANGE\n$1fs = undefined;\n$1// END MONACOCHANGE'
+	);
+
 	// Flag any new require calls (outside comments) so they can be corrected preemptively.
 	// Flag any new require calls (outside comments) so they can be corrected preemptively.
 	// To avoid missing cases (or using an even more complex regex), temporarily remove comments
 	// To avoid missing cases (or using an even more complex regex), temporarily remove comments
 	// about require() and then check for lines actually calling require().
 	// about require() and then check for lines actually calling require().
@@ -74,13 +79,13 @@ export const typescriptVersion = "${typeScriptDependencyVersion}";\n`
 
 
 	// Allow error messages to include references to require() in their strings
 	// Allow error messages to include references to require() in their strings
 	const runtimeRequires =
 	const runtimeRequires =
-		linesWithRequire && linesWithRequire.filter((l) => !l.includes(': diag('));
+		linesWithRequire && linesWithRequire.filter((l) => !l.includes(': diag(') && !l.includes("ts.DiagnosticCategory"));
 
 
 	if (runtimeRequires && runtimeRequires.length && linesWithRequire) {
 	if (runtimeRequires && runtimeRequires.length && linesWithRequire) {
 		console.error(
 		console.error(
 			'Found new require() calls on the following lines. These should be removed to avoid breaking webpack builds.\n'
 			'Found new require() calls on the following lines. These should be removed to avoid breaking webpack builds.\n'
 		);
 		);
-		console.error(linesWithRequire.join('\n'));
+		console.error(runtimeRequires.map(r => `${r} (${tsServicesNoCommentedRequire.indexOf(r)})`).join('\n'));
 		process.exit(1);
 		process.exit(1);
 	}
 	}