From e07ff45ae6cad8bb301e34b003116ae94f5af942 Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Thu, 29 Jun 2023 19:50:10 +0100
Subject: [PATCH] :fire: remove pikaday monkeypatch (#1203)
AFAIK with the build-script upgrades we have done - this monkeypatch is
no longer necessary. The build size still seems to be the same.
---
packages/desktop-client/config-overrides.js | 10 ++++++++++
patches/pikaday+1.8.0.patch | 15 ---------------
upcoming-release-notes/1203.md | 6 ++++++
3 files changed, 16 insertions(+), 15 deletions(-)
delete mode 100644 patches/pikaday+1.8.0.patch
create mode 100644 upcoming-release-notes/1203.md
diff --git a/packages/desktop-client/config-overrides.js b/packages/desktop-client/config-overrides.js
index 360c87031..080e83bb1 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 66369e938..000000000
--- 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 000000000..901ba86d1
--- /dev/null
+++ b/upcoming-release-notes/1203.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Remove `pikaday` monkeypatch
--
GitLab