FXDK: fxcode changes

.vscode/settings.json

@@ -88,5 +88,6 @@
 		"list",
 		"git",
 		"sash"
-	]
+	],
+	"eslint.enable": false
 }

build/gulpfile.extensions.js

@@ -224,7 +224,10 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));
 
 gulp.task(compileExtensionsBuildTask);
-gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask)));
+// NOTE@FXDK expose compileExtensionsCi
+const compileExtensionsCi = task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask);
+gulp.task(task.define('extensions-ci', compileExtensionsCi));
+exports.compileExtensionsCi = compileExtensionsCi;
 
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
 

build/gulpfile.fxdk.js

@@ -0,0 +1,297 @@
+// @ts-check
+'use strict';
+
+const gulp = require('gulp');
+const path = require('path');
+const es = require('event-stream');
+const util = require('./lib/util');
+const task = require('./lib/task');
+const common = require('./lib/optimize');
+const product = require('../resources/fxdk/product.json');
+const rename = require('gulp-rename');
+const replace = require('gulp-replace');
+const filter = require('gulp-filter');
+const _ = require('underscore');
+const { getProductionDependencies } = require('./lib/dependencies');
+const vfs = require('vinyl-fs');
+const packageJson = require('../package.json');
+
+const { compileBuildTask } = require('./gulpfile.compile');
+gulp.task(task.define('compile-web-server', compileBuildTask));
+const { compileExtensionsCi } = require('./gulpfile.extensions');
+
+gulp.task(task.define('watch-init', require('./lib/compilation').watchTask('out', false)));
+
+const root = path.join(__dirname, '..');
+const commit = util.getVersion(root);
+const date = new Date().toISOString();
+
+/**
+ * @param {{
+ *  header?: string
+ * }} options
+ */
+function defineTasks(options = {}) {
+	const webResources = [
+		// Workbench
+		'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg}',
+		`out-build/vs/fxdk/browser/workbench/*.html`,
+		'out-build/vs/base/browser/ui/codicons/codicon/**',
+		'out-build/vs/**/markdown.css',
+
+		// Webview
+		'out-build/vs/workbench/contrib/webview/browser/pre/**',
+
+		// Extension Worker
+		'out-build/vs/workbench/services/extensions/worker/*.html',
+
+		// Excludes
+		'!out-build/vs/**/{node,electron-browser,electron-sandbox,electron-main}/**',
+		'!out-build/vs/editor/standalone/**',
+		'!out-build/vs/workbench/**/*-tb.png',
+		'!**/test/**'
+	];
+
+	const serverResources = [
+		// Server
+		`out-build/fxdk.js`,
+		'out-build/bootstrap.js',
+		'out-build/bootstrap-fork.js',
+		'out-build/bootstrap-node.js',
+		'out-build/bootstrap-amd.js',
+		'out-build/paths.js',
+		'out-build/serverUriTransformer.js',
+		'out-build/vs/base/common/performance.js',
+
+		// Excludes
+		'!out-build/vs/**/{node,browser,electron-browser,electron-sandbox,electron-main}/**',
+		'!out-build/vs/editor/standalone/**',
+		'!**/test/**'
+	];
+
+	const buildfile = require('../src/buildfile');
+
+	const webEntryPoints = _.flatten([
+		buildfile.entrypoint('vs/workbench/workbench.web.api', []),
+		buildfile.base,
+		buildfile.workerExtensionHost,
+		buildfile.workerNotebook,
+		buildfile.keyboardMaps,
+		buildfile.workbenchWeb
+	]).map(p => {
+		if (p.name === 'vs/code/browser/workbench/workbench') {
+			return {
+				...p,
+				name: `vs/fxdk/browser/workbench/workbench`
+			};
+		}
+		return p;
+	});
+
+	const serverEntryPoints = _.flatten([
+		buildfile.entrypoint(`vs/fxdk/node/server`, []),
+		buildfile.fxdkServer,
+	]);
+
+	const outWeb = `out-fxdk-web`;
+
+	const optimizeWebTask = task.define(`optimize-fxdk-web`, task.series(
+		util.rimraf(outWeb),
+		common.optimizeTask({
+			src: 'out-build',
+			entryPoints: _.flatten(webEntryPoints),
+			resources: webResources,
+			loaderConfig: common.loaderConfig(),
+			out: outWeb,
+			bundleInfo: undefined,
+			header: options.header
+		})
+	));
+	gulp.task(optimizeWebTask);
+
+	const outServer = `out-fxdk-server`;
+
+	const optimizeServerTask = task.define(`optimize-fxdk-server`, task.series(
+		util.rimraf(outServer),
+		common.optimizeTask({
+			src: 'out-build',
+			entryPoints: _.flatten(serverEntryPoints),
+			resources: serverResources,
+			loaderConfig: common.loaderConfig(),
+			out: outServer,
+			bundleInfo: undefined,
+			header: options.header,
+		})
+	));
+	gulp.task(optimizeServerTask);
+
+	const optimizeWebServerTask = task.define(`optimize-fxdk`, task.parallel(optimizeWebTask, optimizeServerTask));
+	gulp.task(optimizeWebServerTask);
+
+	const outWebMin = outWeb + '-min';
+
+	const minifyWebTask = task.define(`minify-fxdk-web`, task.series(
+		optimizeWebTask,
+		util.rimraf(outWebMin),
+		common.minifyTask(outWeb)
+	));
+	gulp.task(minifyWebTask);
+
+	const outServerMin = outServer + '-min';
+
+	const minifyServerTask = task.define(`minify-fxdk-server`, task.series(
+		optimizeServerTask,
+		util.rimraf(outServerMin),
+		common.minifyTask(outServer, '/out')
+	));
+	gulp.task(minifyWebTask);
+
+	const minifyWebServerTask = task.define(`minify-fxdk`, task.parallel(minifyWebTask, minifyServerTask));
+	gulp.task(minifyWebServerTask);
+
+	/**
+	 * @param {string} sourceFolderName
+	 * @param {string} destinationFolderName
+	 */
+	function packageWebTask(sourceFolderName, destinationFolderName) {
+		const destination = path.join(root, destinationFolderName);
+
+		return () => {
+			const json = require('gulp-json-editor');
+
+			const src = gulp.src(sourceFolderName + '/**', { base: '.' })
+				.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }));
+
+			// @ts-ignore
+			const sources = es.merge(src);
+
+			let version = packageJson.version;
+
+			const productJsonStream = gulp.src(['product.json'], { base: '.' })
+				.pipe(json({ commit, date }));
+
+			const base = 'remote/web';
+
+			const dependenciesSrc = _.flatten(getProductionDependencies(path.join(root, base))
+				.map(d => path.relative(root, d.path))
+				.map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]));
+
+			const runtimeDependencies = gulp.src(dependenciesSrc, { base, dot: true })
+				.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock']))
+				.pipe(util.cleanNodeModules(path.join(__dirname, '.webignore')));
+
+			const name = product.applicationName;
+			const packageJsonStream = gulp.src([base + '/package.json'], { base })
+				.pipe(json({ name, version }));
+
+			let all = es.merge(
+				// @ts-ignore
+				packageJsonStream,
+				productJsonStream,
+				sources,
+				runtimeDependencies,
+			);
+
+			let result = all
+				.pipe(util.skipDirectories())
+				.pipe(util.fixWin32DirectoryPermissions());
+
+			return result.pipe(vfs.dest(destination));
+		};
+	}
+
+	/**
+	 * @param {string} sourceFolderName
+	 * @param {string} destinationFolderName
+	 */
+	function packageServerTask(sourceFolderName, destinationFolderName) {
+		const destination = path.join(root, destinationFolderName);
+
+		return () => {
+			const json = require('gulp-json-editor');
+
+			const src = gulp.src(sourceFolderName + '/**', { base: '.' })
+				.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }));
+
+			const extensions = gulp.src('.build/extensions/**', { base: '.build', dot: true });
+
+			// @ts-ignore
+			const sources = es.merge(src, extensions);
+
+			let version = packageJson.version;
+
+			const productJsonStream = gulp.src(['product.json'], { base: '.' })
+				.pipe(json({ commit, date }));
+
+			const base = 'remote';
+			const dependenciesSrc = _.flatten(getProductionDependencies(path.join(root, base))
+				.map(d => path.relative(root, d.path))
+				.map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]));
+
+			const runtimeDependencies = gulp.src(dependenciesSrc, { base, dot: true })
+				.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock']))
+				.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')));
+
+			const name = product.applicationName;
+			const packageJsonStream = gulp.src([base + '/package.json'], { base })
+				.pipe(json({ name, version }));
+
+			let all = es.merge(
+				// @ts-ignore
+				packageJsonStream,
+				productJsonStream,
+				// license,
+				sources,
+				runtimeDependencies
+			);
+
+			let result = all
+				.pipe(util.skipDirectories())
+				.pipe(util.fixWin32DirectoryPermissions());
+
+			return result.pipe(vfs.dest(destination));
+		};
+	}
+
+	const dashed = (str) => (str ? `-${str}` : ``);
+
+	['', 'min'].forEach(minified => {
+		const destination = 'out-fxdk-pkg';
+		const destinationWeb = 'out-fxdk-pkg-web';
+		const destinationServer = 'out-fxdk-pkg-server';
+
+		const webRoot = path.join(root, destinationWeb);
+		const packageWeb = task.define(`package-fxdk-web${dashed(minified)}`, task.series(
+			util.rimraf(webRoot),
+			packageWebTask(outWeb + dashed(minified), destinationWeb)
+		));
+		gulp.task(packageWeb);
+
+		const serverRoot = path.join(root, destinationServer);
+		const packageServer = task.define(`package-fxdk-server${dashed(minified)}`, task.series(
+			util.rimraf(serverRoot),
+			packageServerTask(outServer + dashed(minified), destinationServer)
+		));
+		gulp.task(packageServer);
+
+		const packageRoot = path.join(root, destination);
+		const packageWebServer = task.define(`package-fxdk${dashed(minified)}`, task.series(
+			task.parallel(packageWeb, packageServer),
+			util.rimraf(packageRoot),
+			() => gulp.src(path.join(webRoot, '**'), { base: webRoot }).pipe(gulp.dest(packageRoot)),
+			() => gulp.src(path.join(serverRoot, '**'), { base: serverRoot }).pipe(gulp.dest(packageRoot))
+		));
+		gulp.task(packageWebServer);
+
+		const webServerTask = task.define(`fxdk${dashed(minified)}`, task.series(
+			compileBuildTask,
+			compileExtensionsCi,
+			minified ? minifyWebServerTask : optimizeWebServerTask,
+			packageWebServer
+		));
+		gulp.task(webServerTask);
+	});
+}
+
+defineTasks();
+exports.defineTasks = defineTasks;

build/lib/compilation.js

@@ -15,7 +15,6 @@ const reporter_1 = require("./reporter");
 const util = require("./util");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const os = require("os");
 const watch = require('./watch');
 const reporter = (0, reporter_1.createReporter)();
 function getTypeScriptCompilerOptions(src) {
@@ -73,9 +72,10 @@ function createCompile(src, build, emitError) {
 }
 function compileTask(src, out, build) {
     return function () {
-        if (os.totalmem() < 4000000000) {
-            throw new Error('compilation requires 4GB of RAM');
-        }
+        // NOTE@FXDK our build machine can scale up just fine
+        // if (os.totalmem() < 4_000_000_000) {
+        // 	throw new Error('compilation requires 4GB of RAM');
+        // }
         const compile = createCompile(src, build, true);
         const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
         let generator = new MonacoGenerator(false);

build/lib/compilation.ts

@@ -15,7 +15,7 @@ import { createReporter } from './reporter';
 import * as util from './util';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
-import * as os from 'os';
+// import * as os from 'os';
 import ts = require('typescript');
 
 const watch = require('./watch');
@@ -87,10 +87,10 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-
-		if (os.totalmem() < 4_000_000_000) {
-			throw new Error('compilation requires 4GB of RAM');
-		}
+		// NOTE@FXDK our build machine can scale up just fine
+		// if (os.totalmem() < 4_000_000_000) {
+		// 	throw new Error('compilation requires 4GB of RAM');
+		// }
 
 		const compile = createCompile(src, build, true);
 		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });

build/npm/dirs.js

@@ -16,6 +16,7 @@ exports.dirs = [
 	'extensions/debug-server-ready',
 	'extensions/emmet',
 	'extensions/extension-editing',
+	'extensions/fxdk-ts-plugin',
 	'extensions/git',
 	'extensions/git-base',
 	'extensions/github',

extensions/fxdk-ts-plugin/LICENSE.txt

@@ -0,0 +1,9 @@
+  CitizenFX/FiveM are (c) 2017-2020 the CitizenFX Collective.
+
+  Use of this source code is subject to the terms provided on the CitizenFX
+Collective web site, currently versioned (4) at the following web URL:
+
+  https://fivem.net/terms
+
+  Files in this directory are optionally available under the LGPLv2, as in
+point 21) of the FiveM Platform Service Agreement.

extensions/fxdk-ts-plugin/ext.js

@@ -0,0 +1,5 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.activate = void 0;
+async function activate() {
+}
+exports.activate = activate;