From 240b68484666a55d280db3af52d7e76ae1527349 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Nov 2021 20:55:19 +0100 Subject: [PATCH] Move `simpleserver` script off of `gulp` --- build/simpleserver.js | 157 ++++++++++++++++++ gulpfile.js | 145 ---------------- ...ating-the-diffeditor-hello-diff-world.html | 4 +- ...ng-the-diffeditor-inline-diff-example.html | 4 +- ...ing-the-diffeditor-multi-line-example.html | 4 +- ...ting-the-diffeditor-navigating-a-diff.html | 4 +- ...ating-the-editor-editor-basic-options.html | 4 +- .../creating-the-editor-hard-wrapping.html | 4 +- .../creating-the-editor-hello-world.html | 4 +- ...syntax-highlighting-for-html-elements.html | 4 +- ...omizing-the-appearence-exposed-colors.html | 4 +- ...customizing-the-appearence-scrollbars.html | 4 +- ...zing-the-appearence-tokens-and-colors.html | 4 +- ...ge-services-codelens-provider-example.html | 4 +- ...guage-services-color-provider-example.html | 4 +- ...-services-completion-provider-example.html | 4 +- ...ervices-configure-javascript-defaults.html | 4 +- ...uage-services-configure-json-defaults.html | 4 +- ...ng-language-services-custom-languages.html | 4 +- ...age-services-folding-provider-example.html | 4 +- ...guage-services-hover-provider-example.html | 4 +- ...ices-semantic-tokens-provider-example.html | 4 +- ...age-services-symbols-provider-example.html | 4 +- .../test/playground.generated/index.html | 4 +- ...dding-a-command-to-an-editor-instance.html | 4 +- ...dding-an-action-to-an-editor-instance.html | 5 +- ...e-editor-customizing-the-line-numbers.html | 4 +- ...he-editor-line-and-inline-decorations.html | 4 +- ...th-the-editor-listening-to-key-events.html | 4 +- ...-the-editor-listening-to-mouse-events.html | 4 +- ...editor-rendering-glyphs-in-the-margin.html | 4 +- ...-with-the-editor-revealing-a-position.html | 4 +- monaco-editor/test/samples-all.generated.js | 2 +- package.json | 2 +- 34 files changed, 219 insertions(+), 208 deletions(-) create mode 100644 build/simpleserver.js diff --git a/build/simpleserver.js b/build/simpleserver.js new file mode 100644 index 00000000..b400d7b5 --- /dev/null +++ b/build/simpleserver.js @@ -0,0 +1,157 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +const fs = require('fs'); +const path = require('path'); +const http = require('http'); +const yaserver = require('yaserver'); +const { REPO_ROOT } = require('./utils'); + +const WEBSITE_GENERATED_PATH = path.join(REPO_ROOT, 'monaco-editor/website/playground/new-samples'); + +generateTestSamplesTask(); + +const SERVER_ROOT = path.normalize(path.join(REPO_ROOT, '../')); +createSimpleServer(SERVER_ROOT, 8080); +createSimpleServer(SERVER_ROOT, 8088); + +function generateTestSamplesTask() { + const sampleNames = fs.readdirSync(path.join(REPO_ROOT, 'monaco-editor/test/samples')); + const samples = sampleNames.map((sampleName) => { + const samplePath = path.join(REPO_ROOT, 'monaco-editor/test/samples', sampleName); + const sampleContent = fs.readFileSync(samplePath).toString(); + return { + name: sampleName, + content: sampleContent + }; + }); + const prefix = + '//This is a generated file via `npm run simpleserver`\ndefine([], function() { return'; + const suffix = '; });'; + fs.writeFileSync( + path.join(REPO_ROOT, 'monaco-editor/test/samples-all.generated.js'), + prefix + JSON.stringify(samples, null, '\t') + suffix + ); + + /** @type {{ chapter: string; name: string; id: string; path: string; }[]} */ + const PLAY_SAMPLES = require(path.join(WEBSITE_GENERATED_PATH, 'all.js')).PLAY_SAMPLES; + /** @type {{ path: string; name: string; }[]} */ + const locations = []; + for (let i = 0; i < PLAY_SAMPLES.length; i++) { + const sample = PLAY_SAMPLES[i]; + const sampleId = sample.id; + const samplePath = path.join(WEBSITE_GENERATED_PATH, sample.path); + + const html = fs.readFileSync(path.join(samplePath, 'sample.html')); + const js = fs.readFileSync(path.join(samplePath, 'sample.js')); + const css = fs.readFileSync(path.join(samplePath, 'sample.css')); + + const result = [ + '', + '', + '', + '', + ' ', + ' ', + '', + '', + '', + '[<< BACK]
', + 'THIS IS A GENERATED FILE VIA `npm run simpleserver`', + '', + '
', + '', + '
', + '
', + '', + '', + html, + '', + '', + '
', + '
', + '', + '', + '', + '', + '', + '' + ]; + fs.writeFileSync( + path.join(REPO_ROOT, 'monaco-editor/test/playground.generated/' + sampleId + '.html'), + result.join('\n') + ); + locations.push({ + path: sampleId + '.html', + name: sample.chapter + ' > ' + sample.name + }); + } + + const index = [ + '', + '', + '', + '', + ' ', + '', + '', + '[<< BACK]
', + 'THIS IS A GENERATED FILE VIA `npm run simpleserver`

', + locations + .map(function (location) { + return ( + '' + + location.name + + '' + ); + }) + .join('
\n'), + '', + '', + '', + '' + ]; + fs.writeFileSync( + path.join(REPO_ROOT, 'monaco-editor/test/playground.generated/index.html'), + index.join('\n') + ); +} + +/** + * @param {string} rootDir + * @param {number} port + */ +function createSimpleServer(rootDir, port) { + yaserver + .createServer({ + rootDir: rootDir + }) + .then((staticServer) => { + const server = http.createServer((request, response) => { + return staticServer.handle(request, response); + }); + server.listen(port, '127.0.0.1', () => { + console.log(`Running at http://127.0.0.1:${port}`); + }); + }); +} diff --git a/gulpfile.js b/gulpfile.js index 5d9daba7..46b5bf00 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,13 +4,10 @@ const path = require('path'); const fs = require('fs'); const rimraf = require('rimraf'); const cp = require('child_process'); -const yaserver = require('yaserver'); -const http = require('http'); const CleanCSS = require('clean-css'); const uncss = require('uncss'); const File = require('vinyl'); -const WEBSITE_GENERATED_PATH = path.join(__dirname, 'monaco-editor/website/playground/new-samples'); /** @type {string} */ const MONACO_EDITOR_VERSION = (function () { const packageJsonPath = path.join(__dirname, 'package.json'); @@ -254,145 +251,3 @@ gulp.task('prepare-website-branch', async function () { }); console.log('RUN monaco-editor-website>git push origin gh-pages --force'); }); - -const generateTestSamplesTask = function () { - var sampleNames = fs.readdirSync(path.join(__dirname, 'monaco-editor/test/samples')); - var samples = sampleNames.map(function (sampleName) { - var samplePath = path.join(__dirname, 'monaco-editor/test/samples', sampleName); - var sampleContent = fs.readFileSync(samplePath).toString(); - return { - name: sampleName, - content: sampleContent - }; - }); - var prefix = - '//This is a generated file via gulp generate-test-samples\ndefine([], function() { return'; - var suffix = '; });'; - fs.writeFileSync( - path.join(__dirname, 'monaco-editor/test/samples-all.generated.js'), - prefix + JSON.stringify(samples, null, '\t') + suffix - ); - - var PLAY_SAMPLES = require(path.join(WEBSITE_GENERATED_PATH, 'all.js')).PLAY_SAMPLES; - var locations = []; - for (var i = 0; i < PLAY_SAMPLES.length; i++) { - var sample = PLAY_SAMPLES[i]; - var sampleId = sample.id; - var samplePath = path.join(WEBSITE_GENERATED_PATH, sample.path); - - var html = fs.readFileSync(path.join(samplePath, 'sample.html')); - var js = fs.readFileSync(path.join(samplePath, 'sample.js')); - var css = fs.readFileSync(path.join(samplePath, 'sample.css')); - - var result = [ - '', - '', - '', - '', - ' ', - ' ', - '', - '', - '', - '[<< BACK]
', - 'THIS IS A GENERATED FILE VIA gulp generate-test-samples', - '', - '
', - '', - '
', - '
', - '', - '', - html, - '', - '', - '
', - '
', - '', - '', - '', - '', - '', - '' - ]; - fs.writeFileSync( - path.join(__dirname, 'monaco-editor/test/playground.generated/' + sampleId + '.html'), - result.join('\n') - ); - locations.push({ - path: sampleId + '.html', - name: sample.chapter + ' > ' + sample.name - }); - } - - var index = [ - '', - '', - '', - '', - ' ', - '', - '', - '[<< BACK]
', - 'THIS IS A GENERATED FILE VIA gulp generate-test-samples

', - locations - .map(function (location) { - return ( - '' + - location.name + - '' - ); - }) - .join('
\n'), - '', - '', - '', - '' - ]; - fs.writeFileSync( - path.join(__dirname, 'monaco-editor/test/playground.generated/index.html'), - index.join('\n') - ); -}; - -function createSimpleServer(rootDir, port) { - yaserver - .createServer({ - rootDir: rootDir - }) - .then((staticServer) => { - const server = http.createServer((request, response) => { - return staticServer.handle(request, response); - }); - server.listen(port, '127.0.0.1', () => { - console.log(`Running at http://127.0.0.1:${port}`); - }); - }); -} - -gulp.task('generate-test-samples', taskSeries(generateTestSamplesTask)); - -gulp.task( - 'simpleserver', - taskSeries(generateTestSamplesTask, function () { - const SERVER_ROOT = path.normalize(path.join(__dirname, '../')); - createSimpleServer(SERVER_ROOT, 8080); - createSimpleServer(SERVER_ROOT, 8088); - }) -); diff --git a/monaco-editor/test/playground.generated/creating-the-diffeditor-hello-diff-world.html b/monaco-editor/test/playground.generated/creating-the-diffeditor-hello-diff-world.html index 6b52eb10..b0b7f0fa 100644 --- a/monaco-editor/test/playground.generated/creating-the-diffeditor-hello-diff-world.html +++ b/monaco-editor/test/playground.generated/creating-the-diffeditor-hello-diff-world.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-diffeditor-inline-diff-example.html b/monaco-editor/test/playground.generated/creating-the-diffeditor-inline-diff-example.html index 0de76746..75cb4968 100644 --- a/monaco-editor/test/playground.generated/creating-the-diffeditor-inline-diff-example.html +++ b/monaco-editor/test/playground.generated/creating-the-diffeditor-inline-diff-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-diffeditor-multi-line-example.html b/monaco-editor/test/playground.generated/creating-the-diffeditor-multi-line-example.html index af50ebdb..36520f04 100644 --- a/monaco-editor/test/playground.generated/creating-the-diffeditor-multi-line-example.html +++ b/monaco-editor/test/playground.generated/creating-the-diffeditor-multi-line-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-diffeditor-navigating-a-diff.html b/monaco-editor/test/playground.generated/creating-the-diffeditor-navigating-a-diff.html index 9a074a2a..74185342 100644 --- a/monaco-editor/test/playground.generated/creating-the-diffeditor-navigating-a-diff.html +++ b/monaco-editor/test/playground.generated/creating-the-diffeditor-navigating-a-diff.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-editor-editor-basic-options.html b/monaco-editor/test/playground.generated/creating-the-editor-editor-basic-options.html index bdce9b21..d6e2b176 100644 --- a/monaco-editor/test/playground.generated/creating-the-editor-editor-basic-options.html +++ b/monaco-editor/test/playground.generated/creating-the-editor-editor-basic-options.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-editor-hard-wrapping.html b/monaco-editor/test/playground.generated/creating-the-editor-hard-wrapping.html index c6c98895..c50edde6 100644 --- a/monaco-editor/test/playground.generated/creating-the-editor-hard-wrapping.html +++ b/monaco-editor/test/playground.generated/creating-the-editor-hard-wrapping.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-editor-hello-world.html b/monaco-editor/test/playground.generated/creating-the-editor-hello-world.html index adcb06b2..da647eaa 100644 --- a/monaco-editor/test/playground.generated/creating-the-editor-hello-world.html +++ b/monaco-editor/test/playground.generated/creating-the-editor-hello-world.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/creating-the-editor-syntax-highlighting-for-html-elements.html b/monaco-editor/test/playground.generated/creating-the-editor-syntax-highlighting-for-html-elements.html index 3cf0fa93..12f71450 100644 --- a/monaco-editor/test/playground.generated/creating-the-editor-syntax-highlighting-for-html-elements.html +++ b/monaco-editor/test/playground.generated/creating-the-editor-syntax-highlighting-for-html-elements.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/customizing-the-appearence-exposed-colors.html b/monaco-editor/test/playground.generated/customizing-the-appearence-exposed-colors.html index 525d0efd..17fb935b 100644 --- a/monaco-editor/test/playground.generated/customizing-the-appearence-exposed-colors.html +++ b/monaco-editor/test/playground.generated/customizing-the-appearence-exposed-colors.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/customizing-the-appearence-scrollbars.html b/monaco-editor/test/playground.generated/customizing-the-appearence-scrollbars.html index 815fa2d7..0d04a744 100644 --- a/monaco-editor/test/playground.generated/customizing-the-appearence-scrollbars.html +++ b/monaco-editor/test/playground.generated/customizing-the-appearence-scrollbars.html @@ -1,5 +1,5 @@ - + @@ -24,7 +24,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/customizing-the-appearence-tokens-and-colors.html b/monaco-editor/test/playground.generated/customizing-the-appearence-tokens-and-colors.html index b567cccc..0e4c0091 100644 --- a/monaco-editor/test/playground.generated/customizing-the-appearence-tokens-and-colors.html +++ b/monaco-editor/test/playground.generated/customizing-the-appearence-tokens-and-colors.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-codelens-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-codelens-provider-example.html index de6d7df1..ab9801df 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-codelens-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-codelens-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-color-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-color-provider-example.html index 0ecf89e2..7c5bffdf 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-color-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-color-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-completion-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-completion-provider-example.html index 1002b00e..1c824230 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-completion-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-completion-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-configure-javascript-defaults.html b/monaco-editor/test/playground.generated/extending-language-services-configure-javascript-defaults.html index 2e19c7a2..448b8557 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-configure-javascript-defaults.html +++ b/monaco-editor/test/playground.generated/extending-language-services-configure-javascript-defaults.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-configure-json-defaults.html b/monaco-editor/test/playground.generated/extending-language-services-configure-json-defaults.html index 2d365933..6237e00f 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-configure-json-defaults.html +++ b/monaco-editor/test/playground.generated/extending-language-services-configure-json-defaults.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-custom-languages.html b/monaco-editor/test/playground.generated/extending-language-services-custom-languages.html index c86e5489..82748e29 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-custom-languages.html +++ b/monaco-editor/test/playground.generated/extending-language-services-custom-languages.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-folding-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-folding-provider-example.html index fba4b7ad..05af7d1b 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-folding-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-folding-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-hover-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-hover-provider-example.html index dbda9a76..b7ce4e8e 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-hover-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-hover-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-semantic-tokens-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-semantic-tokens-provider-example.html index 0e65657e..1ff766cc 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-semantic-tokens-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-semantic-tokens-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/extending-language-services-symbols-provider-example.html b/monaco-editor/test/playground.generated/extending-language-services-symbols-provider-example.html index 07d2a8c8..e6821d71 100644 --- a/monaco-editor/test/playground.generated/extending-language-services-symbols-provider-example.html +++ b/monaco-editor/test/playground.generated/extending-language-services-symbols-provider-example.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/index.html b/monaco-editor/test/playground.generated/index.html index 4ed9e573..4d1971e7 100644 --- a/monaco-editor/test/playground.generated/index.html +++ b/monaco-editor/test/playground.generated/index.html @@ -1,12 +1,12 @@ - + [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples

+THIS IS A GENERATED FILE VIA `npm run simpleserver`

Creating the editor > Hello world!
Creating the editor > Editor basic options
Creating the editor > Hard wrapping
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-a-command-to-an-editor-instance.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-a-command-to-an-editor-instance.html index 2146640c..d3270a1b 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-a-command-to-an-editor-instance.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-a-command-to-an-editor-instance.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-an-action-to-an-editor-instance.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-an-action-to-an-editor-instance.html index 28ce8d9a..928c0025 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-an-action-to-an-editor-instance.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-adding-an-action-to-an-editor-instance.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
@@ -85,7 +85,6 @@ editor.addAction({ // @param editor The editor instance is passed in as a convenience run: function (ed) { alert("i'm running => " + ed.getPosition()); - return null; } }); diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-customizing-the-line-numbers.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-customizing-the-line-numbers.html index 9fd8b5c9..e0f6f33b 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-customizing-the-line-numbers.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-customizing-the-line-numbers.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-line-and-inline-decorations.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-line-and-inline-decorations.html index c3de5c3f..a946f6af 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-line-and-inline-decorations.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-line-and-inline-decorations.html @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-key-events.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-key-events.html index 7e8d8ce0..fd7d6168 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-key-events.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-key-events.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-mouse-events.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-mouse-events.html index d3a024e5..70c72ba7 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-mouse-events.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-listening-to-mouse-events.html @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-rendering-glyphs-in-the-margin.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-rendering-glyphs-in-the-margin.html index c225b5a3..75b02144 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-rendering-glyphs-in-the-margin.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-rendering-glyphs-in-the-margin.html @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/playground.generated/interacting-with-the-editor-revealing-a-position.html b/monaco-editor/test/playground.generated/interacting-with-the-editor-revealing-a-position.html index 12c4faa4..93c4c775 100644 --- a/monaco-editor/test/playground.generated/interacting-with-the-editor-revealing-a-position.html +++ b/monaco-editor/test/playground.generated/interacting-with-the-editor-revealing-a-position.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ /*----------------------------------------SAMPLE CSS END*/ [<< BACK]
-THIS IS A GENERATED FILE VIA gulp generate-test-samples +THIS IS A GENERATED FILE VIA `npm run simpleserver`
diff --git a/monaco-editor/test/samples-all.generated.js b/monaco-editor/test/samples-all.generated.js index 78474b62..5ee198dc 100644 --- a/monaco-editor/test/samples-all.generated.js +++ b/monaco-editor/test/samples-all.generated.js @@ -1,4 +1,4 @@ -//This is a generated file via gulp generate-test-samples +//This is a generated file via `npm run simpleserver` define([], function() { return[ { "name": "run-editor-failing-js.txt", diff --git a/package.json b/package.json index 4feed63f..1ed6453d 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "prettier": "prettier --write .", "pretty-quick": "pretty-quick --staged", "release": "node ./build/build.js && node ./build/release.js && node ./build/importEditorWebpackPlugin.js", - "simpleserver": "gulp simpleserver", + "simpleserver": "node ./build/simpleserver", "smoketest-debug": "node ./test/smoke/runner.js --debug-tests", "smoketest": "node ./test/smoke/runner.js", "test": "node ./test/unit/all.js",