Merge pull request #1230 from merico-dev/1229-upgrade-dayjs-to-1119-a…

…nd-remove-dayjs-plugins-from-bundle 1229 upgrade dayjs to 1119 and remove dayjs plugins from bundle
merico-dev · Oct 9, 2023 · bb2f7ae · bb2f7ae
2 parents 4c4b834 + 018c14e
commit bb2f7ae
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 22 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.44.1",
+  "version": "10.44.2",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.44.1",
+  "version": "10.44.2",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",
@@ -145,7 +145,7 @@
     "crypto-js": "^4.1.1",
     "d3-array": "3.2.3",
     "d3-regression": "1.3.10",
-    "dayjs": "1.11.7",
+    "dayjs": "1.11.9",
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
     "echarts-gl": "^2.0.9",

diff --git a/dashboard/vite.config.ts b/dashboard/vite.config.ts
@@ -21,11 +21,7 @@ const EXTERNAL_PATHS = [
   '/node_modules/dayjs',
 ];
 const DEPENDENCIES = new Set(Object.keys(dependencies).concat(Object.keys(peerDependencies)));
-const externals = (id: string) => {
-  if (id.includes('node_modules/dayjs/plugin')) {
-    // FIXME: find a way to use alias on dayjs/plugins
-    return false;
-  }
+const externals = (id: string, importer: any, isResolved: boolean) => {
   // babel transforms module id of emotion, we need to exclude all of them
   if (id.startsWith('@emotion')) {
     return true;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.44.1",
+  "version": "10.44.2",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.44.1",
+  "version": "10.44.2",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.44.1",
+  "version": "10.44.2",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"
@@ -47,7 +47,7 @@
     "crypto-js": "^4.1.1",
     "d3-array": "3.2.3",
     "d3-regression": "1.3.10",
-    "dayjs": "1.11.7",
+    "dayjs": "1.11.9",
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
     "echarts-gl": "^2.0.9",

diff --git a/yarn.lock b/yarn.lock
@@ -1736,7 +1736,7 @@ __metadata:
     crypto-js: ^4.1.1
     d3-array: 3.2.3
     d3-regression: 1.3.10
-    dayjs: 1.11.7
+    dayjs: 1.11.9
     echarts: ^5.3.2
     echarts-for-react: ^3.0.2
     echarts-gl: ^2.0.9
@@ -1884,7 +1884,7 @@ __metadata:
     crypto-js: ^4.1.1
     d3-array: 3.2.3
     d3-regression: 1.3.10
-    dayjs: 1.11.7
+    dayjs: 1.11.9
     echarts: ^5.3.2
     echarts-for-react: ^3.0.2
     echarts-gl: ^2.0.9
@@ -8374,14 +8374,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dayjs@npm:1.11.7":
-  version: 1.11.7
-  resolution: "dayjs@npm:1.11.7"
-  checksum: 5003a7c1dd9ed51385beb658231c3548700b82d3548c0cfbe549d85f2d08e90e972510282b7506941452c58d32136d6362f009c77ca55381a09c704e9f177ebb
-  languageName: node
-  linkType: hard
-
-"dayjs@npm:^1.10.4, dayjs@npm:^1.9.1":
+"dayjs@npm:1.11.9, dayjs@npm:^1.10.4, dayjs@npm:^1.9.1":
   version: 1.11.9
   resolution: "dayjs@npm:1.11.9"
   checksum: a4844d83dc87f921348bb9b1b93af851c51e6f71fa259604809cfe1b49d1230e6b0212dab44d1cb01994c096ad3a77ea1cf18fa55154da6efcc9d3610526ac38