diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40646c5d6..aab4b749d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: cache: 'npm' - uses: nrwl/nx-set-shas@v3 - - run: npm install --no-frozen-lockfile --legacy-peer-deps + - run: npm install --legacy-peer-deps - run: npm run build:tools-ci - run: npx nx format diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index bed5c34e5..c5a18eaf6 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -49,7 +49,7 @@ jobs: - name: Install Dependencies uses: nrwl/nx-set-shas@v3 - - run: npm install --no-frozen-lockfile --legacy-peer-deps + - run: npm install --legacy-peer-deps - name: Prepare for build run: npm run build:tools-ci diff --git a/.github/workflows/nextjs-bundle-analysis.yml b/.github/workflows/nextjs-bundle-analysis.yml index 91609ac61..763dad546 100644 --- a/.github/workflows/nextjs-bundle-analysis.yml +++ b/.github/workflows/nextjs-bundle-analysis.yml @@ -28,7 +28,7 @@ jobs: node-version: "18.x" - name: Install dependencies - run: npm install --frozen-lockfile --legacy-peer-deps + run: npm install --legacy-peer-deps - name: Restore next build uses: actions/cache@v3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3d7356c5f..5d489f8d7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -29,7 +29,7 @@ jobs: cache: 'npm' - name: Install dependencies - run: npm install --no-frozen-lockfile --legacy-peer-deps + run: npm install --legacy-peer-deps - name: Get appropriate base and head commits for `nx affected` commands uses: nrwl/nx-set-shas@v3 diff --git a/package-lock.json b/package-lock.json index b8392d3f2..69fed8af1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "@docusaurus/module-type-aliases": "2.4.1", "@docusaurus/preset-classic": "^2.4.1", "@hookform/devtools": "^4.3.1", - "@mdx-js/react": "^2.0.0", + "@mdx-js/react": "^1.6.22", "@nx-dotnet/core": "^1.22.0", "@nx-dotnet/dotnet": "^1.22.0", "@nx-plus/docusaurus": "^15.0.0-rc.0", @@ -129,7 +129,7 @@ "cross-env": "^7.0.3", "cspell": "^6.31.1", "css-loader": "^6.4.0", - "cypress": "^12.16.0", + "cypress": "^12.11.0", "cz-conventional-changelog": "^3.3.0", "docusaurus-plugin-react-docgen-typescript": "^1.1.0", "eslint": "^8.43.0", @@ -5684,19 +5684,6 @@ "react-dom": "*" } }, - "node_modules/@docusaurus/theme-classic/node_modules/@mdx-js/react": { - "version": "1.6.22", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz", - "integrity": "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" - } - }, "node_modules/@docusaurus/theme-classic/node_modules/prism-react-renderer": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz", @@ -9864,20 +9851,16 @@ } }, "node_modules/@mdx-js/react": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz", - "integrity": "sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==", + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz", + "integrity": "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==", "dev": true, - "dependencies": { - "@types/mdx": "^2.0.0", - "@types/react": ">=16" - }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" }, "peerDependencies": { - "react": ">=16" + "react": "^16.13.1 || ^17.0.0" } }, "node_modules/@mdx-js/util": { @@ -20605,6 +20588,23 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/@storybook/addon-docs/node_modules/@mdx-js/react": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz", + "integrity": "sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==", + "dev": true, + "dependencies": { + "@types/mdx": "^2.0.0", + "@types/react": ">=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + }, + "peerDependencies": { + "react": ">=16" + } + }, "node_modules/@storybook/addon-docs/node_modules/@storybook/preview-api": { "version": "7.0.23", "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.0.23.tgz", diff --git a/package.json b/package.json index 7134101b7..7fa27b389 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "docs/*" ], "scripts": { - "nx": "cross-env FORCE_COLOR=1 nx", + "nx": "nx", "prepare:restore": "is-ci || nx g @nx-dotnet/core:restore", "prepare:husky": "is-ci || husky install", "prepare": "npm run prepare:restore && npm run prepare:husky && npx patch-package -y", @@ -39,33 +39,33 @@ "clean:tools": "rimraf dist/tools", "clean": "rimraf dist", "restore": "nx g @nx-dotnet/core:restore", - "build:tools-executors-typescript": "npx nx run tools-executors-typescript:build:client-api-sync && npx nx run tools-executors-typescript:build:design-tokens-clean && npx nx run tools-executors-typescript:build:design-tokens-build", - "build:tools-generators-typescript": "npx nx run tools-generators-typescript:build:client-api", - "build:tools-executors-dotnet": "npx nx run tools-executors-dotnet:build:async-api-sync && npx nx run tools-executors-dotnet:build:server-api-sync && npx nx run tools-executors-dotnet:build:build", - "build:tools-generators-dotnet": "npx nx run tools-generators-dotnet:build:async-api && npx nx run tools-generators-dotnet:build:server-api && npx nx run tools-generators-dotnet:build:restore", - "build:tools-executors-docs": "npx nx run tools-executors-docs:build:design-tokens-docgen", - "build:tools-typescript": "npm run build:tools-executors-typescript && npm run build:tools-generators-typescript", - "build:tools-dotnet": "npm run build:tools-executors-dotnet && npm run build:tools-generators-dotnet", - "build:tools": "npm run build:tools-typescript && npm run build:tools-dotnet && npm run build:tools-executors-docs", - "build:tools-ci": "npx nx run tools-executors-typescript:build:design-tokens-build && npx nx run design-system-tokens:build:open-system", - "build:web-deploy": "npm run build:tools-ci && npx nx run web-shell:build:production", - "build:storybook": "storybook build -s public", + "build:tools-executors-typescript": "cross-env FORCE_COLOR=1 npx nx run tools-executors-typescript:build:client-api-sync && npx nx run tools-executors-typescript:build:design-tokens-clean && npx nx run tools-executors-typescript:build:design-tokens-build", + "build:tools-generators-typescript": "cross-env FORCE_COLOR=1 npx nx run tools-generators-typescript:build:client-api", + "build:tools-executors-dotnet": "cross-env FORCE_COLOR=1 npx nx run tools-executors-dotnet:build:async-api-sync && npx nx run tools-executors-dotnet:build:server-api-sync && npx nx run tools-executors-dotnet:build:build", + "build:tools-generators-dotnet": "cross-env FORCE_COLOR=1 npx nx run tools-generators-dotnet:build:async-api && npx nx run tools-generators-dotnet:build:server-api && npx nx run tools-generators-dotnet:build:restore", + "build:tools-executors-docs": "cross-env FORCE_COLOR=1 npx nx run tools-executors-docs:build:design-tokens-docgen", + "build:tools-typescript": "cross-env FORCE_COLOR=1 npm run build:tools-executors-typescript && npm run build:tools-generators-typescript", + "build:tools-dotnet": "cross-env FORCE_COLOR=1 npm run build:tools-executors-dotnet && npm run build:tools-generators-dotnet", + "build:tools": "cross-env FORCE_COLOR=1 npm run build:tools-typescript && npm run build:tools-dotnet && npm run build:tools-executors-docs", + "build:tools-ci": "cross-env FORCE_COLOR=1 npx nx run tools-executors-typescript:build:design-tokens-build && npx nx run design-system-tokens:build:open-system", + "build:web-deploy": "cross-env FORCE_COLOR=1 npm run build:tools-ci && npx nx run web-shell:build:production", + "build:storybook": "cross-env FORCE_COLOR=1 storybook build -s public", "build": "cross-env FORCE_COLOR=1 nx run-many -t build --all --parallel 4", - "lint:spellcheck": "cspell --no-progress --relative --dot --gitignore", - "lint:language": "alex .", - "lint:js": "eslint --cache --report-unused-disable-directives \"**/*.{js,jsx,ts,tsx}\"", - "lint": "cross-env FORCE_COLOR=1 nx lint && npm run lint:spellcheck && npm run lint:language && npm run lint:js", + "lint:spellcheck": "cross-env FORCE_COLOR=1 cspell --no-progress --relative --dot --gitignore", + "lint:language": "cross-env FORCE_COLOR=1 alex .", + "lint:js": "cross-env FORCE_COLOR=1 eslint --cache --report-unused-disable-directives \"**/*.{js,jsx,ts,tsx}\"", + "lint": "nx lint && npm run lint:spellcheck && npm run lint:language && npm run lint:js", "analyze": "cross-env ANALYZE=true npm run build", - "test:storybook": "test-storybook", - "test": "cross-env FORCE_COLOR=1 nx test", + "test:storybook": "cross-env FORCE_COLOR=1 test-storybook", + "test": "nx test", "storybook": "cross-env FORCE_COLOR=1 storybook dev -p 6006", - "start": "cross-env FORCE_COLOR=1 nx serve", - "format": "cross-env FORCE_COLOR=1 nx format", + "start": "nx serve", + "format": "nx format", "add:contributors": "all-contributors add", "generate:contributors": "all-contributors generate", "add:decisions": "npx log4brains adr new", "preview:decisions": "npx log4brains preview", - "semantic-release": "cross-env FORCE_COLOR=1 semantic-release --branches main" + "semantic-release": "semantic-release --branches main" }, "private": true, "dependencies": { @@ -113,7 +113,7 @@ "@docusaurus/module-type-aliases": "2.4.1", "@docusaurus/preset-classic": "^2.4.1", "@hookform/devtools": "^4.3.1", - "@mdx-js/react": "^2.0.0", + "@mdx-js/react": "^1.6.22", "@nx-dotnet/core": "^1.22.0", "@nx-dotnet/dotnet": "^1.22.0", "@nx-plus/docusaurus": "^15.0.0-rc.0",