Skip to content

Commit bb2f7ae

Browse files
authored
Merge pull request #1230 from merico-dev/1229-upgrade-dayjs-to-1119-and-remove-dayjs-plugins-from-bundle
1229 upgrade dayjs to 1119 and remove dayjs plugins from bundle
2 parents 4c4b834 + 018c14e commit bb2f7ae

File tree

7 files changed

+11
-22
lines changed

7 files changed

+11
-22
lines changed

api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/api",
3-
"version": "10.44.1",
3+
"version": "10.44.2",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

dashboard/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/dashboard",
3-
"version": "10.44.1",
3+
"version": "10.44.2",
44
"license": "Apache-2.0",
55
"publishConfig": {
66
"access": "public",
@@ -145,7 +145,7 @@
145145
"crypto-js": "^4.1.1",
146146
"d3-array": "3.2.3",
147147
"d3-regression": "1.3.10",
148-
"dayjs": "1.11.7",
148+
"dayjs": "1.11.9",
149149
"echarts": "^5.3.2",
150150
"echarts-for-react": "^3.0.2",
151151
"echarts-gl": "^2.0.9",

dashboard/vite.config.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ const EXTERNAL_PATHS = [
2121
'/node_modules/dayjs',
2222
];
2323
const DEPENDENCIES = new Set(Object.keys(dependencies).concat(Object.keys(peerDependencies)));
24-
const externals = (id: string) => {
25-
if (id.includes('node_modules/dayjs/plugin')) {
26-
// FIXME: find a way to use alias on dayjs/plugins
27-
return false;
28-
}
24+
const externals = (id: string, importer: any, isResolved: boolean) => {
2925
// babel transforms module id of emotion, we need to exclude all of them
3026
if (id.startsWith('@emotion')) {
3127
return true;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/root",
3-
"version": "10.44.1",
3+
"version": "10.44.2",
44
"private": true,
55
"workspaces": [
66
"api",

settings-form/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/settings-form",
3-
"version": "10.44.1",
3+
"version": "10.44.2",
44
"license": "Apache-2.0",
55
"publishConfig": {
66
"access": "public",

website/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@devtable/website",
33
"private": true,
44
"license": "Apache-2.0",
5-
"version": "10.44.1",
5+
"version": "10.44.2",
66
"scripts": {
77
"dev": "vite",
88
"preview": "vite preview"
@@ -47,7 +47,7 @@
4747
"crypto-js": "^4.1.1",
4848
"d3-array": "3.2.3",
4949
"d3-regression": "1.3.10",
50-
"dayjs": "1.11.7",
50+
"dayjs": "1.11.9",
5151
"echarts": "^5.3.2",
5252
"echarts-for-react": "^3.0.2",
5353
"echarts-gl": "^2.0.9",

yarn.lock

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,7 @@ __metadata:
17361736
crypto-js: ^4.1.1
17371737
d3-array: 3.2.3
17381738
d3-regression: 1.3.10
1739-
dayjs: 1.11.7
1739+
dayjs: 1.11.9
17401740
echarts: ^5.3.2
17411741
echarts-for-react: ^3.0.2
17421742
echarts-gl: ^2.0.9
@@ -1884,7 +1884,7 @@ __metadata:
18841884
crypto-js: ^4.1.1
18851885
d3-array: 3.2.3
18861886
d3-regression: 1.3.10
1887-
dayjs: 1.11.7
1887+
dayjs: 1.11.9
18881888
echarts: ^5.3.2
18891889
echarts-for-react: ^3.0.2
18901890
echarts-gl: ^2.0.9
@@ -8374,14 +8374,7 @@ __metadata:
83748374
languageName: node
83758375
linkType: hard
83768376

8377-
"dayjs@npm:1.11.7":
8378-
version: 1.11.7
8379-
resolution: "dayjs@npm:1.11.7"
8380-
checksum: 5003a7c1dd9ed51385beb658231c3548700b82d3548c0cfbe549d85f2d08e90e972510282b7506941452c58d32136d6362f009c77ca55381a09c704e9f177ebb
8381-
languageName: node
8382-
linkType: hard
8383-
8384-
"dayjs@npm:^1.10.4, dayjs@npm:^1.9.1":
8377+
"dayjs@npm:1.11.9, dayjs@npm:^1.10.4, dayjs@npm:^1.9.1":
83858378
version: 1.11.9
83868379
resolution: "dayjs@npm:1.11.9"
83878380
checksum: a4844d83dc87f921348bb9b1b93af851c51e6f71fa259604809cfe1b49d1230e6b0212dab44d1cb01994c096ad3a77ea1cf18fa55154da6efcc9d3610526ac38

0 commit comments

Comments
 (0)