Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

nls - removal of loader plugin (#219098)

Browse Source
This commit is contained in:
Benjamin Pasero
2024-06-28 15:45:52 +02:00
committed by GitHub
parent ff1b0028ad
commit 2014f1ddb2
14 changed files with 18 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/lib/bundle.js
-5
View File
@@ -36,14 +36,10 @@ function bundle(entryPoints, config, callback) {
const loader = loaderModule.exports;
config.isBuild = true;
config.paths = config.paths || {};
if (!config.paths['vs/nls']) {
config.paths['vs/nls'] = 'out-build/vs/nls.build';
}
if (!config.paths['vs/css']) {
config.paths['vs/css'] = 'out-build/vs/css.build';
}
config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
config.buildForceInvokeFactory['vs/nls'] = true;
config.buildForceInvokeFactory['vs/css'] = true;
loader.config(config);
loader(['require'], (localRequire) => {
@@ -53,7 +49,6 @@ function bundle(entryPoints, config, callback) {
r += '.js';
}
// avoid packaging the build version of plugins:
r = r.replace('vs/nls.build.js', 'vs/nls.js');
r = r.replace('vs/css.build.js', 'vs/css.js');
return { path: r, amdModuleId: entry.amdModuleId };
};
build/lib/bundle.ts
-5
View File
@@ -138,14 +138,10 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
const loader: any = loaderModule.exports;
config.isBuild = true;
config.paths = config.paths || {};
if (!config.paths['vs/nls']) {
config.paths['vs/nls'] = 'out-build/vs/nls.build';
}
if (!config.paths['vs/css']) {
config.paths['vs/css'] = 'out-build/vs/css.build';
}
config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
config.buildForceInvokeFactory['vs/nls'] = true;
config.buildForceInvokeFactory['vs/css'] = true;
loader.config(config);
@@ -156,7 +152,6 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
r += '.js';
}
// avoid packaging the build version of plugins:
r = r.replace('vs/nls.build.js', 'vs/nls.js');
r = r.replace('vs/css.build.js', 'vs/css.js');
return { path: r, amdModuleId: entry.amdModuleId };
};
build/lib/mangle/index.js
-1
View File
@@ -250,7 +250,6 @@ function isNameTakenInFile(node, name) {
const skippedExportMangledFiles = [
// Build
'css.build',
'nls.build',
// Monaco
'editorCommon',
'editorOptions',
build/lib/mangle/index.ts
-1
View File
@@ -283,7 +283,6 @@ function isNameTakenInFile(node: ts.Node, name: string): boolean {
const skippedExportMangledFiles = [
// Build
'css.build',
'nls.build',
// Monaco
'editorCommon',
build/lib/optimize.js
+2 -5
View File
@@ -53,7 +53,7 @@ function loaderPlugin(src, base, amdModuleId) {
function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) {
let loaderStream = gulp.src(`${src}/vs/loader.js`, { base: `${src}` });
if (bundleLoader) {
loaderStream = es.merge(loaderStream, loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'), loaderPlugin(`${src}/vs/nls.js`, `${src}`, 'vs/nls'));
loaderStream = es.merge(loaderStream, loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'));
}
const files = [];
const order = (f) => {
@@ -63,10 +63,7 @@ function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) {
if (f.path.endsWith('css.js')) {
return 1;
}
if (f.path.endsWith('nls.js')) {
return 2;
}
return 3;
return 2;
};
return (loaderStream
.pipe(es.through(function (data) {
build/lib/optimize.ts
+2 -6
View File
@@ -60,8 +60,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, e
if (bundleLoader) {
loaderStream = es.merge(
loaderStream,
loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'),
loaderPlugin(`${src}/vs/nls.js`, `${src}`, 'vs/nls'),
loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css')
);
}
@@ -73,10 +72,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, e
if (f.path.endsWith('css.js')) {
return 1;
}
if (f.path.endsWith('nls.js')) {
return 2;
}
return 3;
return 2;
};
return (
build/lib/standalone.js
+1 -4
View File
@@ -106,10 +106,7 @@ function extractEditor(options) {
'vs/css.build.ts',
'vs/css.ts',
'vs/loader.js',
'vs/loader.d.ts',
'vs/nls.build.ts',
'vs/nls.ts',
'vs/nls.mock.ts',
'vs/loader.d.ts'
].forEach(copyFile);
}
function createESMSourcesAndResources2(options) {
build/lib/standalone.ts
+1 -4
View File
@@ -118,10 +118,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
'vs/css.build.ts',
'vs/css.ts',
'vs/loader.js',
'vs/loader.d.ts',
'vs/nls.build.ts',
'vs/nls.ts',
'vs/nls.mock.ts',
'vs/loader.d.ts'
].forEach(copyFile);
}