fix: change dayjs to per-package dependency (#6992)

* fix: change dayjs to per-package dependency

* fix: add node version to artifact name

---------

Co-authored-by: Anze Demsar <[email protected]>

Author: martinjagodic

.github/workflows/nodejs.yml

@@ -56,7 +56,7 @@ jobs:
         if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/upload-artifact@master
         with:
-          name: dev-test-website-${{ runner.os }}
+          name: dev-test-website-${{ runner.os }}-${{ matrix.node-version }}
           path: dev-test
         if: ${{ needs.changes.outputs.cms == 'true' }}
 
@@ -81,7 +81,7 @@ jobs:
         if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/download-artifact@master
         with:
-          name: dev-test-website-${{ runner.os }}
+          name: dev-test-website-${{ runner.os }}-18.x
           path: dev-test
         if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: npm install

package.json

@@ -186,7 +186,6 @@
     "@emotion/babel-preset-css-prop": "^11.11.0",
     "browserify": "^17.0.0",
     "buffer": "^6.0.3",
-    "dayjs": "^1.11.10",
     "emotion": "^11.0.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-babel": "^5.3.0",

packages/decap-cms-app/package.json

@@ -29,6 +29,7 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "codemirror": "^5.46.0",
+    "dayjs": "^1.11.10",
     "decap-cms-backend-azure": "^3.1.0-beta.0",
     "decap-cms-backend-bitbucket": "^3.1.0-beta.0",
     "decap-cms-backend-git-gateway": "^3.1.0-beta.0",
@@ -65,7 +66,6 @@
     "uuid": "^8.3.2"
   },
   "peerDependencies": {
-    "dayjs": "^1.11.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/decap-cms-app/src/index.js

@@ -1,5 +1,4 @@
 import { DecapCmsCore as CMS } from 'decap-cms-core';
-import dayjs from 'dayjs';
 import './extensions.js';
 
 // Log version
@@ -11,6 +10,5 @@ if (typeof window !== 'undefined') {
 
 export const DecapCmsApp = {
   ...CMS,
-  dayjs,
 };
 export default CMS;

packages/decap-cms-core/package.json

@@ -31,6 +31,7 @@
     "ajv-keywords": "^5.0.0",
     "clean-stack": "^4.1.0",
     "copy-text-to-clipboard": "^3.0.0",
+    "dayjs": "^1.11.10",
     "deepmerge": "^4.2.2",
     "diacritics": "^1.3.0",
     "fuzzy": "^0.1.1",
@@ -77,7 +78,6 @@
   "peerDependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "dayjs": "^1.11.10",
     "decap-cms-editor-component-image": "^3.0.0",
     "decap-cms-lib-auth": "^3.0.0",
     "decap-cms-lib-util": "^3.0.0",

packages/decap-cms-default-exports/package.json

@@ -28,7 +28,6 @@
     "uuid": "^8.3.2"
   },
   "peerDependencies": {
-    "dayjs": "^1.11.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

packages/decap-cms-default-exports/src/index.js

@@ -13,7 +13,6 @@ import EmotionStyled from '@emotion/styled';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Lodash from 'lodash/lodash';
-import Dayjs from 'dayjs';
 import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -35,7 +34,6 @@ export const DecapCmsDefaultExports = {
   Immutable,
   ImmutablePropTypes,
   Lodash,
-  Dayjs,
   PropTypes,
   React,
   ReactDOM,

packages/decap-cms-lib-widgets/package.json

@@ -16,8 +16,10 @@
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore \"**/__tests__\" --root-mode upward --extensions \".js,.jsx,.ts,.tsx\""
   },
+  "dependencies": {
+    "dayjs": "^1.11.10"
+  },
   "peerDependencies": {
-    "dayjs": "^1.11.10",
     "immutable": "^3.7.6",
     "lodash": "^4.17.11"
   }

packages/decap-cms-widget-datetime/package.json

@@ -21,9 +21,11 @@
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore \"**/__tests__\" --root-mode upward"
   },
+  "dependencies": {
+    "dayjs": "^1.11.10"
+  },
   "peerDependencies": {
     "@emotion/react": "^11.11.1",
-    "dayjs": "^1.11.10",
     "react": "^18.2.0"
   }
 }

scripts/externals.js

@@ -70,13 +70,6 @@ module.exports = {
       amd: 'immutable',
       umd: 'immutable',
     },
-    dayjs: {
-      root: ['DecapCmsDefaultExports', 'Dayjs'],
-      commonjs2: 'dayjs',
-      commonjs: 'dayjs',
-      amd: 'dayjs',
-      umd: 'dayjs',
-    },
     'prop-types': {
       root: ['DecapCmsDefaultExports', 'PropTypes'],
       commonjs2: 'prop-types',