Reorganize project

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('monaco.contribution'),
-			bundleOne('src/bat'),
+			bundleOne('bat'),
-			bundleOne('src/css'),
+			bundleOne('css'),
-			bundleOne('src/coffee'),
+			bundleOne('coffee'),
-			bundleOne('src/cpp'),
+			bundleOne('cpp'),
-			bundleOne('src/csharp'),
+			bundleOne('csharp'),
-			bundleOne('src/dockerfile'),
+			bundleOne('dockerfile'),
-			bundleOne('src/fsharp'),
+			bundleOne('fsharp'),
-			bundleOne('src/go'),
+			bundleOne('go'),
-			bundleOne('src/handlebars'),
+			bundleOne('handlebars'),
-			bundleOne('src/html'),
+			bundleOne('html'),
-			bundleOne('src/ini'),
+			bundleOne('ini'),
-			bundleOne('src/pug'),
+			bundleOne('pug'),
-			bundleOne('src/java'),
+			bundleOne('java'),
-			bundleOne('src/less'),
+			bundleOne('less'),
-			bundleOne('src/lua'),
+			bundleOne('lua'),
-			bundleOne('src/markdown'),
+			bundleOne('markdown'),
-			bundleOne('src/msdax'),
+			bundleOne('msdax'),
-			bundleOne('src/objective-c'),
+			bundleOne('objective-c'),
-			bundleOne('src/php'),
+			bundleOne('php'),
-			bundleOne('src/powershell'),
+			bundleOne('powershell'),
-			bundleOne('src/postiats'),
+			bundleOne('postiats'),
-			bundleOne('src/python'),
+			bundleOne('python'),
-			bundleOne('src/r'),
+			bundleOne('r'),
-			bundleOne('src/razor'),
+			bundleOne('razor'),
-			bundleOne('src/ruby'),
+			bundleOne('ruby'),
-			bundleOne('src/scss'),
+			bundleOne('scss'),
-			bundleOne('src/sql'),
+			bundleOne('sql'),
-			bundleOne('src/swift'),
+			bundleOne('swift'),
-			bundleOne('src/vb'),
+			bundleOne('vb'),
-			bundleOne('src/xml'),
+			bundleOne('xml'),
-			bundleOne('src/yaml'),
+			bundleOne('yaml'),
-			bundleOne('src/solidity'),
+			bundleOne('solidity'),
-			bundleOne('src/sb'),
+			bundleOne('sb'),
-			bundleOne('src/mysql'),
+			bundleOne('mysql'),
-			bundleOne('src/redshift'),
+			bundleOne('redshift'),
-			bundleOne('src/pgsql'),
+			bundleOne('pgsql'),
-			bundleOne('src/redis'),
+			bundleOne('redis'),
-			bundleOne('src/csp')
+			bundleOne('csp')
 		)
 		.pipe(uglify({
 			output: {
@@ -96,25 +96,7 @@ gulp.task('release', ['clean-release','compile'], function() {
 			);
 			this.emit('data', data);
 		}))
-		.pipe(gulp.dest('./release/'));
+		.pipe(gulp.dest('./release/min/'));
-});
-
-
-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']);
 });
 
 function getGitVersion(repo) {

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",
+    "compile": "tsc -p ./src",
-    "watch": "node_modules/.bin/gulp watch",
+    "watch": "tsc -p ./src --watch",
-    "test": "node_modules/.bin/mocha",
+    "test": "mocha",
-    "prepublish": "node_modules/.bin/gulp release"
+    "prepublish": "npm run compile && gulp release"
   },
   "author": "Microsoft Corporation",
   "license": "MIT",

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

src/tsconfig.json

@@ -1,14 +1,13 @@
 {
   "compilerOptions": {
     "module": "amd",
-    "outDir": "out",
+    "outDir": "../out/amd",
     "target": "es5"
   },
   "include": [
-    "src/*.ts",
+    "**/*.ts"
-    "test/*.ts"
   ],
   "files": [
-    "node_modules/monaco-editor-core/monaco.d.ts"
+    "../node_modules/monaco-editor-core/monaco.d.ts"
   ]
 }

test/all.js

@@ -27,43 +27,43 @@ requirejs([
 	'vs/editor/editor.main'
 ], function() {
 	requirejs([
-		'out/test/bat.test',
+		'out/amd/test/bat.test',
-		'out/test/css.test',
+		'out/amd/test/css.test',
-		'out/test/coffee.test',
+		'out/amd/test/coffee.test',
-		'out/test/cpp.test',
+		'out/amd/test/cpp.test',
-		'out/test/csharp.test',
+		'out/amd/test/csharp.test',
-		'out/test/dockerfile.test',
+		'out/amd/test/dockerfile.test',
-		'out/test/fsharp.test',
+		'out/amd/test/fsharp.test',
-		'out/test/go.test',
+		'out/amd/test/go.test',
-		'out/test/handlebars.test',
+		'out/amd/test/handlebars.test',
-		'out/test/html.test',
+		'out/amd/test/html.test',
-		'out/test/pug.test',
+		'out/amd/test/pug.test',
-		'out/test/java.test',
+		'out/amd/test/java.test',
-		'out/test/less.test',
+		'out/amd/test/less.test',
-		'out/test/lua.test',
+		'out/amd/test/lua.test',
-		'out/test/markdown.test',
+		'out/amd/test/markdown.test',
-		'out/test/msdax.test',
+		'out/amd/test/msdax.test',
-		'out/test/objective-c.test',
+		'out/amd/test/objective-c.test',
-		'out/test/php.test',
+		'out/amd/test/php.test',
-		'out/test/postiats.test',
+		'out/amd/test/postiats.test',
-		'out/test/powershell.test',
+		'out/amd/test/powershell.test',
-		'out/test/python.test',
+		'out/amd/test/python.test',
-		'out/test/r.test',
+		'out/amd/test/r.test',
-		'out/test/razor.test',
+		'out/amd/test/razor.test',
-		'out/test/ruby.test',
+		'out/amd/test/ruby.test',
-		'out/test/scss.test',
+		'out/amd/test/scss.test',
-		'out/test/swift.test',
+		'out/amd/test/swift.test',
-		'out/test/sql.test',
+		'out/amd/test/sql.test',
-		'out/test/vb.test',
+		'out/amd/test/vb.test',
-		'out/test/xml.test',
+		'out/amd/test/xml.test',
-		'out/test/yaml.test',
+		'out/amd/test/yaml.test',
-		'out/test/solidity.test',
+		'out/amd/test/solidity.test',
-		'out/test/sb.test',
+		'out/amd/test/sb.test',
-		'out/test/mysql.test',
+		'out/amd/test/mysql.test',
-		'out/test/pgsql.test',
+		'out/amd/test/pgsql.test',
-		'out/test/redshift.test',
+		'out/amd/test/redshift.test',
-		'out/test/redis.test',
+		'out/amd/test/redis.test',
-		'out/test/csp.test',
+		'out/amd/test/csp.test',
 	], function() {
 		run(); // We can launch the tests!
 	});