@worktile/theia 13.0.21 → 13.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/esm2020/core/utils/merge-options.mjs +7 -2
  2. package/fesm2015/worktile-theia.mjs +6 -1
  3. package/fesm2015/worktile-theia.mjs.map +1 -1
  4. package/fesm2020/worktile-theia.mjs +6 -1
  5. package/fesm2020/worktile-theia.mjs.map +1 -1
  6. package/package.json +1 -1
package/esm2020/core/utils/merge-options.mjs CHANGED
@@ -10,11 +10,16 @@ export const mergeOptions = (plugin, override) => {
10
10
  continue;
11
11
  }
12
12
  if (isObject(override.options[option]) && newOptions[option]) {
13
- newOptions[option] = assign(newOptions[option], override.options[option]);
13
+ if (typeof newOptions[option] === 'function') {
14
+ newOptions[option] = override.options[option];
15
+ }
16
+ else {
17
+ newOptions[option] = assign(newOptions[option], override.options[option]);
18
+ }
14
19
  continue;
15
20
  }
16
21
  newOptions[option] = override.options[option];
17
22
  }
18
23
  plugin.options = newOptions;
19
24
  };
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVyZ2Utb3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3NyYy9jb3JlL3V0aWxzL21lcmdlLW9wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUFpQixNQUFnQyxFQUFFLFFBQXVCLEVBQUUsRUFBRTtJQUN0RyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBQzNCLE1BQU0sVUFBVSxHQUFHLE9BQXVCLENBQUM7SUFDM0MsS0FBSyxJQUFJLE1BQU0sSUFBSSxRQUFRLENBQUMsT0FBTyxFQUFFO1FBQ2pDLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQy9ELFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxVQUFVLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUM5RSxTQUFTO1NBQ1o7UUFDRCxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQzFELFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUMxRSxTQUFTO1NBQ1o7UUFDRCxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUNqRDtJQUNELE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0FBQ2hDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGlzT2JqZWN0IH0gZnJvbSAnbmd4LXRldGh5cy91dGlsJztcbmltcG9ydCB7IGFzc2lnbiB9IGZyb20gJy4uLy4uL3V0aWxzL2xvZGFzaCc7XG5pbXBvcnQgeyBOb0luZmVyLCBPdmVycmlkZUJ5S2V5LCBUaGVQbHVnaW4gfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzJztcbmltcG9ydCB7IG1lcmdlQXJyYXkgfSBmcm9tICcuL21lcmdlLWFycmF5JztcblxuZXhwb3J0IGNvbnN0IG1lcmdlT3B0aW9ucyA9IDxUID0ge30sIFAgPSB7fT4ocGx1Z2luOiBUaGVQbHVnaW48VCwgTm9JbmZlcjxQPj4sIG92ZXJyaWRlOiBPdmVycmlkZUJ5S2V5KSA9PiB7XG4gICAgY29uc3QgeyBvcHRpb25zIH0gPSBwbHVnaW47XG4gICAgY29uc3QgbmV3T3B0aW9ucyA9IG9wdGlvbnMgYXMgdW5rbm93biBhcyBQO1xuICAgIGZvciAobGV0IG9wdGlvbiBpbiBvdmVycmlkZS5vcHRpb25zKSB7XG4gICAgICAgIGlmIChBcnJheS5pc0FycmF5KG92ZXJyaWRlLm9wdGlvbnNbb3B0aW9uXSkgJiYgbmV3T3B0aW9uc1tvcHRpb25dKSB7XG4gICAgICAgICAgICBuZXdPcHRpb25zW29wdGlvbl0gPSBtZXJnZUFycmF5KG5ld09wdGlvbnNbb3B0aW9uXSwgb3ZlcnJpZGUub3B0aW9uc1tvcHRpb25dKTtcbiAgICAgICAgICAgIGNvbnRpbnVlO1xuICAgICAgICB9XG4gICAgICAgIGlmIChpc09iamVjdChvdmVycmlkZS5vcHRpb25zW29wdGlvbl0pICYmIG5ld09wdGlvbnNbb3B0aW9uXSkge1xuICAgICAgICAgICAgbmV3T3B0aW9uc1tvcHRpb25dID0gYXNzaWduKG5ld09wdGlvbnNbb3B0aW9uXSwgb3ZlcnJpZGUub3B0aW9uc1tvcHRpb25dKTtcbiAgICAgICAgICAgIGNvbnRpbnVlO1xuICAgICAgICB9XG4gICAgICAgIG5ld09wdGlvbnNbb3B0aW9uXSA9IG92ZXJyaWRlLm9wdGlvbnNbb3B0aW9uXTtcbiAgICB9XG4gICAgcGx1Z2luLm9wdGlvbnMgPSBuZXdPcHRpb25zO1xufTtcbiJdfQ==
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVyZ2Utb3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3NyYy9jb3JlL3V0aWxzL21lcmdlLW9wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUFpQixNQUFnQyxFQUFFLFFBQXVCLEVBQUUsRUFBRTtJQUN0RyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBQzNCLE1BQU0sVUFBVSxHQUFHLE9BQXVCLENBQUM7SUFDM0MsS0FBSyxJQUFJLE1BQU0sSUFBSSxRQUFRLENBQUMsT0FBTyxFQUFFO1FBQ2pDLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQy9ELFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxVQUFVLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUM5RSxTQUFTO1NBQ1o7UUFDRCxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQzFELElBQUksT0FBTyxVQUFVLENBQUMsTUFBTSxDQUFDLEtBQUssVUFBVSxFQUFFO2dCQUMxQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQzthQUNqRDtpQkFBTTtnQkFDSCxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsRUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7YUFDN0U7WUFDRCxTQUFTO1NBQ1o7UUFDRCxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUNqRDtJQUNELE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0FBQ2hDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGlzT2JqZWN0IH0gZnJvbSAnbmd4LXRldGh5cy91dGlsJztcbmltcG9ydCB7IGFzc2lnbiB9IGZyb20gJy4uLy4uL3V0aWxzL2xvZGFzaCc7XG5pbXBvcnQgeyBOb0luZmVyLCBPdmVycmlkZUJ5S2V5LCBUaGVQbHVnaW4gfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzJztcbmltcG9ydCB7IG1lcmdlQXJyYXkgfSBmcm9tICcuL21lcmdlLWFycmF5JztcblxuZXhwb3J0IGNvbnN0IG1lcmdlT3B0aW9ucyA9IDxUID0ge30sIFAgPSB7fT4ocGx1Z2luOiBUaGVQbHVnaW48VCwgTm9JbmZlcjxQPj4sIG92ZXJyaWRlOiBPdmVycmlkZUJ5S2V5KSA9PiB7XG4gICAgY29uc3QgeyBvcHRpb25zIH0gPSBwbHVnaW47XG4gICAgY29uc3QgbmV3T3B0aW9ucyA9IG9wdGlvbnMgYXMgdW5rbm93biBhcyBQO1xuICAgIGZvciAobGV0IG9wdGlvbiBpbiBvdmVycmlkZS5vcHRpb25zKSB7XG4gICAgICAgIGlmIChBcnJheS5pc0FycmF5KG92ZXJyaWRlLm9wdGlvbnNbb3B0aW9uXSkgJiYgbmV3T3B0aW9uc1tvcHRpb25dKSB7XG4gICAgICAgICAgICBuZXdPcHRpb25zW29wdGlvbl0gPSBtZXJnZUFycmF5KG5ld09wdGlvbnNbb3B0aW9uXSwgb3ZlcnJpZGUub3B0aW9uc1tvcHRpb25dKTtcbiAgICAgICAgICAgIGNvbnRpbnVlO1xuICAgICAgICB9XG4gICAgICAgIGlmIChpc09iamVjdChvdmVycmlkZS5vcHRpb25zW29wdGlvbl0pICYmIG5ld09wdGlvbnNbb3B0aW9uXSkge1xuICAgICAgICAgICAgaWYgKHR5cGVvZiBuZXdPcHRpb25zW29wdGlvbl0gPT09ICdmdW5jdGlvbicpIHtcbiAgICAgICAgICAgICAgICBuZXdPcHRpb25zW29wdGlvbl0gPSBvdmVycmlkZS5vcHRpb25zW29wdGlvbl07XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgIG5ld09wdGlvbnNbb3B0aW9uXSA9IGFzc2lnbihuZXdPcHRpb25zW29wdGlvbl0sIG92ZXJyaWRlLm9wdGlvbnNbb3B0aW9uXSk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBjb250aW51ZTtcbiAgICAgICAgfVxuICAgICAgICBuZXdPcHRpb25zW29wdGlvbl0gPSBvdmVycmlkZS5vcHRpb25zW29wdGlvbl07XG4gICAgfVxuICAgIHBsdWdpbi5vcHRpb25zID0gbmV3T3B0aW9ucztcbn07XG4iXX0=
package/fesm2015/worktile-theia.mjs CHANGED
@@ -1114,7 +1114,12 @@ const mergeOptions = (plugin, override) => {
1114
1114
  continue;
1115
1115
  }
1116
1116
  if (isObject(override.options[option]) && newOptions[option]) {
1117
- newOptions[option] = assign(newOptions[option], override.options[option]);
1117
+ if (typeof newOptions[option] === 'function') {
1118
+ newOptions[option] = override.options[option];
1119
+ }
1120
+ else {
1121
+ newOptions[option] = assign(newOptions[option], override.options[option]);
1122
+ }
1118
1123
  continue;
1119
1124
  }
1120
1125
  newOptions[option] = override.options[option];