diff --git a/packages/desktop-client/config-overrides.js b/packages/desktop-client/config-overrides.js index 360c870318e5700b0a986682301dd71b4749587a..080e83bb1f5b0b85e1254fe5fbd351a1a7ee5b61 100644 --- a/packages/desktop-client/config-overrides.js +++ b/packages/desktop-client/config-overrides.js @@ -7,6 +7,7 @@ const { override, overrideDevServer, } = require('customize-cra'); +const { IgnorePlugin } = require('webpack'); const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); if (process.env.CI) { @@ -35,6 +36,15 @@ module.exports = { generateStatsFile: true, }), ), + // Pikaday throws a warning if Moment.js is not installed however it doesn't + // actually require it to be installed. As we don't use Moment.js ourselves + // then we can just silence this warning. + addWebpackPlugin( + new IgnorePlugin({ + contextRegExp: /moment$/, + resourceRegExp: /pikaday$/, + }), + ), config => { config.cache = false; return config; diff --git a/patches/pikaday+1.8.0.patch b/patches/pikaday+1.8.0.patch deleted file mode 100644 index 66369e938743d52c451e9ccc433fc6bccd8a59ea..0000000000000000000000000000000000000000 --- a/patches/pikaday+1.8.0.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/node_modules/pikaday/pikaday.js b/node_modules/pikaday/pikaday.js -index 8dae838..13ecfbe 100755 ---- a/node_modules/pikaday/pikaday.js -+++ b/node_modules/pikaday/pikaday.js -@@ -12,8 +12,8 @@ - if (typeof exports === 'object') { - // CommonJS module - // Load moment.js as an optional dependency -- try { moment = require('moment'); } catch (e) {} -- module.exports = factory(moment); -+ // try { moment = require('moment'); } catch (e) {} -+ module.exports = factory(null); - } else if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(function (req) diff --git a/upcoming-release-notes/1203.md b/upcoming-release-notes/1203.md new file mode 100644 index 0000000000000000000000000000000000000000..901ba86d1d3cd17bb0a652291dfb2a612325b00f --- /dev/null +++ b/upcoming-release-notes/1203.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Remove `pikaday` monkeypatch