Merge pull request #628 from highcharts/564/instr-and-resources-error

564/instr-and-resources-error

Author: cvasseng

CHANGELOG.md

@@ -11,6 +11,8 @@ _Fixes:_
 - Fixed an issue where the chart constructor was sometimes incorrectly set, causing the export to fail
 - Added referrers to CDN cache fetches on first startup/install. 
 - Fixed an issue that would sometimes cause cause a crash due to fail due to `Accept-Ranges` headers
+- Fixed the warning message when the the default `resources.json` file is not found.
+- Fixed the problem with the lack of the `instr` value, when the `options` is set instead
 
 _New Features:_
 

dist/index.cjs

@@ -97,6 +97,9 @@ export const startExport = async (settings, endCallback) => {
     try {
       log(4, '[chart] Attempting to export from a raw input.');
 
+      // Use whichever one is available
+      exportOptions.instr = exportOptions.instr || exportOptions.options;
+
       // Perform a direct inject when forced
       if (toBoolean(options.customLogic?.allowCodeExecution)) {
         return doStraightInject(options, endCallback);
@@ -321,11 +324,7 @@ const doExport = async (options, chartJson, endCallback, svg) => {
           toBoolean(options.customLogic.allowFileResources)
         );
       } catch (error) {
-        logWithStack(
-          2,
-          error,
-          `[chart] Unable to load the default resources.json file.`
-        );
+        log(2, `[chart] Unable to load the default resources.json file.`);
       }
     }
   }