@mui/codemod 5.0.0 → 5.0.4

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Call-Em-All
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2014 Call-Em-All
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -542,7 +542,7 @@ import Typography from '@material-ui/core/Typography';
 -    backgroundColor: theme.palette.primary.main
 -  },
 -  cta: {
--    borderRadius: theme.shape.radius.
+-    borderRadius: theme.shape.radius
 -  },
 -  content: {
 -    color: theme.palette.common.white,
@@ -563,7 +563,7 @@ import Typography from '@material-ui/core/Typography';
 +    backgroundColor: theme.palette.primary.main
 +  },
 +  [`& .${classes.cta}`]: {
-+    borderRadius: theme.shape.radius.
++    borderRadius: theme.shape.radius
 +  },
 +  [`& .${classes.content}`]: {
 +    color: theme.palette.common.white,
@@ -1266,6 +1266,24 @@ The diff should look like this:
 npx @mui/codemod v1.0.0/svg-icon-imports <path>
 ```
 
+#### `menu-item-primary-text`
+
+Updates `MenuItem` with `primaryText` property making its value tag's child.
+The diff should look like this:
+
+```diff
+-<MenuItem primaryText="Profile" />
+-<MenuItem primaryText={"Profile" + "!"} />
++<MenuItem>Profile</MenuItem>
++<MenuItem>{"Profile" + "!"}</MenuItem>
+```
+
+<!-- #default-branch-switch -->
+
+```sh
+npx @mui/codemod v1.0.0/menu-item-primary-text <path>
+```
+
 ### v0.15.0
 
 #### `import-path`

package/node/v1.0.0/menu-item-primary-text.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = transformer;
+
+/**
+ * @param {import('jscodeshift').FileInfo} file
+ * @param {import('jscodeshift').API} api
+ */
+function transformer(file, api, options) {
+  const j = api.jscodeshift;
+  const printOptions = options.printOptions;
+  return j(file.source).findJSXElements('MenuItem').forEach(path => {
+    if (!path.node.openingElement.selfClosing) {
+      return;
+    }
+
+    const attributes = path.node.openingElement.attributes;
+    attributes.forEach((node, index) => {
+      if (node.type === 'JSXAttribute' && node.name.name === 'primaryText') {
+        delete attributes[index];
+        path.node.openingElement.selfClosing = false;
+        path.node.children = [node.value];
+        path.node.closingElement = j.jsxClosingElement(path.node.openingElement.name);
+      }
+    });
+  }).toSource(printOptions);
+}

package/node/v1.0.0/menu-item-primary-text.test/actual.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+/*#__PURE__*/
+(0, _jsxRuntime.jsxs)("div", {
+  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress');
+    },
+    primaryText: "My Progress",
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {})
+  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress2');
+    },
+    primaryText: true ? "My Progress" : "Not progress",
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {})
+  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress2');
+    },
+    primaryText: getText('progress'),
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {})
+  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress');
+    },
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {}),
+    children: "Already changed"
+  })]
+});

package/node/v1.0.0/menu-item-primary-text.test/expected.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+/*#__PURE__*/
+(0, _jsxRuntime.jsxs)("div", {
+  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress');
+    },
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {}),
+    children: "My Progress"
+  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress2');
+    },
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {}),
+    children: true ? "My Progress" : "Not progress"
+  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress2');
+    },
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {}),
+    children: getText('progress')
+  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MenuItem, {
+    onClick: () => {
+      analytics('Clicked Menu > Progress');
+    },
+    rightIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIcon, {}),
+    children: "Already changed"
+  })]
+});

package/node/v5.0.0/create-theme.test/custom-fn.actual.js

@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createTheme = createTheme;
 exports.createThemeOptions = createThemeOptions;
 exports.createThemeOverrides = createThemeOverrides;
-exports.createTheme = createTheme;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 

package/node/v5.0.0/create-theme.test/custom-fn.expected.js

@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createTheme = createTheme;
 exports.createThemeOptions = createThemeOptions;
 exports.createThemeOverrides = createThemeOverrides;
-exports.createTheme = createTheme;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 

package/node/v5.0.0/jss-to-styled.js

@@ -517,7 +517,7 @@ function transformer(file, api, options) {
   });
 
   if (!imports.size()) {
-    root.find(j.ImportDeclaration).at(0).forEach(path => path.insertAfter(j.importDeclaration([j.importSpecifier(j.identifier('styled'))], j.literal('@material-ui/core/styles'))));
+    root.find(j.ImportDeclaration).at(0).forEach(path => path.insertAfter(j.importDeclaration([j.importSpecifier(j.identifier('styled'))], j.literal('@mui/material/styles'))));
   }
   /**
    * remove import

package/node/v5.0.0/jss-to-styled.test/Anonymous.expected.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/eighth.expected.js

@@ -9,7 +9,7 @@ exports.default = Cart;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
 

package/node/v5.0.0/jss-to-styled.test/eleventh.expected.js

@@ -9,7 +9,7 @@ exports.default = Page;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _SomeNamespace = _interopRequireDefault(require("SomeNamespace"));
 

package/node/v5.0.0/jss-to-styled.test/exportClass.expected.js

@@ -7,7 +7,7 @@ exports.default = exports.Bug = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/exportFunction.expected.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/fifth.expected.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _Typography2 = _interopRequireDefault(require("@material-ui/core/Typography"));
 

package/node/v5.0.0/jss-to-styled.test/first.expected.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 

package/node/v5.0.0/jss-to-styled.test/fourth.expected.js

@@ -9,7 +9,7 @@ exports.MyCard = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 

package/node/v5.0.0/jss-to-styled.test/nineth.expected.js

@@ -7,7 +7,7 @@ exports.default = Page;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/second.expected.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _Typography2 = _interopRequireDefault(require("@material-ui/core/Typography"));
 

package/node/v5.0.0/jss-to-styled.test/seventh.expected.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _CircularProgress2 = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
 

package/node/v5.0.0/jss-to-styled.test/sixth.expected.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 

package/node/v5.0.0/jss-to-styled.test/tenth.expected.js

@@ -9,7 +9,7 @@ exports.default = Page;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/third.expected.js

@@ -9,7 +9,7 @@ exports.MyCard = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 

package/node/v5.0.0/jss-to-styled.test/withCreateStyles.expected.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/withCreateStyles1.expected.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/withCreateStyles2.expected.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/jss-to-styled.test/withCreateStyles3.expected.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
-var _styles = require("@material-ui/core/styles");
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 

package/node/v5.0.0/optimal-imports.js

@@ -17,7 +17,7 @@ var _getJSExports = _interopRequireDefault(require("../util/getJSExports"));
 if (process.env.NODE_ENV === 'test') {
   const resolve = require.resolve;
 
-  require.resolve = source => resolve(source.replace(/^@material-ui\/core\/modern/, '../../../mui-material/src'));
+  require.resolve = source => resolve(source.replace(/^@material-ui\/core\/es/, '../../../mui-material/src').replace(/^@material-ui\/core\/modern/, '../../../mui-material/src'));
 }
 
 function transformer(fileInfo, api, options) {
@@ -59,9 +59,19 @@ function transformer(fileInfo, api, options) {
     }
 
     const targetImportPath = `${targetModule}/${subpath}`;
-    const whitelist = (0, _getJSExports.default)(require.resolve(`${importModule}/modern/${subpath}`, {
-      paths: [(0, _path.dirname)(fileInfo.path)]
-    }));
+    let loader;
+
+    try {
+      loader = require.resolve(`${importModule}/modern/${subpath}`, {
+        paths: [(0, _path.dirname)(fileInfo.path)]
+      });
+    } catch (error) {
+      loader = require.resolve(`${importModule}/es/${subpath}`, {
+        paths: [(0, _path.dirname)(fileInfo.path)]
+      });
+    }
+
+    const whitelist = (0, _getJSExports.default)(loader);
     path.node.specifiers.forEach((specifier, index) => {
       if (!path.node.specifiers.length) {
         return;

package/node/v5.0.0/theme-spacing.js

@@ -10,7 +10,7 @@ exports.default = transformer;
  */
 function transformer(file) {
   return file.source // `${theme.spacing(2)}px` -> theme.spacing(2)
-  .replace(/`\${((theme\.spacing|spacing)\([^{}]*\))}px`/gm, '$1') // `${theme.spacing(2)}px ${theme.spacing(4)}px` -> `${theme.spacing(2)} ${theme.spacing(4)}`
+  .replace(/`(-?)\${(-?)(theme\.spacing|spacing)\(([^{}]*)\)}px`/gm, '$3($1$2$4)') // `${theme.spacing(2)}px ${theme.spacing(4)}px` -> `${theme.spacing(2)} ${theme.spacing(4)}`
   .replace(/(?<={(theme\.spacing|spacing)\(.*\)})px/gm, '').replace(/((theme\.spacing|spacing)\(.*\))\s*\+\s*'px'/gm, '$1').replace(/\${(theme.spacing|spacing)(\(.*\))\s*([+-])\s*([\d.]+)\s*}px/gm, // eslint-disable-next-line no-template-curly-in-string
   'calc(${$1$2} $3 $4px)').replace(/\${(theme.spacing|spacing)(\(.*\))\s*([*/])\s*([\d.]+)\s*}px/gm, // eslint-disable-next-line no-template-curly-in-string
   'calc(${$1$2} $3 $4)');

package/node/v5.0.0/theme-spacing.test/actual.js

@@ -4,4 +4,4 @@
 theme.spacing(gap) + 'px';
 spacing(gap) + 'px'`calc(100% - ${spacing(itemHorzPadding * 2)}px)``calc(100% - ${theme.spacing(itemHorzPadding * 2)}px)`;
 
-padding: `${theme.spacing(2) - 1}px 0``calc(100% - ${theme.spacing(itemHorzPadding) * 0.3}px)`;
+padding: `${theme.spacing(2) - 1}px 0``calc(100% - ${theme.spacing(itemHorzPadding) * 0.3}px)``${-theme.spacing(1)}px``-${theme.spacing(1)}px`;

package/node/v5.0.0/theme-spacing.test/expected.js

@@ -7,4 +7,7 @@ theme.spacing(0.5)`${theme.spacing(1 / 2)} ${theme.spacing(4)}`;
 theme.spacing(gap);
 spacing(gap)`calc(100% - ${spacing(itemHorzPadding * 2)})``calc(100% - ${theme.spacing(itemHorzPadding * 2)})`;
 
-padding: `calc(${theme.spacing(2)} - 1px) 0``calc(100% - calc(${theme.spacing(itemHorzPadding)} * 0.3))`;
+padding: `calc(${theme.spacing(2)} - 1px) 0``calc(100% - calc(${theme.spacing(itemHorzPadding)} * 0.3))`;
+
+theme.spacing(-1);
+theme.spacing(-1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/codemod",
-  "version": "5.0.0",
+  "version": "5.0.4",
   "bin": "./codemod.js",
   "private": false,
   "author": "MUI Team",
@@ -26,12 +26,12 @@
   "license": "MIT",
   "homepage": "https://github.com/mui-org/material-ui/tree/master/packages/mui-codemod",
   "dependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/runtime": "^7.14.8",
-    "@babel/traverse": "^7.15.0",
+    "@babel/core": "^7.15.8",
+    "@babel/runtime": "^7.15.4",
+    "@babel/traverse": "^7.15.4",
     "jscodeshift": "^0.13.0",
     "jscodeshift-add-imports": "^1.0.10",
-    "yargs": "^17.0.1"
+    "yargs": "^17.2.1"
   },
   "devDependencies": {
     "@types/jscodeshift": "0.11.2"
@@ -42,5 +42,6 @@
   },
   "engines": {
     "node": ">=12.0.0"
-  }
+  },
+  "gitHead": "86443310e4344ae1ce6e04f084d58e17e4d62170"
 }