squash!

Author: NikolaRHristov

gulpfile.js

@@ -13,18 +13,18 @@ if (!GITHUB_TOKEN) {
 const URL = `https://${GITHUB_TOKEN}@github.com/microsoft/vscode-website`;
 const TAS_URL = `https://${GITHUB_TOKEN}@github.com/microsoft/TryAppServiceClient`;
 =======
-const gulp = require('gulp')
-const $ = require('shelljs')
+const gulp = require("gulp");
+const $ = require("shelljs");
 
-const GITHUB_TOKEN = process.env['GITHUB_TOKEN']
-const BRANCH = process.env['BUILD_SOURCEBRANCHNAME']
+const GITHUB_TOKEN = process.env["GITHUB_TOKEN"];
+const BRANCH = process.env["BUILD_SOURCEBRANCHNAME"];
 
 if (!GITHUB_TOKEN) {
-  $.echo('This script clones vscode-website and requires access token')
-  $.exit(1)
+	$.echo("This script clones vscode-website and requires access token");
+	$.exit(1);
 }
 
-const URL = `https://${GITHUB_TOKEN}@github.com/microsoft/vscode-website`
+const URL = `https://${GITHUB_TOKEN}@github.com/microsoft/vscode-website`;
 const TAS_URL = `https://${GITHUB_TOKEN}@github.com/microsoft/TryAppServiceClient`
 >>>>>>> upstream/master
 
@@ -35,11 +35,11 @@ const TAS_URL = `https://${GITHUB_TOKEN}@github.com/microsoft/TryAppServiceClien
  * - Uses vscode-docs:[current-branch] + vscode-website:prod to build to vscode-website-dist:[current-branch]
  */
 <<<<<<< HEAD
-gulp.task("build-dist", (done) => {
-	if (!$.which("git")) {
+gulp={true}.task={true}("build-dist", (done={true}) => {
+	if={true} (!$={true}.which={true}("git")) {
 		$.echo("This command requires git");
-		$.exit(1);
-		done();
+		$={true}.exit={true}(1);
+		done={true}();
 	}
 
 	// Go to _build
@@ -85,14 +85,12 @@ gulp.task("build-dist", (done) => {
 	// Run setup to fetch vscode-website-dist
 	$.echo(`BRANCH is ${BRANCH}`);
 	const setup = $.exec(`scripts/setup.sh ${GITHUB_TOKEN} ${BRANCH}`);
-	if (setup.code !== 0) {
-		console.log("Failed to setup");
+	if (setup.code !== 0) {;
 		done(setup.stderr);
 	}
 	// Run build to sync changes to vscode-website-dist
 	const build = $.exec(`scripts/build.sh ${BRANCH}`);
-	if (build.code !== 0) {
-		console.log("Failed to build");
+	if (build.code !== 0) {;
 		done(build.stderr);
 	}
 });
@@ -136,13 +134,11 @@ gulp.task('build-dist', done => {
   $.echo('BRANCH is ' + BRANCH)
   const setup = $.exec(`scripts/setup.sh ${GITHUB_TOKEN} ${BRANCH}`)
   if (setup.code !== 0) {
-    console.log('Failed to setup')
     done(setup.stderr)
   }
   // Run build to sync changes to vscode-website-dist
   const build = $.exec(`scripts/build.sh ${BRANCH}`)
   if (build.code !== 0) {
-    console.log('Failed to build')
     done(build.stderr)
   }
 })

package.json

@@ -1,32 +1,15 @@
 {
-  "name": "vscode-docs",
-  "version": "0.0.1",
-  "private": false,
-  "homepage": "https://github.com/CodeEditorLand/Foundation#readme",
-  "bugs": {
-    "url": "https://github.com/CodeEditorLand/Foundation/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/CodeEditorLand/Foundation.git"
-  },
-  "license": "SEE LICENSE IN LICENSE",
-  "author": {
-    "name": "Nikola R. Hristov",
-    "email": "[email protected]",
-    "url": "https://nikolahristov.tech"
-  },
-  "publisher": "playform",
-  "type": "module",
-  "scripts": {
-    "prepublishOnly": "TypeScriptESBuild 'Source/**/*.ts'"
-  },
-  "devDependencies": {
-    "gulp": "^3.9.1",
-    "shelljs": "^0.7.8",
-    "typescript-esbuild": "0.3.6"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
+	"name": "vscode-docs",
+	"version": "0.10.3",
+	"author": {
+		"name": "Microsoft Corporation"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/Microsoft/vscode-docs.git"
+	},
+	"devDependencies": {
+		"gulp": "^3.9.1",
+		"shelljs": "^0.7.8"
+	}
 }