chore: fix develop watch (#2237)

babel.config.js

@@ -6,18 +6,7 @@ const isTest = process.env.NODE_ENV === 'test';
 const isESM = process.env.NODE_ENV === 'esm';
 
 const presets = () => {
-  if (isTest) {
+  return ['@babel/preset-react', '@babel/preset-env'];
-    return ['@babel/preset-react', '@babel/preset-env'];
-  }
-  return [
-    '@babel/preset-react',
-    [
-      '@babel/preset-env',
-      {
-        modules: false,
-      },
-    ],
-  ];
 };
 
 const plugins = () => {
@@ -33,6 +22,13 @@ const plugins = () => {
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-object-rest-spread',
     '@babel/plugin-proposal-export-default-from',
+    [
+      'emotion',
+      {
+        sourceMap: true,
+        autoLabel: true,
+      },
+    ],
     [
       'module-resolver',
       isESM
@@ -80,19 +76,6 @@ const plugins = () => {
     ],
   ];
 
-  if (isProduction) {
-    return [
-      ...defaultPlugins,
-      [
-        'emotion',
-        {
-          hoist: true,
-          autoLabel: true,
-        },
-      ],
-    ];
-  }
-
   if (isESM) {
     return [
       ...defaultPlugins,
@@ -103,13 +86,6 @@ const plugins = () => {
           NETLIFY_CMS_CORE_VERSION: `${coreVersion}`,
         },
       ],
-      [
-        'emotion',
-        {
-          hoist: true,
-          autoLabel: true,
-        },
-      ],
       [
         'inline-svg',
         {
@@ -132,27 +108,14 @@ const plugins = () => {
           },
         },
       ],
-      [
-        'emotion',
-        {
-          sourceMap: true,
-          autoLabel: true,
-        },
-      ],
     ];
   }
 
-  defaultPlugins.push('react-hot-loader/babel');
+  if (!isProduction) {
-  return [
+    defaultPlugins.push('react-hot-loader/babel');
-    ...defaultPlugins,
+  }
-    [
+
-      'emotion',
+  return defaultPlugins;
-      {
-        sourceMap: true,
-        autoLabel: true,
-      },
-    ],
-  ];
 };
 
 module.exports = {

package.json

@@ -1,9 +1,8 @@
 {
   "scripts": {
     "bootstrap": "lerna bootstrap",
-    "start": "run-s clean bootstrap develop",
+    "start": "run-s clean bootstrap build:esm develop",
-    "watch": "lerna run watch --parallel",
+    "develop": "lerna run develop --parallel",
-    "develop": "lerna run --parallel develop",
     "build": "run-s clean build:esm build:lerna",
     "build:lerna": "lerna run build",
     "build:esm": "lerna run build:esm",

packages/netlify-cms-backend-bitbucket/package.json

@@ -15,8 +15,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-backend-git-gateway/package.json

@@ -16,8 +16,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-backend-github/package.json

@@ -15,8 +15,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-backend-gitlab/package.json

@@ -15,8 +15,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-backend-test/package.json

@@ -14,8 +14,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-core/package.json

@@ -11,7 +11,7 @@
     "dist/"
   ],
   "scripts": {
-    "develop": "webpack -w",
+    "develop": "yarn build:esm --watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

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

@@ -15,8 +15,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-editor-component-image/package.json

@@ -15,8 +15,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-lib-auth/package.json

@@ -16,8 +16,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-lib-util/package.json

@@ -12,8 +12,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-media-library-cloudinary/package.json

@@ -20,8 +20,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-media-library-uploadcare/package.json

@@ -18,8 +18,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-ui-default/package.json

@@ -12,8 +12,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-boolean/package.json

@@ -16,8 +16,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-date/package.json

@@ -17,8 +17,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-date/src/index.js

@@ -9,3 +9,4 @@ const Widget = (opts = {}) => ({
 });
 
 export const NetlifyCmsWidgetDate = { Widget, controlComponent, previewComponent };
+export { Widget as default, controlComponent, previewComponent };

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

@@ -18,8 +18,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-datetime/src/index.js

@@ -9,3 +9,4 @@ const Widget = (opts = {}) => ({
 });
 
 export const NetlifyCmsWidgetDatetime = { Widget, controlComponent, previewComponent };
+export { Widget as default, controlComponent, previewComponent };

packages/netlify-cms-widget-file/package.json

@@ -18,8 +18,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-image/package.json

@@ -18,8 +18,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-list/package.json

@@ -17,8 +17,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-map/package.json

@@ -17,8 +17,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-markdown/package.json

@@ -17,8 +17,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-number/package.json

@@ -16,8 +16,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-object/package.json

@@ -18,8 +18,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-relation/package.json

@@ -17,8 +17,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-select/package.json

@@ -18,8 +18,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-string/package.json

@@ -16,8 +16,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms-widget-text/package.json

@@ -19,8 +19,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "watch": "webpack -w",
+    "develop": "yarn build:esm --watch",
-    "develop": "npm run watch",
     "build": "cross-env NODE_ENV=production webpack",
     "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore src/**/__tests__/* --root-mode upward"
   },

packages/netlify-cms/src/widgets.js

@@ -11,8 +11,8 @@ import * as NetlifyCmsWidgetObject from 'netlify-cms-widget-object';
 import * as NetlifyCmsWidgetRelation from 'netlify-cms-widget-relation';
 import * as NetlifyCmsWidgetBoolean from 'netlify-cms-widget-boolean';
 import * as NetlifyCmsWidgetMap from 'netlify-cms-widget-map';
-import * as NetlifyCmsWidgetDate from 'netlify-cms-widget-date';
+import { NetlifyCmsWidgetDate } from 'netlify-cms-widget-date';
-import * as NetlifyCmsWidgetDateTime from 'netlify-cms-widget-datetime';
+import { NetlifyCmsWidgetDatetime } from 'netlify-cms-widget-datetime';
 
 registerWidget(
   'string',
@@ -66,4 +66,4 @@ registerWidget(
 );
 registerWidget('boolean', NetlifyCmsWidgetBoolean.controlComponent);
 registerWidget('map', NetlifyCmsWidgetMap.controlComponent, NetlifyCmsWidgetMap.previewComponent);
-registerWidget([NetlifyCmsWidgetDate.Widget(), NetlifyCmsWidgetDateTime.Widget()]);
+registerWidget([NetlifyCmsWidgetDate.Widget(), NetlifyCmsWidgetDatetime.Widget()]);