From 941c14e345ee93be72e788fdbd2ba2502bb7638f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 17:04:32 +0000 Subject: [PATCH 01/18] Bump react-imask to ^7.1.2 --- docs/package.json | 2 +- yarn.lock | 33 ++++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/docs/package.json b/docs/package.json index 453afdb2a5cc8e..fe095240b3084e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -99,7 +99,7 @@ "react-dom": "^18.2.0", "react-draggable": "^4.4.5", "react-final-form": "^6.5.9", - "react-imask": "^6.6.3", + "react-imask": "^7.1.2", "react-intersection-observer": "^9.5.2", "react-is": "^18.2.0", "react-number-format": "^5.2.2", diff --git a/yarn.lock b/yarn.lock index 9c408d53bb0e62..3c388933d00077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1308,6 +1308,14 @@ core-js "^2.6.12" regenerator-runtime "^0.13.11" +"@babel/runtime-corejs3@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.22.6.tgz#e8e625eb3db29491e0326b3aeb9929c43b270ae4" + integrity sha512-M+37LLIRBTEVjktoJjbw4KVhupF0U/3PYUCbBwgAd9k17hoKhRu1n935QiG7Tuxv0LJOMrb2vuKEeYUlv0iyiw== + dependencies: + core-js-pure "^3.30.2" + regenerator-runtime "^0.13.11" + "@babel/runtime@7.0.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.22.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438" @@ -5985,6 +5993,11 @@ core-js-compat@^3.31.0: dependencies: browserslist "^4.21.9" +core-js-pure@^3.30.2: + version "3.31.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.1.tgz#73d154958881873bc19381df80bddb20c8d0cdb5" + integrity sha512-w+C62kvWti0EPs4KPMCMVv9DriHSXfQOCQ94bGGBiEW5rrbtt/Rz8n5Krhfw9cpFyzXBjf3DB3QnPdEzGDY4Fw== + core-js@^2.6.11, core-js@^2.6.12: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -9122,10 +9135,12 @@ ignore@^5.0.4, ignore@^5.1.4, ignore@^5.2.0, ignore@^5.2.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -imask@^6.6.3: - version "6.6.3" - resolved "https://registry.yarnpkg.com/imask/-/imask-6.6.3.tgz#f9619cea770b97b5ef616acb036d27cf4a1b33d8" - integrity sha512-a9MTDhm+ET4G2IRcdUGuVTXHS05WsRNPGM5CeNJnXiXuoi4zv7g0/UDFLlRF4lBBeb8EWds4C4JVwhI0nuAIug== +imask@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/imask/-/imask-7.1.2.tgz#9d23dbd2b335344f8a6af505797fb6e480d44bf5" + integrity sha512-CsVunS2MS9n5eOEVK7CpyDNR3vLS+S8hQjRDrkaE1jImy/7ltFf9g3VsQjKJmmHHL1cHQdIJNgxv6uiHAVAkwg== + dependencies: + "@babel/runtime-corejs3" "^7.22.6" immediate@~3.0.5: version "3.0.6" @@ -13547,12 +13562,12 @@ react-final-form@^6.5.9: dependencies: "@babel/runtime" "^7.15.4" -react-imask@^6.6.3: - version "6.6.3" - resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-6.6.3.tgz#febb3fb62e098d5cb51537e591bb2b6f7a7676ff" - integrity sha512-ZjqKXqBtc1LlFQWEj/SNuk4rQWXDdzLnDqCfNMnqdHHMqSvD1J+JuQZTuWgCCr5cLJxaXshDHW5AmhClk367Gw== +react-imask@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-7.1.2.tgz#988897ea08235fa969ab243cf80a98c480d52ad8" + integrity sha512-rhWT72SzAWYyVz/1bSrKlt6q/T7NXiUiO+yCPfJHIJFBJank+7sES9W+QTnAaeGNYCPPHMPFqLnOJzuGPpkufA== dependencies: - imask "^6.6.3" + imask "^7.1.2" prop-types "^15.8.1" react-intersection-observer@^9.5.2: From 0447c9dcc1d650a7ca6cd6060de57cde561db628 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:31:22 +0200 Subject: [PATCH 02/18] Attempt fixing ESM setup --- babel.config.js | 37 ++++++++++++++++++++----------------- packages/markdown/prism.js | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/babel.config.js b/babel.config.js index 6a0a54d455f095..7514de5320019d 100644 --- a/babel.config.js +++ b/babel.config.js @@ -8,28 +8,31 @@ function resolveAliasPath(relativeToBabelConf) { return `./${resolvedPath.replace('\\', '/')}`; } -const defaultAlias = { - '@mui/material': resolveAliasPath('./packages/mui-material/src'), - '@mui/docs': resolveAliasPath('./packages/mui-docs/src'), - '@mui/icons-material': resolveAliasPath('./packages/mui-icons-material/lib'), - '@mui/lab': resolveAliasPath('./packages/mui-lab/src'), - '@mui/styled-engine': resolveAliasPath('./packages/mui-styled-engine/src'), - '@mui/styled-engine-sc': resolveAliasPath('./packages/mui-styled-engine-sc/src'), - '@mui/styles': resolveAliasPath('./packages/mui-styles/src'), - '@mui/system': resolveAliasPath('./packages/mui-system/src'), - '@mui/private-theming': resolveAliasPath('./packages/mui-private-theming/src'), - '@mui/base': resolveAliasPath('./packages/mui-base/src'), - '@mui/utils': resolveAliasPath('./packages/mui-utils/src'), - '@mui/material-next': resolveAliasPath('./packages/mui-material-next/src'), - '@mui/joy': resolveAliasPath('./packages/mui-joy/src'), -}; - const productionPlugins = [ ['babel-plugin-react-remove-properties', { properties: ['data-mui-test'] }], ]; module.exports = function getBabelConfig(api) { - const useESModules = api.env(['legacy', 'modern', 'stable', 'rollup']); + const useESModules = api.env(['development', 'legacy', 'modern', 'stable', 'rollup']); + + const defaultAlias = { + '@mui/material': resolveAliasPath('./packages/mui-material/src'), + '@mui/docs': resolveAliasPath('./packages/mui-docs/src'), + '@mui/icons-material': resolveAliasPath( + `./packages/mui-icons-material/lib${useESModules ? '/esm' : ''}`, + ), + '@mui/lab': resolveAliasPath('./packages/mui-lab/src'), + '@mui/markdown': resolveAliasPath('./packages/markdown'), + '@mui/styled-engine': resolveAliasPath('./packages/mui-styled-engine/src'), + '@mui/styled-engine-sc': resolveAliasPath('./packages/mui-styled-engine-sc/src'), + '@mui/styles': resolveAliasPath('./packages/mui-styles/src'), + '@mui/system': resolveAliasPath('./packages/mui-system/src'), + '@mui/private-theming': resolveAliasPath('./packages/mui-private-theming/src'), + '@mui/base': resolveAliasPath('./packages/mui-base/src'), + '@mui/utils': resolveAliasPath('./packages/mui-utils/src'), + '@mui/material-next': resolveAliasPath('./packages/mui-material-next/src'), + '@mui/joy': resolveAliasPath('./packages/mui-joy/src'), + }; const presets = [ [ diff --git a/packages/markdown/prism.js b/packages/markdown/prism.js index 4fff68849135a1..71a5ecd166e885 100644 --- a/packages/markdown/prism.js +++ b/packages/markdown/prism.js @@ -1,12 +1,12 @@ -const prism = require('prismjs'); -require('prismjs/components/prism-css'); -require('prismjs/components/prism-bash'); -require('prismjs/components/prism-diff'); -require('prismjs/components/prism-javascript'); -require('prismjs/components/prism-json'); -require('prismjs/components/prism-jsx'); -require('prismjs/components/prism-markup'); -require('prismjs/components/prism-tsx'); +import prism from 'prismjs'; +import 'prismjs/components/prism-css'; +import 'prismjs/components/prism-bash'; +import 'prismjs/components/prism-diff'; +import 'prismjs/components/prism-javascript'; +import 'prismjs/components/prism-json'; +import 'prismjs/components/prism-jsx'; +import 'prismjs/components/prism-markup'; +import 'prismjs/components/prism-tsx'; function highlight(code, language) { let prismLanguage; @@ -57,4 +57,4 @@ function highlight(code, language) { return prism.highlight(code, prismLanguage); } -module.exports = highlight; +export default highlight; From ead4782d62d296fc6feeaeca3f367d4e48019b1c Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:49:27 +0200 Subject: [PATCH 03/18] try this way --- babel.config.js | 2 +- package.json | 2 +- test/e2e/webpack.config.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/babel.config.js b/babel.config.js index 7514de5320019d..4b2db95b51a9b5 100644 --- a/babel.config.js +++ b/babel.config.js @@ -13,7 +13,7 @@ const productionPlugins = [ ]; module.exports = function getBabelConfig(api) { - const useESModules = api.env(['development', 'legacy', 'modern', 'stable', 'rollup']); + const useESModules = api.env(['regressions', 'legacy', 'modern', 'stable', 'rollup']); const defaultAlias = { '@mui/material': resolveAliasPath('./packages/mui-material/src'), diff --git a/package.json b/package.json index c060be77263611..984470cb4a262f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "test:karma": "cross-env NODE_ENV=test karma start test/karma.conf.js", "test:karma:profile": "cross-env NODE_ENV=test karma start test/karma.conf.profile.js", "test:regressions": "cross-env NODE_ENV=production yarn test:regressions:build && concurrently --success first --kill-others \"yarn test:regressions:run\" \"yarn test:regressions:server\"", - "test:regressions:build": "webpack --config test/regressions/webpack.config.js", + "test:regressions:build": "cross-env BABEL_ENV=regressions webpack --config test/regressions/webpack.config.js", "test:regressions:dev": "concurrently \"yarn test:regressions:build --watch\" \"yarn test:regressions:server\"", "test:regressions:run": "mocha --config test/regressions/.mocharc.js --delay 'test/regressions/**/*.test.js'", "test:regressions:server": "serve test/regressions -p 5001", diff --git a/test/e2e/webpack.config.js b/test/e2e/webpack.config.js index 56d16cbce663f5..bba5e320532420 100644 --- a/test/e2e/webpack.config.js +++ b/test/e2e/webpack.config.js @@ -31,6 +31,7 @@ module.exports = { options: { cacheDirectory: true, configFile: path.resolve(__dirname, '../../babel.config.js'), + envName: 'regressions', }, }, { From 466baad87aadec69fbe0a681d1fc9da9b0e16f8a Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:53:25 +0200 Subject: [PATCH 04/18] try this --- .../markdown/prism.js => docs/lib/prism.ts | 2 +- docs/package.json | 1 + docs/src/modules/components/DemoEditor.tsx | 2 +- .../src/modules/components/HighlightedCode.js | 2 +- package.json | 2 +- packages/markdown/prism.d.ts | 1 - yarn.lock | 270 +++++------------- 7 files changed, 84 insertions(+), 196 deletions(-) rename packages/markdown/prism.js => docs/lib/prism.ts (96%) delete mode 100644 packages/markdown/prism.d.ts diff --git a/packages/markdown/prism.js b/docs/lib/prism.ts similarity index 96% rename from packages/markdown/prism.js rename to docs/lib/prism.ts index 71a5ecd166e885..274bb8d2bbe34a 100644 --- a/packages/markdown/prism.js +++ b/docs/lib/prism.ts @@ -8,7 +8,7 @@ import 'prismjs/components/prism-jsx'; import 'prismjs/components/prism-markup'; import 'prismjs/components/prism-tsx'; -function highlight(code, language) { +function highlight(code: string, language: string) { let prismLanguage; switch (language) { case 'ts': diff --git a/docs/package.json b/docs/package.json index fe095240b3084e..56e1d998932e32 100644 --- a/docs/package.json +++ b/docs/package.json @@ -123,6 +123,7 @@ "@babel/plugin-transform-react-constant-elements": "^7.22.5", "@babel/preset-typescript": "^7.22.5", "@types/marked": "^5.0.0", + "@types/prismjs": "^1.26.0", "@types/recharts": "^2.0.0", "cross-fetch": "^4.0.0", "gm": "^1.25.0", diff --git a/docs/src/modules/components/DemoEditor.tsx b/docs/src/modules/components/DemoEditor.tsx index af9d8a5e07a20d..30d40a6a6b4ab4 100644 --- a/docs/src/modules/components/DemoEditor.tsx +++ b/docs/src/modules/components/DemoEditor.tsx @@ -3,7 +3,7 @@ import SimpleCodeEditor from 'react-simple-code-editor'; import Box from '@mui/material/Box'; import NoSsr from '@mui/base/NoSsr'; import { styled, useTheme } from '@mui/material/styles'; -import prism from '@mui/markdown/prism'; +import prism from 'docs/lib/prism'; import MarkdownElement from 'docs/src/modules/components/MarkdownElement'; import CodeCopyButton from 'docs/src/modules/components/CodeCopyButton'; import { useTranslate } from 'docs/src/modules/utils/i18n'; diff --git a/docs/src/modules/components/HighlightedCode.js b/docs/src/modules/components/HighlightedCode.js index 0dee17130dba3b..58763a7bac8888 100644 --- a/docs/src/modules/components/HighlightedCode.js +++ b/docs/src/modules/components/HighlightedCode.js @@ -1,6 +1,6 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import prism from '@mui/markdown/prism'; +import prism from 'docs/lib/prism'; import NoSsr from '@mui/base/NoSsr'; import MarkdownElement from 'docs/src/modules/components/MarkdownElement'; import CodeCopyButton from 'docs/src/modules/components/CodeCopyButton'; diff --git a/package.json b/package.json index 984470cb4a262f..6044913d6c4d69 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "markdownlint-cli2": "^0.8.1", "mocha": "^10.2.0", "node-fetch": "^2.6.12", - "nx": "^15.9.4", + "nx": "16.5.2", "nyc": "^15.1.0", "piscina": "^4.0.0", "postcss-styled-syntax": "^0.4.0", diff --git a/packages/markdown/prism.d.ts b/packages/markdown/prism.d.ts deleted file mode 100644 index cdc055519484ab..00000000000000 --- a/packages/markdown/prism.d.ts +++ /dev/null @@ -1 +0,0 @@ -export default function highlight(code: string, language: string): string; diff --git a/yarn.lock b/yarn.lock index 3c388933d00077..471c4e0b5d67b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2226,13 +2226,6 @@ read-package-json-fast "^3.0.0" which "^3.0.0" -"@nrwl/cli@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.4.tgz#63b600dff1cdc126f234d16978a888f72c22a00c" - integrity sha512-FoiGFCLpb/r4HXCM3KYqT0xteP+MRV6bIHjz3bdPHIDLmBNQQnRRaV2K47jtJ6zjh1eOU5UHKyDtDDYf80Idpw== - dependencies: - nx "15.9.4" - "@nrwl/devkit@16.4.0": version "16.4.0" resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.4.0.tgz#0bd16834e09d1b01fadf5c68fd19410893e61ac8" @@ -2240,64 +2233,12 @@ dependencies: "@nx/devkit" "16.4.0" -"@nrwl/nx-darwin-arm64@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.4.tgz#e5a2f39d42a60397a01140a251f894788f5d1fda" - integrity sha512-XnvrnT9BJsgThY/4xUcYtE077ERq/img8CkRj7MOOBNOh0/nVcR4LGbBKDHtwE3HPk0ikyS/SxRyNa9msvi3QQ== - -"@nrwl/nx-darwin-x64@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.4.tgz#97a810d4ff6b4bf395a43e4740890c0def2372da" - integrity sha512-WKSfSlpVMLchpXkax0geeUNyhvNxwO7qUz/s0/HJWBekt8fizwKDwDj1gP7fOu+YWb/tHiSscbR1km8PtdjhQw== - -"@nrwl/nx-linux-arm-gnueabihf@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.4.tgz#b8dd23b8c755b7e640d744945ab2dec3fd3eda65" - integrity sha512-a/b4PP7lP/Cgrh0LjC4O2YTt5pyf4DQTGtuE8qlo8o486UiofCtk4QGJX72q80s23L0ejCaKY2ULKx/3zMLjuA== - -"@nrwl/nx-linux-arm64-gnu@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.4.tgz#5bc150c2bdb2e0a2eaf8721b3c5fdb2eb93f8739" - integrity sha512-ibBV8fMhSfLVd/2WzcDuUm32BoZsattuKkvMmOoyU6Pzoznc3AqyDjJR4xCIoAn5Rf+Nu1oeQONr5FAtb1Ugow== - -"@nrwl/nx-linux-arm64-musl@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.4.tgz#df2f18f813828000dc52f1b7668339947b1a0862" - integrity sha512-iIjvVYd7+uM4jVD461+PvU5XTALgSvJOODUaMRGOoDl0KlMuTe6pQZlw0eXjl5rcTd6paKaVFWT5j6awr8kj7w== - -"@nrwl/nx-linux-x64-gnu@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.4.tgz#55547b07e6aeb0c36a43e05bd07c15b013f2de9f" - integrity sha512-q4OyH72mdrE4KellBWtwpr5EwfxHKNoFP9//7FAILO68ROh0rpMd7YQMlTB7T04UEUHjKEEsFGTlVXIee3Viwg== - -"@nrwl/nx-linux-x64-musl@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.4.tgz#29cd644736f643566d9c0e1a1171c49a62a08c09" - integrity sha512-67+/XNMR1CgLPyeGX8jqSG6l8yYD0iiwUgcu1Vaxq6N05WwnqVisIW8XzLSRUtKt4WyVQgOWk3aspImpMVOG3Q== - -"@nrwl/nx-win32-arm64-msvc@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.4.tgz#55a38bf5dc201e9088729fb03e505dc63caf8b3a" - integrity sha512-2rEsq3eOGVCYpYJn2tTJkOGNJm/U8rP/FmqtZXYa6VJv/00XP3Gl00IXFEDaYV6rZo7SWqLxtEPUbjK5LwPzZA== - -"@nrwl/nx-win32-x64-msvc@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.4.tgz#56bb859bfe47d08d14f8d5822d9a31d9098d95a9" - integrity sha512-bogVju4Z/hy1jbppqaTNbmV1R4Kg0R5fKxXAXC2LaL7FL0dup31wPumdV+mXttXBNOBDjV8V/Oz1ZqdmxpOJUw== - -"@nrwl/tao@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.4.tgz#5e384af06d1fb68e326eda2c6a5d8f99ce1583b8" - integrity sha512-m90iz8UsXx1rgPm1dxsBQjSrCViWYZIrp8bpwjSCW24j3kifyilYSXGuKaRwZwUn7eNmH/kZcI9/8qeGIPF4Sg== - dependencies: - nx "15.9.4" - -"@nrwl/tao@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.4.0.tgz#81a844c8c707ff747b26ea7d23f6bed005b72967" - integrity sha512-6n4chOOv6jqact07NvIDRQfsnaiYYhi+mrqSuJKs6fL+c5kx/VCryndTP0MDTBbazfL6H7vwiQUkTja2sQDuwA== +"@nrwl/tao@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.5.2.tgz#6b46b880e36ff0af4cceaf2409fd2055bf2cf2b1" + integrity sha512-4vQt0Jj9xHc8SpNgM2TxkPZrkjf4ayNW7elgt5rlOT1yD3Q1Fn3/VHb3cWtm/RC2vSckB4qUEuFGpdEU8wEnCg== dependencies: - nx "16.4.0" + nx "16.5.2" "@nx/devkit@16.4.0", "@nx/devkit@>=16.1.3 < 17": version "16.4.0" @@ -2311,55 +2252,55 @@ tmp "~0.2.1" tslib "^2.3.0" -"@nx/nx-darwin-arm64@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.4.0.tgz#72d5cbeb585aa05b4035f1de8f92ba562b180137" - integrity sha512-/ZXuF8M3u8DSNmjYstQKorzo7uIETNhnFinwWlO8mzz+SyR+Xs5G6penJ4+cB1ju3Hf3lZkXd5U6pEiW4OAAkA== - -"@nx/nx-darwin-x64@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.4.0.tgz#24f8b9946c77ec1d66e42ffe2f84623e4072167c" - integrity sha512-0Fo58qZzHgRs4SRVaAOBipdJQNew57YQbpFaLHKhCTyKc0Pe6THEYaaT/x9QVkcFO0x4AzNr9T7iJTrneNwcKg== - -"@nx/nx-freebsd-x64@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.4.0.tgz#a82954fe4bc6a74cd6b7e0cb89e1486ac4c06e27" - integrity sha512-Qoes/NifE4zb5Gb6ZdC32HvxZBzO0xo74j7EozUV5rZEm3bCtKbKqThPV9Uuu+8S4j718r5vlob/IMXqRcWK4g== - -"@nx/nx-linux-arm-gnueabihf@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.4.0.tgz#77911992e38c1aee51d4a075545ea2828d074c45" - integrity sha512-m8uklbettj8RnLtasjQPiYxqJotDSfO3LO1II8Bds53C7OT8TDnTkW68MEx+CxuSCQFy2Aa0Oih3jSvDzfnZzA== - -"@nx/nx-linux-arm64-gnu@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.4.0.tgz#ee2b7208083cf3fc63121ee079ab3e0c2bbe5fa4" - integrity sha512-bAs2T/zZQDTCzzhciE8kCrkwgXbeX3K83cGRacB7PDZZl/O4jr5TRO4zYHi6doytyLONjqhvWNLbIo4cEEcfZA== - -"@nx/nx-linux-arm64-musl@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.4.0.tgz#afaf514d3df0bc31c4a6545d254502c661e3d347" - integrity sha512-K1D8j4lRZDBVuW8iomeJjCznFz7rfP3qaB3RHjKZU5qrZBq1uYohhdfT7dzwWFNWEvt6WytfhGCl2S9PsQ37Wg== - -"@nx/nx-linux-x64-gnu@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.4.0.tgz#fba4991ac27f0c342157445259485c06fca686f2" - integrity sha512-v1NJ3ESaw5bdSeuh5Xslq1dXGWztf0mSLwZP510Rt9+ulr5LQ/X1Rri8zefU0gZNLcmJL0G2Qq7UTnppYGRTEg== - -"@nx/nx-linux-x64-musl@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.4.0.tgz#9bbdb590a49de9667e2e26dc173fe6d303e165be" - integrity sha512-+8YLVWZFq+k6YJ2ZDwR5sGaRnZhUVYtR8aPbGyonMnJ8VEQJNEqsm1KT6nt0gd3JJdxyphm3VsMQWBMo42jM+w== - -"@nx/nx-win32-arm64-msvc@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.4.0.tgz#a2e06890c70afdd339d0d95516ae8bbc222d9ce6" - integrity sha512-HwE6AxlrfWvODT49vVX6NGMYc3zdMVXETCdZb0jZ/oz28XXTAPvVb/8DJgKSyCs0DPirEeCHiPwbdcJA1Bqw8A== - -"@nx/nx-win32-x64-msvc@16.4.0": - version "16.4.0" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.4.0.tgz#d98b4087b696b524461fc142f656a337ed00a520" - integrity sha512-ISL3c6i/v+JOsUHEbngDHaobmbgu6oSY0htKas1RjLWGkWXDLgEXMRjQ/xDbNVYH00Mto7mmq+nrjkNNbqOrfQ== +"@nx/nx-darwin-arm64@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.2.tgz#0efcc62881eddd20e5bb8f881e6c8cc082c864f8" + integrity sha512-myiNbDJLhhVHRLo6z3TeiaUeYTWdvBR3RdHQq4szTgb82Bnn8ruzteRGGJwKZd551YlttRcieBysxzUzHkmVBg== + +"@nx/nx-darwin-x64@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.2.tgz#6b03c1f4569411db7f8f90df90c820b083bde65f" + integrity sha512-m354qmKrv7a5eD9Qv8bGEmrLCBEyCS6/y0PyOR32Dmi7qwlgHsQ4FfVkOnlWefC5ednhFLJQT6yxwhg8cFGDxw== + +"@nx/nx-freebsd-x64@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.2.tgz#931e8be5c70d87b87f17d8faf0b9089383df0505" + integrity sha512-qrR9yxcC2BLnw9JulecILmyp6Jco9unHHzQcfhLZTpw5c1PNHmZzHwJ3i3iNEf1o2kXEIa+SlOCis9ndvNQQVA== + +"@nx/nx-linux-arm-gnueabihf@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.2.tgz#d9d865f99ba1128f6aa5b6bf0887bb743590eeb6" + integrity sha512-+I1Oj54caDymMsQuRu/l4ULS4RVvwDUM1nXey5JhWulDOUF//09Ckz03Q9p0NCnvBvQd3SyE65++PMfZrrurbA== + +"@nx/nx-linux-arm64-gnu@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.2.tgz#c442df598108776cce297561555520ffbce251ea" + integrity sha512-4Q4jpgtNBTb4lMegFKS9hkzS/WttH3MxkgM//8qs1zhgUz/AsuXTitBo71E3xCnQl/i38p0eIpiKXXwBJeHgDw== + +"@nx/nx-linux-arm64-musl@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.2.tgz#e07c0031f60372e726d2272fac5f3743c4d9591c" + integrity sha512-VLukS/pfenr/Qw/EUn3GPAREDVXuSmfKeYBQKkALXEK6cRVQhXFXMLGHgMemCYbpoUJyFtFEO94PKV7VU7wZPg== + +"@nx/nx-linux-x64-gnu@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.2.tgz#0748beae6944b42276f4705bc41b9e06cefb1d55" + integrity sha512-TAGmY+MXbNl/aGg2KMvtg53rbmX0XHwnJRQtjhjqjAyvaOfFWI/WOqTU7xf/QCkXBUIK0D9xHWpALfA/fZFCBA== + +"@nx/nx-linux-x64-musl@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.2.tgz#7b150081e21ba7aa0da511f80aae1c5d230d1664" + integrity sha512-YyWmqcNbZgU76+LThAt+0arx9C2ewfI5UUI6kooZRniAd408EA2xl5fx2AWLLrISGH4nTb5p20HGmeWfGqjHPA== + +"@nx/nx-win32-arm64-msvc@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.2.tgz#f06f74b876c92d6b12cd351baff016b18bfd9a73" + integrity sha512-pl7LluCc/57kl9VZ1ES27ym16ps4zgfCIeJiF8Ne8C6ALgt7C3PEG6417sFqbQw5J7NhsZ1aTb3eJ9fa9hurhA== + +"@nx/nx-win32-x64-msvc@16.5.2": + version "16.5.2" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.2.tgz#6ae96b6a90924daba81350863da4f9d12884fe8e" + integrity sha512-bKSMElhzP37MkzWQ/Y12pQlesZ6TxwOOqwoaK/vHe6ZtxPxvG2+U8tQ21Nw5L3KyrDCnU5MJHGFtQVHHHt5MwA== "@octokit/auth-token@^2.4.4": version "2.5.0" @@ -3492,6 +3433,11 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== +"@types/prismjs@^1.26.0": + version "1.26.0" + resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.0.tgz#a1c3809b0ad61c62cac6d4e0c56d610c910b7654" + integrity sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ== + "@types/promise.allsettled@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@types/promise.allsettled/-/promise.allsettled-1.0.3.tgz#6f3166618226a570b98c8250fc78687a912e56d5" @@ -3939,10 +3885,10 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -"@yarnpkg/parsers@^3.0.0-rc.18": - version "3.0.0-rc.20" - resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.20.tgz#6842744d2419512e39c652dfabf8693c1ec13d31" - integrity sha512-ZzW6i9dspJsMzA0SxOTa/HABWWHYDIM4qSGE/ndX8wgae1qg+1+iqLQVVxKli674f386mo3RAKAmXia0q5nCOg== +"@yarnpkg/parsers@3.0.0-rc.46": + version "3.0.0-rc.46" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01" + integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q== dependencies: js-yaml "^3.10.0" tslib "^2.4.0" @@ -12122,66 +12068,15 @@ nwsapi@^2.2.4: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== -nx@15.9.4, nx@^15.9.4: - version "15.9.4" - resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.4.tgz#1075bc33fe8ee6c6546c21ec6ffcfd2e000946c6" - integrity sha512-P1G4t59UvE/lkHyruLeSOB5ZuNyh01IwU0tTUOi8f9s/NbP7+OQ8MYVwDV74JHTr6mQgjlS+n+4Eox8tVm9itA== - dependencies: - "@nrwl/cli" "15.9.4" - "@nrwl/tao" "15.9.4" - "@parcel/watcher" "2.0.4" - "@yarnpkg/lockfile" "^1.1.0" - "@yarnpkg/parsers" "^3.0.0-rc.18" - "@zkochan/js-yaml" "0.0.6" - axios "^1.0.0" - chalk "^4.1.0" - cli-cursor "3.1.0" - cli-spinners "2.6.1" - cliui "^7.0.2" - dotenv "~10.0.0" - enquirer "~2.3.6" - fast-glob "3.2.7" - figures "3.2.0" - flat "^5.0.2" - fs-extra "^11.1.0" - glob "7.1.4" - ignore "^5.0.4" - js-yaml "4.1.0" - jsonc-parser "3.2.0" - lines-and-columns "~2.0.3" - minimatch "3.0.5" - npm-run-path "^4.0.1" - open "^8.4.0" - semver "7.3.4" - string-width "^4.2.3" - strong-log-transformer "^2.1.0" - tar-stream "~2.2.0" - tmp "~0.2.1" - tsconfig-paths "^4.1.2" - tslib "^2.3.0" - v8-compile-cache "2.3.0" - yargs "^17.6.2" - yargs-parser "21.1.1" - optionalDependencies: - "@nrwl/nx-darwin-arm64" "15.9.4" - "@nrwl/nx-darwin-x64" "15.9.4" - "@nrwl/nx-linux-arm-gnueabihf" "15.9.4" - "@nrwl/nx-linux-arm64-gnu" "15.9.4" - "@nrwl/nx-linux-arm64-musl" "15.9.4" - "@nrwl/nx-linux-x64-gnu" "15.9.4" - "@nrwl/nx-linux-x64-musl" "15.9.4" - "@nrwl/nx-win32-arm64-msvc" "15.9.4" - "@nrwl/nx-win32-x64-msvc" "15.9.4" - -nx@16.4.0, "nx@>=16.1.3 < 17": - version "16.4.0" - resolved "https://registry.yarnpkg.com/nx/-/nx-16.4.0.tgz#cd136a3ebadf77138dce421b0c0e0944527fe9b3" - integrity sha512-HhJnOAm2wlaIVMmxK1HcdcKfX5DlnQc1RAHFf+QostvQQ/SmUg9f7LoStxpNm01JhQTehb01tH9zAsXKcKzO4A== +nx@16.5.2, "nx@>=16.1.3 < 17": + version "16.5.2" + resolved "https://registry.yarnpkg.com/nx/-/nx-16.5.2.tgz#a271513abe73324fdf2924277d5f273d807a6f0e" + integrity sha512-3XAkVBhXuoFgD7r0lASOh2589XSmBUjioevZb13lDjKDN/FHFWedwMZWtmmbzxBGO3EAWjl+3owBS1RIPm1UHw== dependencies: - "@nrwl/tao" "16.4.0" + "@nrwl/tao" "16.5.2" "@parcel/watcher" "2.0.4" "@yarnpkg/lockfile" "^1.1.0" - "@yarnpkg/parsers" "^3.0.0-rc.18" + "@yarnpkg/parsers" "3.0.0-rc.46" "@zkochan/js-yaml" "0.0.6" axios "^1.0.0" chalk "^4.1.0" @@ -12213,16 +12108,16 @@ nx@16.4.0, "nx@>=16.1.3 < 17": yargs "^17.6.2" yargs-parser "21.1.1" optionalDependencies: - "@nx/nx-darwin-arm64" "16.4.0" - "@nx/nx-darwin-x64" "16.4.0" - "@nx/nx-freebsd-x64" "16.4.0" - "@nx/nx-linux-arm-gnueabihf" "16.4.0" - "@nx/nx-linux-arm64-gnu" "16.4.0" - "@nx/nx-linux-arm64-musl" "16.4.0" - "@nx/nx-linux-x64-gnu" "16.4.0" - "@nx/nx-linux-x64-musl" "16.4.0" - "@nx/nx-win32-arm64-msvc" "16.4.0" - "@nx/nx-win32-x64-msvc" "16.4.0" + "@nx/nx-darwin-arm64" "16.5.2" + "@nx/nx-darwin-x64" "16.5.2" + "@nx/nx-freebsd-x64" "16.5.2" + "@nx/nx-linux-arm-gnueabihf" "16.5.2" + "@nx/nx-linux-arm64-gnu" "16.5.2" + "@nx/nx-linux-arm64-musl" "16.5.2" + "@nx/nx-linux-x64-gnu" "16.5.2" + "@nx/nx-linux-x64-musl" "16.5.2" + "@nx/nx-win32-arm64-msvc" "16.5.2" + "@nx/nx-win32-x64-msvc" "16.5.2" nyc@^15.1.0: version "15.1.0" @@ -14541,13 +14436,6 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - semver@7.5.3: version "7.5.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" From b507d7667f2017d09ff3ebf13023233ab09735c0 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:01:28 +0200 Subject: [PATCH 05/18] Revert "try this" This reverts commit 466baad87aadec69fbe0a681d1fc9da9b0e16f8a. --- docs/package.json | 1 - docs/src/modules/components/DemoEditor.tsx | 2 +- .../src/modules/components/HighlightedCode.js | 2 +- package.json | 2 +- packages/markdown/prism.d.ts | 1 + .../prism.ts => packages/markdown/prism.js | 2 +- yarn.lock | 270 +++++++++++++----- 7 files changed, 196 insertions(+), 84 deletions(-) create mode 100644 packages/markdown/prism.d.ts rename docs/lib/prism.ts => packages/markdown/prism.js (96%) diff --git a/docs/package.json b/docs/package.json index 56e1d998932e32..fe095240b3084e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -123,7 +123,6 @@ "@babel/plugin-transform-react-constant-elements": "^7.22.5", "@babel/preset-typescript": "^7.22.5", "@types/marked": "^5.0.0", - "@types/prismjs": "^1.26.0", "@types/recharts": "^2.0.0", "cross-fetch": "^4.0.0", "gm": "^1.25.0", diff --git a/docs/src/modules/components/DemoEditor.tsx b/docs/src/modules/components/DemoEditor.tsx index 30d40a6a6b4ab4..af9d8a5e07a20d 100644 --- a/docs/src/modules/components/DemoEditor.tsx +++ b/docs/src/modules/components/DemoEditor.tsx @@ -3,7 +3,7 @@ import SimpleCodeEditor from 'react-simple-code-editor'; import Box from '@mui/material/Box'; import NoSsr from '@mui/base/NoSsr'; import { styled, useTheme } from '@mui/material/styles'; -import prism from 'docs/lib/prism'; +import prism from '@mui/markdown/prism'; import MarkdownElement from 'docs/src/modules/components/MarkdownElement'; import CodeCopyButton from 'docs/src/modules/components/CodeCopyButton'; import { useTranslate } from 'docs/src/modules/utils/i18n'; diff --git a/docs/src/modules/components/HighlightedCode.js b/docs/src/modules/components/HighlightedCode.js index 58763a7bac8888..0dee17130dba3b 100644 --- a/docs/src/modules/components/HighlightedCode.js +++ b/docs/src/modules/components/HighlightedCode.js @@ -1,6 +1,6 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import prism from 'docs/lib/prism'; +import prism from '@mui/markdown/prism'; import NoSsr from '@mui/base/NoSsr'; import MarkdownElement from 'docs/src/modules/components/MarkdownElement'; import CodeCopyButton from 'docs/src/modules/components/CodeCopyButton'; diff --git a/package.json b/package.json index 6044913d6c4d69..984470cb4a262f 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "markdownlint-cli2": "^0.8.1", "mocha": "^10.2.0", "node-fetch": "^2.6.12", - "nx": "16.5.2", + "nx": "^15.9.4", "nyc": "^15.1.0", "piscina": "^4.0.0", "postcss-styled-syntax": "^0.4.0", diff --git a/packages/markdown/prism.d.ts b/packages/markdown/prism.d.ts new file mode 100644 index 00000000000000..cdc055519484ab --- /dev/null +++ b/packages/markdown/prism.d.ts @@ -0,0 +1 @@ +export default function highlight(code: string, language: string): string; diff --git a/docs/lib/prism.ts b/packages/markdown/prism.js similarity index 96% rename from docs/lib/prism.ts rename to packages/markdown/prism.js index 274bb8d2bbe34a..71a5ecd166e885 100644 --- a/docs/lib/prism.ts +++ b/packages/markdown/prism.js @@ -8,7 +8,7 @@ import 'prismjs/components/prism-jsx'; import 'prismjs/components/prism-markup'; import 'prismjs/components/prism-tsx'; -function highlight(code: string, language: string) { +function highlight(code, language) { let prismLanguage; switch (language) { case 'ts': diff --git a/yarn.lock b/yarn.lock index 471c4e0b5d67b6..3c388933d00077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2226,6 +2226,13 @@ read-package-json-fast "^3.0.0" which "^3.0.0" +"@nrwl/cli@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.4.tgz#63b600dff1cdc126f234d16978a888f72c22a00c" + integrity sha512-FoiGFCLpb/r4HXCM3KYqT0xteP+MRV6bIHjz3bdPHIDLmBNQQnRRaV2K47jtJ6zjh1eOU5UHKyDtDDYf80Idpw== + dependencies: + nx "15.9.4" + "@nrwl/devkit@16.4.0": version "16.4.0" resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.4.0.tgz#0bd16834e09d1b01fadf5c68fd19410893e61ac8" @@ -2233,12 +2240,64 @@ dependencies: "@nx/devkit" "16.4.0" -"@nrwl/tao@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.5.2.tgz#6b46b880e36ff0af4cceaf2409fd2055bf2cf2b1" - integrity sha512-4vQt0Jj9xHc8SpNgM2TxkPZrkjf4ayNW7elgt5rlOT1yD3Q1Fn3/VHb3cWtm/RC2vSckB4qUEuFGpdEU8wEnCg== +"@nrwl/nx-darwin-arm64@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.4.tgz#e5a2f39d42a60397a01140a251f894788f5d1fda" + integrity sha512-XnvrnT9BJsgThY/4xUcYtE077ERq/img8CkRj7MOOBNOh0/nVcR4LGbBKDHtwE3HPk0ikyS/SxRyNa9msvi3QQ== + +"@nrwl/nx-darwin-x64@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.4.tgz#97a810d4ff6b4bf395a43e4740890c0def2372da" + integrity sha512-WKSfSlpVMLchpXkax0geeUNyhvNxwO7qUz/s0/HJWBekt8fizwKDwDj1gP7fOu+YWb/tHiSscbR1km8PtdjhQw== + +"@nrwl/nx-linux-arm-gnueabihf@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.4.tgz#b8dd23b8c755b7e640d744945ab2dec3fd3eda65" + integrity sha512-a/b4PP7lP/Cgrh0LjC4O2YTt5pyf4DQTGtuE8qlo8o486UiofCtk4QGJX72q80s23L0ejCaKY2ULKx/3zMLjuA== + +"@nrwl/nx-linux-arm64-gnu@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.4.tgz#5bc150c2bdb2e0a2eaf8721b3c5fdb2eb93f8739" + integrity sha512-ibBV8fMhSfLVd/2WzcDuUm32BoZsattuKkvMmOoyU6Pzoznc3AqyDjJR4xCIoAn5Rf+Nu1oeQONr5FAtb1Ugow== + +"@nrwl/nx-linux-arm64-musl@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.4.tgz#df2f18f813828000dc52f1b7668339947b1a0862" + integrity sha512-iIjvVYd7+uM4jVD461+PvU5XTALgSvJOODUaMRGOoDl0KlMuTe6pQZlw0eXjl5rcTd6paKaVFWT5j6awr8kj7w== + +"@nrwl/nx-linux-x64-gnu@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.4.tgz#55547b07e6aeb0c36a43e05bd07c15b013f2de9f" + integrity sha512-q4OyH72mdrE4KellBWtwpr5EwfxHKNoFP9//7FAILO68ROh0rpMd7YQMlTB7T04UEUHjKEEsFGTlVXIee3Viwg== + +"@nrwl/nx-linux-x64-musl@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.4.tgz#29cd644736f643566d9c0e1a1171c49a62a08c09" + integrity sha512-67+/XNMR1CgLPyeGX8jqSG6l8yYD0iiwUgcu1Vaxq6N05WwnqVisIW8XzLSRUtKt4WyVQgOWk3aspImpMVOG3Q== + +"@nrwl/nx-win32-arm64-msvc@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.4.tgz#55a38bf5dc201e9088729fb03e505dc63caf8b3a" + integrity sha512-2rEsq3eOGVCYpYJn2tTJkOGNJm/U8rP/FmqtZXYa6VJv/00XP3Gl00IXFEDaYV6rZo7SWqLxtEPUbjK5LwPzZA== + +"@nrwl/nx-win32-x64-msvc@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.4.tgz#56bb859bfe47d08d14f8d5822d9a31d9098d95a9" + integrity sha512-bogVju4Z/hy1jbppqaTNbmV1R4Kg0R5fKxXAXC2LaL7FL0dup31wPumdV+mXttXBNOBDjV8V/Oz1ZqdmxpOJUw== + +"@nrwl/tao@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.4.tgz#5e384af06d1fb68e326eda2c6a5d8f99ce1583b8" + integrity sha512-m90iz8UsXx1rgPm1dxsBQjSrCViWYZIrp8bpwjSCW24j3kifyilYSXGuKaRwZwUn7eNmH/kZcI9/8qeGIPF4Sg== + dependencies: + nx "15.9.4" + +"@nrwl/tao@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.4.0.tgz#81a844c8c707ff747b26ea7d23f6bed005b72967" + integrity sha512-6n4chOOv6jqact07NvIDRQfsnaiYYhi+mrqSuJKs6fL+c5kx/VCryndTP0MDTBbazfL6H7vwiQUkTja2sQDuwA== dependencies: - nx "16.5.2" + nx "16.4.0" "@nx/devkit@16.4.0", "@nx/devkit@>=16.1.3 < 17": version "16.4.0" @@ -2252,55 +2311,55 @@ tmp "~0.2.1" tslib "^2.3.0" -"@nx/nx-darwin-arm64@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.2.tgz#0efcc62881eddd20e5bb8f881e6c8cc082c864f8" - integrity sha512-myiNbDJLhhVHRLo6z3TeiaUeYTWdvBR3RdHQq4szTgb82Bnn8ruzteRGGJwKZd551YlttRcieBysxzUzHkmVBg== - -"@nx/nx-darwin-x64@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.2.tgz#6b03c1f4569411db7f8f90df90c820b083bde65f" - integrity sha512-m354qmKrv7a5eD9Qv8bGEmrLCBEyCS6/y0PyOR32Dmi7qwlgHsQ4FfVkOnlWefC5ednhFLJQT6yxwhg8cFGDxw== - -"@nx/nx-freebsd-x64@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.2.tgz#931e8be5c70d87b87f17d8faf0b9089383df0505" - integrity sha512-qrR9yxcC2BLnw9JulecILmyp6Jco9unHHzQcfhLZTpw5c1PNHmZzHwJ3i3iNEf1o2kXEIa+SlOCis9ndvNQQVA== - -"@nx/nx-linux-arm-gnueabihf@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.2.tgz#d9d865f99ba1128f6aa5b6bf0887bb743590eeb6" - integrity sha512-+I1Oj54caDymMsQuRu/l4ULS4RVvwDUM1nXey5JhWulDOUF//09Ckz03Q9p0NCnvBvQd3SyE65++PMfZrrurbA== - -"@nx/nx-linux-arm64-gnu@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.2.tgz#c442df598108776cce297561555520ffbce251ea" - integrity sha512-4Q4jpgtNBTb4lMegFKS9hkzS/WttH3MxkgM//8qs1zhgUz/AsuXTitBo71E3xCnQl/i38p0eIpiKXXwBJeHgDw== - -"@nx/nx-linux-arm64-musl@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.2.tgz#e07c0031f60372e726d2272fac5f3743c4d9591c" - integrity sha512-VLukS/pfenr/Qw/EUn3GPAREDVXuSmfKeYBQKkALXEK6cRVQhXFXMLGHgMemCYbpoUJyFtFEO94PKV7VU7wZPg== - -"@nx/nx-linux-x64-gnu@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.2.tgz#0748beae6944b42276f4705bc41b9e06cefb1d55" - integrity sha512-TAGmY+MXbNl/aGg2KMvtg53rbmX0XHwnJRQtjhjqjAyvaOfFWI/WOqTU7xf/QCkXBUIK0D9xHWpALfA/fZFCBA== - -"@nx/nx-linux-x64-musl@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.2.tgz#7b150081e21ba7aa0da511f80aae1c5d230d1664" - integrity sha512-YyWmqcNbZgU76+LThAt+0arx9C2ewfI5UUI6kooZRniAd408EA2xl5fx2AWLLrISGH4nTb5p20HGmeWfGqjHPA== - -"@nx/nx-win32-arm64-msvc@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.2.tgz#f06f74b876c92d6b12cd351baff016b18bfd9a73" - integrity sha512-pl7LluCc/57kl9VZ1ES27ym16ps4zgfCIeJiF8Ne8C6ALgt7C3PEG6417sFqbQw5J7NhsZ1aTb3eJ9fa9hurhA== - -"@nx/nx-win32-x64-msvc@16.5.2": - version "16.5.2" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.2.tgz#6ae96b6a90924daba81350863da4f9d12884fe8e" - integrity sha512-bKSMElhzP37MkzWQ/Y12pQlesZ6TxwOOqwoaK/vHe6ZtxPxvG2+U8tQ21Nw5L3KyrDCnU5MJHGFtQVHHHt5MwA== +"@nx/nx-darwin-arm64@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.4.0.tgz#72d5cbeb585aa05b4035f1de8f92ba562b180137" + integrity sha512-/ZXuF8M3u8DSNmjYstQKorzo7uIETNhnFinwWlO8mzz+SyR+Xs5G6penJ4+cB1ju3Hf3lZkXd5U6pEiW4OAAkA== + +"@nx/nx-darwin-x64@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.4.0.tgz#24f8b9946c77ec1d66e42ffe2f84623e4072167c" + integrity sha512-0Fo58qZzHgRs4SRVaAOBipdJQNew57YQbpFaLHKhCTyKc0Pe6THEYaaT/x9QVkcFO0x4AzNr9T7iJTrneNwcKg== + +"@nx/nx-freebsd-x64@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.4.0.tgz#a82954fe4bc6a74cd6b7e0cb89e1486ac4c06e27" + integrity sha512-Qoes/NifE4zb5Gb6ZdC32HvxZBzO0xo74j7EozUV5rZEm3bCtKbKqThPV9Uuu+8S4j718r5vlob/IMXqRcWK4g== + +"@nx/nx-linux-arm-gnueabihf@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.4.0.tgz#77911992e38c1aee51d4a075545ea2828d074c45" + integrity sha512-m8uklbettj8RnLtasjQPiYxqJotDSfO3LO1II8Bds53C7OT8TDnTkW68MEx+CxuSCQFy2Aa0Oih3jSvDzfnZzA== + +"@nx/nx-linux-arm64-gnu@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.4.0.tgz#ee2b7208083cf3fc63121ee079ab3e0c2bbe5fa4" + integrity sha512-bAs2T/zZQDTCzzhciE8kCrkwgXbeX3K83cGRacB7PDZZl/O4jr5TRO4zYHi6doytyLONjqhvWNLbIo4cEEcfZA== + +"@nx/nx-linux-arm64-musl@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.4.0.tgz#afaf514d3df0bc31c4a6545d254502c661e3d347" + integrity sha512-K1D8j4lRZDBVuW8iomeJjCznFz7rfP3qaB3RHjKZU5qrZBq1uYohhdfT7dzwWFNWEvt6WytfhGCl2S9PsQ37Wg== + +"@nx/nx-linux-x64-gnu@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.4.0.tgz#fba4991ac27f0c342157445259485c06fca686f2" + integrity sha512-v1NJ3ESaw5bdSeuh5Xslq1dXGWztf0mSLwZP510Rt9+ulr5LQ/X1Rri8zefU0gZNLcmJL0G2Qq7UTnppYGRTEg== + +"@nx/nx-linux-x64-musl@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.4.0.tgz#9bbdb590a49de9667e2e26dc173fe6d303e165be" + integrity sha512-+8YLVWZFq+k6YJ2ZDwR5sGaRnZhUVYtR8aPbGyonMnJ8VEQJNEqsm1KT6nt0gd3JJdxyphm3VsMQWBMo42jM+w== + +"@nx/nx-win32-arm64-msvc@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.4.0.tgz#a2e06890c70afdd339d0d95516ae8bbc222d9ce6" + integrity sha512-HwE6AxlrfWvODT49vVX6NGMYc3zdMVXETCdZb0jZ/oz28XXTAPvVb/8DJgKSyCs0DPirEeCHiPwbdcJA1Bqw8A== + +"@nx/nx-win32-x64-msvc@16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.4.0.tgz#d98b4087b696b524461fc142f656a337ed00a520" + integrity sha512-ISL3c6i/v+JOsUHEbngDHaobmbgu6oSY0htKas1RjLWGkWXDLgEXMRjQ/xDbNVYH00Mto7mmq+nrjkNNbqOrfQ== "@octokit/auth-token@^2.4.4": version "2.5.0" @@ -3433,11 +3492,6 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/prismjs@^1.26.0": - version "1.26.0" - resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.0.tgz#a1c3809b0ad61c62cac6d4e0c56d610c910b7654" - integrity sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ== - "@types/promise.allsettled@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@types/promise.allsettled/-/promise.allsettled-1.0.3.tgz#6f3166618226a570b98c8250fc78687a912e56d5" @@ -3885,10 +3939,10 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -"@yarnpkg/parsers@3.0.0-rc.46": - version "3.0.0-rc.46" - resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01" - integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q== +"@yarnpkg/parsers@^3.0.0-rc.18": + version "3.0.0-rc.20" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.20.tgz#6842744d2419512e39c652dfabf8693c1ec13d31" + integrity sha512-ZzW6i9dspJsMzA0SxOTa/HABWWHYDIM4qSGE/ndX8wgae1qg+1+iqLQVVxKli674f386mo3RAKAmXia0q5nCOg== dependencies: js-yaml "^3.10.0" tslib "^2.4.0" @@ -12068,15 +12122,66 @@ nwsapi@^2.2.4: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== -nx@16.5.2, "nx@>=16.1.3 < 17": - version "16.5.2" - resolved "https://registry.yarnpkg.com/nx/-/nx-16.5.2.tgz#a271513abe73324fdf2924277d5f273d807a6f0e" - integrity sha512-3XAkVBhXuoFgD7r0lASOh2589XSmBUjioevZb13lDjKDN/FHFWedwMZWtmmbzxBGO3EAWjl+3owBS1RIPm1UHw== +nx@15.9.4, nx@^15.9.4: + version "15.9.4" + resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.4.tgz#1075bc33fe8ee6c6546c21ec6ffcfd2e000946c6" + integrity sha512-P1G4t59UvE/lkHyruLeSOB5ZuNyh01IwU0tTUOi8f9s/NbP7+OQ8MYVwDV74JHTr6mQgjlS+n+4Eox8tVm9itA== + dependencies: + "@nrwl/cli" "15.9.4" + "@nrwl/tao" "15.9.4" + "@parcel/watcher" "2.0.4" + "@yarnpkg/lockfile" "^1.1.0" + "@yarnpkg/parsers" "^3.0.0-rc.18" + "@zkochan/js-yaml" "0.0.6" + axios "^1.0.0" + chalk "^4.1.0" + cli-cursor "3.1.0" + cli-spinners "2.6.1" + cliui "^7.0.2" + dotenv "~10.0.0" + enquirer "~2.3.6" + fast-glob "3.2.7" + figures "3.2.0" + flat "^5.0.2" + fs-extra "^11.1.0" + glob "7.1.4" + ignore "^5.0.4" + js-yaml "4.1.0" + jsonc-parser "3.2.0" + lines-and-columns "~2.0.3" + minimatch "3.0.5" + npm-run-path "^4.0.1" + open "^8.4.0" + semver "7.3.4" + string-width "^4.2.3" + strong-log-transformer "^2.1.0" + tar-stream "~2.2.0" + tmp "~0.2.1" + tsconfig-paths "^4.1.2" + tslib "^2.3.0" + v8-compile-cache "2.3.0" + yargs "^17.6.2" + yargs-parser "21.1.1" + optionalDependencies: + "@nrwl/nx-darwin-arm64" "15.9.4" + "@nrwl/nx-darwin-x64" "15.9.4" + "@nrwl/nx-linux-arm-gnueabihf" "15.9.4" + "@nrwl/nx-linux-arm64-gnu" "15.9.4" + "@nrwl/nx-linux-arm64-musl" "15.9.4" + "@nrwl/nx-linux-x64-gnu" "15.9.4" + "@nrwl/nx-linux-x64-musl" "15.9.4" + "@nrwl/nx-win32-arm64-msvc" "15.9.4" + "@nrwl/nx-win32-x64-msvc" "15.9.4" + +nx@16.4.0, "nx@>=16.1.3 < 17": + version "16.4.0" + resolved "https://registry.yarnpkg.com/nx/-/nx-16.4.0.tgz#cd136a3ebadf77138dce421b0c0e0944527fe9b3" + integrity sha512-HhJnOAm2wlaIVMmxK1HcdcKfX5DlnQc1RAHFf+QostvQQ/SmUg9f7LoStxpNm01JhQTehb01tH9zAsXKcKzO4A== dependencies: - "@nrwl/tao" "16.5.2" + "@nrwl/tao" "16.4.0" "@parcel/watcher" "2.0.4" "@yarnpkg/lockfile" "^1.1.0" - "@yarnpkg/parsers" "3.0.0-rc.46" + "@yarnpkg/parsers" "^3.0.0-rc.18" "@zkochan/js-yaml" "0.0.6" axios "^1.0.0" chalk "^4.1.0" @@ -12108,16 +12213,16 @@ nx@16.5.2, "nx@>=16.1.3 < 17": yargs "^17.6.2" yargs-parser "21.1.1" optionalDependencies: - "@nx/nx-darwin-arm64" "16.5.2" - "@nx/nx-darwin-x64" "16.5.2" - "@nx/nx-freebsd-x64" "16.5.2" - "@nx/nx-linux-arm-gnueabihf" "16.5.2" - "@nx/nx-linux-arm64-gnu" "16.5.2" - "@nx/nx-linux-arm64-musl" "16.5.2" - "@nx/nx-linux-x64-gnu" "16.5.2" - "@nx/nx-linux-x64-musl" "16.5.2" - "@nx/nx-win32-arm64-msvc" "16.5.2" - "@nx/nx-win32-x64-msvc" "16.5.2" + "@nx/nx-darwin-arm64" "16.4.0" + "@nx/nx-darwin-x64" "16.4.0" + "@nx/nx-freebsd-x64" "16.4.0" + "@nx/nx-linux-arm-gnueabihf" "16.4.0" + "@nx/nx-linux-arm64-gnu" "16.4.0" + "@nx/nx-linux-arm64-musl" "16.4.0" + "@nx/nx-linux-x64-gnu" "16.4.0" + "@nx/nx-linux-x64-musl" "16.4.0" + "@nx/nx-win32-arm64-msvc" "16.4.0" + "@nx/nx-win32-x64-msvc" "16.4.0" nyc@^15.1.0: version "15.1.0" @@ -14436,6 +14541,13 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== +semver@7.3.4: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + semver@7.5.3: version "7.5.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" From 63d36e55f1caae50db62d94fe159758507df84b6 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:03:51 +0200 Subject: [PATCH 06/18] cjs --- packages/markdown/parseMarkdown.js | 2 +- packages/markdown/{prism.js => prism.cjs} | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) rename packages/markdown/{prism.js => prism.cjs} (72%) diff --git a/packages/markdown/parseMarkdown.js b/packages/markdown/parseMarkdown.js index 3fae9387178057..f9ae4e882a6585 100644 --- a/packages/markdown/parseMarkdown.js +++ b/packages/markdown/parseMarkdown.js @@ -1,7 +1,7 @@ const { marked } = require('marked'); const kebabCase = require('lodash/kebabCase'); const textToHash = require('./textToHash'); -const prism = require('./prism'); +const prism = require('./prism.cjs'); /** * Option used by `marked` the library parsing markdown. diff --git a/packages/markdown/prism.js b/packages/markdown/prism.cjs similarity index 72% rename from packages/markdown/prism.js rename to packages/markdown/prism.cjs index 71a5ecd166e885..4fff68849135a1 100644 --- a/packages/markdown/prism.js +++ b/packages/markdown/prism.cjs @@ -1,12 +1,12 @@ -import prism from 'prismjs'; -import 'prismjs/components/prism-css'; -import 'prismjs/components/prism-bash'; -import 'prismjs/components/prism-diff'; -import 'prismjs/components/prism-javascript'; -import 'prismjs/components/prism-json'; -import 'prismjs/components/prism-jsx'; -import 'prismjs/components/prism-markup'; -import 'prismjs/components/prism-tsx'; +const prism = require('prismjs'); +require('prismjs/components/prism-css'); +require('prismjs/components/prism-bash'); +require('prismjs/components/prism-diff'); +require('prismjs/components/prism-javascript'); +require('prismjs/components/prism-json'); +require('prismjs/components/prism-jsx'); +require('prismjs/components/prism-markup'); +require('prismjs/components/prism-tsx'); function highlight(code, language) { let prismLanguage; @@ -57,4 +57,4 @@ function highlight(code, language) { return prism.highlight(code, prismLanguage); } -export default highlight; +module.exports = highlight; From 016fc245ae5114ab0a35cda2780ccc8d6b8c3dbe Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:37:53 +0200 Subject: [PATCH 07/18] build it --- webpackBaseConfig.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index a12b5c108f60e0..287b1d5ffe2396 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -9,6 +9,7 @@ module.exports = { resolve: { modules: [__dirname, 'node_modules'], alias: { + '@mui/markdown': path.resolve(__dirname, './packages/markdown'), '@mui/material': path.resolve(__dirname, './packages/mui-material/src'), '@mui/docs': path.resolve(__dirname, './packages/mui-docs/src'), '@mui/icons-material': path.resolve(__dirname, './packages/mui-icons-material/lib'), From 607b5b467b74ad915792ee4ce3910d54a33bbcc1 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:38:45 +0200 Subject: [PATCH 08/18] Update webpackBaseConfig.js --- webpackBaseConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 287b1d5ffe2396..0b9c59bdf248fb 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -12,7 +12,7 @@ module.exports = { '@mui/markdown': path.resolve(__dirname, './packages/markdown'), '@mui/material': path.resolve(__dirname, './packages/mui-material/src'), '@mui/docs': path.resolve(__dirname, './packages/mui-docs/src'), - '@mui/icons-material': path.resolve(__dirname, './packages/mui-icons-material/lib'), + '@mui/icons-material': path.resolve(__dirname, './packages/mui-icons-material/lib/esm'), '@mui/lab': path.resolve(__dirname, './packages/mui-lab/src'), '@mui/styled-engine': path.resolve(__dirname, './packages/mui-styled-engine/src'), '@mui/styled-engine-sc': path.resolve(__dirname, './packages/mui-styled-engine-sc/src'), From d654a66fd2d7c2e2e25f51371e4f6ae0f635d6ba Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:52:49 +0200 Subject: [PATCH 09/18] Update HighlightedCode.js --- docs/src/modules/components/HighlightedCode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/modules/components/HighlightedCode.js b/docs/src/modules/components/HighlightedCode.js index 0dee17130dba3b..6fa954c58eded0 100644 --- a/docs/src/modules/components/HighlightedCode.js +++ b/docs/src/modules/components/HighlightedCode.js @@ -1,6 +1,6 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import prism from '@mui/markdown/prism'; +import prism from '@mui/markdown/prism.cjs'; import NoSsr from '@mui/base/NoSsr'; import MarkdownElement from 'docs/src/modules/components/MarkdownElement'; import CodeCopyButton from 'docs/src/modules/components/CodeCopyButton'; From 7830d9ee8ac01f2f71b38bb42f7f5b1fb6e4c37c Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Sat, 15 Jul 2023 04:48:23 +0200 Subject: [PATCH 10/18] Update webpack.config.js --- test/regressions/webpack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index 4faf947c15c333..15a1ccd68d0415 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -11,6 +11,7 @@ module.exports = { // Helps debugging and build perf. // Bundle size is irrelevant for local serving minimize: false, + concatenateModules: false, }, output: { path: path.resolve(__dirname, './build'), From a59ee53956f4fca47b7b44f72a2ca31780506dc3 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:23:21 +0200 Subject: [PATCH 11/18] envName --- package.json | 2 +- test/regressions/webpack.config.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3efd21f7938d04..c567592388dca4 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "test:karma": "cross-env NODE_ENV=test karma start test/karma.conf.js", "test:karma:profile": "cross-env NODE_ENV=test karma start test/karma.conf.profile.js", "test:regressions": "cross-env NODE_ENV=production yarn test:regressions:build && concurrently --success first --kill-others \"yarn test:regressions:run\" \"yarn test:regressions:server\"", - "test:regressions:build": "cross-env BABEL_ENV=regressions webpack --config test/regressions/webpack.config.js", + "test:regressions:build": "webpack --config test/regressions/webpack.config.js", "test:regressions:dev": "concurrently \"yarn test:regressions:build --watch\" \"yarn test:regressions:server\"", "test:regressions:run": "mocha --config test/regressions/.mocharc.js --delay 'test/regressions/**/*.test.js'", "test:regressions:server": "serve test/regressions -p 5001", diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index 15a1ccd68d0415..27502f81600dce 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -38,6 +38,7 @@ module.exports = { options: { cacheDirectory: true, configFile: path.resolve(__dirname, '../../babel.config.js'), + envName: 'regressions', }, }, { From a834adc5e4106e73c5d03bec175dcc0b56a63a9b Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:27:11 +0200 Subject: [PATCH 12/18] dewd --- babel.config.js | 2 +- test/e2e/webpack.config.js | 2 +- test/regressions/webpack.config.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/babel.config.js b/babel.config.js index 4b2db95b51a9b5..589695a58a0e1c 100644 --- a/babel.config.js +++ b/babel.config.js @@ -13,7 +13,7 @@ const productionPlugins = [ ]; module.exports = function getBabelConfig(api) { - const useESModules = api.env(['regressions', 'legacy', 'modern', 'stable', 'rollup']); + const useESModules = api.env(['webpack', 'legacy', 'modern', 'stable', 'rollup']); const defaultAlias = { '@mui/material': resolveAliasPath('./packages/mui-material/src'), diff --git a/test/e2e/webpack.config.js b/test/e2e/webpack.config.js index bba5e320532420..f72a6bb6dd5498 100644 --- a/test/e2e/webpack.config.js +++ b/test/e2e/webpack.config.js @@ -31,7 +31,7 @@ module.exports = { options: { cacheDirectory: true, configFile: path.resolve(__dirname, '../../babel.config.js'), - envName: 'regressions', + envName: 'webpack', }, }, { diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index 27502f81600dce..cd3c2601703167 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -38,7 +38,7 @@ module.exports = { options: { cacheDirectory: true, configFile: path.resolve(__dirname, '../../babel.config.js'), - envName: 'regressions', + envName: 'webpack', }, }, { From fa0cacd301526adfa781b1e4f2facb999a49bad0 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:41:19 +0200 Subject: [PATCH 13/18] Revert "dewd" This reverts commit a834adc5e4106e73c5d03bec175dcc0b56a63a9b. --- babel.config.js | 2 +- test/e2e/webpack.config.js | 2 +- test/regressions/webpack.config.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/babel.config.js b/babel.config.js index 589695a58a0e1c..4b2db95b51a9b5 100644 --- a/babel.config.js +++ b/babel.config.js @@ -13,7 +13,7 @@ const productionPlugins = [ ]; module.exports = function getBabelConfig(api) { - const useESModules = api.env(['webpack', 'legacy', 'modern', 'stable', 'rollup']); + const useESModules = api.env(['regressions', 'legacy', 'modern', 'stable', 'rollup']); const defaultAlias = { '@mui/material': resolveAliasPath('./packages/mui-material/src'), diff --git a/test/e2e/webpack.config.js b/test/e2e/webpack.config.js index f72a6bb6dd5498..bba5e320532420 100644 --- a/test/e2e/webpack.config.js +++ b/test/e2e/webpack.config.js @@ -31,7 +31,7 @@ module.exports = { options: { cacheDirectory: true, configFile: path.resolve(__dirname, '../../babel.config.js'), - envName: 'webpack', + envName: 'regressions', }, }, { diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index cd3c2601703167..27502f81600dce 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -38,7 +38,7 @@ module.exports = { options: { cacheDirectory: true, configFile: path.resolve(__dirname, '../../babel.config.js'), - envName: 'webpack', + envName: 'regressions', }, }, { From 01855e9aac5508d1022046cffe1a2f8025a7f08c Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:40:17 +0200 Subject: [PATCH 14/18] dhdh --- docs/src/modules/components/HighlightedCode.js | 2 +- packages/markdown/parseMarkdown.js | 2 +- packages/markdown/{prism.cjs => prism.js} | 0 test/regressions/webpack.config.js | 2 +- tsconfig.json | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename packages/markdown/{prism.cjs => prism.js} (100%) diff --git a/docs/src/modules/components/HighlightedCode.js b/docs/src/modules/components/HighlightedCode.js index 6fa954c58eded0..0dee17130dba3b 100644 --- a/docs/src/modules/components/HighlightedCode.js +++ b/docs/src/modules/components/HighlightedCode.js @@ -1,6 +1,6 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import prism from '@mui/markdown/prism.cjs'; +import prism from '@mui/markdown/prism'; import NoSsr from '@mui/base/NoSsr'; import MarkdownElement from 'docs/src/modules/components/MarkdownElement'; import CodeCopyButton from 'docs/src/modules/components/CodeCopyButton'; diff --git a/packages/markdown/parseMarkdown.js b/packages/markdown/parseMarkdown.js index dfbd68128baec4..f6abd86617b831 100644 --- a/packages/markdown/parseMarkdown.js +++ b/packages/markdown/parseMarkdown.js @@ -1,7 +1,7 @@ const { marked } = require('marked'); const kebabCase = require('lodash/kebabCase'); const textToHash = require('./textToHash'); -const prism = require('./prism.cjs'); +const prism = require('./prism'); /** * Option used by `marked` the library parsing markdown. diff --git a/packages/markdown/prism.cjs b/packages/markdown/prism.js similarity index 100% rename from packages/markdown/prism.cjs rename to packages/markdown/prism.js diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index 27502f81600dce..39882b0ef3917f 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -33,7 +33,7 @@ module.exports = { rules: [ { test: /\.(js|ts|tsx)$/, - exclude: /node_modules/, + exclude: /node_modules|prism\.js/, loader: 'babel-loader', options: { cacheDirectory: true, diff --git a/tsconfig.json b/tsconfig.json index ff9e54bfb84492..7caf992444606a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,7 @@ "@mui/lab": ["./packages/mui-lab/src"], "@mui/lab/*": ["./packages/mui-lab/src/*"], "@mui/markdown": ["./packages/markdown"], + "@mui/markdown/*": ["./packages/markdown/*"], "@mui/styled-engine": ["./packages/mui-styled-engine/src"], "@mui/styled-engine/*": ["./packages/mui-styled-engine/src/*"], "@mui/styled-engine-sc": ["./packages/mui-styled-engine-sc/src"], From 47b5c0ef38b18c413cf2dec44800c63495f793fc Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 23 Aug 2023 10:53:51 +0200 Subject: [PATCH 15/18] Update yarn.lock --- yarn.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2e9e999a288a85..0c3e185adc5c13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1303,12 +1303,12 @@ regenerator-runtime "^0.14.0" "@babel/runtime-corejs3@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.22.6.tgz#e8e625eb3db29491e0326b3aeb9929c43b270ae4" - integrity sha512-M+37LLIRBTEVjktoJjbw4KVhupF0U/3PYUCbBwgAd9k17hoKhRu1n935QiG7Tuxv0LJOMrb2vuKEeYUlv0iyiw== + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz#5ecc3d32faa70009f084cc2e087d79e5f5cdcca9" + integrity sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA== dependencies: core-js-pure "^3.30.2" - regenerator-runtime "^0.13.11" + regenerator-runtime "^0.14.0" "@babel/runtime@7.0.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.10", "@babel/runtime@^7.22.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.22.10" @@ -6219,9 +6219,9 @@ core-js-compat@^3.31.0: browserslist "^4.21.9" core-js-pure@^3.30.2: - version "3.31.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.1.tgz#73d154958881873bc19381df80bddb20c8d0cdb5" - integrity sha512-w+C62kvWti0EPs4KPMCMVv9DriHSXfQOCQ94bGGBiEW5rrbtt/Rz8n5Krhfw9cpFyzXBjf3DB3QnPdEzGDY4Fw== + version "3.32.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.32.1.tgz#5775b88f9062885f67b6d7edce59984e89d276f3" + integrity sha512-f52QZwkFVDPf7UEQZGHKx6NYxsxmVGJe5DIvbzOdRMJlmT6yv0KDjR8rmy3ngr/t5wU54c7Sp/qIJH0ppbhVpQ== core-js@^2.6.11, core-js@^2.6.12: version "2.6.12" @@ -9450,10 +9450,10 @@ ignore@^5.0.4, ignore@^5.1.4, ignore@^5.2.0, ignore@^5.2.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -imask@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/imask/-/imask-7.1.2.tgz#9d23dbd2b335344f8a6af505797fb6e480d44bf5" - integrity sha512-CsVunS2MS9n5eOEVK7CpyDNR3vLS+S8hQjRDrkaE1jImy/7ltFf9g3VsQjKJmmHHL1cHQdIJNgxv6uiHAVAkwg== +imask@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/imask/-/imask-7.1.3.tgz#d07e6f50effe353630323a58baf25c2f7a83c2eb" + integrity sha512-jZCqTI5Jgukhl2ff+znBQd8BiHOTlnFYCIgggzHYDdoJsHmSSWr1BaejcYBxsjy4ZIs8Rm0HhbOxQcobcdESRQ== dependencies: "@babel/runtime-corejs3" "^7.22.6" @@ -13848,11 +13848,11 @@ react-final-form@^6.5.9: "@babel/runtime" "^7.15.4" react-imask@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-7.1.2.tgz#988897ea08235fa969ab243cf80a98c480d52ad8" - integrity sha512-rhWT72SzAWYyVz/1bSrKlt6q/T7NXiUiO+yCPfJHIJFBJank+7sES9W+QTnAaeGNYCPPHMPFqLnOJzuGPpkufA== + version "7.1.3" + resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-7.1.3.tgz#bb0131c643678532005f266e7df6d54b117eeaf6" + integrity sha512-anCnzdkqpDzNwe7ot76kQSvmnz4Sw7AW/QFjjLh3B87HVNv9e2oHC+1m9hQKSIui2Tqm7w68ooMgDFsCQlDMyg== dependencies: - imask "^7.1.2" + imask "^7.1.3" prop-types "^15.8.1" react-intersection-observer@^9.5.2: @@ -14321,7 +14321,7 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.9: +regenerator-runtime@^0.13.9: version "0.13.11" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== From 25dcada52919cf692c5ef8a54d6a5d6a60763aae Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:17:48 +0200 Subject: [PATCH 16/18] fewf --- docs/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/package.json b/docs/package.json index d0fa788670bcb3..072c9069594c43 100644 --- a/docs/package.json +++ b/docs/package.json @@ -101,7 +101,7 @@ "react-dom": "^18.2.0", "react-draggable": "^4.4.5", "react-final-form": "^6.5.9", - "react-imask": "^7.1.2", + "react-imask": "^7.1.3", "react-intersection-observer": "^9.5.2", "react-is": "^18.2.0", "react-number-format": "^5.3.0", diff --git a/yarn.lock b/yarn.lock index 0c3e185adc5c13..a0744954388539 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13847,7 +13847,7 @@ react-final-form@^6.5.9: dependencies: "@babel/runtime" "^7.15.4" -react-imask@^7.1.2: +react-imask@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-7.1.3.tgz#bb0131c643678532005f266e7df6d54b117eeaf6" integrity sha512-anCnzdkqpDzNwe7ot76kQSvmnz4Sw7AW/QFjjLh3B87HVNv9e2oHC+1m9hQKSIui2Tqm7w68ooMgDFsCQlDMyg== From 2128373d402044434a3ece1466eaaa6041193f91 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:11:36 +0200 Subject: [PATCH 17/18] Try removing extension --- test/regressions/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index 2fc647330c6f03..b2e69ca9b04caf 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -33,7 +33,7 @@ module.exports = { rules: [ { test: /\.(js|ts|tsx)$/, - exclude: /node_modules|prism\.js/, + exclude: /node_modules|prism/, loader: 'babel-loader', options: { cacheDirectory: true, From b7742f6679f8907f34e1c14994bc577b4b902c6c Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Thu, 24 Aug 2023 13:46:29 +0200 Subject: [PATCH 18/18] bring this back with a comment --- test/regressions/webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js index b2e69ca9b04caf..f01402c61451df 100644 --- a/test/regressions/webpack.config.js +++ b/test/regressions/webpack.config.js @@ -33,7 +33,8 @@ module.exports = { rules: [ { test: /\.(js|ts|tsx)$/, - exclude: /node_modules|prism/, + // prism.js blocks @mui/markdown/prism from being interpreted as ESM in this build. + exclude: /node_modules|prism\.js/, loader: 'babel-loader', options: { cacheDirectory: true,