From dd6bd3ae6a81ef8453ca52bcd06a47ca6124ba0a Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 24 Sep 2020 17:39:48 +0200 Subject: [PATCH] Reduce the number of folders where we use TS --- build/.gitignore | 2 -- build/gulpfile.editor.js | 2 +- build/lib/compilation.ts | 2 +- build/{monaco/api.ts => lib/monaco-api.ts} | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) rename build/{monaco/api.ts => lib/monaco-api.ts} (99%) diff --git a/build/.gitignore b/build/.gitignore index ade0096d6a1..01e8737ef58 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1,5 +1,3 @@ azure-pipelines/**/*.js -builtin/**/*.js darwin/**/*.js lib/**/*.js -monaco/**/*.js diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index 0c0e20d1fe6..aa0282bff57 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -14,7 +14,7 @@ const i18n = require('./lib/i18n'); const standalone = require('./lib/standalone'); const cp = require('child_process'); const compilation = require('./lib/compilation'); -const monacoapi = require('./monaco/api'); +const monacoapi = require('./lib/monaco-api'); const fs = require('fs'); const webpack = require('webpack'); const webpackGulp = require('webpack-stream'); diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts index 11a0c7f2da7..96e7d59ea16 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts @@ -12,7 +12,7 @@ import * as bom from 'gulp-bom'; import * as sourcemaps from 'gulp-sourcemaps'; import * as tsb from 'gulp-tsb'; import * as path from 'path'; -import * as monacodts from '../monaco/api'; +import * as monacodts from './monaco-api'; import * as nls from './nls'; import { createReporter } from './reporter'; import * as util from './util'; diff --git a/build/monaco/api.ts b/build/lib/monaco-api.ts similarity index 99% rename from build/monaco/api.ts rename to build/lib/monaco-api.ts index f3542988a4b..6604b14d91e 100644 --- a/build/monaco/api.ts +++ b/build/lib/monaco-api.ts @@ -14,7 +14,7 @@ const dtsv = '3'; const tsfmt = require('../../tsfmt.json'); const SRC = path.join(__dirname, '../../src'); -export const RECIPE_PATH = path.join(__dirname, './monaco.d.ts.recipe'); +export const RECIPE_PATH = path.join(__dirname, '../monaco/monaco.d.ts.recipe'); const DECLARATION_PATH = path.join(__dirname, '../../src/vs/monaco.d.ts'); function logErr(message: any, ...rest: any[]): void {