From bf7c78973cb2c7ebfd2d528b97451fc1664394b9 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 12 Mar 2018 11:41:11 +0100 Subject: [PATCH] Reorganize project --- gulpfile.js | 104 ++++++++++--------------- package.json | 8 +- {test => src/test}/assert.d.ts | 0 {test => src/test}/bat.test.ts | 0 {test => src/test}/coffee.test.ts | 0 {test => src/test}/cpp.test.ts | 0 {test => src/test}/csharp.test.ts | 0 {test => src/test}/csp.test.ts | 0 {test => src/test}/css.test.ts | 0 {test => src/test}/dockerfile.test.ts | 0 {test => src/test}/fsharp.test.ts | 0 {test => src/test}/go.test.ts | 0 {test => src/test}/handlebars.test.ts | 0 {test => src/test}/html.test.ts | 0 {test => src/test}/java.test.ts | 0 {test => src/test}/less.test.ts | 0 {test => src/test}/lua.test.ts | 0 {test => src/test}/markdown.test.ts | 0 {test => src/test}/mocha.d.ts | 0 {test => src/test}/msdax.test.ts | 0 {test => src/test}/mysql.test.ts | 0 {test => src/test}/objective-c.test.ts | 0 {test => src/test}/pgsql.test.ts | 0 {test => src/test}/php.test.ts | 0 {test => src/test}/postiats.test.ts | 0 {test => src/test}/powershell.test.ts | 0 {test => src/test}/pug.test.ts | 0 {test => src/test}/python.test.ts | 0 {test => src/test}/r.test.ts | 0 {test => src/test}/razor.test.ts | 0 {test => src/test}/redis.test.ts | 0 {test => src/test}/redshift.test.ts | 0 {test => src/test}/ruby.test.ts | 0 {test => src/test}/sb.test.ts | 0 {test => src/test}/scss.test.ts | 0 {test => src/test}/solidity.test.ts | 0 {test => src/test}/sql.test.ts | 0 {test => src/test}/swift.test.ts | 0 {test => src/test}/testRunner.ts | 2 +- {test => src/test}/vb.test.ts | 0 {test => src/test}/xml.test.ts | 0 {test => src/test}/yaml.test.ts | 0 tsconfig.json => src/tsconfig.json | 7 +- test/all.js | 74 +++++++++--------- 44 files changed, 88 insertions(+), 107 deletions(-) rename {test => src/test}/assert.d.ts (100%) rename {test => src/test}/bat.test.ts (100%) rename {test => src/test}/coffee.test.ts (100%) rename {test => src/test}/cpp.test.ts (100%) rename {test => src/test}/csharp.test.ts (100%) rename {test => src/test}/csp.test.ts (100%) rename {test => src/test}/css.test.ts (100%) rename {test => src/test}/dockerfile.test.ts (100%) rename {test => src/test}/fsharp.test.ts (100%) rename {test => src/test}/go.test.ts (100%) rename {test => src/test}/handlebars.test.ts (100%) rename {test => src/test}/html.test.ts (100%) rename {test => src/test}/java.test.ts (100%) rename {test => src/test}/less.test.ts (100%) rename {test => src/test}/lua.test.ts (100%) rename {test => src/test}/markdown.test.ts (100%) rename {test => src/test}/mocha.d.ts (100%) rename {test => src/test}/msdax.test.ts (100%) rename {test => src/test}/mysql.test.ts (100%) rename {test => src/test}/objective-c.test.ts (100%) rename {test => src/test}/pgsql.test.ts (100%) rename {test => src/test}/php.test.ts (100%) rename {test => src/test}/postiats.test.ts (100%) rename {test => src/test}/powershell.test.ts (100%) rename {test => src/test}/pug.test.ts (100%) rename {test => src/test}/python.test.ts (100%) rename {test => src/test}/r.test.ts (100%) rename {test => src/test}/razor.test.ts (100%) rename {test => src/test}/redis.test.ts (100%) rename {test => src/test}/redshift.test.ts (100%) rename {test => src/test}/ruby.test.ts (100%) rename {test => src/test}/sb.test.ts (100%) rename {test => src/test}/scss.test.ts (100%) rename {test => src/test}/solidity.test.ts (100%) rename {test => src/test}/sql.test.ts (100%) rename {test => src/test}/swift.test.ts (100%) rename {test => src/test}/testRunner.ts (93%) rename {test => src/test}/vb.test.ts (100%) rename {test => src/test}/xml.test.ts (100%) rename {test => src/test}/yaml.test.ts (100%) rename tsconfig.json => src/tsconfig.json (51%) diff --git a/gulpfile.js b/gulpfile.js index 12d7511e..975c68b0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,7 +15,7 @@ var rimraf = require('rimraf'); var es = require('event-stream'); gulp.task('clean-release', function(cb) { rimraf('release', { maxBusyTries: 1 }, cb); }); -gulp.task('release', ['clean-release','compile'], function() { +gulp.task('release', ['clean-release'], function() { var sha1 = getGitVersion(__dirname); var semver = require('./package.json').version; @@ -33,56 +33,56 @@ gulp.task('release', ['clean-release','compile'], function() { function bundleOne(moduleId, exclude) { return rjs({ - baseUrl: '/out/', + baseUrl: '/out/amd/', name: 'vs/basic-languages/' + moduleId, out: moduleId + '.js', exclude: exclude, paths: { - 'vs/basic-languages': __dirname + '/out' + 'vs/basic-languages': __dirname + '/out/amd' } }) } return merge( - bundleOne('src/monaco.contribution'), - bundleOne('src/bat'), - bundleOne('src/css'), - bundleOne('src/coffee'), - bundleOne('src/cpp'), - bundleOne('src/csharp'), - bundleOne('src/dockerfile'), - bundleOne('src/fsharp'), - bundleOne('src/go'), - bundleOne('src/handlebars'), - bundleOne('src/html'), - bundleOne('src/ini'), - bundleOne('src/pug'), - bundleOne('src/java'), - bundleOne('src/less'), - bundleOne('src/lua'), - bundleOne('src/markdown'), - bundleOne('src/msdax'), - bundleOne('src/objective-c'), - bundleOne('src/php'), - bundleOne('src/powershell'), - bundleOne('src/postiats'), - bundleOne('src/python'), - bundleOne('src/r'), - bundleOne('src/razor'), - bundleOne('src/ruby'), - bundleOne('src/scss'), - bundleOne('src/sql'), - bundleOne('src/swift'), - bundleOne('src/vb'), - bundleOne('src/xml'), - bundleOne('src/yaml'), - bundleOne('src/solidity'), - bundleOne('src/sb'), - bundleOne('src/mysql'), - bundleOne('src/redshift'), - bundleOne('src/pgsql'), - bundleOne('src/redis'), - bundleOne('src/csp') + bundleOne('monaco.contribution'), + bundleOne('bat'), + bundleOne('css'), + bundleOne('coffee'), + bundleOne('cpp'), + bundleOne('csharp'), + bundleOne('dockerfile'), + bundleOne('fsharp'), + bundleOne('go'), + bundleOne('handlebars'), + bundleOne('html'), + bundleOne('ini'), + bundleOne('pug'), + bundleOne('java'), + bundleOne('less'), + bundleOne('lua'), + bundleOne('markdown'), + bundleOne('msdax'), + bundleOne('objective-c'), + bundleOne('php'), + bundleOne('powershell'), + bundleOne('postiats'), + bundleOne('python'), + bundleOne('r'), + bundleOne('razor'), + bundleOne('ruby'), + bundleOne('scss'), + bundleOne('sql'), + bundleOne('swift'), + bundleOne('vb'), + bundleOne('xml'), + bundleOne('yaml'), + bundleOne('solidity'), + bundleOne('sb'), + bundleOne('mysql'), + bundleOne('redshift'), + bundleOne('pgsql'), + bundleOne('redis'), + bundleOne('csp') ) .pipe(uglify({ output: { @@ -96,25 +96,7 @@ gulp.task('release', ['clean-release','compile'], function() { ); this.emit('data', data); })) - .pipe(gulp.dest('./release/')); -}); - - -var compilation = tsb.create(assign({ verbose: true }, require('./tsconfig.json').compilerOptions)); - -var tsSources = require('./tsconfig.json').include.concat(require('./tsconfig.json').files); - -function compileTask() { - return merge( - gulp.src(tsSources, { base: '.' }).pipe(compilation()) - ) - .pipe(gulp.dest('out')); -} -gulp.task('clean-out', function(cb) { rimraf('out', { maxBusyTries: 1 }, cb); }); -gulp.task('compile', ['clean-out'], compileTask); -gulp.task('compile-without-clean', compileTask); -gulp.task('watch', ['compile'], function() { - gulp.watch(tsSources, ['compile-without-clean']); + .pipe(gulp.dest('./release/min/')); }); function getGitVersion(repo) { diff --git a/package.json b/package.json index 52703a83..42ce843e 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "version": "0.9.0", "description": "Bundle of many languages for the Monaco Editor.", "scripts": { - "compile": "node_modules/.bin/gulp compile", - "watch": "node_modules/.bin/gulp watch", - "test": "node_modules/.bin/mocha", - "prepublish": "node_modules/.bin/gulp release" + "compile": "tsc -p ./src", + "watch": "tsc -p ./src --watch", + "test": "mocha", + "prepublish": "npm run compile && gulp release" }, "author": "Microsoft Corporation", "license": "MIT", diff --git a/test/assert.d.ts b/src/test/assert.d.ts similarity index 100% rename from test/assert.d.ts rename to src/test/assert.d.ts diff --git a/test/bat.test.ts b/src/test/bat.test.ts similarity index 100% rename from test/bat.test.ts rename to src/test/bat.test.ts diff --git a/test/coffee.test.ts b/src/test/coffee.test.ts similarity index 100% rename from test/coffee.test.ts rename to src/test/coffee.test.ts diff --git a/test/cpp.test.ts b/src/test/cpp.test.ts similarity index 100% rename from test/cpp.test.ts rename to src/test/cpp.test.ts diff --git a/test/csharp.test.ts b/src/test/csharp.test.ts similarity index 100% rename from test/csharp.test.ts rename to src/test/csharp.test.ts diff --git a/test/csp.test.ts b/src/test/csp.test.ts similarity index 100% rename from test/csp.test.ts rename to src/test/csp.test.ts diff --git a/test/css.test.ts b/src/test/css.test.ts similarity index 100% rename from test/css.test.ts rename to src/test/css.test.ts diff --git a/test/dockerfile.test.ts b/src/test/dockerfile.test.ts similarity index 100% rename from test/dockerfile.test.ts rename to src/test/dockerfile.test.ts diff --git a/test/fsharp.test.ts b/src/test/fsharp.test.ts similarity index 100% rename from test/fsharp.test.ts rename to src/test/fsharp.test.ts diff --git a/test/go.test.ts b/src/test/go.test.ts similarity index 100% rename from test/go.test.ts rename to src/test/go.test.ts diff --git a/test/handlebars.test.ts b/src/test/handlebars.test.ts similarity index 100% rename from test/handlebars.test.ts rename to src/test/handlebars.test.ts diff --git a/test/html.test.ts b/src/test/html.test.ts similarity index 100% rename from test/html.test.ts rename to src/test/html.test.ts diff --git a/test/java.test.ts b/src/test/java.test.ts similarity index 100% rename from test/java.test.ts rename to src/test/java.test.ts diff --git a/test/less.test.ts b/src/test/less.test.ts similarity index 100% rename from test/less.test.ts rename to src/test/less.test.ts diff --git a/test/lua.test.ts b/src/test/lua.test.ts similarity index 100% rename from test/lua.test.ts rename to src/test/lua.test.ts diff --git a/test/markdown.test.ts b/src/test/markdown.test.ts similarity index 100% rename from test/markdown.test.ts rename to src/test/markdown.test.ts diff --git a/test/mocha.d.ts b/src/test/mocha.d.ts similarity index 100% rename from test/mocha.d.ts rename to src/test/mocha.d.ts diff --git a/test/msdax.test.ts b/src/test/msdax.test.ts similarity index 100% rename from test/msdax.test.ts rename to src/test/msdax.test.ts diff --git a/test/mysql.test.ts b/src/test/mysql.test.ts similarity index 100% rename from test/mysql.test.ts rename to src/test/mysql.test.ts diff --git a/test/objective-c.test.ts b/src/test/objective-c.test.ts similarity index 100% rename from test/objective-c.test.ts rename to src/test/objective-c.test.ts diff --git a/test/pgsql.test.ts b/src/test/pgsql.test.ts similarity index 100% rename from test/pgsql.test.ts rename to src/test/pgsql.test.ts diff --git a/test/php.test.ts b/src/test/php.test.ts similarity index 100% rename from test/php.test.ts rename to src/test/php.test.ts diff --git a/test/postiats.test.ts b/src/test/postiats.test.ts similarity index 100% rename from test/postiats.test.ts rename to src/test/postiats.test.ts diff --git a/test/powershell.test.ts b/src/test/powershell.test.ts similarity index 100% rename from test/powershell.test.ts rename to src/test/powershell.test.ts diff --git a/test/pug.test.ts b/src/test/pug.test.ts similarity index 100% rename from test/pug.test.ts rename to src/test/pug.test.ts diff --git a/test/python.test.ts b/src/test/python.test.ts similarity index 100% rename from test/python.test.ts rename to src/test/python.test.ts diff --git a/test/r.test.ts b/src/test/r.test.ts similarity index 100% rename from test/r.test.ts rename to src/test/r.test.ts diff --git a/test/razor.test.ts b/src/test/razor.test.ts similarity index 100% rename from test/razor.test.ts rename to src/test/razor.test.ts diff --git a/test/redis.test.ts b/src/test/redis.test.ts similarity index 100% rename from test/redis.test.ts rename to src/test/redis.test.ts diff --git a/test/redshift.test.ts b/src/test/redshift.test.ts similarity index 100% rename from test/redshift.test.ts rename to src/test/redshift.test.ts diff --git a/test/ruby.test.ts b/src/test/ruby.test.ts similarity index 100% rename from test/ruby.test.ts rename to src/test/ruby.test.ts diff --git a/test/sb.test.ts b/src/test/sb.test.ts similarity index 100% rename from test/sb.test.ts rename to src/test/sb.test.ts diff --git a/test/scss.test.ts b/src/test/scss.test.ts similarity index 100% rename from test/scss.test.ts rename to src/test/scss.test.ts diff --git a/test/solidity.test.ts b/src/test/solidity.test.ts similarity index 100% rename from test/solidity.test.ts rename to src/test/solidity.test.ts diff --git a/test/sql.test.ts b/src/test/sql.test.ts similarity index 100% rename from test/sql.test.ts rename to src/test/sql.test.ts diff --git a/test/swift.test.ts b/src/test/swift.test.ts similarity index 100% rename from test/swift.test.ts rename to src/test/swift.test.ts diff --git a/test/testRunner.ts b/src/test/testRunner.ts similarity index 93% rename from test/testRunner.ts rename to src/test/testRunner.ts index 35a860ca..15011a2f 100644 --- a/test/testRunner.ts +++ b/src/test/testRunner.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import {loadLanguage} from '../src/monaco.contribution'; +import {loadLanguage} from '../monaco.contribution'; import * as assert from 'assert'; // Allow for running under nodejs/requirejs in tests diff --git a/test/vb.test.ts b/src/test/vb.test.ts similarity index 100% rename from test/vb.test.ts rename to src/test/vb.test.ts diff --git a/test/xml.test.ts b/src/test/xml.test.ts similarity index 100% rename from test/xml.test.ts rename to src/test/xml.test.ts diff --git a/test/yaml.test.ts b/src/test/yaml.test.ts similarity index 100% rename from test/yaml.test.ts rename to src/test/yaml.test.ts diff --git a/tsconfig.json b/src/tsconfig.json similarity index 51% rename from tsconfig.json rename to src/tsconfig.json index 3534ffba..ebdf3791 100644 --- a/tsconfig.json +++ b/src/tsconfig.json @@ -1,14 +1,13 @@ { "compilerOptions": { "module": "amd", - "outDir": "out", + "outDir": "../out/amd", "target": "es5" }, "include": [ - "src/*.ts", - "test/*.ts" + "**/*.ts" ], "files": [ - "node_modules/monaco-editor-core/monaco.d.ts" + "../node_modules/monaco-editor-core/monaco.d.ts" ] } diff --git a/test/all.js b/test/all.js index be1e6fd1..048e396d 100644 --- a/test/all.js +++ b/test/all.js @@ -27,43 +27,43 @@ requirejs([ 'vs/editor/editor.main' ], function() { requirejs([ - 'out/test/bat.test', - 'out/test/css.test', - 'out/test/coffee.test', - 'out/test/cpp.test', - 'out/test/csharp.test', - 'out/test/dockerfile.test', - 'out/test/fsharp.test', - 'out/test/go.test', - 'out/test/handlebars.test', - 'out/test/html.test', - 'out/test/pug.test', - 'out/test/java.test', - 'out/test/less.test', - 'out/test/lua.test', - 'out/test/markdown.test', - 'out/test/msdax.test', - 'out/test/objective-c.test', - 'out/test/php.test', - 'out/test/postiats.test', - 'out/test/powershell.test', - 'out/test/python.test', - 'out/test/r.test', - 'out/test/razor.test', - 'out/test/ruby.test', - 'out/test/scss.test', - 'out/test/swift.test', - 'out/test/sql.test', - 'out/test/vb.test', - 'out/test/xml.test', - 'out/test/yaml.test', - 'out/test/solidity.test', - 'out/test/sb.test', - 'out/test/mysql.test', - 'out/test/pgsql.test', - 'out/test/redshift.test', - 'out/test/redis.test', - 'out/test/csp.test', + 'out/amd/test/bat.test', + 'out/amd/test/css.test', + 'out/amd/test/coffee.test', + 'out/amd/test/cpp.test', + 'out/amd/test/csharp.test', + 'out/amd/test/dockerfile.test', + 'out/amd/test/fsharp.test', + 'out/amd/test/go.test', + 'out/amd/test/handlebars.test', + 'out/amd/test/html.test', + 'out/amd/test/pug.test', + 'out/amd/test/java.test', + 'out/amd/test/less.test', + 'out/amd/test/lua.test', + 'out/amd/test/markdown.test', + 'out/amd/test/msdax.test', + 'out/amd/test/objective-c.test', + 'out/amd/test/php.test', + 'out/amd/test/postiats.test', + 'out/amd/test/powershell.test', + 'out/amd/test/python.test', + 'out/amd/test/r.test', + 'out/amd/test/razor.test', + 'out/amd/test/ruby.test', + 'out/amd/test/scss.test', + 'out/amd/test/swift.test', + 'out/amd/test/sql.test', + 'out/amd/test/vb.test', + 'out/amd/test/xml.test', + 'out/amd/test/yaml.test', + 'out/amd/test/solidity.test', + 'out/amd/test/sb.test', + 'out/amd/test/mysql.test', + 'out/amd/test/pgsql.test', + 'out/amd/test/redshift.test', + 'out/amd/test/redis.test', + 'out/amd/test/csp.test', ], function() { run(); // We can launch the tests! });