php extension compiles to commonjs

alexdima · alexdima · commit 58c1cdd3eb7f · 2016-03-01T11:40:14.000+01:00
diff --git a/build/gulpfile.plugins.js b/build/gulpfile.plugins.js
@@ -26,35 +26,18 @@ var extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 
 function getTSConfig(plugin) {
 	var script = (plugin.desc && plugin.desc.scripts && plugin.desc.scripts['vscode:prepublish']) || '';
-	var match = /^node \.\.\/\.\.\/node\_modules\/gulp\/bin\/gulp\.js \-\-gulpfile \.\.\/\.\.\/gulpfile\.plugins\.js compile-plugin:([^ ]+) ?(.*tsconfig\.json)?/.exec(script);
+	var match = /^node \.\.\/\.\.\/node\_modules\/gulp\/bin\/gulp\.js \-\-gulpfile \.\.\/\.\.\/build\/gulpfile\.plugins\.js compile-plugin:([^ ]+) ?(.*tsconfig\.json)/.exec(script);
 
 	if (!match) {
 		return;
 	}
 
 	var pluginRoot = path.join(extensionsPath, plugin.desc.name);
-	var options = null;
-
-	if (match[2]) {
-		options = require(path.join(pluginRoot, match[2])).compilerOptions;
-	} else {
-		options = {
-			noLib: true,
-			target: 'ES5',
-			module: 'amd',
-			declaration: false,
-			sourceMap: true,
-			rootDir: path.join(pluginRoot, 'src'),
-			sourceRoot: util.toFileUri(path.join(pluginRoot, 'src'))
-		};
-	}
-
+	var options = require(path.join(pluginRoot, match[2])).compilerOptions;
 	options.verbose = !quiet;
 	return options;
 }
 
-function noop() {}
-
 function readAllPlugins() {
 	var PLUGINS_FOLDER = path.join(extensionsPath);
 
diff --git a/extensions/javascript-migration/package.json b/extensions/javascript-migration/package.json
@@ -17,7 +17,7 @@
 	"main": "./out/extension",
 
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:javascript-migration ./src/tsconfig.json"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.plugins.js compile-plugin:javascript-migration ./src/tsconfig.json"
 	},
 	"devDependencies": {
 		"typescript": "^1.7.5",
diff --git a/extensions/json/package.json b/extensions/json/package.json
@@ -10,7 +10,7 @@
 	],
 	"main": "./out/jsonMain",
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:json ./src/tsconfig.json",
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.plugins.js compile-plugin:json ./src/tsconfig.json",
 		"postinstall": "cd server && npm install && npm run compile && cd .."
 	},
 	"contributes": {
diff --git a/extensions/php/package.json b/extensions/php/package.json
@@ -40,8 +40,7 @@
 			}
 		}
 	},
-	"isAMD": true,
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:php"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.plugins.js compile-plugin:php ./src/tsconfig.json"
 	}
 }
diff --git a/extensions/php/src/tsconfig.json b/extensions/php/src/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"compilerOptions": {
+		"noLib": true,
+		"target": "es5",
+		"module": "commonjs",
+		"sourceMap": false,
+		"outDir": "../out"
+	},
+	"exclude": [
+		"node_modules"
+	]
+}
diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json
@@ -14,7 +14,7 @@
     "vscode-extension-telemetry": "^0.0.4"
 	},
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:typescript ./src/tsconfig.json"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.plugins.js compile-plugin:typescript ./src/tsconfig.json"
 	},
 	"activationEvents": [
 		"onLanguage:javascript",
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
@@ -9,8 +9,8 @@
 	},
 	"scripts": {
 		"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:vscode-api-tests ./tsconfig.json",
-        "postinstall": "node ./node_modules/vscode/bin/install"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.plugins.js compile-plugin:vscode-api-tests ./tsconfig.json",
+		"postinstall": "node ./node_modules/vscode/bin/install"
 	},
 	"devDependencies": {
 		"typescript": "^1.6.2",

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`},`
`43`		`- "isAMD": true,`
`44`	`43`	`"scripts": {`
`45`		`- "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:php"`
	`44`	`+ "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.plugins.js compile-plugin:php ./src/tsconfig.json"`
`46`	`45`	`}`
`47`	`46`	`}`