diff --git a/src/buildfile.js b/build/buildfile.js similarity index 98% rename from src/buildfile.js rename to build/buildfile.js index 5ac5381695b..74ac8436ccf 100644 --- a/src/buildfile.js +++ b/build/buildfile.js @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -const { isESM } = require('../build/lib/esm'); +const { isESM } = require('./lib/esm'); /** * @param {string} name * @param {string[]=} exclude - * @returns {import('../build/lib/bundle').IEntryPoint} + * @returns {import('./lib/bundle').IEntryPoint} */ function createModuleDescription(name, exclude) { diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index 85b9b2e547b..e12a33e670f 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -32,7 +32,7 @@ const { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require( const cp = require('child_process'); const log = require('fancy-log'); const { isESM } = require('./lib/esm'); -const buildfile = require('../src/buildfile'); +const buildfile = require('./buildfile'); const REPO_ROOT = path.dirname(__dirname); const commit = getVersion(REPO_ROOT); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 8d15015f9b9..7841bb90887 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -17,7 +17,7 @@ const util = require('./lib/util'); const { getVersion } = require('./lib/getVersion'); const { readISODate } = require('./lib/date'); const task = require('./lib/task'); -const buildfile = require('../src/buildfile'); +const buildfile = require('./buildfile'); const optimize = require('./lib/optimize'); const { inlineMeta } = require('./lib/inlineMeta'); const root = path.dirname(__dirname); diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index cc76274ff4a..b6a26fc4845 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -54,7 +54,7 @@ const vscodeWebResourceIncludes = isESM() ? [ // Extension Host Worker 'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html', -]: [ +] : [ // Workbench 'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg,mp3}', @@ -71,7 +71,7 @@ const vscodeWebResourceIncludes = isESM() ? [ // Extension Worker 'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html', - + // Tree Sitter highlights 'out-build/vs/editor/common/languages/highlights/*.scm', @@ -94,7 +94,7 @@ const vscodeWebResources = [ '!**/test/**' ]; -const buildfile = require('../src/buildfile'); +const buildfile = require('./buildfile'); const vscodeWebEntryPoints = isESM() ? [ buildfile.base, diff --git a/build/lib/mangle/index.js b/build/lib/mangle/index.js index c000f44ef40..f72d299930b 100644 --- a/build/lib/mangle/index.js +++ b/build/lib/mangle/index.js @@ -15,7 +15,7 @@ const url_1 = require("url"); const workerpool = require("workerpool"); const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost"); const esm_1 = require("../esm"); -const buildfile = require('../../../src/buildfile'); +const buildfile = require('../../buildfile'); class ShortIdent { prefix; static _keywords = new Set(['await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger', diff --git a/build/lib/mangle/index.ts b/build/lib/mangle/index.ts index 14ec11bc471..7b6c6d20843 100644 --- a/build/lib/mangle/index.ts +++ b/build/lib/mangle/index.ts @@ -13,7 +13,7 @@ import { pathToFileURL } from 'url'; import * as workerpool from 'workerpool'; import { StaticLanguageServiceHost } from './staticLanguageServiceHost'; import { isESM } from '../esm'; -const buildfile = require('../../../src/buildfile'); +const buildfile = require('../../buildfile'); class ShortIdent {