@fontoxml/fontoxml-development-tools 3.9.0-beta.3 → 3.9.0-beta.6

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
-	"version": "3.9.0-beta.3",
+	"version": "3.9.0-beta.6",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@fontoxml/fontoxml-development-tools",
-			"version": "3.9.0-beta.3",
+			"version": "3.9.0-beta.6",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/core": "7.14.6",
@@ -8156,9 +8156,7 @@
 			"version": "1.6.2",
 			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
 			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"engines": [
-				"node >= 0.8"
-			],
+			"engines": ["node >= 0.8"],
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"inherits": "^2.0.3",
@@ -9987,9 +9985,7 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"engines": [
-				"node >=0.6.0"
-			]
+			"engines": ["node >=0.6.0"]
 		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
@@ -10337,9 +10333,7 @@
 			"dev": true,
 			"hasInstallScript": true,
 			"optional": true,
-			"os": [
-				"darwin"
-			],
+			"os": ["darwin"],
 			"engines": {
 				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
 			}
@@ -16674,9 +16668,7 @@
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"engines": [
-				"node >=0.6.0"
-			],
+			"engines": ["node >=0.6.0"],
 			"dependencies": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
 	"description": "Development tools for Fonto.",
-	"version": "3.9.0-beta.3",
+	"version": "3.9.0-beta.6",
 	"author": "The Fonto Team",
 	"license": "MIT",
 	"keywords": [

package/src/modules/editor/src/getAppManifest.js

@@ -8,9 +8,9 @@ export default async function getAppManifest(editorPath) {
 	appManifest.favicon = appManifest.favicon || 'assets/images/favicon.ico';
 	appManifest.name = appManifest.name || 'Fonto Editor';
 	appManifest.supportedBrowsers = appManifest.supportedBrowsers || {
-		chrome: '95',
-		edge: '95',
-		firefox: '94',
+		chrome: '98',
+		edge: '98',
+		firefox: '97',
 		safari: '15',
 	};
 	return appManifest;

package/src/modules/editor-pre-7-7-0/instanceTemplateTypeScript/package.json

@@ -0,0 +1,5 @@
+{
+	"devDependencies": {
+		"typescript": "4.3.4"
+	}
+}

package/src/modules/editor-pre-7-7-0/src/command.init.controller.js

@@ -4,7 +4,7 @@ import path from 'path';
 import unzipper from 'unzipper';
 import { fileURLToPath } from 'url';
 
-import { isNightly, isPre770Editor } from '../../../editorVersions.js';
+import { isNightly } from '../../../editorVersions.js';
 import addonsAddDependencies from './api/addonsAddDependencies.js';
 import createMessageTemplate from './api/createMessageTemplate.js';
 import downloadEditorSDK from './api/downloadEditorSDK.js';
@@ -49,8 +49,6 @@ export default async function editorInitCommand(req, res) {
 		);
 	}
 
-	const useTypeScript = !req.options['output-javascript'];
-
 	// Check if the required fonto.json path has been specified when running non-interactive.
 	if (req.options['non-interactive'] && !req.options['schema']) {
 		throw new res.InputError('Missing schema value.');
@@ -119,6 +117,14 @@ export default async function editorInitCommand(req, res) {
 		destroySpinner();
 	}
 
+	// Do not initialise with TypeScript when no tsconfig.json is found.
+	const platformHasTsConfig = sdkFiles.some(
+		(file) => file.path === 'tsconfig.json'
+	);
+	const useTypeScript = req.options['output-javascript']
+		? false
+		: platformHasTsConfig;
+
 	// Set the sdkVersion to the actual version, for nightlies it's sets to the specific nightly version string instead of 'nightly'.
 	sdkVersion = sdkManifest.version;
 
@@ -529,10 +535,8 @@ export default async function editorInitCommand(req, res) {
 
 	destroySpinner();
 
-	// npm install.
-	if (isPre770Editor(sdkVersion)) {
-		await npmInstall(editorPath, res);
-	}
+	// Install NPM depencencies when there's a package.json.
+	await npmInstall(editorPath, res);
 
 	// Done.
 	res.break();

package/src/modules/editor-pre-7-7-0/src/command.upgrade.controller.js

@@ -331,6 +331,21 @@ export default async function editorUpgradeCommand(req, res) {
 				overwrite: false,
 			}
 		);
+
+		// Add a package.json with a TypeScript dependency when there's none.
+		await fs.copy(
+			path.resolve(
+				__dirname,
+				'..',
+				'instanceTemplateTypeScript',
+				'package.json'
+			),
+			path.resolve(editorPath, 'package.json'),
+			{
+				// Silently fail when target already exists.
+				overwrite: false,
+			}
+		);
 	}
 
 	await req.fdt.license.sendTelemetry({
@@ -365,5 +380,12 @@ export default async function editorUpgradeCommand(req, res) {
 
 	// Done.
 	res.break();
-	res.notice('Done.');
+	res.notice('You succesfully upgraded Fonto Editor!');
+	if (platformHasTsConfig) {
+		res.break();
+		res.notice('For setting up code intelligence and/or TypeScript, see:');
+		res.notice(
+			'https://documentation.fontoxml.com/latest/typescript-f488eb98fb35'
+		);
+	}
 }