From d39f715d564b0b9ad2f0e18fecf006ce2103cc8c Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 28 Jul 2023 13:04:20 +0200 Subject: [PATCH] chore: migrate to nx 16.1.4 (#28583) * chore: nx 16.0 migration * chore: exec migrations from @nrwl to @nx packages * chore: exec migration which converts tools/ to tools/workspace-plugin nx plugin * generate change file * chore: nx 16.1 migration * chore: bump swc/core to 1.3.45 which resolves issues with swc-node/register to make nx no-build DX work, without need to bump swc helpers to 0.5.x which increases v9 bundle size * chore: dedup deps * test(workspace-plugin): nx 16 changed transpilation which broke some of our generator test * fix: rollback to swc/core 1.3.44 which is the latest version to support swc/helpers@0.4.x and remove swc-node in order to use ts-node within nx(nx uses swc/helpers 0.5 if swc-node is used/installed) --- .eslintrc.json | 8 +- .vscode/settings.json | 1 + azure-pipelines.release-vnext-nightly.yml | 2 +- azure-pipelines.yml | 6 +- ...-09407c84-dd7b-4550-b467-fef7d9945fda.json | 7 + jest.config.ts | 2 +- lerna.json | 2 +- migrations.json | 98 +- nx.json | 2 +- package.json | 27 +- .../eslint-plugin/src/utils/configHelpers.js | 8 +- .../tasks/fluentPerfRegressions.ts | 2 +- .../fluentui/react-northstar/jest.config.js | 2 +- .../src/index.dev.js | 2 +- scripts/babel/preset-v9.js | 2 +- scripts/beachball/shared.config.ts | 2 +- scripts/bundle-size-auditor/src/cli.spec.ts | 2 +- scripts/generators/create-package/index.ts | 2 +- .../generators/generate-version-files.spec.ts | 2 +- scripts/generators/generate-version-files.ts | 2 +- scripts/jest/src/jest.preset.v0.spec.ts | 2 +- scripts/jest/src/jest.preset.v8.spec.ts | 2 +- scripts/monorepo/src/tree.js | 2 +- scripts/monorepo/src/utils.js | 4 +- scripts/projects-test/src/utils.ts | 8 +- scripts/storybook/src/utils.js | 2 +- scripts/storybook/src/utils.spec.js | 2 +- scripts/tasks/src/api-extractor.ts | 2 +- scripts/tasks/src/perf-task/perf-test.ts | 2 +- scripts/tasks/src/utils.spec.ts | 2 +- scripts/tasks/src/utils.ts | 2 +- tools/.eslintrc.json | 8 - tools/generators/react-library/lib/.gitkeep | 0 tools/jest.config.ts | 21 - tools/package.json | 11 - tools/project.json | 36 - tools/tsconfig.lib.json | 11 - tools/tsconfig.spec.json | 20 - tools/tsconfig.tools.json | 14 - tools/workspace-plugin/.eslintrc.json | 35 + tools/workspace-plugin/README.md | 14 + tools/{ => workspace-plugin}/STYLE-GUIDE.md | 2 +- tools/workspace-plugin/generators.json | 84 + tools/workspace-plugin/jest.config.ts | 18 + tools/workspace-plugin/package.json | 12 + tools/workspace-plugin/project.json | 74 + .../scripts}/check-dep-graph.js | 10 +- .../src}/generators/add-codeowners.spec.ts | 4 +- .../src}/generators/add-codeowners.ts | 4 +- .../cypress-component-configuration/README.md | 6 +- .../files/cypress.config.ts__tmpl__ | 0 .../files/tsconfig.cy.json__tmpl__ | 0 .../index.spec.ts | 4 +- .../cypress-component-configuration/index.ts | 2 +- .../lib/add-files.ts | 19 +- .../lib/utils.spec.ts | 0 .../lib/utils.ts | 0 .../schema.json | 0 .../cypress-component-configuration/schema.ts | 0 .../generators/dependency-mismatch/README.md | 6 +- .../dependency-mismatch/index.spec.ts | 4 +- .../generators/dependency-mismatch/index.ts | 0 .../dependency-mismatch/schema.json | 0 .../generators/dependency-mismatch/schema.ts | 0 .../src}/generators/epic-generator/README.md | 4 +- .../generators/epic-generator/index.spec.ts | 4 +- .../src}/generators/epic-generator/index.ts | 2 +- .../generators/epic-generator/schema.json | 0 .../src}/generators/epic-generator/schema.ts | 0 .../generators/generate-change-file.spec.ts | 2 +- .../src}/generators/generate-change-files.ts | 2 +- .../migrate-converged-pkg/README.md | 12 +- .../__fixtures__/conformance-setup.ts__tmpl__ | 0 .../__fixtures__/just-config.ts__tmpl__ | 0 .../__fixtures__/old-jest-config.js__tmpl__ | 0 .../__fixtures__/ts-ignore-story.ts__tmpl__ | 0 .../__snapshots__/index.spec.ts.snap | 0 .../migrate-converged-pkg/files}/.gitkeep | 0 .../files/just-config.ts__tmpl__ | 0 .../migrate-converged-pkg/index.spec.ts | 30 +- .../generators/migrate-converged-pkg/index.ts | 12 +- .../utils-hello-substitute.ts__tmpl__ | 0 .../lib/__fixtures__/utils-hello.ts__tmpl__ | 0 .../migrate-converged-pkg/lib/utils.spec.ts | 2 +- .../migrate-converged-pkg/lib/utils.ts | 4 +- .../migrate-converged-pkg/schema.json | 0 .../migrate-converged-pkg/schema.ts | 0 .../migrate-fixed-versions/README.md | 8 +- .../migrate-fixed-versions/index.spec.ts | 4 +- .../migrate-fixed-versions/index.ts | 2 +- .../migrate-fixed-versions/schema.json | 0 .../migrate-fixed-versions/schema.ts | 0 .../src}/generators/migrate-v8-pkg/README.md | 6 +- .../generators/migrate-v8-pkg/index.spec.ts | 6 +- .../src}/generators/migrate-v8-pkg/index.ts | 2 +- .../migrate-v8-pkg/lib/utils.spec.ts | 2 +- .../generators/migrate-v8-pkg/lib/utils.ts | 2 +- .../generators/migrate-v8-pkg/schema.json | 0 .../src}/generators/migrate-v8-pkg/schema.ts | 0 .../src}/generators/move-packages/README.md | 8 +- .../generators/move-packages/index.spec.ts | 16 +- .../src}/generators/move-packages/index.ts | 4 +- .../src}/generators/move-packages/schema.json | 0 .../src}/generators/move-packages/schema.ts | 0 .../normalize-package-dependencies/README.md | 6 +- .../index.spec.ts | 10 +- .../normalize-package-dependencies/index.ts | 4 +- .../lib}/.gitkeep | 0 .../schema.json | 0 .../normalize-package-dependencies/schema.ts | 0 .../prepare-initial-release/README.md | 6 +- .../prepare-initial-release/index.spec.ts | 29 +- .../prepare-initial-release/index.ts | 0 .../prepare-initial-release}/lib/.gitkeep | 0 .../prepare-initial-release/schema.json | 0 .../prepare-initial-release/schema.ts | 0 .../src}/generators/print-stats.spec.ts | 4 +- .../src}/generators/print-stats.ts | 2 +- .../src}/generators/rc-caret/README.md | 8 +- .../src}/generators/rc-caret/index.spec.ts | 4 +- .../src}/generators/rc-caret/index.ts | 2 +- .../src}/generators/rc-caret/schema.json | 0 .../src}/generators/rc-caret/schema.ts | 0 .../src}/generators/react-component/README.md | 6 +- .../__componentName__.test.tsx__tmpl__ | 0 .../component/__componentName__.tsx__tmpl__ | 0 .../__componentName__.types.ts__tmpl__ | 0 .../files/component/index.ts__tmpl__ | 0 .../render__componentName__.tsx__tmpl__ | 0 .../component/use__componentName__.ts__tmpl__ | 0 ...e__componentName__Styles.styles.ts__tmpl__ | 0 .../__componentName__BestPractices.md__tmpl__ | 0 ...componentName__Default.stories.tsx__tmpl__ | 0 .../__componentName__Description.md__tmpl__ | 0 .../files/story/index.stories.tsx__tmpl__ | 0 .../generators/react-component/index.spec.ts | 4 +- .../src}/generators/react-component/index.ts | 2 +- .../generators/react-component}/lib/.gitkeep | 0 .../generators/react-component/schema.json | 0 .../src}/generators/react-component/schema.ts | 0 .../src}/generators/react-library/README.md | 6 +- .../react-library/files/.babelrc.json__tmpl__ | 0 .../files/.eslintrc.json__tmpl__ | 0 .../react-library/files/.npmignore__tmpl__ | 0 .../files/.storybook/main.js__tmpl__ | 0 .../files/.storybook/preview.js__tmpl__ | 0 .../files/.storybook/tsconfig.json__tmpl__ | 0 .../react-library/files/.swcrc__tmpl__ | 0 .../react-library/files/LICENSE__tmpl__ | 0 .../react-library/files/README.md__tmpl__ | 0 .../files/config/api-extractor.json__tmpl__ | 0 .../files/config/tests.js__tmpl__ | 0 .../react-library/files/docs/Spec.md__tmpl__ | 0 .../files/etc/__packageName__.api.md | 0 .../files/jest.config.js__tmpl__ | 0 .../files/just.config.ts__tmpl__ | 0 .../react-library/files/package.json__tmpl__ | 0 .../react-library/files/src/index.ts__tmpl__ | 0 .../files/src/testing/isConformant.ts__tmpl__ | 0 .../react-library/files/stories}/.gitkeep | 0 .../react-library/files/tsconfig.json__tmpl__ | 0 .../files/tsconfig.lib.json__tmpl__ | 0 .../files/tsconfig.spec.json__tmpl__ | 0 .../generators/react-library/index.spec.ts | 4 +- .../src}/generators/react-library/index.ts | 2 +- .../generators/react-library/lib}/.gitkeep | 0 .../src}/generators/react-library/schema.json | 0 .../src}/generators/react-library/schema.ts | 0 .../generators/recipe-generator/README.md | 8 +- .../__snapshots__/index.spec.ts.snap | 0 .../__fileName__.stories.mdx__tmpl__ | 0 .../code-snippets/__fileName__.tsx__tmpl__ | 0 .../code-snippets/index.ts__tmpl__ | 0 .../generators/recipe-generator/index.spec.ts | 4 +- .../src}/generators/recipe-generator/index.ts | 2 +- .../generators/recipe-generator/schema.json | 0 .../generators/recipe-generator/schema.ts | 0 .../generators/tsconfig-base-all/README.md | 8 +- .../tsconfig-base-all/index.spec.ts | 6 +- .../generators/tsconfig-base-all/index.ts | 4 +- .../generators/tsconfig-base-all/lib/utils.ts | 2 +- .../generators/tsconfig-base-all/schema.json | 0 .../generators/tsconfig-base-all/schema.ts | 0 .../src}/generators/version-bump/README.md | 12 +- .../generators/version-bump/index.spec.ts | 4 +- .../src}/generators/version-bump/index.ts | 2 +- .../src}/generators/version-bump/schema.json | 0 .../src}/generators/version-bump/schema.ts | 0 .../files/README.md__tmpl__ | 6 +- .../files/index.spec.ts__tmpl__ | 4 +- .../files/index.ts__tmpl__ | 4 +- .../files/lib/utils.spec.ts__tmpl__ | 0 .../files/lib/utils.ts__tmpl__ | 0 .../files/schema.json__tmpl__ | 0 .../files/schema.ts__tmpl__ | 0 .../workspace-generator/index.spec.ts | 18 +- .../generators/workspace-generator/index.ts | 2 +- .../workspace-generator/schema.json | 0 .../generators/workspace-generator/schema.ts | 0 tools/workspace-plugin/src/index.ts | 1 + .../{ => workspace-plugin/src}/types.spec.ts | 0 tools/{ => workspace-plugin/src}/types.ts | 0 .../src}/utils-testing.ts | 2 +- .../{ => workspace-plugin/src}/utils.spec.ts | 2 +- tools/{ => workspace-plugin/src}/utils.ts | 6 +- tools/{ => workspace-plugin}/tsconfig.json | 9 +- tools/workspace-plugin/tsconfig.lib.json | 10 + tools/workspace-plugin/tsconfig.spec.json | 9 + tsconfig.base.all.json | 5 +- tsconfig.base.json | 3 +- yarn.lock | 1617 +++++++---------- 211 files changed, 1204 insertions(+), 1409 deletions(-) create mode 100644 change/@fluentui-eslint-plugin-09407c84-dd7b-4550-b467-fef7d9945fda.json delete mode 100644 tools/.eslintrc.json delete mode 100644 tools/generators/react-library/lib/.gitkeep delete mode 100644 tools/jest.config.ts delete mode 100644 tools/package.json delete mode 100644 tools/project.json delete mode 100644 tools/tsconfig.lib.json delete mode 100644 tools/tsconfig.spec.json delete mode 100644 tools/tsconfig.tools.json create mode 100644 tools/workspace-plugin/.eslintrc.json create mode 100644 tools/workspace-plugin/README.md rename tools/{ => workspace-plugin}/STYLE-GUIDE.md (98%) create mode 100644 tools/workspace-plugin/generators.json create mode 100644 tools/workspace-plugin/jest.config.ts create mode 100644 tools/workspace-plugin/package.json create mode 100644 tools/workspace-plugin/project.json rename tools/{ => workspace-plugin/scripts}/check-dep-graph.js (65%) rename tools/{ => workspace-plugin/src}/generators/add-codeowners.spec.ts (95%) rename tools/{ => workspace-plugin/src}/generators/add-codeowners.ts (91%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/README.md (67%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/files/cypress.config.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/index.spec.ts (97%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/index.ts (94%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/lib/add-files.ts (68%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/lib/utils.spec.ts (100%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/lib/utils.ts (100%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/cypress-component-configuration/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/dependency-mismatch/README.md (85%) rename tools/{ => workspace-plugin/src}/generators/dependency-mismatch/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/dependency-mismatch/index.ts (100%) rename tools/{ => workspace-plugin/src}/generators/dependency-mismatch/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/dependency-mismatch/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/epic-generator/README.md (81%) rename tools/{ => workspace-plugin/src}/generators/epic-generator/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/epic-generator/index.ts (98%) rename tools/{ => workspace-plugin/src}/generators/epic-generator/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/epic-generator/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/generate-change-file.spec.ts (96%) rename tools/{ => workspace-plugin/src}/generators/generate-change-files.ts (97%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/README.md (73%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/__fixtures__/conformance-setup.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/__fixtures__/just-config.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/__fixtures__/old-jest-config.js__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/__fixtures__/ts-ignore-story.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/__snapshots__/index.spec.ts.snap (100%) rename tools/{generators => workspace-plugin/src/generators/migrate-converged-pkg/files}/.gitkeep (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/files/just-config.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/index.ts (98%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello-substitute.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/lib/utils.spec.ts (94%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/lib/utils.ts (86%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-converged-pkg/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-fixed-versions/README.md (75%) rename tools/{ => workspace-plugin/src}/generators/migrate-fixed-versions/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/migrate-fixed-versions/index.ts (99%) rename tools/{ => workspace-plugin/src}/generators/migrate-fixed-versions/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-fixed-versions/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/README.md (65%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/index.ts (99%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/lib/utils.spec.ts (95%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/lib/utils.ts (97%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/migrate-v8-pkg/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/move-packages/README.md (76%) rename tools/{ => workspace-plugin/src}/generators/move-packages/index.spec.ts (96%) rename tools/{ => workspace-plugin/src}/generators/move-packages/index.ts (98%) rename tools/{ => workspace-plugin/src}/generators/move-packages/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/move-packages/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/normalize-package-dependencies/README.md (76%) rename tools/{ => workspace-plugin/src}/generators/normalize-package-dependencies/index.spec.ts (97%) rename tools/{ => workspace-plugin/src}/generators/normalize-package-dependencies/index.ts (97%) rename tools/{generators/migrate-converged-pkg/files => workspace-plugin/src/generators/normalize-package-dependencies/lib}/.gitkeep (100%) rename tools/{ => workspace-plugin/src}/generators/normalize-package-dependencies/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/normalize-package-dependencies/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/prepare-initial-release/README.md (87%) rename tools/{ => workspace-plugin/src}/generators/prepare-initial-release/index.spec.ts (96%) rename tools/{ => workspace-plugin/src}/generators/prepare-initial-release/index.ts (100%) rename tools/{generators/normalize-package-dependencies => workspace-plugin/src/generators/prepare-initial-release}/lib/.gitkeep (100%) rename tools/{ => workspace-plugin/src}/generators/prepare-initial-release/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/prepare-initial-release/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/print-stats.spec.ts (97%) rename tools/{ => workspace-plugin/src}/generators/print-stats.ts (97%) rename tools/{ => workspace-plugin/src}/generators/rc-caret/README.md (83%) rename tools/{ => workspace-plugin/src}/generators/rc-caret/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/rc-caret/index.ts (97%) rename tools/{ => workspace-plugin/src}/generators/rc-caret/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/rc-caret/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/README.md (74%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/__componentName__.test.tsx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/__componentName__.tsx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/__componentName__.types.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/index.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/render__componentName__.tsx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/use__componentName__.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/component/use__componentName__Styles.styles.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/story/__componentName__BestPractices.md__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/story/__componentName__Default.stories.tsx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/story/__componentName__Description.md__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/files/story/index.stories.tsx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/react-component/index.ts (98%) rename tools/{generators/prepare-initial-release => workspace-plugin/src/generators/react-component}/lib/.gitkeep (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/react-component/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/README.md (80%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.babelrc.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.eslintrc.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.npmignore__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.storybook/main.js__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.storybook/preview.js__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.storybook/tsconfig.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/.swcrc__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/LICENSE__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/README.md__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/config/api-extractor.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/config/tests.js__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/docs/Spec.md__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/etc/__packageName__.api.md (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/jest.config.js__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/just.config.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/package.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/src/index.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/src/testing/isConformant.ts__tmpl__ (100%) rename tools/{generators/react-component/lib => workspace-plugin/src/generators/react-library/files/stories}/.gitkeep (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/tsconfig.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/tsconfig.lib.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/files/tsconfig.spec.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/index.spec.ts (98%) rename tools/{ => workspace-plugin/src}/generators/react-library/index.ts (99%) rename tools/{generators/react-library/files/stories => workspace-plugin/src/generators/react-library/lib}/.gitkeep (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/react-library/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/README.md (65%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/__snapshots__/index.spec.ts.snap (100%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/files/__packageName__/__fileName__.stories.mdx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/files/__packageName__/code-snippets/__fileName__.tsx__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/files/__packageName__/code-snippets/index.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/index.spec.ts (94%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/index.ts (97%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/recipe-generator/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/tsconfig-base-all/README.md (74%) rename tools/{ => workspace-plugin/src}/generators/tsconfig-base-all/index.spec.ts (93%) rename tools/{ => workspace-plugin/src}/generators/tsconfig-base-all/index.ts (86%) rename tools/{ => workspace-plugin/src}/generators/tsconfig-base-all/lib/utils.ts (96%) rename tools/{ => workspace-plugin/src}/generators/tsconfig-base-all/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/tsconfig-base-all/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/version-bump/README.md (79%) rename tools/{ => workspace-plugin/src}/generators/version-bump/index.spec.ts (99%) rename tools/{ => workspace-plugin/src}/generators/version-bump/index.ts (98%) rename tools/{ => workspace-plugin/src}/generators/version-bump/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/version-bump/schema.ts (100%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/README.md__tmpl__ (66%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/index.spec.ts__tmpl__ (78%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/index.ts__tmpl__ (92%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/lib/utils.spec.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/lib/utils.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/schema.json__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/files/schema.ts__tmpl__ (100%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/index.spec.ts (90%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/index.ts (98%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/schema.json (100%) rename tools/{ => workspace-plugin/src}/generators/workspace-generator/schema.ts (100%) create mode 100644 tools/workspace-plugin/src/index.ts rename tools/{ => workspace-plugin/src}/types.spec.ts (100%) rename tools/{ => workspace-plugin/src}/types.ts (100%) rename tools/{ => workspace-plugin/src}/utils-testing.ts (92%) rename tools/{ => workspace-plugin/src}/utils.spec.ts (97%) rename tools/{ => workspace-plugin/src}/utils.ts (97%) rename tools/{ => workspace-plugin}/tsconfig.json (63%) create mode 100644 tools/workspace-plugin/tsconfig.lib.json create mode 100644 tools/workspace-plugin/tsconfig.spec.json diff --git a/.eslintrc.json b/.eslintrc.json index ec2adcf854d35..fb0078681dba9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,4 +1,3 @@ -// Default eslintrc for packages without one, or files outside a package { "parser": "@typescript-eslint/parser", "parserOptions": { @@ -20,5 +19,12 @@ "**/node_modules", "**/temp", "**/*.scss.ts" + ], + "overrides": [ + { + "files": "*.json", + "parser": "jsonc-eslint-parser", + "rules": {} + } ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index abe6440061113..94bec1ca23c80 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -45,6 +45,7 @@ }, "editor.rulers": [120], "eslint.workingDirectories": [{ "mode": "auto" }], // infer working directory based on .eslintrc/package.json location + "eslint.validate": ["json"], "files.associations": { "**/package.json.hbs": "json", "**/*.json.hbs": "jsonc", diff --git a/azure-pipelines.release-vnext-nightly.yml b/azure-pipelines.release-vnext-nightly.yml index cdb35c0438745..580b676bc983c 100644 --- a/azure-pipelines.release-vnext-nightly.yml +++ b/azure-pipelines.release-vnext-nightly.yml @@ -56,7 +56,7 @@ jobs: - script: | date=$(date +"%Y%m%d-%H%M") #release version name will follow a 0.0.0-nightly-{year}{month}{day}-{hour}{minute} format. - yarn nx workspace-generator version-bump --all --bumpType nightly --prereleaseTag "nightly-${date}" + yarn nx g @fluentui/workspace-plugin:version-bump --all --bumpType nightly --prereleaseTag "nightly-${date}" git add . git commit -m "bump nightly versions" yarn change --type prerelease --message "Release nightly v9" --dependent-change-type "prerelease" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8bb8ccee6b7af..6b02abf6c9bfa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,9 +30,9 @@ jobs: - script: | yarn nx workspace-lint - yarn nx run @fluentui/nx-workspace-tools:check-graph - yarn nx workspace-generator tsconfig-base-all --verify - yarn nx workspace-generator normalize-package-dependencies --verify + yarn nx run @fluentui/workspace-plugin:check-graph + yarn nx g @fluentui/workspace-plugin:tsconfig-base-all --verify + yarn nx g @fluentui/workspace-plugin:normalize-package-dependencies --verify displayName: Workspace lint diff --git a/change/@fluentui-eslint-plugin-09407c84-dd7b-4550-b467-fef7d9945fda.json b/change/@fluentui-eslint-plugin-09407c84-dd7b-4550-b467-fef7d9945fda.json new file mode 100644 index 0000000000000..4a5ac005f65f1 --- /dev/null +++ b/change/@fluentui-eslint-plugin-09407c84-dd7b-4550-b467-fef7d9945fda.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: exec migrations from @nrwl to @nx packages", + "packageName": "@fluentui/eslint-plugin", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} diff --git a/jest.config.ts b/jest.config.ts index c28af4986b129..90b8b012d9018 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,4 +1,4 @@ -const { getJestProjects } = require('@nrwl/jest'); +const { getJestProjects } = require('@nx/jest'); export default { projects: [...getJestProjects()], diff --git a/lerna.json b/lerna.json index 6ffde71379156..a6915169f8f1a 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "packages/react-components/*", "scripts/*", "packages/fluentui/*", - "tools", + "tools/*", "typings" ], "npmClient": "yarn", diff --git a/migrations.json b/migrations.json index bf9e7e1a365fb..be8ee72691cee 100644 --- a/migrations.json +++ b/migrations.json @@ -1,52 +1,92 @@ { "migrations": [ { - "version": "15.7.0-beta.0", - "description": "Split global configuration files into individual project.json files. This migration has been added automatically to the beginning of your migration set to retroactively make them work with the new version of Nx.", "cli": "nx", - "implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files", - "package": "@nrwl/workspace", - "name": "15-7-0-split-configuration-into-project-json-files" + "version": "16.0.0-beta.0", + "description": "Remove @nrwl/cli.", + "implementation": "./src/migrations/update-16-0-0/remove-nrwl-cli", + "package": "nx", + "name": "16.0.0-remove-nrwl-cli" + }, + { + "cli": "nx", + "version": "16.0.0-beta.9", + "description": "Replace `dependsOn.projects` and `inputs` definitions with new configuration format.", + "implementation": "./src/migrations/update-16-0-0/update-depends-on-to-tokens", + "package": "nx", + "name": "16.0.0-tokens-for-depends-on" }, { "cli": "nx", - "version": "15.8.2-beta.0", - "description": "Updates the nx wrapper.", - "implementation": "./src/migrations/update-15-8-2/update-nxw", + "version": "16.0.0-beta.0", + "description": "Replace @nrwl/nx-cloud with nx-cloud", + "implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner", "package": "nx", - "name": "15.8.2-update-nx-wrapper" + "name": "16.0.0-update-nx-cloud-runner" + }, + { + "cli": "nx", + "version": "16.0.0-beta.1", + "description": "Replace @nx/devkit with @nx/devkit", + "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages", + "package": "@nx/devkit", + "name": "update-16-0-0-add-nx-packages" + }, + { + "cli": "nx", + "version": "16.0.0-beta.1", + "description": "Replace @nx/workspace with @nx/workspace", + "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages", + "package": "@nx/workspace", + "name": "update-16-0-0-add-nx-packages" + }, + { + "cli": "nx", + "version": "16.0.0-beta.1", + "description": "Replace @nx/js with @nx/js", + "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages", + "package": "@nx/js", + "name": "update-16-0-0-add-nx-packages" + }, + { + "cli": "nx", + "version": "16.0.0-beta.1", + "description": "Replace @nx/jest with @nx/jest", + "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages", + "package": "@nx/jest", + "name": "update-16-0-0-add-nx-packages" }, { "cli": "nx", - "version": "15.8.0-beta.0", - "description": "Rename .lib.swcrc to .swcrc for better SWC support throughout the workspace", - "factory": "./src/migrations/update-15-8-0/rename-swcrc-config", - "package": "@nrwl/js", - "name": "rename-swcrc-config" + "version": "16.0.0-beta.1", + "description": "Replace @nx/node with @nx/node", + "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages", + "package": "@nx/node", + "name": "update-16-0-0-add-nx-packages" }, { - "version": "15.7.0-beta.0", - "description": "Split global configuration files (e.g., workspace.json) into individual project.json files.", "cli": "nx", - "implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files", - "package": "@nrwl/workspace", - "name": "15-7-0-split-configuration-into-project-json-files" + "version": "16.0.0-beta.5", + "description": "Replace @nx/node:webpack with @nx/node:webpack", + "implementation": "./src/migrations/update-16-0-0/update-webpack-executor", + "package": "@nx/node", + "name": "update-16-0-0-update-executor" }, { - "version": "15.8.0-beta.0", + "version": "16.0.0-beta.9", + "description": "Fix .babelrc presets if it contains an invalid entry for @nx/web/babel.", "cli": "nx", - "description": "Update jest configs to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)", - "factory": "./src/migrations/update-15-8-0/update-configs-jest-29", - "package": "@nrwl/jest", - "name": "update-configs-jest-29" + "implementation": "./src/migrations/update-16-0-0/fix-invalid-babelrc", + "package": "@nx/workspace", + "name": "16-0-0-fix-invalid-babelrc" }, { - "version": "15.8.0-beta.0", + "version": "16.0.0-beta.4", + "description": "Generates a plugin called 'workspace-plugin' containing your workspace generators.", "cli": "nx", - "description": "Update jest test files to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)", - "factory": "./src/migrations/update-15-8-0/update-tests-jest-29", - "package": "@nrwl/jest", - "name": "update-tests-jest-29" + "implementation": "./src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin", + "package": "@nx/workspace", + "name": "16-0-0-move-workspace-generators-into-local-plugin" } ] } diff --git a/nx.json b/nx.json index 2468b28063718..78f773db2755a 100644 --- a/nx.json +++ b/nx.json @@ -19,7 +19,7 @@ "defaultBase": "master" }, "pluginsConfig": { - "@nrwl/js": { + "@nx/js": { "analyzeSourceFiles": true } }, diff --git a/package.json b/package.json index b9925dc60b18f..8c40e42abf01f 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "code-style": "lage code-style --verbose", "codepen": "cd packages/react && node ../../scripts/executors/local-codepen.js", "copy-notices": "node scripts/generators/copy-notices.js", - "create-component": "yarn nx workspace-generator react-component", - "create-package": "yarn nx workspace-generator react-library", + "create-component": "yarn nx g @fluentui/workspace-plugin:react-component", + "create-package": "yarn nx g @fluentui/workspace-plugin:react-library", "e2e": "lage e2e --verbose --concurrency=1", "format": "node scripts/executors/format.js", "generate-version-files": "node -r ./scripts/ts-node/register ./scripts/generators/generate-version-files", @@ -101,12 +101,12 @@ "@microsoft/load-themed-styles": "1.10.26", "@microsoft/loader-load-themed-styles": "2.0.17", "@microsoft/tsdoc": "0.14.1", - "@nrwl/cli": "15.9.4", - "@nrwl/devkit": "15.9.4", - "@nrwl/jest": "15.9.4", - "@nrwl/js": "15.9.4", - "@nrwl/node": "15.9.4", - "@nrwl/workspace": "15.9.4", + "@nx/devkit": "16.1.4", + "@nx/jest": "16.1.4", + "@nx/js": "16.1.4", + "@nx/node": "16.1.4", + "@nx/plugin": "16.1.4", + "@nx/workspace": "16.1.4", "@octokit/rest": "18.12.0", "@phenomnomnominal/tsquery": "6.1.2", "@storybook/addon-a11y": "6.5.15", @@ -126,8 +126,8 @@ "@storybook/manager-webpack5": "6.5.15", "@storybook/react": "6.5.15", "@storybook/theming": "6.5.15", - "@swc-node/register": "1.6.1", - "@swc/core": "1.3.30", + "@swc/cli": "0.1.62", + "@swc/core": "1.3.44", "@swc/helpers": "0.4.14", "@testing-library/dom": "8.11.3", "@testing-library/jest-dom": "5.16.5", @@ -269,6 +269,7 @@ "jju": "1.4.0", "json-schema": "0.4.0", "json-stable-stringify-without-jsonify": "1.0.1", + "jsonc-eslint-parser": "2.3.0", "just-scripts": "1.8.2", "lage": "1.8.8", "lerna": "5.5.2", @@ -284,7 +285,7 @@ "monosize-storage-azure": "0.0.3", "node-plop": "0.25.0", "node-polyfill-webpack-plugin": "1.0.2", - "nx": "15.9.4", + "nx": "16.1.4", "p-queue": "6.6.2", "parallel-webpack": "2.6.0", "parse-diff": "0.7.1", @@ -338,7 +339,7 @@ "terser-webpack-plugin": "5.3.9", "through2": "4.0.2", "tmp": "0.2.1", - "ts-jest": "29.1.0", + "ts-jest": "29.1.1", "ts-loader": "9.3.1", "ts-node": "10.9.1", "tsconfig-paths": "4.1.0", @@ -370,7 +371,7 @@ "packages/fluentui/*", "packages/react-components/*", "scripts/*", - "tools", + "tools/*", "typings" ], "nohoist": [ diff --git a/packages/eslint-plugin/src/utils/configHelpers.js b/packages/eslint-plugin/src/utils/configHelpers.js index be50373c29943..496ef038a2dc5 100644 --- a/packages/eslint-plugin/src/utils/configHelpers.js +++ b/packages/eslint-plugin/src/utils/configHelpers.js @@ -7,23 +7,23 @@ const jju = require('jju'); // eslint-disable-next-line import/no-extraneous-dependencies const { FsTree } = require('nx/src/generators/tree'); // eslint-disable-next-line import/no-extraneous-dependencies -const { readProjectConfiguration } = require('@nrwl/devkit'); +const { readProjectConfiguration } = require('@nx/devkit'); /** * @typedef {{root: string, name: string}} Options * @typedef {{name: string, version: string, dependencies: {[key: string]: string}}} PackageJson - * @typedef {import("@nrwl/devkit").WorkspaceJsonConfiguration} WorkspaceJsonConfiguration + * @typedef {import("@nx/devkit").WorkspaceJsonConfiguration} WorkspaceJsonConfiguration */ // FIXME: this is not ok (to depend on nx packages within this plugin - redo) /** * Gets project metadata from monorepo source of truth which is `project.json` per project * @param {Options} options - * @returns {import('@nrwl/devkit').ProjectConfiguration} + * @returns {import('@nx/devkit').ProjectConfiguration} */ function getProjectMetadata(options) { /** - * @type {import('@nrwl/devkit').Tree} + * @type {import('@nx/devkit').Tree} */ const tree = new FsTree(options.root, false); diff --git a/packages/fluentui/perf-test-northstar/tasks/fluentPerfRegressions.ts b/packages/fluentui/perf-test-northstar/tasks/fluentPerfRegressions.ts index e86a7a6d30cd8..24b91cad0baf9 100644 --- a/packages/fluentui/perf-test-northstar/tasks/fluentPerfRegressions.ts +++ b/packages/fluentui/perf-test-northstar/tasks/fluentPerfRegressions.ts @@ -1,6 +1,6 @@ import * as _ from 'lodash'; import * as path from 'path'; -import { workspaceRoot } from '@nrwl/devkit'; +import { workspaceRoot } from '@nx/devkit'; import { perfTestEnv } from '@fluentui/scripts-tasks'; import { config } from './perf-test.config'; diff --git a/packages/fluentui/react-northstar/jest.config.js b/packages/fluentui/react-northstar/jest.config.js index 58083ac69d28b..5cdf12e0e8ac3 100644 --- a/packages/fluentui/react-northstar/jest.config.js +++ b/packages/fluentui/react-northstar/jest.config.js @@ -1,6 +1,6 @@ const path = require('path'); const fs = require('fs'); -const { workspaceRoot } = require('@nrwl/devkit'); +const { workspaceRoot } = require('@nx/devkit'); const { pathsToModuleNameMapper } = require('ts-jest'); const { createV0Config: commonConfig } = require('@fluentui/scripts-jest'); diff --git a/packages/react-components/babel-preset-storybook-full-source/src/index.dev.js b/packages/react-components/babel-preset-storybook-full-source/src/index.dev.js index ffab4869e8d48..62c09df0331a0 100644 --- a/packages/react-components/babel-preset-storybook-full-source/src/index.dev.js +++ b/packages/react-components/babel-preset-storybook-full-source/src/index.dev.js @@ -3,7 +3,7 @@ const { registerTsProject } = require('nx/src/utils/register'); // This is internal code and should be a dev dependency -const { joinPathFragments } = require('@nrwl/devkit'); +const { joinPathFragments } = require('@nx/devkit'); /* eslint-enable import/no-extraneous-dependencies */ registerTsProject(joinPathFragments(__dirname, '..'), 'tsconfig.lib.json'); diff --git a/scripts/babel/preset-v9.js b/scripts/babel/preset-v9.js index 6652270ece2b4..fbdd9e130ad9b 100644 --- a/scripts/babel/preset-v9.js +++ b/scripts/babel/preset-v9.js @@ -1,7 +1,7 @@ const fs = require('fs'); const path = require('path'); -const { workspaceRoot } = require('@nrwl/devkit'); +const { workspaceRoot } = require('@nx/devkit'); const cwd = process.cwd(); const rootOffset = path.relative(cwd, workspaceRoot); diff --git a/scripts/beachball/shared.config.ts b/scripts/beachball/shared.config.ts index 6363ff741d725..5df8edb9c271d 100644 --- a/scripts/beachball/shared.config.ts +++ b/scripts/beachball/shared.config.ts @@ -29,7 +29,7 @@ export const config: typeof baseConfig & Required { - const cmd = `yarn nx workspace-generator ${generator}`; + const cmd = `yarn nx g @fluentui/workspace-plugin:${generator}`; const out = execSync(cmd); console.log(out.toString()); }); diff --git a/scripts/bundle-size-auditor/src/cli.spec.ts b/scripts/bundle-size-auditor/src/cli.spec.ts index 57d84ff9ee783..f1e51912b15ce 100644 --- a/scripts/bundle-size-auditor/src/cli.spec.ts +++ b/scripts/bundle-size-auditor/src/cli.spec.ts @@ -1,7 +1,7 @@ import * as path from 'path'; import * as fs from 'fs'; -import { stripIndents } from '@nrwl/devkit'; +import { stripIndents } from '@nx/devkit'; import { bundleSizeAuditor } from './cli'; diff --git a/scripts/generators/create-package/index.ts b/scripts/generators/create-package/index.ts index 782cac0ff8c90..27612069cafc6 100644 --- a/scripts/generators/create-package/index.ts +++ b/scripts/generators/create-package/index.ts @@ -2,7 +2,7 @@ import { spawnSync } from 'child_process'; import * as path from 'path'; import { PackageJson, findGitRoot, flushTreeChanges, getProjectMetadata, tree } from '@fluentui/scripts-monorepo'; -import { addProjectConfiguration } from '@nrwl/devkit'; +import { addProjectConfiguration } from '@nx/devkit'; import chalk from 'chalk'; import * as fs from 'fs-extra'; import _ from 'lodash'; diff --git a/scripts/generators/generate-version-files.spec.ts b/scripts/generators/generate-version-files.spec.ts index 15cb3f73b6626..190bc89f61b49 100644 --- a/scripts/generators/generate-version-files.spec.ts +++ b/scripts/generators/generate-version-files.spec.ts @@ -2,7 +2,7 @@ import childProcess from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; -import { stripIndents } from '@nrwl/devkit'; +import { stripIndents } from '@nx/devkit'; import * as tmp from 'tmp'; import { generateVersionFiles } from './generate-version-files'; diff --git a/scripts/generators/generate-version-files.ts b/scripts/generators/generate-version-files.ts index 7a4d7c6d8e151..ca240d8d59ba4 100644 --- a/scripts/generators/generate-version-files.ts +++ b/scripts/generators/generate-version-files.ts @@ -2,7 +2,7 @@ import { spawnSync } from 'child_process'; import * as path from 'path'; import { findGitRoot } from '@fluentui/scripts-monorepo'; -import { stripIndents } from '@nrwl/devkit'; +import { stripIndents } from '@nx/devkit'; import * as fs from 'fs-extra'; import * as glob from 'glob'; diff --git a/scripts/jest/src/jest.preset.v0.spec.ts b/scripts/jest/src/jest.preset.v0.spec.ts index e0217356efcc4..ebe3057d530a5 100644 --- a/scripts/jest/src/jest.preset.v0.spec.ts +++ b/scripts/jest/src/jest.preset.v0.spec.ts @@ -1,4 +1,4 @@ -import { workspaceRoot } from '@nrwl/devkit'; +import { workspaceRoot } from '@nx/devkit'; import preset from './jest.preset.v0'; diff --git a/scripts/jest/src/jest.preset.v8.spec.ts b/scripts/jest/src/jest.preset.v8.spec.ts index 872fe2e413357..b70d446dba1bd 100644 --- a/scripts/jest/src/jest.preset.v8.spec.ts +++ b/scripts/jest/src/jest.preset.v8.spec.ts @@ -1,4 +1,4 @@ -import { workspaceRoot } from '@nrwl/devkit'; +import { workspaceRoot } from '@nx/devkit'; import preset from './jest.preset.v8'; diff --git a/scripts/monorepo/src/tree.js b/scripts/monorepo/src/tree.js index 5b8d0f9ab399c..6479df0a01dce 100644 --- a/scripts/monorepo/src/tree.js +++ b/scripts/monorepo/src/tree.js @@ -1,4 +1,4 @@ -const { workspaceRoot } = require('@nrwl/devkit'); +const { workspaceRoot } = require('@nx/devkit'); const { FsTree, flushChanges } = require('nx/src/generators/tree'); const tree = new FsTree(workspaceRoot, false); diff --git a/scripts/monorepo/src/utils.js b/scripts/monorepo/src/utils.js index 0c24a88e8d869..591814148916d 100644 --- a/scripts/monorepo/src/utils.js +++ b/scripts/monorepo/src/utils.js @@ -1,6 +1,6 @@ const { execSync } = require('child_process'); -const { workspaceRoot, readProjectConfiguration } = require('@nrwl/devkit'); +const { workspaceRoot, readProjectConfiguration } = require('@nx/devkit'); const { tree } = require('./tree'); @@ -9,7 +9,7 @@ const TEN_MEGABYTES = 1024 * 10000; /** * Gets nx project metadata * @param {string} projectName - package name - * @returns {import('@nrwl/devkit').ProjectConfiguration} + * @returns {import('@nx/devkit').ProjectConfiguration} */ function getProjectMetadata(projectName) { return readProjectConfiguration(tree, projectName); diff --git a/scripts/projects-test/src/utils.ts b/scripts/projects-test/src/utils.ts index c14d7c4824e0c..2405a9f8f9f19 100644 --- a/scripts/projects-test/src/utils.ts +++ b/scripts/projects-test/src/utils.ts @@ -1,10 +1,10 @@ import fs from 'fs'; -import fsExtra from 'fs-extra'; import path from 'path'; -import tmp from 'tmp'; -import { sh } from '@fluentui/scripts-utils'; import { workspaceRoot } from '@fluentui/scripts-monorepo'; +import { sh } from '@fluentui/scripts-utils'; +import fsExtra from 'fs-extra'; +import tmp from 'tmp'; // Clean up created files/folders on exit, even after exceptions // (will not catch SIGINT on windows) @@ -61,7 +61,7 @@ export async function shEcho(cmd: string, cwd?: string) { /** * Generates a folder of files based on provided templates. - * This is similar to nx `@nrwl/devkit#generateFiles` without templating and ability to run on virtual FS + * This is similar to nx `@nx/devkit#generateFiles` without templating and ability to run on virtual FS * * @example * ```typescript diff --git a/scripts/storybook/src/utils.js b/scripts/storybook/src/utils.js index 87e3372c2a971..c2616e724cff0 100644 --- a/scripts/storybook/src/utils.js +++ b/scripts/storybook/src/utils.js @@ -3,7 +3,7 @@ const path = require('path'); const { fullSourcePlugin: babelPlugin } = require('@fluentui/babel-preset-storybook-full-source'); const { getAllPackageInfo } = require('@fluentui/scripts-monorepo'); -const { stripIndents, offsetFromRoot, workspaceRoot, readProjectConfiguration } = require('@nrwl/devkit'); +const { stripIndents, offsetFromRoot, workspaceRoot, readProjectConfiguration } = require('@nx/devkit'); const { FsTree } = require('nx/src/generators/tree'); const semver = require('semver'); const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin'); diff --git a/scripts/storybook/src/utils.spec.js b/scripts/storybook/src/utils.spec.js index 4eb469327d2cf..f91a544bb7544 100644 --- a/scripts/storybook/src/utils.spec.js +++ b/scripts/storybook/src/utils.spec.js @@ -1,7 +1,7 @@ const fs = require('fs'); const path = require('path'); -const { stripIndents } = require('@nrwl/devkit'); +const { stripIndents } = require('@nx/devkit'); const tmp = require('tmp'); const { loadWorkspaceAddon, getPackageStoriesGlob } = require('./utils'); diff --git a/scripts/tasks/src/api-extractor.ts b/scripts/tasks/src/api-extractor.ts index 96c8cc8b6cf38..dd11a1d3c2925 100644 --- a/scripts/tasks/src/api-extractor.ts +++ b/scripts/tasks/src/api-extractor.ts @@ -1,7 +1,7 @@ import * as path from 'path'; import type { ExtractorMessageCategory, ExtractorResult } from '@microsoft/api-extractor'; -import { workspaceRoot } from '@nrwl/devkit'; +import { workspaceRoot } from '@nx/devkit'; import chalk from 'chalk'; import { isCI } from 'ci-info'; import * as glob from 'glob'; diff --git a/scripts/tasks/src/perf-task/perf-test.ts b/scripts/tasks/src/perf-task/perf-test.ts index 6fa725fbbcd48..1c6b05a79327f 100644 --- a/scripts/tasks/src/perf-task/perf-test.ts +++ b/scripts/tasks/src/perf-task/perf-test.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; -import { workspaceRoot } from '@nrwl/devkit'; +import { workspaceRoot } from '@nx/devkit'; import flamegrill, { CookResult, CookResults, ScenarioConfig, Scenarios } from 'flamegrill'; import { getJustArgv as argv } from '../argv'; diff --git a/scripts/tasks/src/utils.spec.ts b/scripts/tasks/src/utils.spec.ts index 84489ea9a4f4b..3f73775547e83 100644 --- a/scripts/tasks/src/utils.spec.ts +++ b/scripts/tasks/src/utils.spec.ts @@ -1,6 +1,6 @@ import * as path from 'path'; -import { workspaceRoot } from '@nrwl/devkit'; +import { workspaceRoot } from '@nx/devkit'; import { getTsPathAliasesApiExtractorConfig } from './utils'; diff --git a/scripts/tasks/src/utils.ts b/scripts/tasks/src/utils.ts index c1af3d56e6b29..922683631a4cf 100644 --- a/scripts/tasks/src/utils.ts +++ b/scripts/tasks/src/utils.ts @@ -2,7 +2,7 @@ import { execSync } from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; -import { parseJson, stripJsonComments } from '@nrwl/devkit'; +import { parseJson, stripJsonComments } from '@nx/devkit'; import type { TscTaskOptions } from 'just-scripts'; /** diff --git a/tools/.eslintrc.json b/tools/.eslintrc.json deleted file mode 100644 index d02e703a7ca86..0000000000000 --- a/tools/.eslintrc.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": ["plugin:@fluentui/eslint-plugin/node"], - "root": true, - "rules": { - "import/no-extraneous-dependencies": ["error", { "packageDir": [".", "../"] }], - "@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }] - } -} diff --git a/tools/generators/react-library/lib/.gitkeep b/tools/generators/react-library/lib/.gitkeep deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tools/jest.config.ts b/tools/jest.config.ts deleted file mode 100644 index 3759017a3b81b..0000000000000 --- a/tools/jest.config.ts +++ /dev/null @@ -1,21 +0,0 @@ -// @ts-check - -/** - * @type {import('@jest/types').Config.InitialOptions} - */ -export default { - displayName: 'tools', - preset: '../jest.preset.js', - testPathIgnorePatterns: ['/node_modules/'], - transform: { - '^.+\\.tsx?$': [ - 'ts-jest', - { - diagnostics: false, - isolatedModules: true, - tsconfig: '/tsconfig.spec.json', - }, - ], - }, - coverageDirectory: './coverage', -}; diff --git a/tools/package.json b/tools/package.json deleted file mode 100644 index 76c06188bc729..0000000000000 --- a/tools/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@fluentui/nx-workspace-tools", - "version": "1.0.0", - "private": true, - "scripts": { - "test": "nx run @fluentui/nx-workspace-tools:test", - "lint": "nx run @fluentui/nx-workspace-tools:lint", - "type-check": "nx run @fluentui/nx-workspace-tools:type-check", - "check-graph": "nx run @fluentui/nx-workspace-tools:check-graph" - } -} diff --git a/tools/project.json b/tools/project.json deleted file mode 100644 index e907b9fca65db..0000000000000 --- a/tools/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "@fluentui/nx-workspace-tools", - "$schema": "../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "tools", - "projectType": "library", - "targets": { - "test": { - "executor": "@nrwl/jest:jest", - "outputs": ["{workspaceRoot}/coverage/tools"], - "options": { - "jestConfig": "tools/jest.config.ts", - "passWithNoTests": true - } - }, - "lint": { - "executor": "nx:run-commands", - "options": { - "command": "eslint **/*.ts", - "cwd": "tools" - } - }, - "type-check": { - "executor": "nx:run-commands", - "options": { - "command": "tsc -b tools/tsconfig.json" - } - }, - "check-graph": { - "executor": "nx:run-commands", - "options": { - "command": "node ./tools/check-dep-graph.js" - } - } - }, - "tags": [] -} diff --git a/tools/tsconfig.lib.json b/tools/tsconfig.lib.json deleted file mode 100644 index 9666fc29f9034..0000000000000 --- a/tools/tsconfig.lib.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "target": "ES2015", - "outDir": "../dist/out-tsc", - "types": ["node"] - }, - "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"], - "include": ["**/*.ts"] -} diff --git a/tools/tsconfig.spec.json b/tools/tsconfig.spec.json deleted file mode 100644 index 6e605fc25fc53..0000000000000 --- a/tools/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/tools/tsconfig.tools.json b/tools/tsconfig.tools.json deleted file mode 100644 index bd2e9b5c1364f..0000000000000 --- a/tools/tsconfig.tools.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "compilerOptions": { - "outDir": "../dist/out-tsc/tools", - "rootDir": ".", - "module": "CommonJS", - "target": "ES2015", - "types": ["node"], - "importHelpers": false, - "downlevelIteration": true - }, - "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"], - "include": ["**/*.ts"] -} diff --git a/tools/workspace-plugin/.eslintrc.json b/tools/workspace-plugin/.eslintrc.json new file mode 100644 index 0000000000000..96f0f958fca84 --- /dev/null +++ b/tools/workspace-plugin/.eslintrc.json @@ -0,0 +1,35 @@ +{ + "extends": ["plugin:@fluentui/eslint-plugin/node"], + "root": true, + "ignorePatterns": ["!**/*"], + "rules": { + "import/no-extraneous-dependencies": "off", + "@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }] + }, + "overrides": [ + { + "files": "*.json", + "parser": "jsonc-eslint-parser", + "rules": {} + }, + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["./package.json", "./generators.json"], + "parser": "jsonc-eslint-parser", + "rules": { + "@nx/nx-plugin-checks": "error" + } + } + ] +} diff --git a/tools/workspace-plugin/README.md b/tools/workspace-plugin/README.md new file mode 100644 index 0000000000000..0b80962f9850c --- /dev/null +++ b/tools/workspace-plugin/README.md @@ -0,0 +1,14 @@ +# @fluentui/workspace-plugin + +nx private monorepo plugin which contains: + +- generators +- executors +- migrations +- other things... + +## Usage + +Run following to get all plugin functionality: + +`yarn nx list @fluentui/workspace-plugin` diff --git a/tools/STYLE-GUIDE.md b/tools/workspace-plugin/STYLE-GUIDE.md similarity index 98% rename from tools/STYLE-GUIDE.md rename to tools/workspace-plugin/STYLE-GUIDE.md index 277c1c6e5fba9..8598c72ee3bf9 100644 --- a/tools/STYLE-GUIDE.md +++ b/tools/workspace-plugin/STYLE-GUIDE.md @@ -75,7 +75,7 @@ npx markdown-toc --bullets "-" -i tools/generators//README.md #### CLI: ```sh -yarn nx workspace-generator workspace-generator +yarn nx g @fluentui/workspace-plugin:workspace-generator ``` #### Nx Console: diff --git a/tools/workspace-plugin/generators.json b/tools/workspace-plugin/generators.json new file mode 100644 index 0000000000000..96f5312e361db --- /dev/null +++ b/tools/workspace-plugin/generators.json @@ -0,0 +1,84 @@ +{ + "generators": { + "cypress-component-configuration": { + "implementation": "./src/generators/cypress-component-configuration/index.ts", + "schema": "./src/generators/cypress-component-configuration/schema.json", + "description": "Set up Cypress component test for a project." + }, + "dependency-mismatch": { + "implementation": "./src/generators/dependency-mismatch/index.ts", + "schema": "./src/generators/dependency-mismatch/schema.json", + "description": "Generator dependency-mismatch" + }, + "epic-generator": { + "implementation": "./src/generators/epic-generator/index.ts", + "schema": "./src/generators/epic-generator/schema.json", + "description": "Generator epic-generator" + }, + "migrate-converged-pkg": { + "implementation": "./src/generators/migrate-converged-pkg/index.ts", + "schema": "./src/generators/migrate-converged-pkg/schema.json", + "description": "Generator migrate-converged-pkg" + }, + "migrate-fixed-versions": { + "implementation": "./src/generators/migrate-fixed-versions/index.ts", + "schema": "./src/generators/migrate-fixed-versions/schema.json", + "description": "Generator migrate-fixed-versions" + }, + "migrate-v8-pkg": { + "implementation": "./src/generators/migrate-v8-pkg/index.ts", + "schema": "./src/generators/migrate-v8-pkg/schema.json", + "description": "Generator migrate-v8-pkg" + }, + "move-packages": { + "implementation": "./src/generators/move-packages/index.ts", + "schema": "./src/generators/move-packages/schema.json", + "description": "Generator move-packages" + }, + "normalize-package-dependencies": { + "implementation": "./src/generators/normalize-package-dependencies/index.ts", + "schema": "./src/generators/normalize-package-dependencies/schema.json", + "description": "Generator normalize-package-dependencies" + }, + "prepare-initial-release": { + "implementation": "./src/generators/prepare-initial-release/index.ts", + "schema": "./src/generators/prepare-initial-release/schema.json", + "description": "Generator prepare-initial-release" + }, + "rc-caret": { + "implementation": "./src/generators/rc-caret/index.ts", + "schema": "./src/generators/rc-caret/schema.json", + "description": "Generator rc-caret" + }, + "react-component": { + "implementation": "./src/generators/react-component/index.ts", + "schema": "./src/generators/react-component/schema.json", + "description": "Create React Component within v9 package" + }, + "react-library": { + "implementation": "./src/generators/react-library/index.ts", + "schema": "./src/generators/react-library/schema.json", + "description": "Generator react-library" + }, + "recipe-generator": { + "implementation": "./src/generators/recipe-generator/index.ts", + "schema": "./src/generators/recipe-generator/schema.json", + "description": "Generator recipe-generator" + }, + "tsconfig-base-all": { + "implementation": "./src/generators/tsconfig-base-all/index.ts", + "schema": "./src/generators/tsconfig-base-all/schema.json", + "description": "Create tsconfig.json with merged 'compilerOptions.paths' from v0,v8,v9 tsconfigs" + }, + "version-bump": { + "implementation": "./src/generators/version-bump/index.ts", + "schema": "./src/generators/version-bump/schema.json", + "description": "Generator version-bump" + }, + "workspace-generator": { + "implementation": "./src/generators/workspace-generator/index.ts", + "schema": "./src/generators/workspace-generator/schema.json", + "description": "Generator workspace-generator" + } + } +} diff --git a/tools/workspace-plugin/jest.config.ts b/tools/workspace-plugin/jest.config.ts new file mode 100644 index 0000000000000..cc41d6f58b725 --- /dev/null +++ b/tools/workspace-plugin/jest.config.ts @@ -0,0 +1,18 @@ +// @ts-check + +export default { + displayName: 'workspace-plugin', + preset: '../../jest.preset.js', + transform: { + '^.+\\.[tj]s$': [ + 'ts-jest', + { + diagnostics: false, + isolatedModules: true, + tsconfig: '/tsconfig.spec.json', + }, + ], + }, + moduleFileExtensions: ['ts', 'js', 'html'], + coverageDirectory: '../../coverage/tools/workspace-plugin', +} as import('@jest/types').Config.InitialOptions; diff --git a/tools/workspace-plugin/package.json b/tools/workspace-plugin/package.json new file mode 100644 index 0000000000000..0ebcc845bda51 --- /dev/null +++ b/tools/workspace-plugin/package.json @@ -0,0 +1,12 @@ +{ + "name": "@fluentui/workspace-plugin", + "version": "0.0.0", + "private": true, + "type": "commonjs", + "generators": "./generators.json", + "scripts": { + "test": "nx run @fluentui/workspace-plugin:test", + "type-check": "nx run @fluentui/workspace-plugin:type-check", + "lint": "nx run @fluentui/workspace-plugin:lint-old" + } +} diff --git a/tools/workspace-plugin/project.json b/tools/workspace-plugin/project.json new file mode 100644 index 0000000000000..bf1831e6326ec --- /dev/null +++ b/tools/workspace-plugin/project.json @@ -0,0 +1,74 @@ +{ + "name": "@fluentui/workspace-plugin", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "tools/workspace-plugin/src", + "projectType": "library", + "targets": { + "build": { + "executor": "@nx/js:tsc", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/tools/workspace-plugin", + "main": "tools/workspace-plugin/src/index.ts", + "tsConfig": "tools/workspace-plugin/tsconfig.lib.json", + "assets": [ + { + "input": "./tools/workspace-plugin/src", + "glob": "**/!(*.ts)", + "output": "./src" + }, + { + "input": "./tools/workspace-plugin/src", + "glob": "**/*.d.ts", + "output": "./src" + }, + { + "input": "./tools/workspace-plugin", + "glob": "generators.json", + "output": "." + }, + { + "input": "./tools/workspace-plugin", + "glob": "executors.json", + "output": "." + } + ] + } + }, + "lint": { + "executor": "@nx/linter:eslint", + "outputs": ["{options.outputFile}"], + "options": { + "lintFilePatterns": [ + "tools/workspace-plugin/**/*.ts", + "tools/workspace-plugin/package.json", + "tools/workspace-plugin/generators.json" + ] + } + }, + "lint-old": { + "command": "eslint tools/workspace-plugin/**/*.ts" + }, + "test": { + "executor": "@nx/jest:jest", + "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], + "options": { + "jestConfig": "tools/workspace-plugin/jest.config.ts", + "passWithNoTests": true + }, + "configurations": { + "ci": { + "ci": true, + "codeCoverage": true + } + } + }, + "type-check": { + "command": "tsc -b tools/workspace-plugin/tsconfig.json" + }, + "check-graph": { + "command": "node ./tools/workspace-plugin/scripts/check-dep-graph.js" + } + }, + "tags": ["platform:any", "tools"] +} diff --git a/tools/check-dep-graph.js b/tools/workspace-plugin/scripts/check-dep-graph.js similarity index 65% rename from tools/check-dep-graph.js rename to tools/workspace-plugin/scripts/check-dep-graph.js index 353f31ad8138f..1d67f301449e9 100644 --- a/tools/check-dep-graph.js +++ b/tools/workspace-plugin/scripts/check-dep-graph.js @@ -1,7 +1,8 @@ // @ts-check -const { stripIndents, logger } = require('@nrwl/devkit'); -const { createProjectGraphAsync } = require('@nrwl/workspace/src/core/project-graph'); +const fs = require('fs'); +const path = require('path'); +const { createProjectGraphAsync, stripIndents, logger } = require('@nx/devkit'); main().catch(err => { logger.error(err); @@ -14,8 +15,9 @@ main().catch(err => { */ async function main() { const graph = await createProjectGraphAsync(); + const workspacePluginConfig = JSON.parse(fs.readFileSync(path.join(__dirname, '../project.json'), 'utf-8')); - const toolsDeps = graph.dependencies['@fluentui/nx-workspace-tools'].reduce( + const toolsDeps = graph.dependencies[workspacePluginConfig.name].reduce( (acc, current) => { if (current.target.startsWith('npm:')) { acc.npm.push(current.target); @@ -31,7 +33,7 @@ async function main() { throw new Error( stripIndents`🚨 Somethings wrong with dependency graph! - @fluentui/nx-workspace-tools should not rely on any libraries within monorepo, but it depends on: + ${workspacePluginConfig.name} should not rely on any libraries within monorepo, but it depends on: ${toolsDeps.own.map(depName => `- ${depName}`).join('\n')}`, ); } diff --git a/tools/generators/add-codeowners.spec.ts b/tools/workspace-plugin/src/generators/add-codeowners.spec.ts similarity index 95% rename from tools/generators/add-codeowners.spec.ts rename to tools/workspace-plugin/src/generators/add-codeowners.spec.ts index 2fa224a3c0c09..ba434c174c6ff 100644 --- a/tools/generators/add-codeowners.spec.ts +++ b/tools/workspace-plugin/src/generators/add-codeowners.spec.ts @@ -1,5 +1,5 @@ -import { Tree, addProjectConfiguration, stripIndents } from '@nrwl/devkit'; -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { Tree, addProjectConfiguration, stripIndents } from '@nx/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { addCodeowner } from './add-codeowners'; import { setupCodeowners } from '../utils-testing'; import { workspacePaths } from '../utils'; diff --git a/tools/generators/add-codeowners.ts b/tools/workspace-plugin/src/generators/add-codeowners.ts similarity index 91% rename from tools/generators/add-codeowners.ts rename to tools/workspace-plugin/src/generators/add-codeowners.ts index dd148d7126b56..23357654e6a08 100644 --- a/tools/generators/add-codeowners.ts +++ b/tools/workspace-plugin/src/generators/add-codeowners.ts @@ -1,5 +1,5 @@ -import { applyChangesToString, Tree } from '@nrwl/devkit'; -import { joinPathFragments, StringChange, ChangeType } from '@nrwl/devkit'; +import { applyChangesToString, Tree } from '@nx/devkit'; +import { joinPathFragments, StringChange, ChangeType } from '@nx/devkit'; import { getProjectConfig } from '../utils'; diff --git a/tools/generators/cypress-component-configuration/README.md b/tools/workspace-plugin/src/generators/cypress-component-configuration/README.md similarity index 67% rename from tools/generators/cypress-component-configuration/README.md rename to tools/workspace-plugin/src/generators/cypress-component-configuration/README.md index ebcbdfdbc4b6e..bbff023b3a0ef 100644 --- a/tools/generators/cypress-component-configuration/README.md +++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/README.md @@ -14,19 +14,19 @@ Workspace Generator for setting up Cypress component testing for a project ## Usage ```sh -yarn nx workspace-generator cypress-component-configuration ... +yarn nx g @fluentui/workspace-plugin:cypress-component-configuration ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator cypress-component-configuration --dry-run +yarn nx g @fluentui/workspace-plugin:cypress-component-configuration --dry-run ``` ### Examples ```sh -yarn nx workspace-generator cypress-component-configuration +yarn nx g @fluentui/workspace-plugin:cypress-component-configuration ``` ## Options diff --git a/tools/generators/cypress-component-configuration/files/cypress.config.ts__tmpl__ b/tools/workspace-plugin/src/generators/cypress-component-configuration/files/cypress.config.ts__tmpl__ similarity index 100% rename from tools/generators/cypress-component-configuration/files/cypress.config.ts__tmpl__ rename to tools/workspace-plugin/src/generators/cypress-component-configuration/files/cypress.config.ts__tmpl__ diff --git a/tools/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__ b/tools/workspace-plugin/src/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__ similarity index 100% rename from tools/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__ rename to tools/workspace-plugin/src/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__ diff --git a/tools/generators/cypress-component-configuration/index.spec.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts similarity index 97% rename from tools/generators/cypress-component-configuration/index.spec.ts rename to tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts index 8dc7b07043db3..3b3df304167b3 100644 --- a/tools/generators/cypress-component-configuration/index.spec.ts +++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts @@ -6,8 +6,8 @@ import { readNxJson, serializeJson, Tree, -} from '@nrwl/devkit'; -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +} from '@nx/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import generator from './index'; diff --git a/tools/generators/cypress-component-configuration/index.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts similarity index 94% rename from tools/generators/cypress-component-configuration/index.ts rename to tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts index a417f05307c1b..b07eb3622a98d 100644 --- a/tools/generators/cypress-component-configuration/index.ts +++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts @@ -1,4 +1,4 @@ -import { Tree, formatFiles, names } from '@nrwl/devkit'; +import { Tree, formatFiles, names } from '@nx/devkit'; import { getProjectConfig, printUserLogs, UserLog } from '../../utils'; diff --git a/tools/generators/cypress-component-configuration/lib/add-files.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts similarity index 68% rename from tools/generators/cypress-component-configuration/lib/add-files.ts rename to tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts index 8eca64ec75745..eb02223b566a4 100644 --- a/tools/generators/cypress-component-configuration/lib/add-files.ts +++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts @@ -1,27 +1,10 @@ -import { stripIndents, Tree, updateJson, generateFiles, joinPathFragments } from '@nrwl/devkit'; +import { Tree, updateJson, generateFiles, joinPathFragments } from '@nx/devkit'; import * as path from 'path'; import { PackageJson, TsConfig } from '../../../types'; import { getProjectConfig } from '../../../utils'; import { uniqueArray } from './utils'; -const templates = { - config: stripIndents` - import { baseConfig } from '@fluentui/scripts-cypress'; - - export default baseConfig; - `, - tsconfig: { - extends: './tsconfig.json', - compilerOptions: { - isolatedModules: false, - types: ['node', 'cypress', 'cypress-storybook/cypress', 'cypress-real-events'], - lib: ['ES2019', 'dom'], - }, - include: ['**/*.cy.ts', '**/*.cy.tsx'], - }, -}; - type Options = ReturnType; export function addFiles(tree: Tree, options: Options) { diff --git a/tools/generators/cypress-component-configuration/lib/utils.spec.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/utils.spec.ts similarity index 100% rename from tools/generators/cypress-component-configuration/lib/utils.spec.ts rename to tools/workspace-plugin/src/generators/cypress-component-configuration/lib/utils.spec.ts diff --git a/tools/generators/cypress-component-configuration/lib/utils.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/utils.ts similarity index 100% rename from tools/generators/cypress-component-configuration/lib/utils.ts rename to tools/workspace-plugin/src/generators/cypress-component-configuration/lib/utils.ts diff --git a/tools/generators/cypress-component-configuration/schema.json b/tools/workspace-plugin/src/generators/cypress-component-configuration/schema.json similarity index 100% rename from tools/generators/cypress-component-configuration/schema.json rename to tools/workspace-plugin/src/generators/cypress-component-configuration/schema.json diff --git a/tools/generators/cypress-component-configuration/schema.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/schema.ts similarity index 100% rename from tools/generators/cypress-component-configuration/schema.ts rename to tools/workspace-plugin/src/generators/cypress-component-configuration/schema.ts diff --git a/tools/generators/dependency-mismatch/README.md b/tools/workspace-plugin/src/generators/dependency-mismatch/README.md similarity index 85% rename from tools/generators/dependency-mismatch/README.md rename to tools/workspace-plugin/src/generators/dependency-mismatch/README.md index c5b90fdc01188..9c7354aacffd2 100644 --- a/tools/generators/dependency-mismatch/README.md +++ b/tools/workspace-plugin/src/generators/dependency-mismatch/README.md @@ -61,17 +61,17 @@ After running generator: ## Usage ```sh -yarn nx workspace-generator dependency-mismatch +yarn nx g @fluentui/workspace-plugin:dependency-mismatch ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator dependency-mismatch --dry-run +yarn nx g @fluentui/workspace-plugin:dependency-mismatch --dry-run ``` ### Examples ```sh -yarn nx workspace-generator dependency-mismatch +yarn nx g @fluentui/workspace-plugin:dependency-mismatch ``` diff --git a/tools/generators/dependency-mismatch/index.spec.ts b/tools/workspace-plugin/src/generators/dependency-mismatch/index.spec.ts similarity index 98% rename from tools/generators/dependency-mismatch/index.spec.ts rename to tools/workspace-plugin/src/generators/dependency-mismatch/index.spec.ts index 77e4ee9c763bd..80a58af939987 100644 --- a/tools/generators/dependency-mismatch/index.spec.ts +++ b/tools/workspace-plugin/src/generators/dependency-mismatch/index.spec.ts @@ -1,5 +1,5 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { Tree, addProjectConfiguration, readNxJson, readJson, writeJson } from '@nrwl/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; +import { Tree, addProjectConfiguration, readNxJson, readJson, writeJson } from '@nx/devkit'; import generator from './index'; import { PackageJson } from '../../types'; diff --git a/tools/generators/dependency-mismatch/index.ts b/tools/workspace-plugin/src/generators/dependency-mismatch/index.ts similarity index 100% rename from tools/generators/dependency-mismatch/index.ts rename to tools/workspace-plugin/src/generators/dependency-mismatch/index.ts diff --git a/tools/generators/dependency-mismatch/schema.json b/tools/workspace-plugin/src/generators/dependency-mismatch/schema.json similarity index 100% rename from tools/generators/dependency-mismatch/schema.json rename to tools/workspace-plugin/src/generators/dependency-mismatch/schema.json diff --git a/tools/generators/dependency-mismatch/schema.ts b/tools/workspace-plugin/src/generators/dependency-mismatch/schema.ts similarity index 100% rename from tools/generators/dependency-mismatch/schema.ts rename to tools/workspace-plugin/src/generators/dependency-mismatch/schema.ts diff --git a/tools/generators/epic-generator/README.md b/tools/workspace-plugin/src/generators/epic-generator/README.md similarity index 81% rename from tools/generators/epic-generator/README.md rename to tools/workspace-plugin/src/generators/epic-generator/README.md index df793a938b92c..eee461425f7c1 100644 --- a/tools/generators/epic-generator/README.md +++ b/tools/workspace-plugin/src/generators/epic-generator/README.md @@ -16,7 +16,7 @@ Workspace Generator for creating a migration tracker issue epic and subsequent t ## Usage ```sh -yarn nx workspace-generator epic-generator ... +yarn nx g @fluentui/workspace-plugin:epic-generator ... ``` ### Examples @@ -24,7 +24,7 @@ yarn nx workspace-generator epic-generator ... Create an epic and sub-issues on the `microsoft/fluentui` repository with the title `Migrate vNext packages`. ```sh -yarn nx workspace-generator epic-generator --repository="microsoft/fluentui" --title="Migrate vNext packages" +yarn nx g @fluentui/workspace-plugin:epic-generator --repository="microsoft/fluentui" --title="Migrate vNext packages" ``` ## Options diff --git a/tools/generators/epic-generator/index.spec.ts b/tools/workspace-plugin/src/generators/epic-generator/index.spec.ts similarity index 98% rename from tools/generators/epic-generator/index.spec.ts rename to tools/workspace-plugin/src/generators/epic-generator/index.spec.ts index 338b737321f8e..f4ab26a32488b 100644 --- a/tools/generators/epic-generator/index.spec.ts +++ b/tools/workspace-plugin/src/generators/epic-generator/index.spec.ts @@ -1,5 +1,5 @@ -import { addProjectConfiguration, ProjectType, stripIndents, writeJson } from '@nrwl/devkit'; -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { addProjectConfiguration, ProjectType, stripIndents, writeJson } from '@nx/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { execSync, spawnSync, SpawnSyncReturns } from 'child_process'; import { workspacePaths } from '../../utils'; import epicGenerator from './index'; diff --git a/tools/generators/epic-generator/index.ts b/tools/workspace-plugin/src/generators/epic-generator/index.ts similarity index 98% rename from tools/generators/epic-generator/index.ts rename to tools/workspace-plugin/src/generators/epic-generator/index.ts index 9bc8ebf87bc23..f689f17f0c552 100644 --- a/tools/generators/epic-generator/index.ts +++ b/tools/workspace-plugin/src/generators/epic-generator/index.ts @@ -1,4 +1,4 @@ -import { getProjects, stripIndents, Tree } from '@nrwl/devkit'; +import { getProjects, stripIndents, Tree } from '@nx/devkit'; import { execSync, spawnSync } from 'child_process'; import { EpicGenerator } from './schema'; import { isPackageConverged, workspacePaths } from '../../utils'; diff --git a/tools/generators/epic-generator/schema.json b/tools/workspace-plugin/src/generators/epic-generator/schema.json similarity index 100% rename from tools/generators/epic-generator/schema.json rename to tools/workspace-plugin/src/generators/epic-generator/schema.json diff --git a/tools/generators/epic-generator/schema.ts b/tools/workspace-plugin/src/generators/epic-generator/schema.ts similarity index 100% rename from tools/generators/epic-generator/schema.ts rename to tools/workspace-plugin/src/generators/epic-generator/schema.ts diff --git a/tools/generators/generate-change-file.spec.ts b/tools/workspace-plugin/src/generators/generate-change-file.spec.ts similarity index 96% rename from tools/generators/generate-change-file.spec.ts rename to tools/workspace-plugin/src/generators/generate-change-file.spec.ts index 49f640254c105..6ab248957567a 100644 --- a/tools/generators/generate-change-file.spec.ts +++ b/tools/workspace-plugin/src/generators/generate-change-file.spec.ts @@ -1,4 +1,4 @@ -import { logger } from '@nrwl/devkit'; +import { logger } from '@nx/devkit'; import * as chalk from 'chalk'; import { disableChalk, formatMockedCalls } from '../utils-testing'; diff --git a/tools/generators/generate-change-files.ts b/tools/workspace-plugin/src/generators/generate-change-files.ts similarity index 97% rename from tools/generators/generate-change-files.ts rename to tools/workspace-plugin/src/generators/generate-change-files.ts index 84b8a621735bc..b61a45e381ed9 100644 --- a/tools/generators/generate-change-files.ts +++ b/tools/workspace-plugin/src/generators/generate-change-files.ts @@ -1,4 +1,4 @@ -import { Tree, logger } from '@nrwl/devkit'; +import { Tree, logger } from '@nx/devkit'; import * as path from 'path'; import * as childProcess from 'child_process'; import * as chalk from 'chalk'; diff --git a/tools/generators/migrate-converged-pkg/README.md b/tools/workspace-plugin/src/generators/migrate-converged-pkg/README.md similarity index 73% rename from tools/generators/migrate-converged-pkg/README.md rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/README.md index bc860c20fd6c1..e27b6405d24ec 100644 --- a/tools/generators/migrate-converged-pkg/README.md +++ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/README.md @@ -17,13 +17,13 @@ Workspace Generator for migrating converged packages to new DX (stage 1)[https:/ ## Usage ```sh -yarn nx workspace-generator migrate-converged-pkg ... +yarn nx g @fluentui/workspace-plugin:migrate-converged-pkg ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator migrate-converged-pkg --dry-run +yarn nx g @fluentui/workspace-plugin:migrate-converged-pkg --dry-run ``` ### Examples @@ -31,13 +31,13 @@ yarn nx workspace-generator migrate-converged-pkg --dry-run Run migration on package named `@fluentui/example` ```sh -yarn nx workspace-generator migrate-converged-pkg --name='@fluentui/example' +yarn nx g @fluentui/workspace-plugin:migrate-converged-pkg --name='@fluentui/example' ``` Run migration on all vNext packages ```sh -yarn nx workspace-generator migrate-converged-pkg --all +yarn nx g @fluentui/workspace-plugin:migrate-converged-pkg --all ``` Get migration stats for how many packages have been migrated yet. @@ -45,7 +45,7 @@ Get migration stats for how many packages have been migrated yet. > No actual migration will happen. ```sh -yarn nx workspace-generator migrate-converged-pkg --stats +yarn nx g @fluentui/workspace-plugin:migrate-converged-pkg --stats ``` ## Options @@ -67,7 +67,7 @@ To run migration on multiple packages you can specify a comma separated list of # - @fluentui/lib-zero # - @fluentui/lib-one # - @fluentui/lib-two -yarn nx workspace-generator migrate-converged-pkg --name='@fluentui/lib-zero,@fluentui/lib-one,@fluentui/lib-two' +yarn nx g @fluentui/workspace-plugin:migrate-converged-pkg --name='@fluentui/lib-zero,@fluentui/lib-one,@fluentui/lib-two' ``` #### `owner` diff --git a/tools/generators/migrate-converged-pkg/__fixtures__/conformance-setup.ts__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/conformance-setup.ts__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/__fixtures__/conformance-setup.ts__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/conformance-setup.ts__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/__fixtures__/just-config.ts__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/just-config.ts__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/__fixtures__/just-config.ts__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/just-config.ts__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/__fixtures__/old-jest-config.js__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/old-jest-config.js__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/__fixtures__/old-jest-config.js__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/old-jest-config.js__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/__fixtures__/ts-ignore-story.ts__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/ts-ignore-story.ts__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/__fixtures__/ts-ignore-story.ts__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/__fixtures__/ts-ignore-story.ts__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/__snapshots__/index.spec.ts.snap b/tools/workspace-plugin/src/generators/migrate-converged-pkg/__snapshots__/index.spec.ts.snap similarity index 100% rename from tools/generators/migrate-converged-pkg/__snapshots__/index.spec.ts.snap rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/__snapshots__/index.spec.ts.snap diff --git a/tools/generators/.gitkeep b/tools/workspace-plugin/src/generators/migrate-converged-pkg/files/.gitkeep similarity index 100% rename from tools/generators/.gitkeep rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/files/.gitkeep diff --git a/tools/generators/migrate-converged-pkg/files/just-config.ts__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/files/just-config.ts__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/files/just-config.ts__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/files/just-config.ts__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/index.spec.ts b/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts similarity index 98% rename from tools/generators/migrate-converged-pkg/index.spec.ts rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts index f59aa004c3102..2b94ab0ed4c11 100644 --- a/tools/generators/migrate-converged-pkg/index.spec.ts +++ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts @@ -2,7 +2,7 @@ import * as Enquirer from 'enquirer'; import * as fs from 'fs'; import * as path from 'path'; import * as chalk from 'chalk'; -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -20,7 +20,7 @@ import { WorkspaceConfiguration, ProjectConfiguration, joinPathFragments, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import { PackageJson, TsConfig } from '../../types'; import { disableChalk, formatMockedCalls, setupCodeowners } from '../../utils-testing'; @@ -76,7 +76,7 @@ describe('migrate-converged-pkg generator', () => { dependencies: { '@proj/make-styles': '^9.0.0-alpha.1', }, - tsConfig: { extends: '../../tsconfig.base.json', compilerOptions: {}, include: ['src'] }, + tsConfig: { extends: '../../../../tsconfig.base.json', compilerOptions: {}, include: ['src'] }, projectConfiguration: { tags: ['vNext', 'platform:node'], sourceRoot: 'packages/babel-make-styles/src' }, }); }); @@ -230,7 +230,7 @@ describe('migrate-converged-pkg generator', () => { expect(tsConfigMain).toEqual({ compilerOptions: { baseUrl: '.', - typeRoots: ['../../node_modules/@types', '../../typings'], + typeRoots: ['../../../../node_modules/@types', '../../../../typings'], }, }); expect(tree.exists(paths.lib)).toBeFalsy(); @@ -243,7 +243,7 @@ describe('migrate-converged-pkg generator', () => { const tsConfigTest = getTsConfig.test(); expect(tsConfigMain).toEqual({ - extends: '../../../tsconfig.base.json', + extends: '../../../../../tsconfig.base.json', compilerOptions: { importHelpers: true, isolatedModules: true, @@ -439,7 +439,7 @@ describe('migrate-converged-pkg generator', () => { */ module.exports = { displayName: 'react-dummy', - preset: '../../../jest.preset.js', + preset: '../../../../../jest.preset.js', transform: { '^.+\\\\\\\\.tsx?$': [ 'ts-jest', @@ -585,10 +585,10 @@ describe('migrate-converged-pkg generator', () => { ); expect(tree.read(`${projectStorybookConfigPath}/main.js`)?.toString('utf-8')).toMatchInlineSnapshot(` - "const rootMain = require('../../../../.storybook/main'); + "const rootMain = require('../../../../../../.storybook/main'); module.exports = - /** @type {Omit} */ ({ + /** @type {Omit} */ ({ ...rootMain, stories: [ ...rootMain.stories, @@ -608,7 +608,7 @@ describe('migrate-converged-pkg generator', () => { `); expect(tree.read(`${projectStorybookConfigPath}/preview.js`)?.toString('utf-8')).toMatchInlineSnapshot(` - "import * as rootPreview from '../../../../.storybook/preview'; + "import * as rootPreview from '../../../../../../.storybook/preview'; /** @type {typeof rootPreview.decorators} */ export const decorators = [...rootPreview.decorators]; @@ -737,7 +737,7 @@ describe('migrate-converged-pkg generator', () => { function createCypressSetup() { writeJson(tree, paths.tsconfig.cypress, { - extends: '../../tsconfig.base.json', + extends: '../../../../tsconfig.base.json', compilerOptions: {}, }); tree.write( @@ -1176,7 +1176,7 @@ describe('migrate-converged-pkg generator', () => { let babelConfig = getBabelConfig(projectConfig); expect(babelConfig).toEqual({ - extends: '../../.babelrc-v9.json', + extends: '../../../../.babelrc-v9.json', plugins: ['annotate-pure-calls', '@babel/transform-react-pure-annotations'], }); @@ -1561,10 +1561,12 @@ function setupDummyPackage( someThirdPartyDep: '^11.1.2', }, babelConfig: { - extends: '../../.babelrc-v9.json', + extends: '../../../../.babelrc-v9.json', plugins: ['annotate-pure-calls', '@babel/transform-react-pure-annotations'], }, - tsConfig: { compilerOptions: { baseUrl: '.', typeRoots: ['../../node_modules/@types', '../../typings'] } }, + tsConfig: { + compilerOptions: { baseUrl: '.', typeRoots: ['../../../../node_modules/@types', '../../../../typings'] }, + }, }; const normalizedOptions = { ...defaults, ...options }; @@ -1692,7 +1694,7 @@ function addUnstableSetup(tree: Tree, projectConfig: ReadProjectConfiguration) { sideEffects: false, license: 'MIT', }); - writeJson(tree, `${unstableRootPath}/tsconfig.json`, { extends: '../../tsconfig.json', include: ['index.ts'] }); + writeJson(tree, `${unstableRootPath}/tsconfig.json`, { extends: '../../../../tsconfig.json', include: ['index.ts'] }); tree.write( `${unstableRootPath}/index.ts`, diff --git a/tools/generators/migrate-converged-pkg/index.ts b/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.ts similarity index 98% rename from tools/generators/migrate-converged-pkg/index.ts rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/index.ts index bb8993c049ea7..978052b4b934d 100644 --- a/tools/generators/migrate-converged-pkg/index.ts +++ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.ts @@ -15,7 +15,7 @@ import { applyChangesToString, ChangeType, readNxJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import * as path from 'path'; import * as os from 'os'; import * as ts from 'typescript'; @@ -187,7 +187,7 @@ const templates = { return { main: () => { const tsConfig = { - extends: '../../../tsconfig.base.json', + extends: '../../../../../tsconfig.base.json', compilerOptions: { target: 'ES2019', // by default we gonna use tsc for type checking only @@ -303,7 +303,7 @@ const templates = { */ module.exports = { displayName: '${options.pkgName}', - preset: '../../../jest.preset.js', + preset: '../../../../../jest.preset.js', transform: { '^.+\\.tsx?$': [ 'ts-jest', @@ -320,9 +320,9 @@ const templates = { `, storybook: { main: stripIndents` - const rootMain = require('../../../../.storybook/main'); + const rootMain = require('../../../../../../.storybook/main'); - module.exports = /** @type {Omit} */ ({ + module.exports = /** @type {Omit} */ ({ ...rootMain, stories: [...rootMain.stories, '../stories/**/*.stories.mdx', '../stories/**/index.stories.@(ts|tsx)'], addons: [...rootMain.addons], @@ -336,7 +336,7 @@ const templates = { }); `, preview: stripIndents` - import * as rootPreview from '../../../../.storybook/preview'; + import * as rootPreview from '../../../../../../.storybook/preview'; /** @type {typeof rootPreview.decorators} */ export const decorators = [...rootPreview.decorators]; diff --git a/tools/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello-substitute.ts__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello-substitute.ts__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello-substitute.ts__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello-substitute.ts__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello.ts__tmpl__ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello.ts__tmpl__ similarity index 100% rename from tools/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello.ts__tmpl__ rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/__fixtures__/utils-hello.ts__tmpl__ diff --git a/tools/generators/migrate-converged-pkg/lib/utils.spec.ts b/tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/utils.spec.ts similarity index 94% rename from tools/generators/migrate-converged-pkg/lib/utils.spec.ts rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/utils.spec.ts index af24708302c56..ed99c650de987 100644 --- a/tools/generators/migrate-converged-pkg/lib/utils.spec.ts +++ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/utils.spec.ts @@ -1,4 +1,4 @@ -import { stripIndents } from '@nrwl/devkit'; +import { stripIndents } from '@nx/devkit'; import path = require('path/posix'); import { getTemplate } from './utils'; describe(`utils`, () => { diff --git a/tools/generators/migrate-converged-pkg/lib/utils.ts b/tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/utils.ts similarity index 86% rename from tools/generators/migrate-converged-pkg/lib/utils.ts rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/utils.ts index d3d6bb27d6810..387fdebe5e2cc 100644 --- a/tools/generators/migrate-converged-pkg/lib/utils.ts +++ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/lib/utils.ts @@ -1,8 +1,8 @@ -import { logger } from '@nrwl/devkit'; +import { logger } from '@nx/devkit'; import * as ejs from 'ejs'; import * as fs from 'fs'; /** - * Similar to @nrwl/devkit#generateFiles function but for getting content only + * Similar to @nx/devkit#generateFiles function but for getting content only * * @param src - the source folder of files (absolute path) * @param substitutions - an object of key-value pairs diff --git a/tools/generators/migrate-converged-pkg/schema.json b/tools/workspace-plugin/src/generators/migrate-converged-pkg/schema.json similarity index 100% rename from tools/generators/migrate-converged-pkg/schema.json rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/schema.json diff --git a/tools/generators/migrate-converged-pkg/schema.ts b/tools/workspace-plugin/src/generators/migrate-converged-pkg/schema.ts similarity index 100% rename from tools/generators/migrate-converged-pkg/schema.ts rename to tools/workspace-plugin/src/generators/migrate-converged-pkg/schema.ts diff --git a/tools/generators/migrate-fixed-versions/README.md b/tools/workspace-plugin/src/generators/migrate-fixed-versions/README.md similarity index 75% rename from tools/generators/migrate-fixed-versions/README.md rename to tools/workspace-plugin/src/generators/migrate-fixed-versions/README.md index 431241a644b24..7c51d65217d5c 100644 --- a/tools/generators/migrate-fixed-versions/README.md +++ b/tools/workspace-plugin/src/generators/migrate-fixed-versions/README.md @@ -21,13 +21,13 @@ Workspace Generator for migrating converged package dependencies from carets to ## Usage ```sh -yarn nx workspace-generator migrate-fixed-versions ... +yarn nx g @fluentui/workspace-plugin:migrate-fixed-versions ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator migrate-fixed-versions --dry-run +yarn nx g @fluentui/workspace-plugin:migrate-fixed-versions --dry-run ``` ### Examples @@ -35,13 +35,13 @@ yarn nx workspace-generator migrate-fixed-versions --dry-run Run migration on package named `@fluentui/example` ```sh -yarn nx workspace-generator migrate-fixed-versions --name='@fluentui/example' +yarn nx g @fluentui/workspace-plugin:migrate-fixed-versions --name='@fluentui/example' ``` Run migration on all vNext web packages ```sh -yarn nx workspace-generator migrate-fixed-versions --all +yarn nx g @fluentui/workspace-plugin:migrate-fixed-versions --all ``` ## Options diff --git a/tools/generators/migrate-fixed-versions/index.spec.ts b/tools/workspace-plugin/src/generators/migrate-fixed-versions/index.spec.ts similarity index 98% rename from tools/generators/migrate-fixed-versions/index.spec.ts rename to tools/workspace-plugin/src/generators/migrate-fixed-versions/index.spec.ts index 2385472957f06..bce07bf39b959 100644 --- a/tools/generators/migrate-fixed-versions/index.spec.ts +++ b/tools/workspace-plugin/src/generators/migrate-fixed-versions/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -6,7 +6,7 @@ import { serializeJson, addProjectConfiguration, readJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import generator from './index'; import { MigrateFixedVersionsGeneratorSchema } from './schema'; diff --git a/tools/generators/migrate-fixed-versions/index.ts b/tools/workspace-plugin/src/generators/migrate-fixed-versions/index.ts similarity index 99% rename from tools/generators/migrate-fixed-versions/index.ts rename to tools/workspace-plugin/src/generators/migrate-fixed-versions/index.ts index a951eda9e1a2b..7c12f2a76964e 100644 --- a/tools/generators/migrate-fixed-versions/index.ts +++ b/tools/workspace-plugin/src/generators/migrate-fixed-versions/index.ts @@ -1,4 +1,4 @@ -import { Tree, updateJson, getProjects, formatFiles, readJson } from '@nrwl/devkit'; +import { Tree, updateJson, getProjects, formatFiles, readJson } from '@nx/devkit'; import { MigrateFixedVersionsGeneratorSchema } from './schema'; import { getProjectConfig, printUserLogs, UserLog } from '../../utils'; import { PackageJson } from '../../types'; diff --git a/tools/generators/migrate-fixed-versions/schema.json b/tools/workspace-plugin/src/generators/migrate-fixed-versions/schema.json similarity index 100% rename from tools/generators/migrate-fixed-versions/schema.json rename to tools/workspace-plugin/src/generators/migrate-fixed-versions/schema.json diff --git a/tools/generators/migrate-fixed-versions/schema.ts b/tools/workspace-plugin/src/generators/migrate-fixed-versions/schema.ts similarity index 100% rename from tools/generators/migrate-fixed-versions/schema.ts rename to tools/workspace-plugin/src/generators/migrate-fixed-versions/schema.ts diff --git a/tools/generators/migrate-v8-pkg/README.md b/tools/workspace-plugin/src/generators/migrate-v8-pkg/README.md similarity index 65% rename from tools/generators/migrate-v8-pkg/README.md rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/README.md index e1b786b8a2628..cf6a7ae8f0365 100644 --- a/tools/generators/migrate-v8-pkg/README.md +++ b/tools/workspace-plugin/src/generators/migrate-v8-pkg/README.md @@ -14,19 +14,19 @@ Workspace Generator ...TODO... ## Usage ```sh -yarn nx workspace-generator migrate-v8-pkg ... +yarn nx g @fluentui/workspace-plugin:migrate-v8-pkg ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator migrate-v8-pkg --dry-run +yarn nx g @fluentui/workspace-plugin:migrate-v8-pkg --dry-run ``` ### Examples ```sh -yarn nx workspace-generator migrate-v8-pkg +yarn nx g @fluentui/workspace-plugin:migrate-v8-pkg ``` ## Options diff --git a/tools/generators/migrate-v8-pkg/index.spec.ts b/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts similarity index 98% rename from tools/generators/migrate-v8-pkg/index.spec.ts rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts index 717e722151696..8fd0790d490b7 100644 --- a/tools/generators/migrate-v8-pkg/index.spec.ts +++ b/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -9,7 +9,7 @@ import { logger, readNxJson, NxJsonConfiguration, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import type { Linter } from 'eslint'; import type { TsConfig } from '../../types'; @@ -178,7 +178,7 @@ function setupDummyPackage( declaration: true, sourceMap: true, lib: ['es5', 'dom', 'es2015.promise'], - typeRoots: ['../../node_modules/@types', '../../typings'], + typeRoots: ['../../../../node_modules/@types', '../../../../typings'], types: ['jest', 'custom-global'], }, include: ['src'], diff --git a/tools/generators/migrate-v8-pkg/index.ts b/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.ts similarity index 99% rename from tools/generators/migrate-v8-pkg/index.ts rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/index.ts index 5882a56b39b6b..652c4008fcac6 100644 --- a/tools/generators/migrate-v8-pkg/index.ts +++ b/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.ts @@ -10,7 +10,7 @@ import { ProjectConfiguration, stripIndents, updateProjectConfiguration, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import { printStats } from '../print-stats'; diff --git a/tools/generators/migrate-v8-pkg/lib/utils.spec.ts b/tools/workspace-plugin/src/generators/migrate-v8-pkg/lib/utils.spec.ts similarity index 95% rename from tools/generators/migrate-v8-pkg/lib/utils.spec.ts rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/lib/utils.spec.ts index d3c9d3ac17cb8..e1bb07a1660ed 100644 --- a/tools/generators/migrate-v8-pkg/lib/utils.spec.ts +++ b/tools/workspace-plugin/src/generators/migrate-v8-pkg/lib/utils.spec.ts @@ -1,4 +1,4 @@ -import { stripIndents } from '@nrwl/devkit'; +import { stripIndents } from '@nx/devkit'; import { getCjsConfigObjectAst, getASTconfigObjectProp } from './utils'; describe(`utils`, () => { diff --git a/tools/generators/migrate-v8-pkg/lib/utils.ts b/tools/workspace-plugin/src/generators/migrate-v8-pkg/lib/utils.ts similarity index 97% rename from tools/generators/migrate-v8-pkg/lib/utils.ts rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/lib/utils.ts index b6c631165941d..72bc9420a1840 100644 --- a/tools/generators/migrate-v8-pkg/lib/utils.ts +++ b/tools/workspace-plugin/src/generators/migrate-v8-pkg/lib/utils.ts @@ -1,4 +1,4 @@ -import { stripIndents } from '@nrwl/devkit'; +import { stripIndents } from '@nx/devkit'; import * as ts from 'typescript'; /** diff --git a/tools/generators/migrate-v8-pkg/schema.json b/tools/workspace-plugin/src/generators/migrate-v8-pkg/schema.json similarity index 100% rename from tools/generators/migrate-v8-pkg/schema.json rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/schema.json diff --git a/tools/generators/migrate-v8-pkg/schema.ts b/tools/workspace-plugin/src/generators/migrate-v8-pkg/schema.ts similarity index 100% rename from tools/generators/migrate-v8-pkg/schema.ts rename to tools/workspace-plugin/src/generators/migrate-v8-pkg/schema.ts diff --git a/tools/generators/move-packages/README.md b/tools/workspace-plugin/src/generators/move-packages/README.md similarity index 76% rename from tools/generators/move-packages/README.md rename to tools/workspace-plugin/src/generators/move-packages/README.md index a015a198ced9e..9463b2a2d9509 100644 --- a/tools/generators/move-packages/README.md +++ b/tools/workspace-plugin/src/generators/move-packages/README.md @@ -21,13 +21,13 @@ Workspace Generator for moving a package to another folder. ## Usage ```sh -yarn nx workspace-generator move-packages ... +yarn nx g @fluentui/workspace-plugin:move-packages ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator move-packages --dry-run +yarn nx g @fluentui/workspace-plugin:move-packages --dry-run ``` ### Examples @@ -35,13 +35,13 @@ yarn nx workspace-generator move-packages --dry-run Run generator on package named `@fluentui/react-menu` and have it moved to a subfolder called `test` ```sh -yarn nx workspace-generator move-packages --name='@fluentui/react-menu' --destination="testFolder/react-menu" +yarn nx g @fluentui/workspace-plugin:move-packages --name='@fluentui/react-menu' --destination="testFolder/react-menu" ``` Run generator on all converged packages ```sh -yarn nx workspace-generator move-packages --allConverged --destination="testFolder" +yarn nx g @fluentui/workspace-plugin:move-packages --allConverged --destination="testFolder" ``` ## Options diff --git a/tools/generators/move-packages/index.spec.ts b/tools/workspace-plugin/src/generators/move-packages/index.spec.ts similarity index 96% rename from tools/generators/move-packages/index.spec.ts rename to tools/workspace-plugin/src/generators/move-packages/index.spec.ts index fb0af37c39d48..41ded844a9f2f 100644 --- a/tools/generators/move-packages/index.spec.ts +++ b/tools/workspace-plugin/src/generators/move-packages/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -14,7 +14,7 @@ import { readJson, updateJson, NxJsonConfiguration, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import generator from './index'; import { TsConfig } from '../../types'; @@ -54,7 +54,7 @@ describe('move-packages generator', () => { dependencies: { '@proj/make-styles': '^9.0.0-alpha.1', }, - tsConfig: { extends: '../../tsconfig.base.json', compilerOptions: {}, include: ['src'] }, + tsConfig: { extends: '../../../../tsconfig.base.json', compilerOptions: {}, include: ['src'] }, projectConfiguration: { tags: ['vNext', 'platform:node'], sourceRoot: 'packages/test' }, }); }); @@ -121,7 +121,7 @@ describe('move-packages generator', () => { expect(tree.exists(`packages/${options.name}/config/tests.js`)).toBeFalsy(); }); it('should update storybook main.js module.exports type to the new relative path', async () => { - const newPath = '../../../../.storybook/main'; + const newPath = '../../../../../../.storybook/main'; let project = getProjects(tree).get(options.name) as ProjectConfiguration; let storybookMainJsPath = joinPathFragments(project.root, '/.storybook/main.js'); @@ -287,7 +287,9 @@ function setupDummyPackage( presets: ['@griffel'], plugins: ['annotate-pure-calls', '@babel/transform-react-pure-annotations'], }, - tsConfig: { compilerOptions: { baseUrl: '.', typeRoots: ['../../node_modules/@types', '../../typings'] } }, + tsConfig: { + compilerOptions: { baseUrl: '.', typeRoots: ['../../../../node_modules/@types', '../../../../typings'] }, + }, }; const normalizedOptions = { ...defaults, ...options }; @@ -356,9 +358,9 @@ function setupDummyPackage( ); tree.write( `${paths.root}/.storybook/main.js`, - `const rootMain = require('../../../.storybook/main'); + `const rootMain = require('../../../../../.storybook/main'); - module.exports = /** @type {Omit} */ ({ + module.exports = /** @type {Omit} */ ({ ...rootMain, stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/*.stories.@(ts|tsx)'], addons: [...rootMain.addons], diff --git a/tools/generators/move-packages/index.ts b/tools/workspace-plugin/src/generators/move-packages/index.ts similarity index 98% rename from tools/generators/move-packages/index.ts rename to tools/workspace-plugin/src/generators/move-packages/index.ts index 4ea8f36733659..d964811134231 100644 --- a/tools/generators/move-packages/index.ts +++ b/tools/workspace-plugin/src/generators/move-packages/index.ts @@ -9,8 +9,8 @@ import { logger, updateProjectConfiguration, readProjectConfiguration, -} from '@nrwl/devkit'; -import { moveGenerator } from '@nrwl/workspace/generators'; +} from '@nx/devkit'; +import { moveGenerator } from '@nx/workspace/generators'; import { getProjectConfig, getProjects, hasSchemaFlag, isPackageConverged, isV8Package } from '../../utils'; import { MovePackagesGeneratorSchema } from './schema'; diff --git a/tools/generators/move-packages/schema.json b/tools/workspace-plugin/src/generators/move-packages/schema.json similarity index 100% rename from tools/generators/move-packages/schema.json rename to tools/workspace-plugin/src/generators/move-packages/schema.json diff --git a/tools/generators/move-packages/schema.ts b/tools/workspace-plugin/src/generators/move-packages/schema.ts similarity index 100% rename from tools/generators/move-packages/schema.ts rename to tools/workspace-plugin/src/generators/move-packages/schema.ts diff --git a/tools/generators/normalize-package-dependencies/README.md b/tools/workspace-plugin/src/generators/normalize-package-dependencies/README.md similarity index 76% rename from tools/generators/normalize-package-dependencies/README.md rename to tools/workspace-plugin/src/generators/normalize-package-dependencies/README.md index 6bd0387079e04..b9eea914a66c3 100644 --- a/tools/generators/normalize-package-dependencies/README.md +++ b/tools/workspace-plugin/src/generators/normalize-package-dependencies/README.md @@ -19,19 +19,19 @@ Workspace Generator for package.json dependencies normalization. ## Usage ```sh -yarn nx workspace-generator normalize-package-dependencies ... +yarn nx g @fluentui/workspace-plugin:normalize-package-dependencies ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator normalize-package-dependencies --dry-run +yarn nx g @fluentui/workspace-plugin:normalize-package-dependencies --dry-run ``` ### Examples ```sh -yarn nx workspace-generator normalize-package-dependencies +yarn nx g @fluentui/workspace-plugin:normalize-package-dependencies ``` ## Options diff --git a/tools/generators/normalize-package-dependencies/index.spec.ts b/tools/workspace-plugin/src/generators/normalize-package-dependencies/index.spec.ts similarity index 97% rename from tools/generators/normalize-package-dependencies/index.spec.ts rename to tools/workspace-plugin/src/generators/normalize-package-dependencies/index.spec.ts index 4c068874fc4de..f902b4a712643 100644 --- a/tools/generators/normalize-package-dependencies/index.spec.ts +++ b/tools/workspace-plugin/src/generators/normalize-package-dependencies/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, addProjectConfiguration, @@ -9,7 +9,7 @@ import { ProjectGraph, readProjectConfiguration, updateJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import * as chalk from 'chalk'; import generator from './index'; @@ -22,13 +22,13 @@ const graphMock: ProjectGraph = { externalNodes: {}, }; -jest.mock('@nrwl/devkit', () => { +jest.mock('@nx/devkit', () => { async function createProjectGraphAsyncMock(): Promise { return graphMock; } return { - ...jest.requireActual('@nrwl/devkit'), + ...jest.requireActual('@nx/devkit'), createProjectGraphAsync: createProjectGraphAsyncMock, }; }); @@ -151,7 +151,7 @@ describe('normalize-package-dependencies generator', () => { expect(infoLogSpy.mock.calls.flat()).toMatchInlineSnapshot(` Array [ "All these dependencies version should be specified as '*' or '>=9.0.0-alpha' ", - "Fix this by running 'nx workspace-generator normalize-package-dependencies'", + "Fix this by running 'nx g @fluentui/workspace-plugin:normalize-package-dependencies'", ] `); }); diff --git a/tools/generators/normalize-package-dependencies/index.ts b/tools/workspace-plugin/src/generators/normalize-package-dependencies/index.ts similarity index 97% rename from tools/generators/normalize-package-dependencies/index.ts rename to tools/workspace-plugin/src/generators/normalize-package-dependencies/index.ts index 25f1331c96599..237f2f454b0bc 100644 --- a/tools/generators/normalize-package-dependencies/index.ts +++ b/tools/workspace-plugin/src/generators/normalize-package-dependencies/index.ts @@ -10,7 +10,7 @@ import { createProjectGraphAsync, ProjectGraph, readProjectConfiguration, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import * as semver from 'semver'; import { NormalizePackageDependenciesGeneratorSchema } from './schema'; @@ -100,7 +100,7 @@ function reportPackageJsonDependenciesIssues(issues: ProjectIssues) { logger.info( `All these dependencies version should be specified as '${NORMALIZED_INNER_WORKSPACE_VERSION}' or '${NORMALIZED_PRERELEASE_RANGE_VERSION}' `, ); - logger.info(`Fix this by running 'nx workspace-generator normalize-package-dependencies'`); + logger.info(`Fix this by running 'nx g @fluentui/workspace-plugin:normalize-package-dependencies'`); throw new Error('package dependency violations found'); } diff --git a/tools/generators/migrate-converged-pkg/files/.gitkeep b/tools/workspace-plugin/src/generators/normalize-package-dependencies/lib/.gitkeep similarity index 100% rename from tools/generators/migrate-converged-pkg/files/.gitkeep rename to tools/workspace-plugin/src/generators/normalize-package-dependencies/lib/.gitkeep diff --git a/tools/generators/normalize-package-dependencies/schema.json b/tools/workspace-plugin/src/generators/normalize-package-dependencies/schema.json similarity index 100% rename from tools/generators/normalize-package-dependencies/schema.json rename to tools/workspace-plugin/src/generators/normalize-package-dependencies/schema.json diff --git a/tools/generators/normalize-package-dependencies/schema.ts b/tools/workspace-plugin/src/generators/normalize-package-dependencies/schema.ts similarity index 100% rename from tools/generators/normalize-package-dependencies/schema.ts rename to tools/workspace-plugin/src/generators/normalize-package-dependencies/schema.ts diff --git a/tools/generators/prepare-initial-release/README.md b/tools/workspace-plugin/src/generators/prepare-initial-release/README.md similarity index 87% rename from tools/generators/prepare-initial-release/README.md rename to tools/workspace-plugin/src/generators/prepare-initial-release/README.md index d79d8bdcc6559..c91685bc05557 100644 --- a/tools/generators/prepare-initial-release/README.md +++ b/tools/workspace-plugin/src/generators/prepare-initial-release/README.md @@ -55,19 +55,19 @@ KP-.->IRP-.->PP-.->IRS-.->SP ## Usage ```sh -yarn nx workspace-generator prepare-initial-release ... +yarn nx g @fluentui/workspace-plugin:prepare-initial-release ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator prepare-initial-release --dry-run +yarn nx g @fluentui/workspace-plugin:prepare-initial-release --dry-run ``` ### Examples ```sh -yarn nx workspace-generator prepare-initial-release +yarn nx g @fluentui/workspace-plugin:prepare-initial-release ``` ## Options diff --git a/tools/generators/prepare-initial-release/index.spec.ts b/tools/workspace-plugin/src/generators/prepare-initial-release/index.spec.ts similarity index 96% rename from tools/generators/prepare-initial-release/index.spec.ts rename to tools/workspace-plugin/src/generators/prepare-initial-release/index.spec.ts index d8c5b1ee08251..8c2bc0d9135bd 100644 --- a/tools/generators/prepare-initial-release/index.spec.ts +++ b/tools/workspace-plugin/src/generators/prepare-initial-release/index.spec.ts @@ -1,16 +1,16 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { - Tree, + type Tree, + type ProjectGraph, addProjectConfiguration, writeJson, joinPathFragments, stripIndents, readJson, updateJson, - ProjectGraph, workspaceRoot, + installPackagesTask, } from '@nrwl/devkit'; -import * as devkit from '@nrwl/devkit'; import * as childProcess from 'child_process'; import generator from './index'; @@ -24,24 +24,24 @@ const blankGraphMock = { let graphMock: ProjectGraph; const codeownersPath = joinPathFragments('.github', 'CODEOWNERS'); -jest.mock('@nrwl/devkit', () => { +// eslint-disable-next-line @typescript-eslint/no-empty-function +const noop = () => {}; + +jest.mock('@nx/devkit', () => { async function createProjectGraphAsyncMock(): Promise { return graphMock; } return { - ...jest.requireActual('@nrwl/devkit'), + ...jest.requireActual('@nx/devkit'), + installPackagesTask: jest.fn(), createProjectGraphAsync: createProjectGraphAsyncMock, }; }); -// eslint-disable-next-line @typescript-eslint/no-empty-function -const noop = () => {}; - -let execSyncSpy: jest.SpyInstance; -let installPackagesTaskSpy: jest.SpyInstance; - describe('prepare-initial-release generator', () => { + const installPackagesTaskSpy = installPackagesTask as unknown as jest.SpyInstance; + let execSyncSpy: jest.SpyInstance; let tree: Tree; beforeEach(() => { @@ -49,7 +49,7 @@ describe('prepare-initial-release generator', () => { // @ts-expect-error - no need to mock whole execSync API noop, ); - installPackagesTaskSpy = jest.spyOn(devkit, 'installPackagesTask').mockImplementation(noop); + // installPackagesTaskSpy = jest.spyOn(devkit, 'installPackagesTask').mockImplementation(noop); graphMock = { ...blankGraphMock, }; @@ -59,6 +59,9 @@ describe('prepare-initial-release generator', () => { writeJson(tree, 'tsconfig.base.v0.json', { compilerOptions: { paths: {} } }); writeJson(tree, 'tsconfig.base.all.json', { compilerOptions: { paths: {} } }); }); + afterEach(() => { + jest.resetAllMocks(); + }); it(`should throw error if executed on invalid project`, async () => { createProject(tree, 'react-one-stable', { diff --git a/tools/generators/prepare-initial-release/index.ts b/tools/workspace-plugin/src/generators/prepare-initial-release/index.ts similarity index 100% rename from tools/generators/prepare-initial-release/index.ts rename to tools/workspace-plugin/src/generators/prepare-initial-release/index.ts diff --git a/tools/generators/normalize-package-dependencies/lib/.gitkeep b/tools/workspace-plugin/src/generators/prepare-initial-release/lib/.gitkeep similarity index 100% rename from tools/generators/normalize-package-dependencies/lib/.gitkeep rename to tools/workspace-plugin/src/generators/prepare-initial-release/lib/.gitkeep diff --git a/tools/generators/prepare-initial-release/schema.json b/tools/workspace-plugin/src/generators/prepare-initial-release/schema.json similarity index 100% rename from tools/generators/prepare-initial-release/schema.json rename to tools/workspace-plugin/src/generators/prepare-initial-release/schema.json diff --git a/tools/generators/prepare-initial-release/schema.ts b/tools/workspace-plugin/src/generators/prepare-initial-release/schema.ts similarity index 100% rename from tools/generators/prepare-initial-release/schema.ts rename to tools/workspace-plugin/src/generators/prepare-initial-release/schema.ts diff --git a/tools/generators/print-stats.spec.ts b/tools/workspace-plugin/src/generators/print-stats.spec.ts similarity index 97% rename from tools/generators/print-stats.spec.ts rename to tools/workspace-plugin/src/generators/print-stats.spec.ts index fbe65c3c065d4..cc18159b7280c 100644 --- a/tools/generators/print-stats.spec.ts +++ b/tools/workspace-plugin/src/generators/print-stats.spec.ts @@ -1,5 +1,5 @@ -import { addProjectConfiguration, getProjects, logger, Tree } from '@nrwl/devkit'; -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { addProjectConfiguration, getProjects, logger, Tree } from '@nx/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import * as chalk from 'chalk'; import { disableChalk, formatMockedCalls } from '../utils-testing'; diff --git a/tools/generators/print-stats.ts b/tools/workspace-plugin/src/generators/print-stats.ts similarity index 97% rename from tools/generators/print-stats.ts rename to tools/workspace-plugin/src/generators/print-stats.ts index bfdde1c13d7ab..25a27f6392e8f 100644 --- a/tools/generators/print-stats.ts +++ b/tools/workspace-plugin/src/generators/print-stats.ts @@ -1,5 +1,5 @@ import * as chalk from 'chalk'; -import { Tree, ProjectConfiguration, logger } from '@nrwl/devkit'; +import { Tree, ProjectConfiguration, logger } from '@nx/devkit'; interface Options { title: string; diff --git a/tools/generators/rc-caret/README.md b/tools/workspace-plugin/src/generators/rc-caret/README.md similarity index 83% rename from tools/generators/rc-caret/README.md rename to tools/workspace-plugin/src/generators/rc-caret/README.md index 9c3b7701b3d7d..2ed1e37caf4af 100644 --- a/tools/generators/rc-caret/README.md +++ b/tools/workspace-plugin/src/generators/rc-caret/README.md @@ -41,13 +41,13 @@ After: ## Usage ```sh -yarn nx workspace-generator rc-caret +yarn nx g @fluentui/workspace-plugin:rc-caret ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator rc-caret --dry-run +yarn nx g @fluentui/workspace-plugin:rc-caret --dry-run ``` ### Examples @@ -55,13 +55,13 @@ yarn nx workspace-generator rc-caret --dry-run Check `@fluentui/react-components` for pinned rc deps and convert them to carets ```sh -yarn nx workspace-generator rc-caret --name='@fluentui/react-components' +yarn nx g @fluentui/workspace-plugin:rc-caret --name='@fluentui/react-components' ``` Check all packages for pinned rc deps and convert them to carets ```sh -yarn nx workspace-generator rc-caret --all +yarn nx g @fluentui/workspace-plugin:rc-caret --all ``` ## Options diff --git a/tools/generators/rc-caret/index.spec.ts b/tools/workspace-plugin/src/generators/rc-caret/index.spec.ts similarity index 98% rename from tools/generators/rc-caret/index.spec.ts rename to tools/workspace-plugin/src/generators/rc-caret/index.spec.ts index 6ff0d3af9206d..c2dec2d2fbe22 100644 --- a/tools/generators/rc-caret/index.spec.ts +++ b/tools/workspace-plugin/src/generators/rc-caret/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -6,7 +6,7 @@ import { serializeJson, addProjectConfiguration, readJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import generator from './index'; import { VersionBumpGeneratorSchema } from './schema'; diff --git a/tools/generators/rc-caret/index.ts b/tools/workspace-plugin/src/generators/rc-caret/index.ts similarity index 97% rename from tools/generators/rc-caret/index.ts rename to tools/workspace-plugin/src/generators/rc-caret/index.ts index e0f0c05826f77..0a93d5e79bafb 100644 --- a/tools/generators/rc-caret/index.ts +++ b/tools/workspace-plugin/src/generators/rc-caret/index.ts @@ -1,4 +1,4 @@ -import { Tree, updateJson, getProjects, formatFiles } from '@nrwl/devkit'; +import { Tree, updateJson, getProjects, formatFiles } from '@nx/devkit'; import * as semver from 'semver'; import { VersionBumpGeneratorSchema } from './schema'; import { getProjectConfig, isPackageVersionConverged, printUserLogs, UserLog } from '../../utils'; diff --git a/tools/generators/rc-caret/schema.json b/tools/workspace-plugin/src/generators/rc-caret/schema.json similarity index 100% rename from tools/generators/rc-caret/schema.json rename to tools/workspace-plugin/src/generators/rc-caret/schema.json diff --git a/tools/generators/rc-caret/schema.ts b/tools/workspace-plugin/src/generators/rc-caret/schema.ts similarity index 100% rename from tools/generators/rc-caret/schema.ts rename to tools/workspace-plugin/src/generators/rc-caret/schema.ts diff --git a/tools/generators/react-component/README.md b/tools/workspace-plugin/src/generators/react-component/README.md similarity index 74% rename from tools/generators/react-component/README.md rename to tools/workspace-plugin/src/generators/react-component/README.md index 162cc609c3834..b6d455f44568b 100644 --- a/tools/generators/react-component/README.md +++ b/tools/workspace-plugin/src/generators/react-component/README.md @@ -15,19 +15,19 @@ Workspace Generator for creating React Component within v9 package. ## Usage ```sh -yarn nx workspace-generator react-component --help +yarn nx g @fluentui/workspace-plugin:react-component --help ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator react-component --dry-run +yarn nx g @fluentui/workspace-plugin:react-component --dry-run ``` ### Examples ```sh -yarn nx workspace-generator react-component +yarn nx g @fluentui/workspace-plugin:react-component ``` ## Options diff --git a/tools/generators/react-component/files/component/__componentName__.test.tsx__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/__componentName__.test.tsx__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/__componentName__.test.tsx__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/__componentName__.test.tsx__tmpl__ diff --git a/tools/generators/react-component/files/component/__componentName__.tsx__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/__componentName__.tsx__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/__componentName__.tsx__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/__componentName__.tsx__tmpl__ diff --git a/tools/generators/react-component/files/component/__componentName__.types.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/__componentName__.types.ts__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/__componentName__.types.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/__componentName__.types.ts__tmpl__ diff --git a/tools/generators/react-component/files/component/index.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/index.ts__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/index.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/index.ts__tmpl__ diff --git a/tools/generators/react-component/files/component/render__componentName__.tsx__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/render__componentName__.tsx__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/render__componentName__.tsx__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/render__componentName__.tsx__tmpl__ diff --git a/tools/generators/react-component/files/component/use__componentName__.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/use__componentName__.ts__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/use__componentName__.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/use__componentName__.ts__tmpl__ diff --git a/tools/generators/react-component/files/component/use__componentName__Styles.styles.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/component/use__componentName__Styles.styles.ts__tmpl__ similarity index 100% rename from tools/generators/react-component/files/component/use__componentName__Styles.styles.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/component/use__componentName__Styles.styles.ts__tmpl__ diff --git a/tools/generators/react-component/files/story/__componentName__BestPractices.md__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/story/__componentName__BestPractices.md__tmpl__ similarity index 100% rename from tools/generators/react-component/files/story/__componentName__BestPractices.md__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/story/__componentName__BestPractices.md__tmpl__ diff --git a/tools/generators/react-component/files/story/__componentName__Default.stories.tsx__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/story/__componentName__Default.stories.tsx__tmpl__ similarity index 100% rename from tools/generators/react-component/files/story/__componentName__Default.stories.tsx__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/story/__componentName__Default.stories.tsx__tmpl__ diff --git a/tools/generators/react-component/files/story/__componentName__Description.md__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/story/__componentName__Description.md__tmpl__ similarity index 100% rename from tools/generators/react-component/files/story/__componentName__Description.md__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/story/__componentName__Description.md__tmpl__ diff --git a/tools/generators/react-component/files/story/index.stories.tsx__tmpl__ b/tools/workspace-plugin/src/generators/react-component/files/story/index.stories.tsx__tmpl__ similarity index 100% rename from tools/generators/react-component/files/story/index.stories.tsx__tmpl__ rename to tools/workspace-plugin/src/generators/react-component/files/story/index.stories.tsx__tmpl__ diff --git a/tools/generators/react-component/index.spec.ts b/tools/workspace-plugin/src/generators/react-component/index.spec.ts similarity index 98% rename from tools/generators/react-component/index.spec.ts rename to tools/workspace-plugin/src/generators/react-component/index.spec.ts index 1233ba9d8725d..ef5efe5649f9f 100644 --- a/tools/generators/react-component/index.spec.ts +++ b/tools/workspace-plugin/src/generators/react-component/index.spec.ts @@ -1,5 +1,5 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { Tree, addProjectConfiguration, writeJson, joinPathFragments } from '@nrwl/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; +import { Tree, addProjectConfiguration, writeJson, joinPathFragments } from '@nx/devkit'; import generator from './index'; diff --git a/tools/generators/react-component/index.ts b/tools/workspace-plugin/src/generators/react-component/index.ts similarity index 98% rename from tools/generators/react-component/index.ts rename to tools/workspace-plugin/src/generators/react-component/index.ts index 4d5e00ed371d7..27cf47f17a668 100644 --- a/tools/generators/react-component/index.ts +++ b/tools/workspace-plugin/src/generators/react-component/index.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { Tree, formatFiles, names, generateFiles, joinPathFragments, workspaceRoot } from '@nrwl/devkit'; +import { Tree, formatFiles, names, generateFiles, joinPathFragments, workspaceRoot } from '@nx/devkit'; import { getProjectConfig, isPackageConverged } from '../../utils'; diff --git a/tools/generators/prepare-initial-release/lib/.gitkeep b/tools/workspace-plugin/src/generators/react-component/lib/.gitkeep similarity index 100% rename from tools/generators/prepare-initial-release/lib/.gitkeep rename to tools/workspace-plugin/src/generators/react-component/lib/.gitkeep diff --git a/tools/generators/react-component/schema.json b/tools/workspace-plugin/src/generators/react-component/schema.json similarity index 100% rename from tools/generators/react-component/schema.json rename to tools/workspace-plugin/src/generators/react-component/schema.json diff --git a/tools/generators/react-component/schema.ts b/tools/workspace-plugin/src/generators/react-component/schema.ts similarity index 100% rename from tools/generators/react-component/schema.ts rename to tools/workspace-plugin/src/generators/react-component/schema.ts diff --git a/tools/generators/react-library/README.md b/tools/workspace-plugin/src/generators/react-library/README.md similarity index 80% rename from tools/generators/react-library/README.md rename to tools/workspace-plugin/src/generators/react-library/README.md index 6ea896a14ffd1..7e6eb4f14e926 100644 --- a/tools/generators/react-library/README.md +++ b/tools/workspace-plugin/src/generators/react-library/README.md @@ -16,19 +16,19 @@ Workspace Generator for bootstrapping a new react library (fluentui v9) ## Usage ```sh -yarn nx workspace-generator react-library --help +yarn nx g @fluentui/workspace-plugin:react-library --help ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator react-library --dry-run +yarn nx g @fluentui/workspace-plugin:react-library --dry-run ``` ### Examples ```sh -yarn nx workspace-generator react-library +yarn nx g @fluentui/workspace-plugin:react-library ``` ## Options diff --git a/tools/generators/react-library/files/.babelrc.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.babelrc.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.babelrc.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.babelrc.json__tmpl__ diff --git a/tools/generators/react-library/files/.eslintrc.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.eslintrc.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.eslintrc.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.eslintrc.json__tmpl__ diff --git a/tools/generators/react-library/files/.npmignore__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.npmignore__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.npmignore__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.npmignore__tmpl__ diff --git a/tools/generators/react-library/files/.storybook/main.js__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.storybook/main.js__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.storybook/main.js__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.storybook/main.js__tmpl__ diff --git a/tools/generators/react-library/files/.storybook/preview.js__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.storybook/preview.js__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.storybook/preview.js__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.storybook/preview.js__tmpl__ diff --git a/tools/generators/react-library/files/.storybook/tsconfig.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.storybook/tsconfig.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.storybook/tsconfig.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.storybook/tsconfig.json__tmpl__ diff --git a/tools/generators/react-library/files/.swcrc__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/.swcrc__tmpl__ similarity index 100% rename from tools/generators/react-library/files/.swcrc__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/.swcrc__tmpl__ diff --git a/tools/generators/react-library/files/LICENSE__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/LICENSE__tmpl__ similarity index 100% rename from tools/generators/react-library/files/LICENSE__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/LICENSE__tmpl__ diff --git a/tools/generators/react-library/files/README.md__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/README.md__tmpl__ similarity index 100% rename from tools/generators/react-library/files/README.md__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/README.md__tmpl__ diff --git a/tools/generators/react-library/files/config/api-extractor.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/config/api-extractor.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/config/api-extractor.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/config/api-extractor.json__tmpl__ diff --git a/tools/generators/react-library/files/config/tests.js__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/config/tests.js__tmpl__ similarity index 100% rename from tools/generators/react-library/files/config/tests.js__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/config/tests.js__tmpl__ diff --git a/tools/generators/react-library/files/docs/Spec.md__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/docs/Spec.md__tmpl__ similarity index 100% rename from tools/generators/react-library/files/docs/Spec.md__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/docs/Spec.md__tmpl__ diff --git a/tools/generators/react-library/files/etc/__packageName__.api.md b/tools/workspace-plugin/src/generators/react-library/files/etc/__packageName__.api.md similarity index 100% rename from tools/generators/react-library/files/etc/__packageName__.api.md rename to tools/workspace-plugin/src/generators/react-library/files/etc/__packageName__.api.md diff --git a/tools/generators/react-library/files/jest.config.js__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/jest.config.js__tmpl__ similarity index 100% rename from tools/generators/react-library/files/jest.config.js__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/jest.config.js__tmpl__ diff --git a/tools/generators/react-library/files/just.config.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/just.config.ts__tmpl__ similarity index 100% rename from tools/generators/react-library/files/just.config.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/just.config.ts__tmpl__ diff --git a/tools/generators/react-library/files/package.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/package.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/package.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/package.json__tmpl__ diff --git a/tools/generators/react-library/files/src/index.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/src/index.ts__tmpl__ similarity index 100% rename from tools/generators/react-library/files/src/index.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/src/index.ts__tmpl__ diff --git a/tools/generators/react-library/files/src/testing/isConformant.ts__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/src/testing/isConformant.ts__tmpl__ similarity index 100% rename from tools/generators/react-library/files/src/testing/isConformant.ts__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/src/testing/isConformant.ts__tmpl__ diff --git a/tools/generators/react-component/lib/.gitkeep b/tools/workspace-plugin/src/generators/react-library/files/stories/.gitkeep similarity index 100% rename from tools/generators/react-component/lib/.gitkeep rename to tools/workspace-plugin/src/generators/react-library/files/stories/.gitkeep diff --git a/tools/generators/react-library/files/tsconfig.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/tsconfig.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/tsconfig.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/tsconfig.json__tmpl__ diff --git a/tools/generators/react-library/files/tsconfig.lib.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/tsconfig.lib.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/tsconfig.lib.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/tsconfig.lib.json__tmpl__ diff --git a/tools/generators/react-library/files/tsconfig.spec.json__tmpl__ b/tools/workspace-plugin/src/generators/react-library/files/tsconfig.spec.json__tmpl__ similarity index 100% rename from tools/generators/react-library/files/tsconfig.spec.json__tmpl__ rename to tools/workspace-plugin/src/generators/react-library/files/tsconfig.spec.json__tmpl__ diff --git a/tools/generators/react-library/index.spec.ts b/tools/workspace-plugin/src/generators/react-library/index.spec.ts similarity index 98% rename from tools/generators/react-library/index.spec.ts rename to tools/workspace-plugin/src/generators/react-library/index.spec.ts index 69c1baf35b18c..1201159d7ff89 100644 --- a/tools/generators/react-library/index.spec.ts +++ b/tools/workspace-plugin/src/generators/react-library/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -8,7 +8,7 @@ import { joinPathFragments, readJson, stripIndents, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import generator from './index'; import { PackageJson } from '../../types'; diff --git a/tools/generators/react-library/index.ts b/tools/workspace-plugin/src/generators/react-library/index.ts similarity index 99% rename from tools/generators/react-library/index.ts rename to tools/workspace-plugin/src/generators/react-library/index.ts index 820671050151e..6114fb9480d94 100644 --- a/tools/generators/react-library/index.ts +++ b/tools/workspace-plugin/src/generators/react-library/index.ts @@ -11,7 +11,7 @@ import { joinPathFragments, updateJson, readJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import { getProjectConfig } from '../../utils'; diff --git a/tools/generators/react-library/files/stories/.gitkeep b/tools/workspace-plugin/src/generators/react-library/lib/.gitkeep similarity index 100% rename from tools/generators/react-library/files/stories/.gitkeep rename to tools/workspace-plugin/src/generators/react-library/lib/.gitkeep diff --git a/tools/generators/react-library/schema.json b/tools/workspace-plugin/src/generators/react-library/schema.json similarity index 100% rename from tools/generators/react-library/schema.json rename to tools/workspace-plugin/src/generators/react-library/schema.json diff --git a/tools/generators/react-library/schema.ts b/tools/workspace-plugin/src/generators/react-library/schema.ts similarity index 100% rename from tools/generators/react-library/schema.ts rename to tools/workspace-plugin/src/generators/react-library/schema.ts diff --git a/tools/generators/recipe-generator/README.md b/tools/workspace-plugin/src/generators/recipe-generator/README.md similarity index 65% rename from tools/generators/recipe-generator/README.md rename to tools/workspace-plugin/src/generators/recipe-generator/README.md index 274dee3c8fbdb..29411253deedf 100644 --- a/tools/generators/recipe-generator/README.md +++ b/tools/workspace-plugin/src/generators/recipe-generator/README.md @@ -14,13 +14,13 @@ Workspace Generator to create a recipe. ## Usage ```sh -yarn nx workspace-generator recipe-generator +yarn nx g @fluentui/workspace-plugin:recipe-generator ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator recipe-generator --dry-run +yarn nx g @fluentui/workspace-plugin:recipe-generator --dry-run ``` ### Examples @@ -28,13 +28,13 @@ yarn nx workspace-generator recipe-generator --dry-run Guided CLI prompt: ```sh -yarn nx workspace-generator recipe-generator +yarn nx g @fluentui/workspace-plugin:recipe-generator ``` Single command: ```sh -yarn nx workspace-generator recipe-generator --recipeName 'My Recipe' +yarn nx g @fluentui/workspace-plugin:recipe-generator --recipeName 'My Recipe' ``` ## Options diff --git a/tools/generators/recipe-generator/__snapshots__/index.spec.ts.snap b/tools/workspace-plugin/src/generators/recipe-generator/__snapshots__/index.spec.ts.snap similarity index 100% rename from tools/generators/recipe-generator/__snapshots__/index.spec.ts.snap rename to tools/workspace-plugin/src/generators/recipe-generator/__snapshots__/index.spec.ts.snap diff --git a/tools/generators/recipe-generator/files/__packageName__/__fileName__.stories.mdx__tmpl__ b/tools/workspace-plugin/src/generators/recipe-generator/files/__packageName__/__fileName__.stories.mdx__tmpl__ similarity index 100% rename from tools/generators/recipe-generator/files/__packageName__/__fileName__.stories.mdx__tmpl__ rename to tools/workspace-plugin/src/generators/recipe-generator/files/__packageName__/__fileName__.stories.mdx__tmpl__ diff --git a/tools/generators/recipe-generator/files/__packageName__/code-snippets/__fileName__.tsx__tmpl__ b/tools/workspace-plugin/src/generators/recipe-generator/files/__packageName__/code-snippets/__fileName__.tsx__tmpl__ similarity index 100% rename from tools/generators/recipe-generator/files/__packageName__/code-snippets/__fileName__.tsx__tmpl__ rename to tools/workspace-plugin/src/generators/recipe-generator/files/__packageName__/code-snippets/__fileName__.tsx__tmpl__ diff --git a/tools/generators/recipe-generator/files/__packageName__/code-snippets/index.ts__tmpl__ b/tools/workspace-plugin/src/generators/recipe-generator/files/__packageName__/code-snippets/index.ts__tmpl__ similarity index 100% rename from tools/generators/recipe-generator/files/__packageName__/code-snippets/index.ts__tmpl__ rename to tools/workspace-plugin/src/generators/recipe-generator/files/__packageName__/code-snippets/index.ts__tmpl__ diff --git a/tools/generators/recipe-generator/index.spec.ts b/tools/workspace-plugin/src/generators/recipe-generator/index.spec.ts similarity index 94% rename from tools/generators/recipe-generator/index.spec.ts rename to tools/workspace-plugin/src/generators/recipe-generator/index.spec.ts index 10b66b74662ef..baf4307a62be6 100644 --- a/tools/generators/recipe-generator/index.spec.ts +++ b/tools/workspace-plugin/src/generators/recipe-generator/index.spec.ts @@ -1,5 +1,5 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { addProjectConfiguration, Tree, writeJson } from '@nrwl/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; +import { addProjectConfiguration, Tree, writeJson } from '@nx/devkit'; import * as path from 'path'; import generator from './index'; diff --git a/tools/generators/recipe-generator/index.ts b/tools/workspace-plugin/src/generators/recipe-generator/index.ts similarity index 97% rename from tools/generators/recipe-generator/index.ts rename to tools/workspace-plugin/src/generators/recipe-generator/index.ts index 67d6dc1b921cc..d9304d8f8edf7 100644 --- a/tools/generators/recipe-generator/index.ts +++ b/tools/workspace-plugin/src/generators/recipe-generator/index.ts @@ -1,4 +1,4 @@ -import { Tree, formatFiles, generateFiles, readWorkspaceConfiguration, joinPathFragments } from '@nrwl/devkit'; +import { Tree, formatFiles, generateFiles, readWorkspaceConfiguration, joinPathFragments } from '@nx/devkit'; import { RecipeGeneratorGeneratorSchema } from './schema'; import { getProjectConfig } from '../../utils'; diff --git a/tools/generators/recipe-generator/schema.json b/tools/workspace-plugin/src/generators/recipe-generator/schema.json similarity index 100% rename from tools/generators/recipe-generator/schema.json rename to tools/workspace-plugin/src/generators/recipe-generator/schema.json diff --git a/tools/generators/recipe-generator/schema.ts b/tools/workspace-plugin/src/generators/recipe-generator/schema.ts similarity index 100% rename from tools/generators/recipe-generator/schema.ts rename to tools/workspace-plugin/src/generators/recipe-generator/schema.ts diff --git a/tools/generators/tsconfig-base-all/README.md b/tools/workspace-plugin/src/generators/tsconfig-base-all/README.md similarity index 74% rename from tools/generators/tsconfig-base-all/README.md rename to tools/workspace-plugin/src/generators/tsconfig-base-all/README.md index bf5861795bcb7..cb91e6b92479a 100644 --- a/tools/generators/tsconfig-base-all/README.md +++ b/tools/workspace-plugin/src/generators/tsconfig-base-all/README.md @@ -16,19 +16,19 @@ Workspace Generator for generating/updating `/tsconfig.base.all.json`. ## Usage ```sh -yarn nx workspace-generator tsconfig-base-all +yarn nx g @fluentui/workspace-plugin:tsconfig-base-all ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator tsconfig-base-all --dry-run +yarn nx g @fluentui/workspace-plugin:tsconfig-base-all --dry-run ``` ### Examples ```sh -yarn nx workspace-generator tsconfig-base-all +yarn nx g @fluentui/workspace-plugin:tsconfig-base-all ``` ## Options @@ -42,5 +42,5 @@ use this option on CI to check if base.all.json is up to date and in sync with a Following will throw an error if `tsconfig.base.all.json` is out of date ```sh -yarn nx workspace-generator tsconfig-base-all --verify +yarn nx g @fluentui/workspace-plugin:tsconfig-base-all --verify ``` diff --git a/tools/generators/tsconfig-base-all/index.spec.ts b/tools/workspace-plugin/src/generators/tsconfig-base-all/index.spec.ts similarity index 93% rename from tools/generators/tsconfig-base-all/index.spec.ts rename to tools/workspace-plugin/src/generators/tsconfig-base-all/index.spec.ts index 956d08ad247a0..fd0a285e16742 100644 --- a/tools/generators/tsconfig-base-all/index.spec.ts +++ b/tools/workspace-plugin/src/generators/tsconfig-base-all/index.spec.ts @@ -1,5 +1,5 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { Tree, writeJson, readJson, updateJson } from '@nrwl/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; +import { Tree, writeJson, readJson, updateJson } from '@nx/devkit'; import generator from './index'; import { TsconfigBaseAllGeneratorSchema } from './schema'; @@ -112,7 +112,7 @@ describe('tsconfig-base-all generator', () => { " 🚨 /tsconfig.base.all.json is out of date. - Please update it by running 'yarn nx workspace-generator tsconfig-base-all'. + Please update it by running 'yarn nx g @fluentui/workspace-plugin:tsconfig-base-all'. " `); } diff --git a/tools/generators/tsconfig-base-all/index.ts b/tools/workspace-plugin/src/generators/tsconfig-base-all/index.ts similarity index 86% rename from tools/generators/tsconfig-base-all/index.ts rename to tools/workspace-plugin/src/generators/tsconfig-base-all/index.ts index fdad039a5f875..85b34ffdbe963 100644 --- a/tools/generators/tsconfig-base-all/index.ts +++ b/tools/workspace-plugin/src/generators/tsconfig-base-all/index.ts @@ -1,4 +1,4 @@ -import { Tree, formatFiles, writeJson } from '@nrwl/devkit'; +import { Tree, formatFiles, writeJson } from '@nx/devkit'; import { isEqual } from 'lodash'; import { TsconfigBaseAllGeneratorSchema } from './schema'; @@ -16,7 +16,7 @@ export default async function (tree: Tree, schema: TsconfigBaseAllGeneratorSchem throw new Error(` 🚨 ${tsConfigAllPath} is out of date. - Please update it by running 'yarn nx workspace-generator tsconfig-base-all'. + Please update it by running 'yarn nx g @fluentui/workspace-plugin:tsconfig-base-all'. `); } diff --git a/tools/generators/tsconfig-base-all/lib/utils.ts b/tools/workspace-plugin/src/generators/tsconfig-base-all/lib/utils.ts similarity index 96% rename from tools/generators/tsconfig-base-all/lib/utils.ts rename to tools/workspace-plugin/src/generators/tsconfig-base-all/lib/utils.ts index f9a246d4f26da..eefe4259be48f 100644 --- a/tools/generators/tsconfig-base-all/lib/utils.ts +++ b/tools/workspace-plugin/src/generators/tsconfig-base-all/lib/utils.ts @@ -1,6 +1,6 @@ // use this module to define any kind of generic utilities that are used in more than 1 place within the generator implementation import * as path from 'path'; -import { readJson, Tree } from '@nrwl/devkit'; +import { readJson, Tree } from '@nx/devkit'; /** * diff --git a/tools/generators/tsconfig-base-all/schema.json b/tools/workspace-plugin/src/generators/tsconfig-base-all/schema.json similarity index 100% rename from tools/generators/tsconfig-base-all/schema.json rename to tools/workspace-plugin/src/generators/tsconfig-base-all/schema.json diff --git a/tools/generators/tsconfig-base-all/schema.ts b/tools/workspace-plugin/src/generators/tsconfig-base-all/schema.ts similarity index 100% rename from tools/generators/tsconfig-base-all/schema.ts rename to tools/workspace-plugin/src/generators/tsconfig-base-all/schema.ts diff --git a/tools/generators/version-bump/README.md b/tools/workspace-plugin/src/generators/version-bump/README.md similarity index 79% rename from tools/generators/version-bump/README.md rename to tools/workspace-plugin/src/generators/version-bump/README.md index 566a57bba082b..79b4b0c654490 100644 --- a/tools/generators/version-bump/README.md +++ b/tools/workspace-plugin/src/generators/version-bump/README.md @@ -38,13 +38,13 @@ The generator also bumps the versions in any dependent packages. ## Usage ```sh -yarn nx workspace-generator version-bump ... +yarn nx g @fluentui/workspace-plugin:version-bump ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator version-bump --dry-run +yarn nx g @fluentui/workspace-plugin:version-bump --dry-run ``` ### Examples @@ -52,25 +52,25 @@ yarn nx workspace-generator version-bump --dry-run Bump `@fluentui/example@9.0.0-alpha.1` to beta ```sh -yarn nx workspace-generator version-bump --name='@fluentui/example' --bumpType prerelease --prereleaseTag beta +yarn nx g @fluentui/workspace-plugin:version-bump --name='@fluentui/example' --bumpType prerelease --prereleaseTag beta ``` Bump all vNext packages from alpha to beta ```sh -yarn nx workspace-generator version-bump --all --bumpType prerelease --prereleaseTag beta +yarn nx g @fluentui/workspace-plugin:version-bump --all --bumpType prerelease --prereleaseTag beta ``` Bump all vNext packages from beta (9.0.0-beta) to full release. The actual bumptype is irrelevant. ```sh -yarn nx workspace-generator version-bump --all --bumpType minor +yarn nx g @fluentui/workspace-plugin:version-bump --all --bumpType minor ``` Bump all vNext packages for a nightly release (0.0.0-nightly). ```sh -yarn nx workspace-generator version-bump --all --bumpType nightly --prereleaseTag nightly +yarn nx g @fluentui/workspace-plugin:version-bump --all --bumpType nightly --prereleaseTag nightly ``` ## Options diff --git a/tools/generators/version-bump/index.spec.ts b/tools/workspace-plugin/src/generators/version-bump/index.spec.ts similarity index 99% rename from tools/generators/version-bump/index.spec.ts rename to tools/workspace-plugin/src/generators/version-bump/index.spec.ts index 9df3ac5383f86..6aa862f274405 100644 --- a/tools/generators/version-bump/index.spec.ts +++ b/tools/workspace-plugin/src/generators/version-bump/index.spec.ts @@ -1,4 +1,4 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree, readProjectConfiguration, @@ -6,7 +6,7 @@ import { serializeJson, addProjectConfiguration, readJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import generator from './index'; import { VersionBumpGeneratorSchema } from './schema'; diff --git a/tools/generators/version-bump/index.ts b/tools/workspace-plugin/src/generators/version-bump/index.ts similarity index 98% rename from tools/generators/version-bump/index.ts rename to tools/workspace-plugin/src/generators/version-bump/index.ts index 6b6e483297807..5bc785d53ae00 100644 --- a/tools/generators/version-bump/index.ts +++ b/tools/workspace-plugin/src/generators/version-bump/index.ts @@ -1,4 +1,4 @@ -import { Tree, updateJson, getProjects, formatFiles } from '@nrwl/devkit'; +import { Tree, updateJson, getProjects, formatFiles } from '@nx/devkit'; import * as semver from 'semver'; import { VersionBumpGeneratorSchema } from './schema'; import { diff --git a/tools/generators/version-bump/schema.json b/tools/workspace-plugin/src/generators/version-bump/schema.json similarity index 100% rename from tools/generators/version-bump/schema.json rename to tools/workspace-plugin/src/generators/version-bump/schema.json diff --git a/tools/generators/version-bump/schema.ts b/tools/workspace-plugin/src/generators/version-bump/schema.ts similarity index 100% rename from tools/generators/version-bump/schema.ts rename to tools/workspace-plugin/src/generators/version-bump/schema.ts diff --git a/tools/generators/workspace-generator/files/README.md__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/README.md__tmpl__ similarity index 66% rename from tools/generators/workspace-generator/files/README.md__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/README.md__tmpl__ index bc178a0a4791b..c8c43fea0f3ad 100644 --- a/tools/generators/workspace-generator/files/README.md__tmpl__ +++ b/tools/workspace-plugin/src/generators/workspace-generator/files/README.md__tmpl__ @@ -14,19 +14,19 @@ Workspace Generator ...TODO... ## Usage ```sh -yarn nx workspace-generator <%= name %> ... +yarn nx g @fluentui/workspace-plugin:<%= name %> ... ``` Show what will be generated without writing to disk: ```sh -yarn nx workspace-generator <%= name %> --dry-run +yarn nx g @fluentui/workspace-plugin:<%= name %> --dry-run ``` ### Examples ```sh -yarn nx workspace-generator <%= name %> +yarn nx g @fluentui/workspace-plugin:<%= name %> ``` ## Options diff --git a/tools/generators/workspace-generator/files/index.spec.ts__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/index.spec.ts__tmpl__ similarity index 78% rename from tools/generators/workspace-generator/files/index.spec.ts__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/index.spec.ts__tmpl__ index 29644b41f0f8d..1735505e90fd0 100644 --- a/tools/generators/workspace-generator/files/index.spec.ts__tmpl__ +++ b/tools/workspace-plugin/src/generators/workspace-generator/files/index.spec.ts__tmpl__ @@ -1,5 +1,5 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { Tree, readProjectConfiguration } from '@nrwl/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; +import { Tree, readProjectConfiguration } from '@nx/devkit'; import generator from './index'; import { <%= className %>GeneratorSchema } from './schema'; diff --git a/tools/generators/workspace-generator/files/index.ts__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/index.ts__tmpl__ similarity index 92% rename from tools/generators/workspace-generator/files/index.ts__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/index.ts__tmpl__ index e51f8d042804b..98e37daed0388 100644 --- a/tools/generators/workspace-generator/files/index.ts__tmpl__ +++ b/tools/workspace-plugin/src/generators/workspace-generator/files/index.ts__tmpl__ @@ -1,6 +1,6 @@ import * as path from 'path'; -import { Tree, formatFiles, installPackagesTask, names, generateFiles } from '@nrwl/devkit'; -import { libraryGenerator } from '@nrwl/workspace/generators'; +import { Tree, formatFiles, installPackagesTask, names, generateFiles } from '@nx/devkit'; +import { libraryGenerator } from '@nx/workspace/generators'; import { getProjectConfig } from '../../utils'; diff --git a/tools/generators/workspace-generator/files/lib/utils.spec.ts__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/lib/utils.spec.ts__tmpl__ similarity index 100% rename from tools/generators/workspace-generator/files/lib/utils.spec.ts__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/lib/utils.spec.ts__tmpl__ diff --git a/tools/generators/workspace-generator/files/lib/utils.ts__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/lib/utils.ts__tmpl__ similarity index 100% rename from tools/generators/workspace-generator/files/lib/utils.ts__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/lib/utils.ts__tmpl__ diff --git a/tools/generators/workspace-generator/files/schema.json__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/schema.json__tmpl__ similarity index 100% rename from tools/generators/workspace-generator/files/schema.json__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/schema.json__tmpl__ diff --git a/tools/generators/workspace-generator/files/schema.ts__tmpl__ b/tools/workspace-plugin/src/generators/workspace-generator/files/schema.ts__tmpl__ similarity index 100% rename from tools/generators/workspace-generator/files/schema.ts__tmpl__ rename to tools/workspace-plugin/src/generators/workspace-generator/files/schema.ts__tmpl__ diff --git a/tools/generators/workspace-generator/index.spec.ts b/tools/workspace-plugin/src/generators/workspace-generator/index.spec.ts similarity index 90% rename from tools/generators/workspace-generator/index.spec.ts rename to tools/workspace-plugin/src/generators/workspace-generator/index.spec.ts index b62715be811d0..3ae0404d0b8d7 100644 --- a/tools/generators/workspace-generator/index.spec.ts +++ b/tools/workspace-plugin/src/generators/workspace-generator/index.spec.ts @@ -1,5 +1,5 @@ -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { Tree, readJson } from '@nrwl/devkit'; +import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; +import { Tree, readJson } from '@nx/devkit'; import generator from './index'; import { WorkspaceGeneratorGeneratorSchema } from './schema'; @@ -62,8 +62,8 @@ describe('workspace-generator generator', () => { installPackagesTask, names, generateFiles, - } from '@nrwl/devkit'; - import { libraryGenerator } from '@nrwl/workspace/generators'; + } from '@nx/devkit'; + import { libraryGenerator } from '@nx/workspace/generators'; import { getProjectConfig } from '../../utils'; @@ -121,8 +121,8 @@ describe('workspace-generator generator', () => { const content = tree.read('/tools/generators/custom/index.spec.ts')?.toString(); expect(content).toMatchInlineSnapshot(` - "import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; - import { Tree, readProjectConfiguration } from '@nrwl/devkit'; + "import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; + import { Tree, readProjectConfiguration } from '@nx/devkit'; import generator from './index'; import { CustomGeneratorSchema } from './schema'; @@ -167,19 +167,19 @@ describe('workspace-generator generator', () => { ## Usage \`\`\`sh - yarn nx workspace-generator custom ... + yarn nx g @fluentui/workspace-plugin:custom ... \`\`\` Show what will be generated without writing to disk: \`\`\`sh - yarn nx workspace-generator custom --dry-run + yarn nx g @fluentui/workspace-plugin:custom --dry-run \`\`\` ### Examples \`\`\`sh - yarn nx workspace-generator custom + yarn nx g @fluentui/workspace-plugin:custom \`\`\` ## Options diff --git a/tools/generators/workspace-generator/index.ts b/tools/workspace-plugin/src/generators/workspace-generator/index.ts similarity index 98% rename from tools/generators/workspace-generator/index.ts rename to tools/workspace-plugin/src/generators/workspace-generator/index.ts index 47d61cd42aeb1..ee3f332a9a6db 100644 --- a/tools/generators/workspace-generator/index.ts +++ b/tools/workspace-plugin/src/generators/workspace-generator/index.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { Tree, formatFiles, generateFiles, names, offsetFromRoot } from '@nrwl/devkit'; +import { Tree, formatFiles, generateFiles, names, offsetFromRoot } from '@nx/devkit'; import { WorkspaceGeneratorGeneratorSchema } from './schema'; diff --git a/tools/generators/workspace-generator/schema.json b/tools/workspace-plugin/src/generators/workspace-generator/schema.json similarity index 100% rename from tools/generators/workspace-generator/schema.json rename to tools/workspace-plugin/src/generators/workspace-generator/schema.json diff --git a/tools/generators/workspace-generator/schema.ts b/tools/workspace-plugin/src/generators/workspace-generator/schema.ts similarity index 100% rename from tools/generators/workspace-generator/schema.ts rename to tools/workspace-plugin/src/generators/workspace-generator/schema.ts diff --git a/tools/workspace-plugin/src/index.ts b/tools/workspace-plugin/src/index.ts new file mode 100644 index 0000000000000..cb0ff5c3b541f --- /dev/null +++ b/tools/workspace-plugin/src/index.ts @@ -0,0 +1 @@ +export {}; diff --git a/tools/types.spec.ts b/tools/workspace-plugin/src/types.spec.ts similarity index 100% rename from tools/types.spec.ts rename to tools/workspace-plugin/src/types.spec.ts diff --git a/tools/types.ts b/tools/workspace-plugin/src/types.ts similarity index 100% rename from tools/types.ts rename to tools/workspace-plugin/src/types.ts diff --git a/tools/utils-testing.ts b/tools/workspace-plugin/src/utils-testing.ts similarity index 92% rename from tools/utils-testing.ts rename to tools/workspace-plugin/src/utils-testing.ts index 33f9b00f34879..dc0aab9b6a255 100644 --- a/tools/utils-testing.ts +++ b/tools/workspace-plugin/src/utils-testing.ts @@ -1,4 +1,4 @@ -import { stripIndents, Tree } from '@nrwl/devkit'; +import { stripIndents, Tree } from '@nx/devkit'; import type { Chalk } from 'chalk'; import { workspacePaths } from './utils'; diff --git a/tools/utils.spec.ts b/tools/workspace-plugin/src/utils.spec.ts similarity index 97% rename from tools/utils.spec.ts rename to tools/workspace-plugin/src/utils.spec.ts index 9f0d30e1fb734..5e30b169649b8 100644 --- a/tools/utils.spec.ts +++ b/tools/workspace-plugin/src/utils.spec.ts @@ -1,4 +1,4 @@ -import { logger } from '@nrwl/devkit'; +import { logger } from '@nx/devkit'; import { printUserLogs } from './utils'; describe(`utils`, () => { diff --git a/tools/utils.ts b/tools/workspace-plugin/src/utils.ts similarity index 97% rename from tools/utils.ts rename to tools/workspace-plugin/src/utils.ts index d2b6a48720c56..b3794830e720a 100644 --- a/tools/utils.ts +++ b/tools/workspace-plugin/src/utils.ts @@ -9,7 +9,7 @@ import { ProjectConfiguration, readJson, readNxJson, -} from '@nrwl/devkit'; +} from '@nx/devkit'; import { PackageJson, PackageJsonWithBeachball } from './types'; import * as semver from 'semver'; @@ -80,7 +80,7 @@ export function parseArgs>(args: string[]) { return parsedArguments; } -export { updateJestConfig } from '@nrwl/jest/src/generators/jest-project/lib/update-jestconfig'; +export { updateJestConfig } from '@nx/jest/src/generators/jest-project/lib/update-jestconfig'; export function getProjectConfig(tree: Tree, options: { packageName: string }) { const projectConfig = readProjectConfiguration(tree, options.packageName); @@ -165,7 +165,7 @@ export function printUserLogs(logs: UserLog) { } /** - * Overridden `@nrwl/devkit#getProjects` function + * Overridden `@nx/devkit#getProjects` function * Get all workspace projects or only subset, if projectNames array is specified * * @param tree diff --git a/tools/tsconfig.json b/tools/workspace-plugin/tsconfig.json similarity index 63% rename from tools/tsconfig.json rename to tools/workspace-plugin/tsconfig.json index adc4274b4103c..19b9eece4df14 100644 --- a/tools/tsconfig.json +++ b/tools/workspace-plugin/tsconfig.json @@ -1,19 +1,16 @@ { - "extends": "../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "noEmit": true + "module": "commonjs" }, - "include": [], "files": [], + "include": [], "references": [ { "path": "./tsconfig.lib.json" }, { "path": "./tsconfig.spec.json" - }, - { - "path": "./tsconfig.tools.json" } ] } diff --git a/tools/workspace-plugin/tsconfig.lib.json b/tools/workspace-plugin/tsconfig.lib.json new file mode 100644 index 0000000000000..33eca2c2cdf8c --- /dev/null +++ b/tools/workspace-plugin/tsconfig.lib.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "declaration": true, + "types": ["node"] + }, + "include": ["src/**/*.ts"], + "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"] +} diff --git a/tools/workspace-plugin/tsconfig.spec.json b/tools/workspace-plugin/tsconfig.spec.json new file mode 100644 index 0000000000000..f6d8ffcc9fb9b --- /dev/null +++ b/tools/workspace-plugin/tsconfig.spec.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"] +} diff --git a/tsconfig.base.all.json b/tsconfig.base.all.json index 09bf88da9e6be..d885a03a78aaa 100644 --- a/tsconfig.base.all.json +++ b/tsconfig.base.all.json @@ -99,7 +99,6 @@ "@fluentui/react-colorpicker-compat": ["packages/react-components/react-colorpicker-compat/src/index.ts"], "@fluentui/react-combobox": ["packages/react-components/react-combobox/src/index.ts"], "@fluentui/react-components": ["packages/react-components/react-components/src/index.ts"], - "@fluentui/react-tags-preview": ["packages/react-components/react-tags-preview/src/index.ts"], "@fluentui/react-components/unstable": ["packages/react-components/react-components/src/unstable/index.ts"], "@fluentui/react-conformance": ["packages/react-conformance/src/index.ts"], "@fluentui/react-conformance-griffel": ["packages/react-components/react-conformance-griffel/src/index.ts"], @@ -143,6 +142,7 @@ "@fluentui/react-table": ["packages/react-components/react-table/src/index.ts"], "@fluentui/react-tabs": ["packages/react-components/react-tabs/src/index.ts"], "@fluentui/react-tabster": ["packages/react-components/react-tabster/src/index.ts"], + "@fluentui/react-tags-preview": ["packages/react-components/react-tags-preview/src/index.ts"], "@fluentui/react-text": ["packages/react-components/react-text/src/index.ts"], "@fluentui/react-textarea": ["packages/react-components/react-textarea/src/index.ts"], "@fluentui/react-theme": ["packages/react-components/react-theme/src/index.ts"], @@ -154,7 +154,8 @@ "@fluentui/react-utilities": ["packages/react-components/react-utilities/src/index.ts"], "@fluentui/react-virtualizer": ["packages/react-components/react-virtualizer/src/index.ts"], "@fluentui/theme-designer": ["packages/react-components/theme-designer/src/index.ts"], - "@fluentui/tokens": ["packages/tokens/src/index.ts"] + "@fluentui/tokens": ["packages/tokens/src/index.ts"], + "@fluentui/workspace-plugin": ["tools/workspace-plugin/src/index.ts"] } } } diff --git a/tsconfig.base.json b/tsconfig.base.json index c1fe5483f49a4..4819b7aea1418 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -89,7 +89,8 @@ "@fluentui/react-utilities": ["packages/react-components/react-utilities/src/index.ts"], "@fluentui/react-virtualizer": ["packages/react-components/react-virtualizer/src/index.ts"], "@fluentui/theme-designer": ["packages/react-components/theme-designer/src/index.ts"], - "@fluentui/tokens": ["packages/tokens/src/index.ts"] + "@fluentui/tokens": ["packages/tokens/src/index.ts"], + "@fluentui/workspace-plugin": ["tools/workspace-plugin/src/index.ts"] } }, "exclude": ["node_modules"] diff --git a/yarn.lock b/yarn.lock index 2b03112f72437..7d8bf8fec08ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -203,7 +203,7 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== @@ -2128,11 +2128,6 @@ resolved "https://registry.yarnpkg.com/@lage-run/logger/-/logger-1.1.1.tgz#250b3e237b100d48f95ead2fb95fb07f9297b947" integrity sha512-8ZWHKCnnOYdLlLS2sSrMRZ4PM3oY5uqc2JN1RptSaKg8tR8g6ITMRmJ04/J4OqqiXiWVv2vozGt9pgxJLI2i7A== -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== - "@lerna/add@5.5.2": version "5.5.2" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.5.2.tgz#d5970f408f7f8fa2eaa139e7d3c6a67bdd5fedb2" @@ -3020,6 +3015,20 @@ resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb" integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug== +"@mole-inc/bin-wrapper@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz#d7fd0ceb1cfa8a855293a3ed9d7d135f4d442f0e" + integrity sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA== + dependencies: + bin-check "^4.1.0" + bin-version-check "^5.0.0" + content-disposition "^0.5.4" + ext-name "^5.0.0" + file-type "^17.1.6" + filenamify "^5.0.2" + got "^11.8.5" + os-filter-obj "^2.0.0" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -3239,87 +3248,40 @@ dependencies: nx "15.9.4" -"@nrwl/devkit@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.9.4.tgz#3f0a43a9637fcd0a46c06df2a9c36012b27f006b" - integrity sha512-mUX1kXTuPMdTzFxIzH+MsSNvdppOmstPDOEtiGFZJTuJ625ki0HhNJILO3N2mJ7MeMrLqIlAiNdvelQaObxYsQ== +"@nrwl/devkit@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.1.4.tgz#3c39dc0dbca2e8c526c6c5ae35f834a748308900" + integrity sha512-ojFu+fmOja+Kt7TZ7T+GmLkPw9z/sIAbmMx1V6ePIsS2XdB68Tc4UyXiQpx18hCwIpOxFf2BatoeLIgledWsXw== dependencies: - ejs "^3.1.7" - ignore "^5.0.4" - semver "7.3.4" - tmp "~0.2.1" - tslib "^2.3.0" + "@nx/devkit" "16.1.4" -"@nrwl/jest@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-15.9.4.tgz#65daa9c321f4703eb3e4ab51945b018959bb6b7f" - integrity sha512-NI/ERsoqL5E5rHFkW1reLx0lgKtu3pKi8esFaIvBR/bQpygK2FTYTu41WBjwk0GfyFaI1tVxOYeV436UXSBDrQ== +"@nrwl/jest@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-16.1.4.tgz#bc97b0d363e59bd55e6019bf0d25717ed016ad7f" + integrity sha512-ZmXb7FPHktbAaIWsNDopPm5fo2NFXXlOE41nTtuISW9/r+RW2sEg81afJr/WT+jmaQwwTAqEfNYnv+VtorKMmg== dependencies: - "@jest/reporters" "^29.4.1" - "@jest/test-result" "^29.4.1" - "@nrwl/devkit" "15.9.4" - "@nrwl/js" "15.9.4" - "@phenomnomnominal/tsquery" "4.1.1" - chalk "^4.1.0" - dotenv "~10.0.0" - identity-obj-proxy "3.0.0" - jest-config "^29.4.1" - jest-resolve "^29.4.1" - jest-util "^29.4.1" - resolve.exports "1.1.0" - tslib "^2.3.0" + "@nx/jest" "16.1.4" -"@nrwl/js@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-15.9.4.tgz#3256955e3fe21b999b4f5ae8ba722579fc9b4386" - integrity sha512-DMJ7qFf/nN5w1WZyxm9JaAPsdfAD+bjLJ8MKA6rtoHcMB3t/BtCZ8lsnsYRUJXFGwuY6aj71bQXQ6F+QQOJY4Q== +"@nrwl/js@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-16.1.4.tgz#56ce4b21961ee85763bcc9e2918023ab2b1cc35d" + integrity sha512-U5R61b4CBo65xt2pOGYz0POZ4Xqq5vifdKzzrD/vYycak28tTHlhAkZLexXhzLJiUJh94Dack0Osb+FuZmbYWQ== dependencies: - "@babel/core" "^7.15.0" - "@babel/plugin-proposal-class-properties" "^7.14.5" - "@babel/plugin-proposal-decorators" "^7.14.5" - "@babel/plugin-transform-runtime" "^7.15.0" - "@babel/preset-env" "^7.15.0" - "@babel/preset-typescript" "^7.15.0" - "@babel/runtime" "^7.14.8" - "@nrwl/devkit" "15.9.4" - "@nrwl/workspace" "15.9.4" - "@phenomnomnominal/tsquery" "4.1.1" - babel-plugin-const-enum "^1.0.1" - babel-plugin-macros "^2.8.0" - babel-plugin-transform-typescript-metadata "^0.3.1" - chalk "^4.1.0" - fast-glob "3.2.7" - fs-extra "^11.1.0" - ignore "^5.0.4" - js-tokens "^4.0.0" - minimatch "3.0.5" - source-map-support "0.5.19" - tree-kill "1.2.2" - tslib "^2.3.0" + "@nx/js" "16.1.4" -"@nrwl/linter@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-15.9.4.tgz#784804387a3e04f4fb8ab2eb4396f2c2711e3c82" - integrity sha512-J8CoccCNhIwzf02/oTpjo8VzrGuzKgOwD4mEnC48doi1FV9/uXT04da671uNHZjO5QRm3ptTzaqwo0sPRDPyuw== +"@nrwl/linter@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-16.1.4.tgz#1181a1014749174ca57ad66c7c9cebf8bc6ae191" + integrity sha512-r0nKnC4EsGFVZO9caYDJ6y8wJLhZMj3TRi+Arf/1ALKEPYTAv8rrqgqf8t+4IiBzxY8DDausIwHfa3e4T3JH4g== dependencies: - "@nrwl/devkit" "15.9.4" - "@nrwl/js" "15.9.4" - "@phenomnomnominal/tsquery" "4.1.1" - tmp "~0.2.1" - tslib "^2.3.0" + "@nx/linter" "16.1.4" -"@nrwl/node@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-15.9.4.tgz#d2765afa717ba06c69d97b9239ed347d29b8d51e" - integrity sha512-cpxG+EL9ajUJmHBrtjxBEX3Xgq7oD3GBYbeIYcP/0qJoKroBjiXb1FZbodBrcMQ0NayQ9+Y2RR4jpAwq4korvQ== - dependencies: - "@nrwl/devkit" "15.9.4" - "@nrwl/jest" "15.9.4" - "@nrwl/js" "15.9.4" - "@nrwl/linter" "15.9.4" - "@nrwl/webpack" "15.9.4" - "@nrwl/workspace" "15.9.4" - tslib "^2.3.0" +"@nrwl/node@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-16.1.4.tgz#bd96ace18a73fe987e69a623e97ab2c8433dd6d2" + integrity sha512-5RbdXSdCDiinIpnwSCtad0i19Cicw/mu6gTgalkltbSULDn1J2AOBEzscdaxCzNso8xX0NfE85S+fi0xR9l4uA== + dependencies: + "@nx/node" "16.1.4" "@nrwl/nx-darwin-arm64@15.9.4": version "15.9.4" @@ -3356,6 +3318,13 @@ 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-plugin@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-plugin/-/nx-plugin-16.1.4.tgz#97ce355362b23c6f2bdf1e6c1b16217bcea096fa" + integrity sha512-LaP4EYFc38VMqGmkPsOqg9rNHdf1Pf4WZBr8eUL8h94zlYA6F5uZB2HS3RrTRQAcuA8dZ1+b9o9noUlB2GBdtw== + dependencies: + "@nx/plugin" "16.1.4" + "@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" @@ -3373,59 +3342,173 @@ dependencies: nx "15.9.4" -"@nrwl/webpack@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/webpack/-/webpack-15.9.4.tgz#95624c3da4e86ff96839189b16e29771758a9151" - integrity sha512-zZuegYgdFPCD2HxKND6YxELLJ3g+kMmOFEa6gIkMqY+2hsW31GR1Wx4CRzbjbDxZrVfPuLvKlDucqGVG6nCDJA== +"@nrwl/tao@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.1.4.tgz#695dba647e20661ff48700f8bc2d56e128584968" + integrity sha512-aArX3E7j+foUUzutsrgOc1lh9Rj5LDCAncHlszu0XGgHRO2EHE4qxZHvmgogGEpRf1ojTNAfN72xhVCSjtca/Q== dependencies: - "@babel/core" "^7.15.0" - "@nrwl/devkit" "15.9.4" - "@nrwl/js" "15.9.4" - "@nrwl/workspace" "15.9.4" - autoprefixer "^10.4.9" - babel-loader "^9.1.2" + nx "16.1.4" + +"@nrwl/workspace@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-16.1.4.tgz#f434278da2ceec9d603740fccfba50475944989a" + integrity sha512-B2qyR2tYykZ5rNeA9klNiEQ7y9rNMGQdnxyp+f6w7nMu8Qtpa1tMtqCyTORhShupRgcwON3oEVn5TznC9T2ZDA== + dependencies: + "@nx/workspace" "16.1.4" + +"@nx/devkit@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.1.4.tgz#0d425daf79e0daf772a5a456a053db750af14c19" + integrity sha512-tyAnpQShhKhR6FwmT7hJTaT/8B8YxFWhgBW0mLi9PhXYS9xRdgZ+ag8/T3EtJudIGMIdn4JhA1YL2zSuziHABQ== + dependencies: + "@nrwl/devkit" "16.1.4" + ejs "^3.1.7" + ignore "^5.0.4" + semver "7.3.4" + tmp "~0.2.1" + tslib "^2.3.0" + +"@nx/jest@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/jest/-/jest-16.1.4.tgz#879b1ac58f6d8ffb6f82aa99ae0a04c46f8b509e" + integrity sha512-lHuREK0luQMBbpp2jYNsE/VFsoy0tqW94QifT5EgsFTjL2L+yw1I7WbRTfemiBijgqmNsyWAXMsItSSr2tlrcA== + dependencies: + "@jest/reporters" "^29.4.1" + "@jest/test-result" "^29.4.1" + "@nrwl/jest" "16.1.4" + "@nx/devkit" "16.1.4" + "@nx/js" "16.1.4" + "@phenomnomnominal/tsquery" "~5.0.1" chalk "^4.1.0" - chokidar "^3.5.1" - copy-webpack-plugin "^10.2.4" - css-loader "^6.4.0" - css-minimizer-webpack-plugin "^3.4.1" dotenv "~10.0.0" - file-loader "^6.2.0" - fork-ts-checker-webpack-plugin "7.2.13" + identity-obj-proxy "3.0.0" + jest-config "^29.4.1" + jest-resolve "^29.4.1" + jest-util "^29.4.1" + resolve.exports "1.1.0" + tslib "^2.3.0" + +"@nx/js@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/js/-/js-16.1.4.tgz#3d85f549fceeaf9148edbc82abeec46d34731c80" + integrity sha512-LYPKvV7AjYvj25p7SVKny22DKVpGVfZ1y+EkmmqWEMvFSEmf7miOCjZEyZGv30CcxFRVDoZ7JZ16TB3S+Zy/gQ== + dependencies: + "@babel/core" "^7.15.0" + "@babel/plugin-proposal-class-properties" "^7.14.5" + "@babel/plugin-proposal-decorators" "^7.14.5" + "@babel/plugin-transform-runtime" "^7.15.0" + "@babel/preset-env" "^7.15.0" + "@babel/preset-typescript" "^7.15.0" + "@babel/runtime" "^7.14.8" + "@nrwl/js" "16.1.4" + "@nx/devkit" "16.1.4" + "@nx/workspace" "16.1.4" + "@phenomnomnominal/tsquery" "~5.0.1" + babel-plugin-const-enum "^1.0.1" + babel-plugin-macros "^2.8.0" + babel-plugin-transform-typescript-metadata "^0.3.1" + chalk "^4.1.0" + fast-glob "3.2.7" + fs-extra "^11.1.0" ignore "^5.0.4" - less "4.1.3" - less-loader "11.1.0" - license-webpack-plugin "^4.0.2" - loader-utils "^2.0.3" - mini-css-extract-plugin "~2.4.7" - parse5 "4.0.0" - postcss "^8.4.14" - postcss-import "~14.1.0" - postcss-loader "^6.1.1" - rxjs "^6.5.4" - sass "^1.42.1" - sass-loader "^12.2.0" - source-map-loader "^3.0.0" - style-loader "^3.3.0" - stylus "^0.55.0" - stylus-loader "^7.1.0" - terser-webpack-plugin "^5.3.3" - ts-loader "^9.3.1" - ts-node "10.9.1" - tsconfig-paths "^4.1.2" - tsconfig-paths-webpack-plugin "4.0.0" + js-tokens "^4.0.0" + minimatch "3.0.5" + source-map-support "0.5.19" + tree-kill "1.2.2" tslib "^2.3.0" - webpack "^5.75.0" - webpack-dev-server "^4.9.3" - webpack-node-externals "^3.0.0" - webpack-subresource-integrity "^5.1.0" -"@nrwl/workspace@15.9.4": - version "15.9.4" - resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-15.9.4.tgz#38ebabb56c6af0adfa70b593631f87335c5eb644" - integrity sha512-CvF6Bv0WetYD4eurTiLKyGz3LOLoEVur81RMvpijPeM2tKOhG3DrgX+x55a5NVbXimTU2hJcxk7GSGEtZmJvZg== +"@nx/linter@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/linter/-/linter-16.1.4.tgz#5cfdcac3f5e9b5ef48e400ed6dbbfd2c0b9301d5" + integrity sha512-wxgyOvQJuBUCU0n6YY7QSgCFGUPTqoGp/zXfrcpDYOZZPYEygENw3Y7NPDrffXvJOcNh2Wb5z0ZaVH5sp2LYNw== + dependencies: + "@nrwl/linter" "16.1.4" + "@nx/devkit" "16.1.4" + "@nx/js" "16.1.4" + "@phenomnomnominal/tsquery" "~5.0.1" + tmp "~0.2.1" + tslib "^2.3.0" + +"@nx/node@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/node/-/node-16.1.4.tgz#c34a699d451d1754beb5dbfc71c9d5f0281eb4bf" + integrity sha512-wmKfFsJSoXnjOJCclwhVwdp6MLwlUdWRohsKy99iMkDX1kRSI50w68lPyVmawGwL4+XivT89dkFm0bJsy0GdyQ== + dependencies: + "@nrwl/node" "16.1.4" + "@nx/devkit" "16.1.4" + "@nx/jest" "16.1.4" + "@nx/js" "16.1.4" + "@nx/linter" "16.1.4" + "@nx/workspace" "16.1.4" + tslib "^2.3.0" + +"@nx/nx-darwin-arm64@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.1.4.tgz#4bc8db556dedd820084f0aead7c3551894e0de53" + integrity sha512-0eITl+18xLtdiAVlv+LRukCHBLSLk8L8OkMnfLoK286sIblK31p2pzr1jL68ILUWPGGbdgo+nDEaaDTwh4tYRA== + +"@nx/nx-darwin-x64@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.1.4.tgz#d18a3e4b8f7489464ae95c884cc66cb68026bbf4" + integrity sha512-owgIq/KsCU/QBK6Y7FsblnPPI0oSccJXaISKbPcCWnkD38rtUkaR99Eh2LvoUpcnvvpL0yldkkdMBzVvDwOSZg== + +"@nx/nx-linux-arm-gnueabihf@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.1.4.tgz#5abe9c94ebf4ea1265cf38b0f6aea3afe93e2892" + integrity sha512-TqphSqAvQcgu83hE/XvJfGALq6EFqfRROct92whj+K5sz/AH67jnFPW+cHnXDwqIlgRB3lj/DFVqlNED8pBHfg== + +"@nx/nx-linux-arm64-gnu@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.1.4.tgz#47d4e6ba6f5540a4dd955af6c4cabda8285d455a" + integrity sha512-0AmO57zf5+ZrIa9XIkmRSbPF/gMqDNlMtMj8q1S+uYRU+WOAW+k1RbcFKdN0voH5eBDVQ03sqkgj9wTNS/m/vQ== + +"@nx/nx-linux-arm64-musl@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.1.4.tgz#67a76291b348c58aabcfd2830daffcd9277bee9c" + integrity sha512-10zAgZP+xh7HwyfDJyiyjAQD2gjvb4ZfCDAOE2Boe5yYcD27SqwAIzgrCc4DjRbUWSdufA4rclyXXp2tSb3uyA== + +"@nx/nx-linux-x64-gnu@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.1.4.tgz#d9703193faf2b8487072302b86f3dcba582b7e83" + integrity sha512-vVea3E6uHvrVieaOHIXKziN/vMbn9g2caiE4N7WiuAPrp2t4jbhtYqcQoNeNVjl92trQu/l2Ma3knmbn75J7jA== + +"@nx/nx-linux-x64-musl@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.1.4.tgz#09b79bdb28205008f615f7ecb9d848bdc30ebded" + integrity sha512-HhJPPU0rBzGeqTrylEjOu190rnMvA0HK7nghyEtTGhdCcTRs1ulfgl6swjAjXtXtGA/rXXkk0IKI7luGBcH6zg== + +"@nx/nx-win32-arm64-msvc@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.1.4.tgz#6da2004760fbb71cd9dfdfa4b884c97fa20dad3d" + integrity sha512-+iaU0yXkgF0Y5fvWFPP2cziDvd+QjQDnhk7/+i9Nk1C8vOaNHkMjx6qL2dNO2qoT49qMhjnI/hzL7+FBVPh11w== + +"@nx/nx-win32-x64-msvc@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.1.4.tgz#4aa82ecb3bb24aa40e18818c7d7d3764b800445c" + integrity sha512-s+H59UBB/dtdvZ+KWCe2PrVWZyoxsl6Vx+hzdUvCwI8f+cZmLRblTThLhUaBgdWLVqzFPemTkWIUasiRx/+3PQ== + +"@nx/plugin@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/plugin/-/plugin-16.1.4.tgz#695b472d63e4d859f0c93f6973b480abe9f610bc" + integrity sha512-wJXwtIv566XFhSKgdRRitT/jPrCnmZKGEPQISzJJKpQ3PO+eZU3dmE9WrQ5LJabkZaC0MHfBBFbRvjrmCH/LNA== + dependencies: + "@nrwl/nx-plugin" "16.1.4" + "@nx/devkit" "16.1.4" + "@nx/jest" "16.1.4" + "@nx/js" "16.1.4" + "@nx/linter" "16.1.4" + "@phenomnomnominal/tsquery" "~5.0.1" + dotenv "~10.0.0" + fs-extra "^11.1.0" + tslib "^2.3.0" + +"@nx/workspace@16.1.4": + version "16.1.4" + resolved "https://registry.yarnpkg.com/@nx/workspace/-/workspace-16.1.4.tgz#771c90ae8f158620d6c8b0b6e73c9b8d834592bd" + integrity sha512-FjzCmbitepS1pH8fqK2I2W3pbJ20+om8rFAQhMUkdJEtio+AXgHdyRfrkjlmNWXME1E0qZc7R0GzD6tILFb0Ew== dependencies: - "@nrwl/devkit" "15.9.4" + "@nrwl/workspace" "16.1.4" + "@nx/devkit" "16.1.4" "@parcel/watcher" "2.0.4" chalk "^4.1.0" chokidar "^3.5.1" @@ -3434,13 +3517,12 @@ dotenv "~10.0.0" figures "3.2.0" flat "^5.0.2" - glob "7.1.4" ignore "^5.0.4" minimatch "3.0.5" npm-run-path "^4.0.1" - nx "15.9.4" + nx "16.1.4" open "^8.4.0" - rxjs "^6.5.4" + rxjs "^7.8.0" tmp "~0.2.1" tslib "^2.3.0" yargs "^17.6.2" @@ -3683,13 +3765,6 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" -"@phenomnomnominal/tsquery@4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-4.1.1.tgz#42971b83590e9d853d024ddb04a18085a36518df" - integrity sha512-jjMmK1tnZbm1Jq5a7fBliM4gQwjxMU7TFoRNwIyzwlO+eHPRCFv/Nv+H/Gi1jc3WR7QURG8D5d0Tn12YGrUqBQ== - dependencies: - esquery "^1.0.1" - "@phenomnomnominal/tsquery@6.1.2": version "6.1.2" resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-6.1.2.tgz#37ec13373ec144f524958770ebc294d0b5e2909e" @@ -3698,6 +3773,13 @@ "@types/esquery" "^1.5.0" esquery "^1.5.0" +"@phenomnomnominal/tsquery@~5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-5.0.1.tgz#a2a5abc89f92c01562a32806655817516653a388" + integrity sha512-3nVv+e2FQwsW8Aw6qTU6f+1rfcJ3hrcnvH/mu9i8YhxO+9sqbOfpL8m6PbET5+xKOlz/VSbp0RoYWYCtIsnmuA== + dependencies: + esquery "^1.4.0" + "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": version "0.5.7" resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2" @@ -4789,96 +4871,83 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" -"@swc-node/core@^1.10.0": - version "1.10.3" - resolved "https://registry.yarnpkg.com/@swc-node/core/-/core-1.10.3.tgz#dbc37c6d8d28ce59bd1bc55b300fb92bd3876152" - integrity sha512-8rpv1DXzsQjN/C8ZXuaTSmJ4M/lRr6geUlbOQ861DLC+sKWcEEvxRjK9cXQ28GserHuEcFDA3wlF9rD1YD0x+Q== - -"@swc-node/register@1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@swc-node/register/-/register-1.6.1.tgz#e2e6172aeebb9e34a7a5c154958420c8e4dc98ff" - integrity sha512-4/vx+bE8tG+gDhvMpaoqiaTXuTMSK+e4ohujn8rj9IW3SSCK4/dYIJKwxW0Mn2sOPMIdylhxu70WWuSRCUG38g== +"@swc/cli@0.1.62": + version "0.1.62" + resolved "https://registry.yarnpkg.com/@swc/cli/-/cli-0.1.62.tgz#6442fde2fcf75175a300fb4fcf30f8c60bbb3ab3" + integrity sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw== dependencies: - "@swc-node/core" "^1.10.0" - "@swc-node/sourcemap-support" "^0.3.0" - colorette "^2.0.19" - debug "^4.3.4" - pirates "^4.0.5" - tslib "^2.5.0" + "@mole-inc/bin-wrapper" "^8.0.1" + commander "^7.1.0" + fast-glob "^3.2.5" + semver "^7.3.8" + slash "3.0.0" + source-map "^0.7.3" -"@swc-node/sourcemap-support@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@swc-node/sourcemap-support/-/sourcemap-support-0.3.0.tgz#e8a0d139bd3e8db39635f63fde43dbe6c39237cc" - integrity sha512-gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA== - dependencies: - source-map-support "^0.5.21" - tslib "^2.5.0" - -"@swc/core-darwin-arm64@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.30.tgz#fb9b20a46455f49597e760e4dfe829196e0fe12e" - integrity sha512-GZ4mZZbH77N8renK34A3Lkhl6x8z+c97SCbl43pn5E0Z0sifohA8WNhrtucKrUdid0svYibwotJzeFNpDtg7gQ== - -"@swc/core-darwin-x64@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.30.tgz#2fd86123d697c024f7fe45995a3ef5a4e5e4eef0" - integrity sha512-ppGrAJmKpT3vFr2vGaxXFL8JqHsb6kSAj0dVYTNYicl3c6XOjnMiNSfu6HRbdmXt0VpFHhC5L/a7Ta89mQ1sJA== - -"@swc/core-linux-arm-gnueabihf@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.30.tgz#a67ffdc80a63b68471bc176206237bd68576be40" - integrity sha512-XQYY/VNRnM0/779ehfMgh2poO3reOANvfzOprF8xmGK20+DxFqbMWjHhJutscQuEjLtdwk/LfgCkwmTaB1hhwg== - -"@swc/core-linux-arm64-gnu@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.30.tgz#7f9b2f860b8abac6636b6ffb46004da4589b513f" - integrity sha512-ME4BjMYSXana0Lfswa3aQW0rTdmR9wa1NGQ3t6MYLdBVm+76Xwe29JKlOfnI1iCCtcbRBoWy4dlhyuxW8DN7cw== - -"@swc/core-linux-arm64-musl@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.30.tgz#b917db1f71b8382e033b8bcbeccd8a326747c41b" - integrity sha512-h3X9Pn1m5kuFSW8lJyDiMB4ELNZFJ+QxLva5GCxZDArQttkNeY4tMNWFcaG44xUXeywffrgjpXO7Yj2JGzmG4g== - -"@swc/core-linux-x64-gnu@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.30.tgz#fc63a70a34d444b0a9460caeb239c630e8cf905b" - integrity sha512-vfPR8cakx5IZQSpNuXPrpkRprBdVxXsvN5JWN3fpuNVIgFFo3q8njihaItujKvePIHQwov4achfBZlm4JRitWQ== - -"@swc/core-linux-x64-musl@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.30.tgz#07003373a8813c3b82bd8ad2c2ea500a8cd6c9cd" - integrity sha512-jtfv8N+00E2RMTVjwfTfimeqzo0B9FmbbSkzlnLvkmV8xDAPyLmX7v/xL5YiVJRLeSrlJ7DmkCSxLzpJao73dw== - -"@swc/core-win32-arm64-msvc@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.30.tgz#473eb708d2a162dd91bca2327e540ad3be57051d" - integrity sha512-fX3T6JzS5F8JJ/UZQWrZfdml8nLuSzgA0EFKetTNa5AHh1x9ltShmlFOJ3OPpD9BKI/QcQSLxyoAjxt7NtAnaQ== - -"@swc/core-win32-ia32-msvc@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.30.tgz#7ea1b9b9d68d91050d25baf300a119f699ccb5a7" - integrity sha512-m88NjTcVFHFAciWRWTW7NbeQPrzjKKBzSoSPukhjvKSWQNk5v6BBbTAKpymNGQssPn5WLarC2QlQzCwjyh1QLA== - -"@swc/core-win32-x64-msvc@1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.30.tgz#43bd3cd1d48a0b7659a8834e0a3e5a3322cea8ca" - integrity sha512-HsePRjbdD5XsnS8NkN+MmhtUyjF16cU3COd92DjRYKsB1rMDE51itfacBvOeZPHFV6VkrLsakubAZCMc+3d/Ag== - -"@swc/core@1.3.30", "@swc/core@^1.2.152": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.30.tgz#f4b3b55d37f766d6246829528b123bc4c8068866" - integrity sha512-pg6GWw615EwCh4vJ5k7xll1E4WJSPeINrRvF/EPyBvNNhlXR3s6+KZevJTx3PpA5PXjprDR0aqwi0/aigSCAPA== +"@swc/core-darwin-arm64@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.44.tgz#e0f5eb9d962c4e6192531c2e3b8c11f55faf1b89" + integrity sha512-Y+oVsCjXUPvr3D9YLuB1gjP84TseM/CRkbPNrf+3JXQhsPEkgxdIdFP1cl/obeqMQrRgPpvSfK+TOvGuOuV22g== + +"@swc/core-darwin-x64@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.44.tgz#a8de4c176a9b12f201fc754a56331113a53ec69c" + integrity sha512-bM0IKBjlSD0yHJbd7bE3il5fTu3oUjUO2zjLkzfIx6tiqbmDyvOX8adaSqse9N+d8Ip9p26b5Vo7pMHq0POGkg== + +"@swc/core-linux-arm-gnueabihf@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.44.tgz#300731367c88bf02b8ae20264d4d402362e444df" + integrity sha512-D4lfVwCbkWscDTb6btb89+bN0kgvjGBPfOmcvih7nY5hxaorwvp+PefkYAhFw8vKmL92lrnWUFNiTemVFN4bxg== + +"@swc/core-linux-arm64-gnu@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.44.tgz#8b52d1cd28f277d47bb45c6791f44da568a62bc4" + integrity sha512-muExPTrN26MFmtO+5uffkH5v4lmd8GdmyWvlC2tL95h7o9genTIQyr7kcSepGZrDe4fM9G6++5YfENhUpXHo+g== + +"@swc/core-linux-arm64-musl@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.44.tgz#7b0e62255ae13c397f09ca5da8bf2266482a28c2" + integrity sha512-MY1wY3kSIosjJKKCfFGniJFFVkt3oPvJLN4Dlj+bMgAt3O7anm8lGbyLqUpJ1Ep4rTsJj7ObO06DQiSWp4Fhcw== + +"@swc/core-linux-x64-gnu@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.44.tgz#0b8b2544c312f247aa5c5f31671a175ad6488309" + integrity sha512-xV4pDxJM06g0yUDTA22ZHgonzGqf/poIlgADRmEkx9cWWm5qLRhmWrrkVX1xZVvdlcXj1ERnia/UkvrDux96lg== + +"@swc/core-linux-x64-musl@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.44.tgz#5b1f76fc1dc75875df59d8c0ff37e99e030f9552" + integrity sha512-NJnnlE8vCkKHoo/wIaoywNN/01vNsvhKUjBgUx865sUM/XWAIanpbV41yfdEkC+Iwd+/zB3ZZnOYql3b+Nn8aQ== + +"@swc/core-win32-arm64-msvc@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.44.tgz#bd4aefcd7734229f780c9bec0502935884935f0f" + integrity sha512-/xOtjZhX25GEOPLN55icjj9E061DDH7G0A9HfUAEilURgBbvm6bIlqK+t8mOKK0tOsDoHftdTBRkYhTAqUtakQ== + +"@swc/core-win32-ia32-msvc@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.44.tgz#0c2ba768f33acb580422e17d4ae816ebfd3dcfe0" + integrity sha512-uKTAWQuMEW1gJnl8F3eiz3kdk8CiaR5dMWWlGbHIq6dRbur2hoKaEnINR4UqkvvAhhY1YB0Xr5DV1H986Xu2EA== + +"@swc/core-win32-x64-msvc@1.3.44": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.44.tgz#b137abefbeb3b73a47cc398bc5603ea6bf6a3a7b" + integrity sha512-D9fBRhr44cK4YIKFikpktyUDLkZgVj0ISaSl8IjiTvjqTrE/9+E+dzTNHULn5tc3lHVLLxyVwMjJRr2G0D4O6w== + +"@swc/core@1.3.44", "@swc/core@^1.2.152": + version "1.3.44" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.44.tgz#2886bdd647942f9670b65c02b6d5484ff3070ddd" + integrity sha512-RC25C8nxOCdfGS//F9Q8aHKx4XoCsxvgO+sSUhvt7zDz1Y2ruVUTu2UOH0VeE0WkA8j6oEZH+xH2SUfDUkxXdA== optionalDependencies: - "@swc/core-darwin-arm64" "1.3.30" - "@swc/core-darwin-x64" "1.3.30" - "@swc/core-linux-arm-gnueabihf" "1.3.30" - "@swc/core-linux-arm64-gnu" "1.3.30" - "@swc/core-linux-arm64-musl" "1.3.30" - "@swc/core-linux-x64-gnu" "1.3.30" - "@swc/core-linux-x64-musl" "1.3.30" - "@swc/core-win32-arm64-msvc" "1.3.30" - "@swc/core-win32-ia32-msvc" "1.3.30" - "@swc/core-win32-x64-msvc" "1.3.30" + "@swc/core-darwin-arm64" "1.3.44" + "@swc/core-darwin-x64" "1.3.44" + "@swc/core-linux-arm-gnueabihf" "1.3.44" + "@swc/core-linux-arm64-gnu" "1.3.44" + "@swc/core-linux-arm64-musl" "1.3.44" + "@swc/core-linux-x64-gnu" "1.3.44" + "@swc/core-linux-x64-musl" "1.3.44" + "@swc/core-win32-arm64-msvc" "1.3.44" + "@swc/core-win32-ia32-msvc" "1.3.44" + "@swc/core-win32-x64-msvc" "1.3.44" "@swc/helpers@0.4.14", "@swc/helpers@^0.4.14": version "0.4.14" @@ -4985,6 +5054,11 @@ traverse "^0.6.6" unified "^6.1.6" +"@tokenizer/token@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" + integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== + "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -4995,11 +5069,6 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - "@ts-morph/common@~0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.8.1.tgz#7be0a0048eb906cb3ddf6506bef06c3cd1a1e3ba" @@ -6007,7 +6076,7 @@ dependencies: "@types/express" "*" -"@types/serve-static@*", "@types/serve-static@^1.13.10": +"@types/serve-static@*": version "1.15.1" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ== @@ -6188,7 +6257,7 @@ anymatch "^3.0.0" source-map "^0.6.0" -"@types/ws@^8.2.2", "@types/ws@^8.5.1": +"@types/ws@^8.2.2": version "8.5.4" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== @@ -6719,7 +6788,7 @@ JSONStream@^1.0.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.5, abab@^2.0.6: +abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== @@ -6778,10 +6847,10 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== +acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.2.0: version "7.2.0" @@ -6808,10 +6877,10 @@ acorn@^7.4.0, acorn@^7.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== +acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.9.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== adal-node@^0.2.3: version "0.2.3" @@ -7180,7 +7249,7 @@ aproba@^2.0.0: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -arch@^2.2.0: +arch@^2.1.0, arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== @@ -7331,7 +7400,7 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-flatten@^2.1.0, array-flatten@^2.1.2: +array-flatten@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== @@ -7398,11 +7467,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== - array-uniq@^1.0.1, array-uniq@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" @@ -7590,18 +7654,6 @@ autoprefixer@10.2.1: normalize-range "^0.1.2" postcss-value-parser "^4.1.0" -autoprefixer@^10.4.9: - version "10.4.14" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" - integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== - dependencies: - browserslist "^4.21.5" - caniuse-lite "^1.0.30001464" - fraction.js "^4.2.0" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - autoprefixer@^9.8.6: version "9.8.6" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" @@ -7739,14 +7791,6 @@ babel-loader@8.2.2, babel-loader@^8.0.0: make-dir "^3.1.0" schema-utils "^2.6.5" -babel-loader@^9.1.2: - version "9.1.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c" - integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA== - dependencies: - find-cache-dir "^3.3.2" - schema-utils "^4.0.0" - babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -8223,6 +8267,14 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +bin-check@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-4.1.0.tgz#fc495970bdc88bb1d5a35fc17e65c4a149fc4a49" + integrity sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA== + dependencies: + execa "^0.7.0" + executable "^4.1.0" + bin-links@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.3.tgz#3842711ef3db2cd9f16a5f404a996a12db355a6e" @@ -8235,6 +8287,23 @@ bin-links@^3.0.0: rimraf "^3.0.0" write-file-atomic "^4.0.0" +bin-version-check@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-5.1.0.tgz#788e80e036a87313f8be7908bc20e5abe43f0837" + integrity sha512-bYsvMqJ8yNGILLz1KP9zKLzQ6YpljV3ln1gqhuLkUtyfGi3qXKGuK2p+U4NAvjVFzDFiBBtOpCOSFNuYYEGZ5g== + dependencies: + bin-version "^6.0.0" + semver "^7.5.3" + semver-truncate "^3.0.0" + +bin-version@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-6.0.0.tgz#08ecbe5fc87898b441425e145f9e105064d00315" + integrity sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw== + dependencies: + execa "^5.0.0" + find-versions "^5.0.0" + binary-extensions@^1.0.0: version "1.13.1" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" @@ -8308,16 +8377,6 @@ body-scroll-lock@^3.1.5: resolved "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz#c1392d9217ed2c3e237fee1e910f6cdd80b7aaec" integrity sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg== -bonjour-service@^1.0.11: - version "1.1.1" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" - integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== - dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.5" - bonjour@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" @@ -8517,15 +8576,15 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: - version "4.21.9" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" - integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== +browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.21.3, browserslist@^4.21.5: + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001503" - electron-to-chromium "^1.4.431" - node-releases "^2.0.12" - update-browserslist-db "^1.0.11" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" bs-logger@0.x: version "0.2.6" @@ -8877,20 +8936,10 @@ camelize@^1.0.0: resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503: - version "1.0.30001516" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001516.tgz#621b1be7d85a8843ee7d210fd9d87b52e3daab3a" - integrity sha512-Wmec9pCBY8CWbmI4HsjBeQLqDTqV91nFVR83DnZpYyRnPI1wePDsTg0bGLPC5VU/3OIZV1fmxEea1b+tFKe86g== +caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001449: + version "1.0.30001517" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz#90fabae294215c3495807eb24fc809e11dc2f0a8" + integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA== capture-exit@^2.0.0: version "2.0.0" @@ -8960,7 +9009,7 @@ chalk@4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -9526,17 +9575,12 @@ color@^3.1.0: color-convert "^1.9.1" color-string "^1.5.2" -colord@^2.9.1: - version "2.9.3" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" - integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== - colorette@^1.2.1, colorette@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== -colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16, colorette@^2.0.19: +colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16: version "2.0.20" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== @@ -9606,7 +9650,7 @@ commander@2.11.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ== -commander@7, commander@^7.0.0, commander@^7.2.0: +commander@7, commander@^7.0.0, commander@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -9749,11 +9793,6 @@ connect-history-api-fallback@1.6.0, connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== -connect-history-api-fallback@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" - integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== - connect@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" @@ -9787,7 +9826,7 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= -content-disposition@0.5.4, content-disposition@~0.5.2: +content-disposition@0.5.4, content-disposition@^0.5.4, content-disposition@~0.5.2: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== @@ -9911,13 +9950,6 @@ cookies@~0.8.0: depd "~2.0.0" keygrip "~1.1.0" -copy-anything@^2.0.1: - version "2.0.6" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480" - integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw== - dependencies: - is-what "^3.14.1" - copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -9968,18 +10000,6 @@ copy-webpack-plugin@8.1.0: schema-utils "^3.0.0" serialize-javascript "^5.0.1" -copy-webpack-plugin@^10.2.4: - version "10.2.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe" - integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg== - dependencies: - fast-glob "^3.2.7" - glob-parent "^6.0.1" - globby "^12.0.2" - normalize-path "^3.0.0" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - core-js-compat@^3.25.1, core-js-compat@^3.8.1: version "3.28.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.28.0.tgz#c08456d854608a7264530a2afa281fadf20ecee6" @@ -10056,7 +10076,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: +cosmiconfig@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== @@ -10210,11 +10230,6 @@ css-color-keywords@^1.0.0: resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= -css-declaration-sorter@^6.3.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" - integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== - css-in-js-utils@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.0.0.tgz#4379185f5cc79f9eba39b4e795c317f253ffaa40" @@ -10259,32 +10274,6 @@ css-loader@^3.6.0: schema-utils "^2.7.0" semver "^6.3.0" -css-loader@^6.4.0: - version "6.7.3" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" - integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ== - dependencies: - icss-utils "^5.1.0" - postcss "^8.4.19" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.8" - -css-minimizer-webpack-plugin@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" - integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== - dependencies: - cssnano "^5.0.6" - jest-worker "^27.0.2" - postcss "^8.3.5" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - css-select@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" @@ -10315,14 +10304,6 @@ css-to-react-native@^3.0.0: css-color-keywords "^1.0.0" postcss-value-parser "^4.0.2" -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" @@ -10348,15 +10329,6 @@ css@2.X, css@^2.2.1: source-map-resolve "^0.5.2" urix "^0.1.0" -css@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" - integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== - dependencies: - inherits "^2.0.4" - source-map "^0.6.1" - source-map-resolve "^0.6.0" - cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -10372,62 +10344,6 @@ cssjanus@^2.0.1: resolved "https://registry.yarnpkg.com/cssjanus/-/cssjanus-2.1.0.tgz#6f99070e0b7cc79f826ea48c63c03cb250713af1" integrity sha512-kAijbny3GmdOi9k+QT6DGIXqFvL96aksNlGr4Rhk9qXDZYWUojU4bRc3IHWxdaLNOqgEZHuXoe5Wl2l7dxLW5g== -cssnano-preset-default@^5.2.14: - version "5.2.14" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8" - integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A== - dependencies: - css-declaration-sorter "^6.3.1" - cssnano-utils "^3.1.0" - postcss-calc "^8.2.3" - postcss-colormin "^5.3.1" - postcss-convert-values "^5.1.3" - postcss-discard-comments "^5.1.2" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.7" - postcss-merge-rules "^5.1.4" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.4" - postcss-minify-selectors "^5.2.1" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.1" - postcss-normalize-repeat-style "^5.1.1" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.1" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.3" - postcss-reduce-initial "^5.1.2" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" - -cssnano-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" - integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== - -cssnano@^5.0.6: - version "5.1.15" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf" - integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw== - dependencies: - cssnano-preset-default "^5.2.14" - lilconfig "^2.0.3" - yaml "^1.10.2" - -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - cssom@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" @@ -10835,7 +10751,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" -debug@3.1.0, debug@~3.1.0: +debug@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== @@ -11284,13 +11200,6 @@ dns-packet@^1.3.1: ip "^1.1.0" safe-buffer "^5.0.1" -dns-packet@^5.2.2: - version "5.6.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" - integrity sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" - dns-txt@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" @@ -11603,10 +11512,10 @@ ejs@3.1.9, ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-to-chromium@^1.4.431: - version "1.4.461" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.461.tgz#6b14af66042732bf883ab63a4d82cac8f35eb252" - integrity sha512-1JkvV2sgEGTDXjdsaQCeSwYYuhLRphRpc+g6EHTFELJXEiznLt3/0pZ9JuAOQ5p2rI3YxKTbivtvajirIfhrEQ== +electron-to-chromium@^1.4.284: + version "1.4.471" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.471.tgz#14cb056d0ce4bfa99df57946d57fe46c2330dac3" + integrity sha512-GpmGRC1vTl60w/k6YpQ18pSiqnmr0j3un//5TV1idPi6aheNfkT1Ye71tMEabWyNDO6sBMgAR+95Eb0eUUr1tA== element-resize-detector@^1.2.2: version "1.2.3" @@ -11820,7 +11729,7 @@ errlop@^2.0.0: resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b" integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw== -errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: +errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== @@ -12097,7 +12006,7 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escape-string-regexp@5.0.0: +escape-string-regexp@5.0.0, escape-string-regexp@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== @@ -12366,10 +12275,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint-visitor-keys@^3.3.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc" - integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ== +eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== eslint@7.25.0: version "7.25.0" @@ -12428,6 +12337,15 @@ espree@^7.3.0, espree@^7.3.1: acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" +espree@^9.0.0: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== + dependencies: + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" + esprima-extract-comments@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/esprima-extract-comments/-/esprima-extract-comments-1.1.0.tgz#0dacab567a5900240de6d344cf18c33617becbc9" @@ -12445,7 +12363,7 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1, esquery@^1.4.0, esquery@^1.5.0: +esquery@^1.4.0, esquery@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== @@ -12596,7 +12514,7 @@ execa@^5.0.0, execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -executable@^4.1.1: +executable@^4.1.0, executable@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg== @@ -12644,7 +12562,7 @@ expect@^29.0.0, expect@^29.5.0: jest-message-util "^29.5.0" jest-util "^29.5.0" -express@4.17.3, express@^4.17.1, express@^4.17.3: +express@4.17.3, express@^4.17.1: version "4.17.3" resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== @@ -12680,6 +12598,21 @@ express@4.17.3, express@^4.17.1, express@^4.17.3: utils-merge "1.0.1" vary "~1.1.2" +ext-list@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" + integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== + dependencies: + mime-db "^1.28.0" + +ext-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" + integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== + dependencies: + ext-list "^2.0.0" + sort-keys-length "^1.0.0" + ext@^1.1.2: version "1.4.0" resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" @@ -12816,7 +12749,7 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.2, fast-glob@^3.2.5, fast-glob@^3.2.7, fast-glob@^3.2.9, fast-glob@^3.3.0: +fast-glob@^3.0.3, fast-glob@^3.2.2, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0" integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA== @@ -13066,6 +12999,15 @@ file-system-cache@^1.0.5: fs-extra "^0.30.0" ramda "^0.21.0" +file-type@^17.1.6: + version "17.1.6" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-17.1.6.tgz#18669e0577a4849ef6e73a41f8bdf1ab5ae21023" + integrity sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw== + dependencies: + readable-web-to-node-stream "^3.0.2" + strtok3 "^7.0.0-alpha.9" + token-types "^5.0.0-alpha.2" + filelist@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83" @@ -13078,6 +13020,11 @@ filename-reserved-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= +filename-reserved-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz#3d5dd6d4e2d73a3fed2ebc4cd0b3448869a081f7" + integrity sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw== + filenamify@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.1.0.tgz#54d110810ae74eebfe115c1b995bd07e03cf2184" @@ -13087,6 +13034,15 @@ filenamify@^4.1.0: strip-outer "^1.0.1" trim-repeated "^1.0.0" +filenamify@^5.0.2: + version "5.1.1" + resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-5.1.1.tgz#a1ccc5ae678a5e34f578afcb9b72898264d166d2" + integrity sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA== + dependencies: + filename-reserved-regex "^3.0.0" + strip-outer "^2.0.0" + trim-repeated "^2.0.0" + filesize@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -13149,7 +13105,7 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-cache-dir@^3.3.1, find-cache-dir@^3.3.2: +find-cache-dir@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== @@ -13221,6 +13177,13 @@ find-up@^6.2.0, find-up@^6.3.0: locate-path "^7.1.0" path-exists "^5.0.0" +find-versions@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-5.1.0.tgz#973f6739ce20f5e439a27eba8542a4b236c8e685" + integrity sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg== + dependencies: + semver-regex "^4.0.5" + find-webpack@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/find-webpack/-/find-webpack-2.2.1.tgz#96e7b701a2d37c3500cae30d4dc59e14923ba460" @@ -13378,24 +13341,6 @@ fork-ts-checker-webpack-plugin@6.1.0, fork-ts-checker-webpack-plugin@^6.0.4: semver "^7.3.2" tapable "^1.0.0" -fork-ts-checker-webpack-plugin@7.2.13: - version "7.2.13" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.13.tgz#51ffd6a2f96f03ab64b92f8aedf305dbf3dee0f1" - integrity sha512-fR3WRkOb4bQdWB/y7ssDUlVdrclvwtyCUIHCfivAoYxq9dF7XfrDKbMdZIfwJ7hxIAqkYSGeU7lLJE6xrxIBdg== - dependencies: - "@babel/code-frame" "^7.16.7" - chalk "^4.1.2" - chokidar "^3.5.3" - cosmiconfig "^7.0.1" - deepmerge "^4.2.2" - fs-extra "^10.0.0" - memfs "^3.4.1" - minimatch "^3.0.4" - node-abort-controller "^3.0.1" - schema-utils "^3.1.1" - semver "^7.3.5" - tapable "^2.2.1" - fork-ts-checker-webpack-plugin@^4.1.6: version "4.1.6" resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5" @@ -13480,7 +13425,7 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -fraction.js@^4.0.13, fraction.js@^4.2.0: +fraction.js@^4.0.13: version "4.2.0" resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== @@ -13946,13 +13891,6 @@ glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0, dependencies: is-glob "^4.0.1" -glob-parent@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - glob-promise@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20" @@ -14150,18 +14088,6 @@ globby@^10.0.1: merge2 "^1.2.3" slash "^3.0.0" -globby@^12.0.2: - version "12.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" - integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== - dependencies: - array-union "^3.0.1" - dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.9" - merge2 "^1.4.1" - slash "^4.0.0" - globby@^13.1.2: version "13.2.2" resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592" @@ -14212,7 +14138,7 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -got@11.8.5: +got@11.8.5, got@^11.8.5: version "11.8.5" resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== @@ -14961,7 +14887,7 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -http-proxy-middleware@^2.0.0, http-proxy-middleware@^2.0.3: +http-proxy-middleware@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== @@ -15102,7 +15028,7 @@ icss-utils@^4.0.0, icss-utils@^4.1.1: dependencies: postcss "^7.0.14" -icss-utils@^5.0.0, icss-utils@^5.1.0: +icss-utils@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== @@ -15153,16 +15079,11 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.9, ignore@^5.2.0, ignore@^5.2.4: +ignore@^5.0.4, ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== - immediate@~3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" @@ -15983,11 +15904,6 @@ is-weakref@^1.0.1: dependencies: call-bind "^1.0.0" -is-what@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" - integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== - is-whitespace-character@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" @@ -16684,7 +16600,7 @@ jest-worker@^26.5.0, jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^27.0.2, jest-worker@^27.4.5: +jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== @@ -16918,6 +16834,16 @@ json5@^2.1.0, json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.1, json5@^2.2 resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== +jsonc-eslint-parser@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.3.0.tgz#7c2de97d01bff7227cbef2f25d1025d42a36198b" + integrity sha512-9xZPKVYp9DxnM3sd1yAsh/d59iIaswDkai8oTxbursfKYbg/ibjX0IzFt35+VZ8iEW453TVTXztnRvYUQlAfUQ== + dependencies: + acorn "^8.5.0" + eslint-visitor-keys "^3.0.0" + espree "^9.0.0" + semver "^7.3.5" + jsonc-parser@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" @@ -17290,7 +17216,7 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -klona@^2.0.4, klona@^2.0.5: +klona@^2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== @@ -17447,14 +17373,6 @@ latest-version@^3.0.0: dependencies: package-json "^4.0.0" -launch-editor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" - integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== - dependencies: - picocolors "^1.0.0" - shell-quote "^1.7.3" - lazy-ass@1.6.0, lazy-ass@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" @@ -17525,30 +17443,6 @@ lerna@5.5.2: nx ">=14.6.1 < 16" typescript "^3 || ^4" -less-loader@11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.0.tgz#a452384259bdf8e4f6d5fdcc39543609e6313f82" - integrity sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug== - dependencies: - klona "^2.0.4" - -less@4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/less/-/less-4.1.3.tgz#175be9ddcbf9b250173e0a00b4d6920a5b770246" - integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA== - dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" - tslib "^2.3.0" - optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - make-dir "^2.1.0" - mime "^1.4.1" - needle "^3.1.0" - source-map "~0.6.0" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -17604,13 +17498,6 @@ license-webpack-plugin@2.3.10: "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" -license-webpack-plugin@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz#1e18442ed20b754b82f1adeff42249b81d11aec6" - integrity sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw== - dependencies: - webpack-sources "^3.0.0" - lie@~3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" @@ -17646,11 +17533,6 @@ liftoff@^3.1.0: rechoir "^0.6.2" resolve "^1.1.7" -lilconfig@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -17765,7 +17647,7 @@ loader-utils@1.4.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4. emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@2.0.0, loader-utils@2.0.4, loader-utils@^2.0.0, loader-utils@^2.0.3, loader-utils@^2.0.4, loader-utils@~2.0.4: +loader-utils@2.0.0, loader-utils@2.0.4, loader-utils@^2.0.0, loader-utils@^2.0.4, loader-utils@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== @@ -18055,7 +17937,7 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash.uniq@4.5.0, lodash.uniq@^4.5.0: +lodash.uniq@4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= @@ -18436,11 +18318,6 @@ mdast-util-to-string@^1.0.0: resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527" integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A== -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - mdurl@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -18615,7 +18492,7 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.52.0, "mime-db@>= 1.40.0 < 2": +mime-db@1.52.0, "mime-db@>= 1.40.0 < 2", mime-db@^1.28.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== @@ -18627,7 +18504,7 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@^2.1.30, dependencies: mime-db "1.52.0" -mime@1.6.0, mime@^1.4.1: +mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -18689,13 +18566,6 @@ mini-css-extract-plugin@2.6.1: dependencies: schema-utils "^4.0.0" -mini-css-extract-plugin@~2.4.7: - version "2.4.7" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.7.tgz#b9f4c4f4d727c7a3cd52a11773bb739f00177fac" - integrity sha512-euWmddf0sk9Nv1O0gfeeUAvAkoSlWncNLF77C0TP2+WoPvy8mAHKOzMajcCz2dzvyt3CNgxb1obIEVFIRxaipg== - dependencies: - schema-utils "^4.0.0" - minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -18881,7 +18751,7 @@ mkdirp@0.5.5, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.3, mkdi dependencies: minimist "^1.2.5" -mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -19031,14 +18901,6 @@ multicast-dns@^6.0.1: dns-packet "^1.3.1" thunky "^1.0.2" -multicast-dns@^7.2.5: - version "7.2.5" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" - integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== - dependencies: - dns-packet "^5.2.2" - thunky "^1.0.2" - multimatch@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6" @@ -19077,7 +18939,7 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== -nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.6: +nanoid@^3.1.23, nanoid@^3.3.1: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== @@ -19124,15 +18986,6 @@ needle@^2.2.1: iconv-lite "^0.4.4" sax "^1.2.4" -needle@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44" - integrity sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ== - dependencies: - debug "^3.2.6" - iconv-lite "^0.6.3" - sax "^1.2.4" - negotiator@0.6.3, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -19173,11 +19026,6 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-abort-controller@^3.0.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" - integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== - node-addon-api@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -19380,7 +19228,7 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^2.0.12: +node-releases@^2.0.8: version "2.0.13" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== @@ -19722,6 +19570,56 @@ nx@15.9.4, "nx@>=14.6.1 < 16": "@nrwl/nx-win32-arm64-msvc" "15.9.4" "@nrwl/nx-win32-x64-msvc" "15.9.4" +nx@16.1.4: + version "16.1.4" + resolved "https://registry.yarnpkg.com/nx/-/nx-16.1.4.tgz#cbdc4896e4cf4fd25d0ec52fab2dc3307984f329" + integrity sha512-fSkgC8wXLdW6QMaBHDXeEUJINgxBa0Vsut6Hq2SxEhtxmnx+lx++7NlhYVNZixTMRmI4a5vK0jdfPpe9hknsRA== + dependencies: + "@nrwl/tao" "16.1.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: + "@nx/nx-darwin-arm64" "16.1.4" + "@nx/nx-darwin-x64" "16.1.4" + "@nx/nx-linux-arm-gnueabihf" "16.1.4" + "@nx/nx-linux-arm64-gnu" "16.1.4" + "@nx/nx-linux-arm64-musl" "16.1.4" + "@nx/nx-linux-x64-gnu" "16.1.4" + "@nx/nx-linux-x64-musl" "16.1.4" + "@nx/nx-win32-arm64-msvc" "16.1.4" + "@nx/nx-win32-x64-msvc" "16.1.4" + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -20012,6 +19910,13 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= +os-filter-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-2.0.0.tgz#1c0b62d5f3a2442749a2d139e6dddee6e81d8d16" + integrity sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg== + dependencies: + arch "^2.1.0" + os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -20473,7 +20378,7 @@ parse-link-header@^2.0.0: dependencies: xtend "~4.0.1" -parse-node-version@^1.0.0, parse-node-version@^1.0.1: +parse-node-version@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== @@ -20497,11 +20402,6 @@ parse-url@^8.1.0: dependencies: parse-path "^7.0.0" -parse5@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" - integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== - parse5@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" @@ -20682,6 +20582,11 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" +peek-readable@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.0.0.tgz#7ead2aff25dc40458c60347ea76cfdfd63efdfec" + integrity sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A== + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -20893,52 +20798,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-calc@^8.2.3: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" - integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== - dependencies: - postcss-selector-parser "^6.0.9" - postcss-value-parser "^4.2.0" - -postcss-colormin@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f" - integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" - -postcss-convert-values@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393" - integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-discard-comments@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" - integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== - -postcss-discard-duplicates@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" - integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== - -postcss-discard-empty@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" - integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== - -postcss-discard-overridden@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" - integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== - postcss-flexbugs-fixes@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690" @@ -20946,15 +20805,6 @@ postcss-flexbugs-fixes@^4.2.1: dependencies: postcss "^7.0.26" -postcss-import@~14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" - integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== - dependencies: - postcss-value-parser "^4.0.0" - read-cache "^1.0.0" - resolve "^1.1.7" - postcss-loader@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.1.0.tgz#4647a6c8dad3cb6b253fbfaa21d62201086f6e39" @@ -20977,65 +20827,6 @@ postcss-loader@^4.2.0: schema-utils "^3.0.0" semver "^7.3.4" -postcss-loader@^6.1.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" - integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== - dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.5" - -postcss-merge-longhand@^5.1.7: - version "5.1.7" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16" - integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== - dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.1.1" - -postcss-merge-rules@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c" - integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - cssnano-utils "^3.1.0" - postcss-selector-parser "^6.0.5" - -postcss-minify-font-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" - integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-minify-gradients@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" - integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== - dependencies: - colord "^2.9.1" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-params@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352" - integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== - dependencies: - browserslist "^4.21.4" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-selectors@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" - integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== - dependencies: - postcss-selector-parser "^6.0.5" - postcss-modules-extract-imports@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" @@ -21111,93 +20902,7 @@ postcss-modules@4.1.3: postcss-modules-values "^4.0.0" string-hash "^1.1.1" -postcss-normalize-charset@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" - integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== - -postcss-normalize-display-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" - integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-positions@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" - integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-repeat-style@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" - integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-string@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" - integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-timing-functions@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" - integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-unicode@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030" - integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-normalize-url@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" - integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== - dependencies: - normalize-url "^6.0.1" - postcss-value-parser "^4.2.0" - -postcss-normalize-whitespace@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" - integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-ordered-values@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" - integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== - dependencies: - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-reduce-initial@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6" - integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" - integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.0.13" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== @@ -21205,27 +20910,12 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" - integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== - dependencies: - postcss-value-parser "^4.2.0" - svgo "^2.7.0" - -postcss-unique-selectors@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" - integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.3.5: +postcss@8.3.5, postcss@^8.1.4: version "8.3.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== @@ -21243,15 +20933,6 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0 source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.1.4, postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.19: - version "8.4.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab" - integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA== - dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" - prefix-style@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/prefix-style/-/prefix-style-2.0.1.tgz#66bba9a870cfda308a5dc20e85e9120932c95a06" @@ -22153,13 +21834,6 @@ react@18.2.0: dependencies: loose-envify "^1.1.0" -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== - dependencies: - pify "^2.3.0" - read-cmd-shim@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087" @@ -22301,6 +21975,13 @@ readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" +readable-web-to-node-stream@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" + integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== + dependencies: + readable-stream "^3.6.0" + readdir-scoped-modules@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" @@ -23076,20 +22757,20 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -rxjs@>=6.4.0, rxjs@^6.5.4, rxjs@^6.5.5, rxjs@^6.6.0: +rxjs@>=6.4.0, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== + dependencies: + tslib "^2.1.0" + +rxjs@^6.5.5, rxjs@^6.6.0: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -rxjs@^7.5.1, rxjs@^7.5.5: - version "7.5.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc" - integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== - dependencies: - tslib "^2.1.0" - safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -23112,7 +22793,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -23139,7 +22820,7 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@12.4.0, sass-loader@^12.2.0: +sass-loader@12.4.0: version "12.4.0" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.4.0.tgz#260b0d51a8a373bb8e88efc11f6ba5583fea0bcf" integrity sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg== @@ -23147,7 +22828,7 @@ sass-loader@12.4.0, sass-loader@^12.2.0: klona "^2.0.4" neo-async "^2.6.2" -sass@1.49.11, sass@^1.42.1: +sass@1.49.11: version "1.49.11" resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.11.tgz#1ffeb77faeed8b806a2a1e021d7c9fd3fc322cb7" integrity sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ== @@ -23173,7 +22854,7 @@ sax@0.5.x: resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" integrity sha512-c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw== -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -23280,7 +22961,7 @@ selenium-webdriver@^4.0.0-alpha.8: tmp "^0.2.1" ws ">=8.7.0" -selfsigned@^2.0.0, selfsigned@^2.1.1: +selfsigned@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== @@ -23306,6 +22987,18 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" +semver-regex@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-4.0.5.tgz#fbfa36c7ba70461311f5debcb3928821eb4f9180" + integrity sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw== + +semver-truncate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-3.0.0.tgz#0e3b4825d4a4225d8ae6e7c72231182b42edba40" + integrity sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg== + dependencies: + semver "^7.3.5" + "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -23318,7 +23011,7 @@ semver@7.3.4: dependencies: lru-cache "^6.0.0" -semver@7.5.2, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: +semver@7.5.2: version "7.5.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== @@ -23330,6 +23023,13 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@~7.3.0: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" @@ -23378,7 +23078,7 @@ serialize-javascript@^5.0.1: dependencies: randombytes "^2.1.0" -serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: +serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== @@ -23498,11 +23198,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.3: - version "1.8.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" - integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -23543,16 +23238,16 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +slash@3.0.0, slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - slash@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" @@ -23649,7 +23344,7 @@ socket.io@^4.4.1: socket.io-adapter "~2.4.0" socket.io-parser "~4.0.4" -sockjs@^0.3.21, sockjs@^0.3.24: +sockjs@^0.3.21: version "0.3.24" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== @@ -23689,6 +23384,20 @@ sort-css-media-queries@^1.4.3: resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-1.5.4.tgz#24182b12002a13d01ba943ddf74f5098d7c244ce" integrity sha512-YP5W/h4Sid/YP7Lp87ejJ5jP13/Mtqt2vx33XyhO+IAugKlufRPbOrPlIiEUuxmpNBSBd3EeeQpFhdu3RfI2Ag== +sort-keys-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" + integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw== + dependencies: + sort-keys "^1.0.0" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg== + dependencies: + is-plain-obj "^1.0.0" + sort-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" @@ -23708,7 +23417,7 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -23727,15 +23436,6 @@ source-map-loader@4.0.0: iconv-lite "^0.6.3" source-map-js "^1.0.2" -source-map-loader@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.2.tgz#af23192f9b344daa729f6772933194cc5fa54fee" - integrity sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg== - dependencies: - abab "^2.0.5" - iconv-lite "^0.6.3" - source-map-js "^1.0.1" - source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -23747,14 +23447,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - source-map-support@0.5.13: version "0.5.13" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" @@ -23771,7 +23463,7 @@ source-map-support@0.5.19: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.5.16, source-map-support@^0.5.21, source-map-support@^0.5.5, source-map-support@~0.5.12, source-map-support@~0.5.20: +source-map-support@^0.5.16, source-map-support@^0.5.5, source-map-support@~0.5.12, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -24350,6 +24042,11 @@ strip-outer@^1.0.1: dependencies: escape-string-regexp "^1.0.2" +strip-outer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-2.0.0.tgz#c45c724ed9b1ff6be5f660503791404f4714084b" + integrity sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg== + strong-log-transformer@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -24359,6 +24056,14 @@ strong-log-transformer@^2.1.0: minimist "^1.2.0" through "^2.3.4" +strtok3@^7.0.0-alpha.9: + version "7.0.0" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.0.0.tgz#868c428b4ade64a8fd8fee7364256001c1a4cbe5" + integrity sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ== + dependencies: + "@tokenizer/token" "^0.3.0" + peek-readable "^5.0.0" + structured-source@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz#dd802425e0f53dc4a6e7aca3752901a1ccda7af5" @@ -24382,11 +24087,6 @@ style-loader@^1.3.0: loader-utils "^2.0.0" schema-utils "^2.7.0" -style-loader@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.2.tgz#eaebca714d9e462c19aa1e3599057bc363924899" - integrity sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw== - style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" @@ -24410,14 +24110,6 @@ styled-components@^5.1.1: shallowequal "^1.1.0" supports-color "^5.5.0" -stylehacks@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" - integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== - dependencies: - browserslist "^4.21.4" - postcss-selector-parser "^6.0.4" - stylis-plugin-rtl@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/stylis-plugin-rtl/-/stylis-plugin-rtl-2.1.0.tgz#e20ad640949b0e62fa214dabc839d2d7c83a2182" @@ -24435,29 +24127,6 @@ stylis@^4.0.13, stylis@^4.0.3, stylis@^4.0.6, stylis@^4.2.0: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c" integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ== -stylus-loader@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-7.1.0.tgz#19e09a98b19075c246e6e3f65e38b8cb89d2d6fb" - integrity sha512-gNUEjjozR+oZ8cuC/Fx4LVXqZOgDKvpW9t2hpXHcxjfPYqSjQftaGwZUK+wL9B0QJ26uS6p1EmoWHmvld1dF7g== - dependencies: - fast-glob "^3.2.12" - klona "^2.0.5" - normalize-path "^3.0.0" - -stylus@^0.55.0: - version "0.55.0" - resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.55.0.tgz#bd404a36dd93fa87744a9dd2d2b1b8450345e5fc" - integrity sha512-MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw== - dependencies: - css "^3.0.0" - debug "~3.1.0" - glob "^7.1.6" - mkdirp "~1.0.4" - safer-buffer "^2.1.2" - sax "~1.2.4" - semver "^6.3.0" - source-map "^0.7.3" - supports-color@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a" @@ -24534,19 +24203,6 @@ sver-compat@^1.5.0: es6-iterator "^2.0.1" es6-symbol "^3.1.1" -svgo@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" - swap-case@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3" @@ -24674,7 +24330,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: +tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== @@ -24761,7 +24417,7 @@ term-size@^2.1.0: resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.1.1.tgz#f81ec25854af91a480d2f9d0c77ffcb26594ed1a" integrity sha512-UqvQSch04R+69g4RDhrslmGvGL3ucDRX/U+snYW0Mab4uCAyKSndUksaoqlJ81QKSpRnIsuOYQCbC2ZWx2896A== -terser-webpack-plugin@5.3.9, terser-webpack-plugin@^5.0.3, terser-webpack-plugin@^5.3.3, terser-webpack-plugin@^5.3.7: +terser-webpack-plugin@5.3.9, terser-webpack-plugin@^5.0.3, terser-webpack-plugin@^5.3.7: version "5.3.9" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== @@ -25071,6 +24727,14 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +token-types@^5.0.0-alpha.2: + version "5.0.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-5.0.1.tgz#aa9d9e6b23c420a675e55413b180635b86a093b4" + integrity sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg== + dependencies: + "@tokenizer/token" "^0.3.0" + ieee754 "^1.2.1" + toposort@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" @@ -25155,6 +24819,13 @@ trim-repeated@^1.0.0: dependencies: escape-string-regexp "^1.0.2" +trim-repeated@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-2.0.0.tgz#5d60556d6d40d9461b7c7e06c3ac20b6b1d50090" + integrity sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg== + dependencies: + escape-string-regexp "^5.0.0" + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -25194,10 +24865,10 @@ ts-invariant@^0.10.3: dependencies: tslib "^2.1.0" -ts-jest@29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.0.tgz#4a9db4104a49b76d2b368ea775b6c9535c603891" - integrity sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA== +ts-jest@29.1.1: + version "29.1.1" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b" + integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA== dependencies: bs-logger "0.x" fast-json-stable-stringify "2.x" @@ -25205,10 +24876,10 @@ ts-jest@29.1.0: json5 "^2.2.3" lodash.memoize "4.x" make-error "1.x" - semver "7.x" + semver "^7.5.3" yargs-parser "^21.0.1" -ts-loader@9.3.1, ts-loader@^9.3.1: +ts-loader@9.3.1: version "9.3.1" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.1.tgz#fe25cca56e3e71c1087fe48dc67f4df8c59b22d4" integrity sha512-OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw== @@ -25298,7 +24969,7 @@ tslib@1.11.2: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9" integrity sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg== -tslib@2.5.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0: +tslib@2.5.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1: version "2.5.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== @@ -25419,11 +25090,6 @@ type@^2.0.0: resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3" integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow== -typed-assert@^1.0.8: - version "1.0.9" - resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213" - integrity sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg== - typed-rest-client@^1.8.4: version "1.8.9" resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.9.tgz#e560226bcadfe71b0fb5c416b587f8da3b8f92d8" @@ -25825,7 +25491,7 @@ upath@^2.0.1: resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== -update-browserslist-db@^1.0.11: +update-browserslist-db@^1.0.10: version "1.0.11" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== @@ -26422,42 +26088,6 @@ webpack-dev-server@4.7.4: webpack-dev-middleware "^5.3.1" ws "^8.4.2" -webpack-dev-server@^4.9.3: - version "4.15.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21" - integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - launch-editor "^2.6.0" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.13.0" - webpack-filter-warnings-plugin@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/webpack-filter-warnings-plugin/-/webpack-filter-warnings-plugin-1.2.1.tgz#dc61521cf4f9b4a336fbc89108a75ae1da951cdb" @@ -26496,11 +26126,6 @@ webpack-merge@^4.1.5: dependencies: lodash "^4.17.15" -webpack-node-externals@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917" - integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ== - webpack-sources@^1.2.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" @@ -26517,18 +26142,11 @@ webpack-sources@^2.2.0: source-list-map "^2.0.1" source-map "^0.6.1" -webpack-sources@^3.0.0, webpack-sources@^3.2.3: +webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack-subresource-integrity@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz#8b7606b033c6ccac14e684267cb7fb1f5c2a132a" - integrity sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q== - dependencies: - typed-assert "^1.0.8" - webpack-virtual-modules@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299" @@ -26911,16 +26529,11 @@ write-pkg@^4.0.0: type-fest "^0.4.1" write-json-file "^3.2.0" -ws@8.11.0: +ws@8.11.0, ws@>=8.7.0, ws@^8.11.0, ws@^8.2.3, ws@^8.4.2: version "8.11.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== -ws@>=8.7.0, ws@^8.11.0, ws@^8.13.0, ws@^8.2.3, ws@^8.4.2: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== - ws@^7.2.0, ws@^7.3.1: version "7.5.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" @@ -27033,7 +26646,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: +yaml@^1.10.0, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==