From c3ac455fd2128d03eabeba6cf997b48d0fad5a1b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:41:24 +0100 Subject: [PATCH] Remove unused functions --- build/build.js | 40 ++++---- build/utils.js | 98 +------------------ ...or.code-workspace => editor.code-workspace | 0 3 files changed, 25 insertions(+), 113 deletions(-) rename monaco-editor.code-workspace => editor.code-workspace (100%) diff --git a/build/build.js b/build/build.js index 619bf425..b54194ce 100644 --- a/build/build.js +++ b/build/build.js @@ -6,7 +6,7 @@ //@ts-check const glob = require('glob'); -const { copyFile, removeDir, tsc, dts, buildESM2, buildAMD2 } = require('../build/utils'); +const { copyFile, removeDir, tsc, dts, buildESM, buildAMD } = require('../build/utils'); removeDir(`out`); @@ -35,23 +35,23 @@ dts( //#region css -buildESM2({ +buildESM({ base: 'css', entryPoints: ['src/css/monaco.contribution.ts', 'src/css/cssMode.ts', 'src/css/css.worker.ts'], external: ['monaco-editor-core', '*/cssMode'] }); -buildAMD2({ +buildAMD({ base: 'css', entryPoint: 'src/css/monaco.contribution.ts', amdModuleId: 'vs/language/css/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'css', entryPoint: 'src/css/cssMode.ts', amdModuleId: 'vs/language/css/cssMode' }); -buildAMD2({ +buildAMD({ base: 'css', entryPoint: 'src/css/cssWorker.ts', amdModuleId: 'vs/language/css/cssWorker' @@ -61,7 +61,7 @@ buildAMD2({ //#region html -buildESM2({ +buildESM({ base: 'html', entryPoints: [ 'src/html/monaco.contribution.ts', @@ -70,18 +70,18 @@ buildESM2({ ], external: ['monaco-editor-core', '*/htmlMode'] }); -buildAMD2({ +buildAMD({ base: 'html', entryPoint: 'src/html/monaco.contribution.ts', amdModuleId: 'vs/language/html/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'html', entryPoint: 'src/html/htmlMode.ts', amdModuleId: 'vs/language/html/htmlMode' }); -buildAMD2({ +buildAMD({ base: 'html', entryPoint: 'src/html/htmlWorker.ts', amdModuleId: 'vs/language/html/htmlWorker' @@ -91,7 +91,7 @@ buildAMD2({ //#region json -buildESM2({ +buildESM({ base: 'json', entryPoints: [ 'src/json/monaco.contribution.ts', @@ -100,18 +100,18 @@ buildESM2({ ], external: ['monaco-editor-core', '*/jsonMode'] }); -buildAMD2({ +buildAMD({ base: 'json', entryPoint: 'src/json/monaco.contribution.ts', amdModuleId: 'vs/language/json/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'json', entryPoint: 'src/json/jsonMode.ts', amdModuleId: 'vs/language/json/jsonMode' }); -buildAMD2({ +buildAMD({ base: 'json', entryPoint: 'src/json/jsonWorker.ts', amdModuleId: 'vs/language/json/jsonWorker' @@ -126,7 +126,7 @@ copyFile( `out/amd/typescript/lib/typescriptServices.js` ); -buildESM2({ +buildESM({ base: 'typescript', entryPoints: [ 'src/typescript/monaco.contribution.ts', @@ -135,18 +135,18 @@ buildESM2({ ], external: ['monaco-editor-core', '*/tsMode'] }); -buildAMD2({ +buildAMD({ base: 'typescript', entryPoint: 'src/typescript/monaco.contribution.ts', amdModuleId: 'vs/language/typescript/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'typescript', entryPoint: 'src/typescript/tsMode.ts', amdModuleId: 'vs/language/typescript/tsMode' }); -buildAMD2({ +buildAMD({ base: 'typescript', entryPoint: 'src/typescript/tsWorker.ts', amdModuleId: 'vs/language/typescript/tsWorker' @@ -175,7 +175,7 @@ glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function external.push(`*/${language}.contribution`); external.push(`*/${language}`); } - buildESM2({ + buildESM({ base: 'basic-languages', entryPoints, external @@ -184,14 +184,14 @@ glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function // AMD { - buildAMD2({ + buildAMD({ base: 'basic-languages', entryPoint: 'src/basic-languages/monaco.contribution.ts', amdModuleId: 'vs/basic-languages/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); for (const language of languages) { - buildAMD2({ + buildAMD({ base: 'basic-languages', entryPoint: `src/basic-languages/${language}/${language}.ts`, amdModuleId: `vs/basic-languages/${language}/${language}` diff --git a/build/utils.js b/build/utils.js index 83290843..b6c3f1c3 100644 --- a/build/utils.js +++ b/build/utils.js @@ -185,37 +185,6 @@ exports.build = build; * }} options */ function buildESM(options) { - build({ - entryPoints: options.entryPoints.map((e) => `${options.base}/${e}`), - bundle: true, - target: 'esnext', - format: 'esm', - define: { - AMD: 'false' - }, - banner: { - js: bundledFileHeader - }, - external: options.external, - outbase: `${options.base}/src`, - outdir: `${options.base}/release/esm/`, - plugins: [ - alias({ - 'vscode-nls': path.join(__dirname, 'fillers/vscode-nls.ts') - }) - ] - }); -} -exports.buildESM = buildESM; - -/** - * @param {{ - * base: string; - * entryPoints: string[]; - * external: string[]; - * }} options - */ -function buildESM2(options) { build({ entryPoints: options.entryPoints, bundle: true, @@ -237,7 +206,7 @@ function buildESM2(options) { ] }); } -exports.buildESM2 = buildESM2; +exports.buildESM = buildESM; /** * @param {'dev'|'min'} type @@ -249,63 +218,6 @@ exports.buildESM2 = buildESM2; * }} options */ function buildOneAMD(type, options) { - /** @type {import('esbuild').BuildOptions} */ - const opts = { - entryPoints: [`${options.base}/${options.entryPoint}`], - bundle: true, - target: 'esnext', - format: 'iife', - define: { - AMD: 'true' - }, - globalName: 'moduleExports', - banner: { - js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []) - .map((dep) => `"${dep}"`) - .join(',')}],()=>{` - }, - footer: { - js: 'return moduleExports;\n});' - }, - outbase: `${options.base}/src`, - outdir: `${options.base}/release/${type}/`, - plugins: [ - alias({ - 'vscode-nls': path.join(__dirname, '../build/fillers/vscode-nls.ts'), - 'monaco-editor-core': path.join(__dirname, '../build/fillers/monaco-editor-core-amd.ts') - }) - ] - }; - if (type === 'min') { - opts.minify = true; - } - build(opts); -} - -/** - * @param {{ - * base: string; - * entryPoint: string; - * amdModuleId: string; - * amdDependencies?: string[]; - * }} options - */ -function buildAMD(options) { - buildOneAMD('dev', options); - buildOneAMD('min', options); -} -exports.buildAMD = buildAMD; - -/** - * @param {'dev'|'min'} type - * @param {{ - * base: string; - * entryPoint: string; - * amdModuleId: string; - * amdDependencies?: string[]; - * }} options - */ -function buildOneAMD2(type, options) { /** @type {import('esbuild').BuildOptions} */ const opts = { entryPoints: [options.entryPoint], @@ -347,11 +259,11 @@ function buildOneAMD2(type, options) { * amdDependencies?: string[]; * }} options */ -function buildAMD2(options) { - buildOneAMD2('dev', options); - buildOneAMD2('min', options); +function buildAMD(options) { + buildOneAMD('dev', options); + buildOneAMD('min', options); } -exports.buildAMD2 = buildAMD2; +exports.buildAMD = buildAMD; function getGitVersion() { const git = path.join(REPO_ROOT, '.git'); diff --git a/monaco-editor.code-workspace b/editor.code-workspace similarity index 100% rename from monaco-editor.code-workspace rename to editor.code-workspace