From 6456774dc2676b5d733cf31cc7604efc700e5eaa Mon Sep 17 00:00:00 2001 From: Dominik Pieper Date: Mon, 23 Oct 2023 12:27:36 +0200 Subject: [PATCH] chore(nxext): update to Nx 17 --- .gitignore | 2 + .prettierignore | 2 + e2e/preact-e2e/project.json | 2 +- e2e/solid-e2e/project.json | 2 +- e2e/stencil-e2e/project.json | 2 +- e2e/svelte-e2e/project.json | 2 +- e2e/sveltekit-e2e/project.json | 2 +- e2e/vue-e2e/project.json | 2 +- migrations.json | 34 +- nx.json | 23 +- package.json | 39 +- packages/core/package.json | 4 +- packages/core/project.json | 2 +- packages/nuxt/package.json | 12 +- packages/nuxt/project.json | 2 +- .../application/application.spec.ts | 2 +- .../generators/application/lib/add-linting.ts | 4 +- .../src/generators/application/schema.d.ts | 2 +- packages/preact/package.json | 12 +- packages/preact/project.json | 2 +- .../application/application.spec.ts | 2 +- .../src/generators/application/application.ts | 17 +- .../generators/application/lib/add-linting.ts | 4 +- .../application/lib/create-lint-target.ts | 2 +- .../application/lib/update-vite-config.ts | 24 - .../src/generators/application/schema.d.ts | 2 +- .../src/generators/library/lib/add-linting.ts | 4 +- .../src/generators/library/lib/add-project.ts | 2 +- .../library/lib/update-vite-config.ts | 24 - .../src/generators/library/library.spec.ts | 2 +- .../preact/src/generators/library/library.ts | 21 +- .../preact/src/generators/library/schema.d.ts | 3 +- .../preact/src/generators/utils/testing.ts | 2 +- packages/solid/package.json | 12 +- packages/solid/project.json | 2 +- .../application/application.spec.ts | 2 +- .../src/generators/application/application.ts | 17 +- .../generators/application/lib/add-linting.ts | 4 +- .../generators/application/lib/add-project.ts | 2 +- .../application/lib/update-vite-config.ts | 24 - .../src/generators/application/schema.d.ts | 2 +- .../src/generators/library/lib/add-linting.ts | 4 +- .../src/generators/library/lib/add-project.ts | 2 +- .../library/lib/update-vite-config.ts | 24 - .../src/generators/library/library.spec.ts | 2 +- .../solid/src/generators/library/library.ts | 17 +- .../solid/src/generators/library/schema.d.ts | 2 +- .../solid/src/generators/utils/testing.ts | 2 +- packages/stencil/package.json | 20 +- packages/stencil/project.json | 2 +- .../add-outputtarget/add-react/generator.ts | 2 +- .../add-outputtarget/add-svelte/generator.ts | 2 +- .../generators/application/generator.spec.ts | 2 +- .../generators/application/lib/add-linting.ts | 6 +- .../src/generators/application/schema.d.ts | 2 +- .../generators/component/component.spec.ts | 4 +- .../stencil/src/generators/init/init.spec.ts | 7 +- .../generators/ionic-pwa/generator.spec.ts | 2 +- .../generators/ionic-pwa/lib/add-linting.ts | 6 +- .../src/generators/ionic-pwa/schema.d.ts | 2 +- .../src/generators/library/generator.ts | 4 +- .../src/generators/library/lib/add-linting.ts | 6 +- .../src/generators/library/schema.d.ts | 2 +- .../make-lib-buildable/lib/update-tsconfig.ts | 2 +- .../make-lib-buildable.spec.ts | 16 +- .../storybook-configuration/generator.ts | 8 +- .../storybook-configuration/schema.d.ts | 2 +- packages/stencil/src/utils/targets.ts | 2 +- packages/stencil/src/utils/testing.ts | 13 +- packages/svelte/package.json | 16 +- packages/svelte/project.json | 2 +- .../application/application.spec.ts | 2 +- .../src/generators/application/application.ts | 22 +- .../generators/application/lib/add-linting.ts | 2 +- .../application/lib/update-vite-config.ts | 29 - .../src/generators/application/schema.d.ts | 2 +- .../generators/init/lib/add-linter-plugin.ts | 4 +- .../src/generators/library/lib/add-linting.ts | 4 +- .../library/lib/update-vite-config.ts | 35 - .../src/generators/library/library.spec.ts | 2 +- .../svelte/src/generators/library/library.ts | 17 +- .../svelte/src/generators/library/schema.d.ts | 2 +- .../configuration.spec.ts | 2 +- .../storybook-configuration/configuration.ts | 2 +- .../storybook-configuration/schema.d.ts | 2 +- .../svelte/src/generators/utils/targets.ts | 2 +- .../svelte/src/generators/utils/testing.ts | 2 +- packages/sveltekit/package.json | 8 +- packages/sveltekit/project.json | 2 +- .../src/executors/add/executor.spec.ts | 1 - .../src/executors/sveltekit/executor.spec.ts | 1 - .../generators/application/generator.spec.ts | 2 +- .../src/generators/application/generator.ts | 17 +- .../generators/application/lib/add-linting.ts | 4 +- .../application/lib/update-vite-config.ts | 24 - .../src/generators/application/schema.d.ts | 2 +- .../sveltekit/src/generators/utils/testing.ts | 2 +- packages/vue/package.json | 17 +- packages/vue/project.json | 2 +- .../application/application.spec.ts | 2 +- .../generators/application/lib/add-linting.ts | 4 +- .../generators/application/lib/add-vite.ts | 16 +- .../application/lib/update-vite-config.ts | 24 - .../src/generators/application/schema.d.ts | 2 +- .../generators/component/component.spec.ts | 2 +- .../src/generators/library/lib/add-linting.ts | 2 +- .../library/lib/update-base-tsconfig.ts | 2 +- .../library/lib/update-vite-config.ts | 24 - .../src/generators/library/library.spec.ts | 2 +- .../vue/src/generators/library/library.ts | 31 +- .../vue/src/generators/preset/preset.spec.ts | 2 +- .../vue/src/generators/preset/schema.d.ts | 2 +- .../configuration.spec.ts | 2 +- .../storybook-configuration/schema.d.ts | 2 +- pnpm-lock.yaml | 956 +++++++++--------- 115 files changed, 859 insertions(+), 940 deletions(-) delete mode 100644 packages/preact/src/generators/application/lib/update-vite-config.ts delete mode 100644 packages/preact/src/generators/library/lib/update-vite-config.ts delete mode 100644 packages/solid/src/generators/application/lib/update-vite-config.ts delete mode 100644 packages/solid/src/generators/library/lib/update-vite-config.ts delete mode 100644 packages/svelte/src/generators/application/lib/update-vite-config.ts delete mode 100644 packages/svelte/src/generators/library/lib/update-vite-config.ts delete mode 100644 packages/sveltekit/src/generators/application/lib/update-vite-config.ts delete mode 100644 packages/vue/src/generators/application/lib/update-vite-config.ts delete mode 100644 packages/vue/src/generators/library/lib/update-vite-config.ts diff --git a/.gitignore b/.gitignore index 842492e13..fe746f4aa 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ e2e/stencil-e2e/tests/dev.test.ts # Vitepress /docs/.vitepress/cache + +.nx/cache \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index bc58e8732..aaada96ef 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,5 @@ /tmp .docusaurus/ /build + +/.nx/cache \ No newline at end of file diff --git a/e2e/preact-e2e/project.json b/e2e/preact-e2e/project.json index f26695fa6..5286a4ad1 100644 --- a/e2e/preact-e2e/project.json +++ b/e2e/preact-e2e/project.json @@ -21,7 +21,7 @@ "dependsOn": ["^build"] }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["e2e/preact-e2e/**/*.ts"] diff --git a/e2e/solid-e2e/project.json b/e2e/solid-e2e/project.json index fb0d20774..22dc1ff82 100644 --- a/e2e/solid-e2e/project.json +++ b/e2e/solid-e2e/project.json @@ -21,7 +21,7 @@ "dependsOn": ["^build"] }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["e2e/solid-e2e/**/*.ts"] diff --git a/e2e/stencil-e2e/project.json b/e2e/stencil-e2e/project.json index ed3ade9a0..d26c9d548 100644 --- a/e2e/stencil-e2e/project.json +++ b/e2e/stencil-e2e/project.json @@ -21,7 +21,7 @@ "dependsOn": ["^build"] }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["e2e/stencil-e2e/**/*.ts"] diff --git a/e2e/svelte-e2e/project.json b/e2e/svelte-e2e/project.json index 03f563a63..f3a55667a 100644 --- a/e2e/svelte-e2e/project.json +++ b/e2e/svelte-e2e/project.json @@ -21,7 +21,7 @@ "dependsOn": ["^build"] }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["e2e/svelte-e2e/**/*.ts"] diff --git a/e2e/sveltekit-e2e/project.json b/e2e/sveltekit-e2e/project.json index 50eff5f26..7c95dceb3 100644 --- a/e2e/sveltekit-e2e/project.json +++ b/e2e/sveltekit-e2e/project.json @@ -21,7 +21,7 @@ "dependsOn": ["^build"] }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["e2e/sveltekit-e2e/**/*.ts"] diff --git a/e2e/vue-e2e/project.json b/e2e/vue-e2e/project.json index ea975f7fb..95d6b0bf7 100644 --- a/e2e/vue-e2e/project.json +++ b/e2e/vue-e2e/project.json @@ -21,7 +21,7 @@ "dependsOn": ["^build"] }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["e2e/vue-e2e/**/*.ts"] diff --git a/migrations.json b/migrations.json index d53422ddb..24295791b 100644 --- a/migrations.json +++ b/migrations.json @@ -2,19 +2,33 @@ "migrations": [ { "cli": "nx", - "version": "16.9.0-beta.1", - "description": "Replace imports of Module Federation utils frm @nx/devkit to @nx/webpack", - "implementation": "./src/migrations/update-16-9-0/migrate-mf-util-usage", - "package": "@nx/devkit", - "name": "update-16-9-0-migrate-mf-usage-to-webpack" + "version": "17.0.0-beta.1", + "description": "Updates the default cache directory to .nx/cache", + "implementation": "./src/migrations/update-17-0-0/move-cache-directory", + "package": "nx", + "name": "17.0.0-move-cache-directory" }, { "cli": "nx", - "version": "16.8.2-beta.0", - "description": "Remove invalid options (strict, noInterop) for ES6 type modules.", - "factory": "./src/migrations/update-16-8-2/update-swcrc", - "package": "@nx/js", - "name": "16-8-2-update-swcrc" + "version": "17.0.0-beta.3", + "description": "Use minimal config for tasksRunnerOptions", + "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options", + "package": "nx", + "name": "17.0.0-use-minimal-config-for-tasks-runner-options" + }, + { + "version": "17.0.0-rc.1", + "description": "Migration for v17.0.0-rc.1", + "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope", + "package": "nx", + "name": "rm-default-collection-npm-scope" + }, + { + "version": "17.0.0-beta.7", + "description": "update-17-0-0-rename-to-eslint", + "implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint", + "package": "@nx/eslint", + "name": "update-17-0-0-rename-to-eslint" } ] } diff --git a/nx.json b/nx.json index 605ab7ada..828d5f69b 100644 --- a/nx.json +++ b/nx.json @@ -1,19 +1,14 @@ { - "npmScope": "nxext", "workspaceLayout": { "appsDir": "e2e", "libsDir": "packages" }, "tasksRunnerOptions": { "default": { - "runner": "nx-cloud", "options": { - "accessToken": "NTlhMGE3ZTYtYjk5OC00Mzc5LWE2ZTAtNzE4ODEzNDY5MjlmfHJlYWQ=", "useLightClient": true, - "cacheableOperations": ["build", "test", "lint", "e2e"], "canTrackAnalytics": true, - "showUsageWarnings": true, - "parallel": 1 + "showUsageWarnings": true } } }, @@ -79,17 +74,20 @@ "targetDefaults": { "build": { "dependsOn": ["^build"], - "inputs": ["production", "^production"] + "inputs": ["production", "^production"], + "cache": true }, "test": { - "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"] + "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"], + "cache": true }, "lint": { "inputs": [ "default", "{workspaceRoot}/.eslintrc.json", "{workspaceRoot}/eslint.config.js" - ] + ], + "cache": true }, "build-storybook": { "inputs": [ @@ -98,6 +96,9 @@ "{projectRoot}/.storybook/**/*", "{projectRoot}/tsconfig.storybook.json" ] + }, + "e2e": { + "cache": true } }, "$schema": "./node_modules/nx/schemas/nx-schema.json", @@ -121,5 +122,7 @@ "!{projectRoot}/tsconfig.storybook.json", "!{projectRoot}/eslint.config.js" ] - } + }, + "nxCloudAccessToken": "NTlhMGE3ZTYtYjk5OC00Mzc5LWE2ZTAtNzE4ODEzNDY5MjlmfHJlYWQ=", + "parallel": 1 } diff --git a/package.json b/package.json index 1800e80d3..c1c764811 100644 --- a/package.json +++ b/package.json @@ -56,21 +56,20 @@ "@eslint/eslintrc": "^2.1.1", "@eslint/js": "8.49.0", "@nuxt/kit": "3.6.5", - "@nx/angular": "16.10.0", - "@nx/cypress": "16.10.0", - "@nx/devkit": "16.10.0", - "@nx/eslint-plugin": "16.10.0", - "@nx/jest": "16.10.0", - "@nx/js": "16.10.0", - "@nx/linter": "16.10.0", - "@nx/node": "16.10.0", - "@nx/playwright": "16.10.0", - "@nx/plugin": "16.10.0", - "@nx/react": "16.10.0", - "@nx/storybook": "16.10.0", - "@nx/vite": "16.10.0", - "@nx/web": "16.10.0", - "@nx/workspace": "16.10.0", + "@nx/angular": "17.0.1", + "@nx/cypress": "17.0.1", + "@nx/devkit": "17.0.1", + "@nx/eslint-plugin": "17.0.1", + "@nx/jest": "17.0.1", + "@nx/js": "17.0.1", + "@nx/node": "17.0.1", + "@nx/playwright": "17.0.1", + "@nx/plugin": "17.0.1", + "@nx/react": "17.0.1", + "@nx/storybook": "17.0.1", + "@nx/vite": "17.0.1", + "@nx/web": "17.0.1", + "@nx/workspace": "17.0.1", "@phenomnomnominal/tsquery": "~5.0.1", "@preact/preset-vite": "^2.5.0", "@schematics/angular": "16.0.0", @@ -95,7 +94,7 @@ "cz-customizable": "^6.9.1", "dotenv": "16.3.1", "eslint": "8.46.0", - "eslint-config-prettier": "8.8.0", + "eslint-config-prettier": "9.0.0", "eslint-plugin-cypress": "2.14.0", "eslint-plugin-svelte3": "^4.0.0", "file-type": "^18.5.0", @@ -113,8 +112,7 @@ "lint-staged": "13.2.3", "nuxi": "3.6.5", "nuxt": "3.6.5", - "nx": "16.10.0", - "nx-cloud": "16.4.0", + "nx": "17.0.1", "prettier": "2.7.1", "pretty-quick": "^3.1.3", "svelte": "^4.2.1", @@ -128,9 +126,10 @@ "verdaccio": "5.18.0", "verdaccio-auth-memory": "^10.2.2", "vite-plugin-solid": "^2.7.0", - "vitepress": "^1.0.0-rc.20", + "vitepress": "^1.0.0-rc.23", "yargs": "^17.7.2", - "yargs-parser": "^21.1.1" + "yargs-parser": "^21.1.1", + "@nx/eslint": "17.0.1" }, "peerDependencies": { "rxjs": "^7.4.0" diff --git a/packages/core/package.json b/packages/core/package.json index 5da404c27..eabeee5d5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -16,8 +16,8 @@ }, "dependencies": { "tslib": "^2.3.0", - "@nx/devkit": "^16.9.1", + "@nx/devkit": "17.0.1", "typescript": "5.1.6", - "nx": "^16.9.1" + "nx": "17.0.1" } } diff --git a/packages/core/project.json b/packages/core/project.json index 042587675..5602dc80b 100644 --- a/packages/core/project.json +++ b/packages/core/project.json @@ -16,7 +16,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": [ diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index bc5a531a1..57d288767 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -27,18 +27,18 @@ "builders": "./executors.json", "executors": "./executors.json", "dependencies": { - "@nx/devkit": "^16.9.1", + "@nx/devkit": "17.0.1", "tslib": "^2.3.0", - "@nx/workspace": "^16.9.1", + "@nx/workspace": "17.0.1", "@nuxt/kit": "3.6.5", "nuxi": "3.6.5", "@nxext/core": "^16.7.0" }, "peerDependencies": { - "@nx/js": "^16.9.1", - "@nx/linter": "^16.9.1", - "@nx/cypress": "^16.9.1", - "@nx/playwright": "^16.9.1" + "@nx/js": "17.0.1", + "@nx/cypress": "17.0.1", + "@nx/playwright": "17.0.1", + "@nx/eslint": "17.0.1" }, "peerDependenciesMeta": { "@nx/cypress": { diff --git a/packages/nuxt/project.json b/packages/nuxt/project.json index 1468bd99e..f29b0d70e 100644 --- a/packages/nuxt/project.json +++ b/packages/nuxt/project.json @@ -43,7 +43,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": [ diff --git a/packages/nuxt/src/generators/application/application.spec.ts b/packages/nuxt/src/generators/application/application.spec.ts index de252e662..e425c2a90 100644 --- a/packages/nuxt/src/generators/application/application.spec.ts +++ b/packages/nuxt/src/generators/application/application.spec.ts @@ -2,7 +2,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { readJson, readProjectConfiguration, Tree } from '@nx/devkit'; import { applicationGenerator } from './application'; import { Schema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // eslint-disable-next-line @typescript-eslint/no-var-requires const devkit = require('@nx/devkit'); diff --git a/packages/nuxt/src/generators/application/lib/add-linting.ts b/packages/nuxt/src/generators/application/lib/add-linting.ts index 9963483c7..5540f7396 100644 --- a/packages/nuxt/src/generators/application/lib/add-linting.ts +++ b/packages/nuxt/src/generators/application/lib/add-linting.ts @@ -18,8 +18,8 @@ import { mapLintPattern } from '@nxext/core'; export async function addLinting(host: Tree, options: NormalizedSchema) { const tasks: GeneratorCallback[] = []; if (options.linter === 'eslint') { - ensurePackage('@nx/linter', NX_VERSION); - const { lintProjectGenerator } = await import('@nx/linter'); + ensurePackage('@nx/eslint', NX_VERSION); + const { lintProjectGenerator } = await import('@nx/eslint'); const lintTask = await lintProjectGenerator(host, { linter: options.linter, project: options.appProjectName, diff --git a/packages/nuxt/src/generators/application/schema.d.ts b/packages/nuxt/src/generators/application/schema.d.ts index d5d5ec9e5..3afec959b 100644 --- a/packages/nuxt/src/generators/application/schema.d.ts +++ b/packages/nuxt/src/generators/application/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface Schema { name: string; diff --git a/packages/preact/package.json b/packages/preact/package.json index b1fbd307f..5f25521a0 100644 --- a/packages/preact/package.json +++ b/packages/preact/package.json @@ -23,15 +23,15 @@ "main": "src/index.js", "generators": "./generators.json", "peerDependencies": { - "@nx/linter": "^16.9.1", - "@nx/jest": "^16.9.1", - "@nx/vite": "^16.9.1", - "@nx/cypress": "^16.9.1", + "@nx/jest": "17.0.1", + "@nx/vite": "17.0.1", + "@nx/cypress": "17.0.1", "typescript": "5.1.6", - "nx": "^16.9.1" + "nx": "17.0.1", + "@nx/eslint": "17.0.1" }, "dependencies": { "tslib": "^2.3.0", - "@nx/devkit": "^16.9.1" + "@nx/devkit": "17.0.1" } } diff --git a/packages/preact/project.json b/packages/preact/project.json index dcc796c52..bd75dfc1d 100644 --- a/packages/preact/project.json +++ b/packages/preact/project.json @@ -6,7 +6,7 @@ "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { "lintFilePatterns": [ "packages/preact/**/*.ts", diff --git a/packages/preact/src/generators/application/application.spec.ts b/packages/preact/src/generators/application/application.spec.ts index d7ca1b687..a2e7408b3 100644 --- a/packages/preact/src/generators/application/application.spec.ts +++ b/packages/preact/src/generators/application/application.spec.ts @@ -1,5 +1,5 @@ import { PreactApplicationSchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import applicationGenerator from './application'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree } from '@nx/devkit'; diff --git a/packages/preact/src/generators/application/application.ts b/packages/preact/src/generators/application/application.ts index 79c22ded8..58075ffda 100644 --- a/packages/preact/src/generators/application/application.ts +++ b/packages/preact/src/generators/application/application.ts @@ -17,7 +17,7 @@ import { addCypress } from './lib/add-cypress'; import { addJest } from './lib/add-jest'; import { updateJestConfig } from './lib/update-jest-config'; import { addVite } from './lib/add-vite'; -import { updateViteConfig } from './lib/update-vite-config'; +import { createOrEditViteConfig } from '@nx/vite'; function normalizeOptions( tree: Tree, @@ -73,11 +73,24 @@ export async function applicationGenerator( createFiles(tree, options); const viteTask = await addVite(tree, options); + createOrEditViteConfig( + tree, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import preact from '@preact/preset-vite'`], + plugins: [`preact()`], + }, + false + ); + const lintTask = await addLinting(tree, options); const jestTask = await addJest(tree, options); const cypressTask = await addCypress(tree, options); updateJestConfig(tree, options); - updateViteConfig(tree, options); if (!options.skipFormat) { await formatFiles(tree); diff --git a/packages/preact/src/generators/application/lib/add-linting.ts b/packages/preact/src/generators/application/lib/add-linting.ts index 5251c7046..52aa0a58f 100644 --- a/packages/preact/src/generators/application/lib/add-linting.ts +++ b/packages/preact/src/generators/application/lib/add-linting.ts @@ -14,8 +14,8 @@ export async function addLinting(host: Tree, options: NormalizedSchema) { // eslint-disable-next-line @typescript-eslint/no-empty-function return () => {}; } - const { lintProjectGenerator } = ensurePackage( - '@nx/linter', + const { lintProjectGenerator } = ensurePackage( + '@nx/eslint', NX_VERSION ); diff --git a/packages/preact/src/generators/application/lib/create-lint-target.ts b/packages/preact/src/generators/application/lib/create-lint-target.ts index 542d2b22b..502f3236a 100644 --- a/packages/preact/src/generators/application/lib/create-lint-target.ts +++ b/packages/preact/src/generators/application/lib/create-lint-target.ts @@ -5,7 +5,7 @@ export function createLintTarget( options: NormalizedSchema ): TargetConfiguration { return { - executor: '@nx/linter:lint', + executor: '@nx/eslint:lint', options: { linter: 'eslint', tsConfig: joinPathFragments(options.projectRoot, 'tsconfig.app.json'), diff --git a/packages/preact/src/generators/application/lib/update-vite-config.ts b/packages/preact/src/generators/application/lib/update-vite-config.ts deleted file mode 100644 index 7c81f7b1d..000000000 --- a/packages/preact/src/generators/application/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - preact(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import preact from '@preact/preset-vite'; - ` - ); -} diff --git a/packages/preact/src/generators/application/schema.d.ts b/packages/preact/src/generators/application/schema.d.ts index c75863ae6..5b1bff4fe 100644 --- a/packages/preact/src/generators/application/schema.d.ts +++ b/packages/preact/src/generators/application/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface PreactApplicationSchema { name: string; diff --git a/packages/preact/src/generators/library/lib/add-linting.ts b/packages/preact/src/generators/library/lib/add-linting.ts index b38c80751..2825c5190 100644 --- a/packages/preact/src/generators/library/lib/add-linting.ts +++ b/packages/preact/src/generators/library/lib/add-linting.ts @@ -14,8 +14,8 @@ export async function addLinting(host: Tree, options: NormalizedSchema) { // eslint-disable-next-line @typescript-eslint/no-empty-function return () => {}; } - const { lintProjectGenerator } = ensurePackage( - '@nx/linter', + const { lintProjectGenerator } = ensurePackage( + '@nx/eslint', NX_VERSION ); diff --git a/packages/preact/src/generators/library/lib/add-project.ts b/packages/preact/src/generators/library/lib/add-project.ts index 25d83926f..ba9e4cf42 100644 --- a/packages/preact/src/generators/library/lib/add-project.ts +++ b/packages/preact/src/generators/library/lib/add-project.ts @@ -17,7 +17,7 @@ export function addProject(tree: Tree, options: NormalizedSchema) { function createLintTarget(options: NormalizedSchema): TargetConfiguration { return { - executor: '@nx/linter:lint', + executor: '@nx/eslint:lint', options: { linter: 'eslint', tsConfig: `${options.projectRoot}/tsconfig.lib.json`, diff --git a/packages/preact/src/generators/library/lib/update-vite-config.ts b/packages/preact/src/generators/library/lib/update-vite-config.ts deleted file mode 100644 index 7c81f7b1d..000000000 --- a/packages/preact/src/generators/library/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - preact(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import preact from '@preact/preset-vite'; - ` - ); -} diff --git a/packages/preact/src/generators/library/library.spec.ts b/packages/preact/src/generators/library/library.spec.ts index 66d4c25f7..d5594edd6 100644 --- a/packages/preact/src/generators/library/library.spec.ts +++ b/packages/preact/src/generators/library/library.spec.ts @@ -1,5 +1,5 @@ import { PreactLibrarySchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { readJson } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { libraryGenerator } from './library'; diff --git a/packages/preact/src/generators/library/library.ts b/packages/preact/src/generators/library/library.ts index d3d99ffd1..022a24723 100644 --- a/packages/preact/src/generators/library/library.ts +++ b/packages/preact/src/generators/library/library.ts @@ -19,13 +19,13 @@ import { addJest } from './lib/add-jest'; import { updateJestConfig } from './lib/update-jest-config'; import { addVite } from './lib/add-vite'; import { addVitest } from './lib/add-vitest'; -import { updateViteConfig } from './lib/update-vite-config'; +import { createOrEditViteConfig } from '@nx/vite'; function normalizeOptions( tree: Tree, options: PreactLibrarySchema ): NormalizedSchema { - const { libsDir, npmScope } = getWorkspaceLayout(tree); + const { libsDir } = getWorkspaceLayout(tree); const name = names(options.name).fileName; const projectDirectory = options.directory ? `${names(options.directory).fileName}/${name}` @@ -36,7 +36,6 @@ function normalizeOptions( const parsedTags = options.tags ? options.tags.split(',').map((s) => s.trim()) : []; - const importPath = options.importPath || `@${npmScope}/${projectDirectory}`; return { ...options, @@ -45,7 +44,6 @@ function normalizeOptions( parsedTags, fileName, projectDirectory, - importPath, }; } @@ -90,13 +88,26 @@ export async function libraryGenerator( createFiles(host, options); const viteTask = await addVite(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import preact from '@preact/preset-vite'`], + plugins: [`preact()`], + }, + false + ); + const vitestTask = await addVitest(host, options); const lintTask = await addLinting(host, options); const jestTask = await addJest(host, options); updateTsConfig(host, options); updateJestConfig(host, options); - updateViteConfig(host, options); if (options.publishable || options.buildable) { updateLibPackageNpmScope(host, options); diff --git a/packages/preact/src/generators/library/schema.d.ts b/packages/preact/src/generators/library/schema.d.ts index 0e9e83ee8..b6a9552ed 100644 --- a/packages/preact/src/generators/library/schema.d.ts +++ b/packages/preact/src/generators/library/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface PreactLibrarySchema { name: string; @@ -19,5 +19,4 @@ export interface NormalizedSchema extends PreactLibrarySchema { projectDirectory: string; fileName: string; parsedTags: string[]; - importPath: string; } diff --git a/packages/preact/src/generators/utils/testing.ts b/packages/preact/src/generators/utils/testing.ts index 8d2cef75c..b6afc104e 100644 --- a/packages/preact/src/generators/utils/testing.ts +++ b/packages/preact/src/generators/utils/testing.ts @@ -1,7 +1,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import applicationGenerator from '../application/application'; import { ProjectType, Tree } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { libraryGenerator } from '../library/library'; export async function createTestProject( diff --git a/packages/solid/package.json b/packages/solid/package.json index 64d7e851d..2f0017868 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -23,16 +23,16 @@ "main": "src/index.js", "generators": "./generators.json", "dependencies": { - "nx": "^16.9.1", - "@nx/devkit": "^16.9.1", + "nx": "17.0.1", + "@nx/devkit": "17.0.1", "typescript": "5.1.6", "tslib": "^2.3.0" }, "peerDependencies": { - "@nx/linter": "^16.9.1", - "@nx/vite": "^16.9.1", - "@nx/jest": "^16.9.1", - "@nx/cypress": "^16.9.1" + "@nx/vite": "17.0.1", + "@nx/jest": "17.0.1", + "@nx/cypress": "17.0.1", + "@nx/eslint": "17.0.1" }, "nx-migrate": { "migrations": "./migrations.json" diff --git a/packages/solid/project.json b/packages/solid/project.json index a895568f8..e7f14823e 100644 --- a/packages/solid/project.json +++ b/packages/solid/project.json @@ -6,7 +6,7 @@ "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { "lintFilePatterns": [ "packages/solid/**/*.ts", diff --git a/packages/solid/src/generators/application/application.spec.ts b/packages/solid/src/generators/application/application.spec.ts index e48ac48ed..41c8668b8 100644 --- a/packages/solid/src/generators/application/application.spec.ts +++ b/packages/solid/src/generators/application/application.spec.ts @@ -1,5 +1,5 @@ import { Schema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import applicationGenerator from './application'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree } from '@nx/devkit'; diff --git a/packages/solid/src/generators/application/application.ts b/packages/solid/src/generators/application/application.ts index e26e3bc87..b93b7f3ea 100644 --- a/packages/solid/src/generators/application/application.ts +++ b/packages/solid/src/generators/application/application.ts @@ -6,6 +6,7 @@ import { runTasksInSerial, GeneratorCallback, } from '@nx/devkit'; +import { createOrEditViteConfig } from '@nx/vite'; import { NormalizedSchema, Schema } from './schema'; import { addProject } from './lib/add-project'; import { initGenerator } from '../init/init'; @@ -14,7 +15,6 @@ import { addCypress } from './lib/add-cypress'; import { addJest } from './lib/add-jest'; import { updateJestConfig } from './lib/update-jest-config'; import { addVite } from './lib/add-vite'; -import { updateViteConfig } from './lib/update-vite-config'; import { createFiles } from './lib/create-project-files'; import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; @@ -78,12 +78,25 @@ export async function applicationGeneratorInternal(tree: Tree, schema: Schema) { createFiles(tree, options); const viteTask = await addVite(tree, options); + createOrEditViteConfig( + tree, + { + project: options.projectName, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import solidPlugin from 'vite-plugin-solid'`], + plugins: [`solidPlugin()`], + }, + false + ); + const lintTask = await addLinting(tree, options); const jestTask = await addJest(tree, options); const cypressTask = await addCypress(tree, options); updateJestConfig(tree, options); - updateViteConfig(tree, options); if (!options.skipFormat) { await formatFiles(tree); diff --git a/packages/solid/src/generators/application/lib/add-linting.ts b/packages/solid/src/generators/application/lib/add-linting.ts index 1288c1129..fd3978fa8 100644 --- a/packages/solid/src/generators/application/lib/add-linting.ts +++ b/packages/solid/src/generators/application/lib/add-linting.ts @@ -14,8 +14,8 @@ export async function addLinting(host: Tree, options: NormalizedSchema) { // eslint-disable-next-line @typescript-eslint/no-empty-function return () => {}; } - const { lintProjectGenerator } = ensurePackage( - '@nx/linter', + const { lintProjectGenerator } = ensurePackage( + '@nx/eslint', NX_VERSION ); diff --git a/packages/solid/src/generators/application/lib/add-project.ts b/packages/solid/src/generators/application/lib/add-project.ts index 6565d8c7f..fc7f840d1 100644 --- a/packages/solid/src/generators/application/lib/add-project.ts +++ b/packages/solid/src/generators/application/lib/add-project.ts @@ -18,7 +18,7 @@ export function addProject(tree: Tree, options: NormalizedSchema) { function createLintTarget(options: NormalizedSchema): TargetConfiguration { return { - executor: '@nx/linter:lint', + executor: '@nx/eslint:lint', options: { linter: 'eslint', tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'), diff --git a/packages/solid/src/generators/application/lib/update-vite-config.ts b/packages/solid/src/generators/application/lib/update-vite-config.ts deleted file mode 100644 index aa774530f..000000000 --- a/packages/solid/src/generators/application/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.appProjectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - solidPlugin(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import solidPlugin from 'vite-plugin-solid'; - ` - ); -} diff --git a/packages/solid/src/generators/application/schema.d.ts b/packages/solid/src/generators/application/schema.d.ts index 7d889514b..d54a9965e 100644 --- a/packages/solid/src/generators/application/schema.d.ts +++ b/packages/solid/src/generators/application/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils'; export interface Schema { diff --git a/packages/solid/src/generators/library/lib/add-linting.ts b/packages/solid/src/generators/library/lib/add-linting.ts index 8978dd0e1..6a077f684 100644 --- a/packages/solid/src/generators/library/lib/add-linting.ts +++ b/packages/solid/src/generators/library/lib/add-linting.ts @@ -10,8 +10,8 @@ import { NormalizedSchema } from '../schema'; import { extraEslintDependencies } from '../../utils/lint'; export async function addLinting(host: Tree, options: NormalizedSchema) { - const { lintProjectGenerator } = ensurePackage( - '@nx/linter', + const { lintProjectGenerator } = ensurePackage( + '@nx/eslint', NX_VERSION ); diff --git a/packages/solid/src/generators/library/lib/add-project.ts b/packages/solid/src/generators/library/lib/add-project.ts index 25d83926f..ba9e4cf42 100644 --- a/packages/solid/src/generators/library/lib/add-project.ts +++ b/packages/solid/src/generators/library/lib/add-project.ts @@ -17,7 +17,7 @@ export function addProject(tree: Tree, options: NormalizedSchema) { function createLintTarget(options: NormalizedSchema): TargetConfiguration { return { - executor: '@nx/linter:lint', + executor: '@nx/eslint:lint', options: { linter: 'eslint', tsConfig: `${options.projectRoot}/tsconfig.lib.json`, diff --git a/packages/solid/src/generators/library/lib/update-vite-config.ts b/packages/solid/src/generators/library/lib/update-vite-config.ts deleted file mode 100644 index 2122e17f7..000000000 --- a/packages/solid/src/generators/library/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - solidPlugin(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import solidPlugin from 'vite-plugin-solid'; - ` - ); -} diff --git a/packages/solid/src/generators/library/library.spec.ts b/packages/solid/src/generators/library/library.spec.ts index fe0fec973..38c23803a 100644 --- a/packages/solid/src/generators/library/library.spec.ts +++ b/packages/solid/src/generators/library/library.spec.ts @@ -1,5 +1,5 @@ import { SolidLibrarySchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { readJson, Tree } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { libraryGenerator } from './library'; diff --git a/packages/solid/src/generators/library/library.ts b/packages/solid/src/generators/library/library.ts index b309a4035..7e7d26aa4 100644 --- a/packages/solid/src/generators/library/library.ts +++ b/packages/solid/src/generators/library/library.ts @@ -14,10 +14,10 @@ import { addLinting } from './lib/add-linting'; import { addJest } from './lib/add-jest'; import { updateJestConfig } from './lib/update-jest-config'; import { createFiles } from './lib/create-project-files'; -import { updateViteConfig } from './lib/update-vite-config'; import { addVite } from './lib/add-vite'; import { addVitest } from './lib/add-vitest'; import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import { createOrEditViteConfig } from '@nx/vite'; async function normalizeOptions( host: Tree, @@ -94,11 +94,24 @@ export async function libraryGeneratorInternal( const lintTask = await addLinting(host, options); const jestTask = await addJest(host, options); const viteTask = await addVite(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import solidPlugin from 'vite-plugin-solid'`], + plugins: [`solidPlugin()`], + }, + false + ); + const vitestTask = await addVitest(host, options); updateTsConfig(host, options); updateJestConfig(host, options); - updateViteConfig(host, options); updateLibPackageNpmScope(host, options); if (!options.skipFormat) { diff --git a/packages/solid/src/generators/library/schema.d.ts b/packages/solid/src/generators/library/schema.d.ts index 33374b30c..631c0459e 100644 --- a/packages/solid/src/generators/library/schema.d.ts +++ b/packages/solid/src/generators/library/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface SolidLibrarySchema { name: string; diff --git a/packages/solid/src/generators/utils/testing.ts b/packages/solid/src/generators/utils/testing.ts index 17a3ac0ee..9f3f0e980 100644 --- a/packages/solid/src/generators/utils/testing.ts +++ b/packages/solid/src/generators/utils/testing.ts @@ -1,7 +1,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import applicationGenerator from '../application/application'; import { Tree } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { libraryGenerator } from '../library/library'; export async function createTestProject( diff --git a/packages/stencil/package.json b/packages/stencil/package.json index 685c6d1be..c95e0ac4a 100644 --- a/packages/stencil/package.json +++ b/packages/stencil/package.json @@ -29,22 +29,22 @@ "tslib": "^2.3.0", "@phenomnomnominal/tsquery": "~5.0.1", "ignore": "^5.2.0", - "@nx/devkit": "^16.9.1", - "@nx/js": "^16.9.1", + "@nx/devkit": "17.0.1", + "@nx/js": "17.0.1", "typescript": "5.1.6", - "@nx/workspace": "^16.9.1", - "@nx/angular": "^16.9.1", - "nx": "^16.9.1", + "@nx/workspace": "17.0.1", + "@nx/angular": "17.0.1", + "nx": "17.0.1", "@nxext/core": "^16.7.0" }, "peerDependencies": { "@nxext/svelte": "^16.7.0", "@stencil/core": "^3.4.0", - "@nx/linter": "^16.9.1", - "@nx/cypress": "^16.9.1", - "@nx/storybook": "^16.9.1", - "@nx/jest": "^16.9.1", - "@nx/react": "^16.9.1" + "@nx/cypress": "17.0.1", + "@nx/storybook": "17.0.1", + "@nx/jest": "17.0.1", + "@nx/react": "17.0.1", + "@nx/eslint": "17.0.1" }, "peerDependenciesMeta": { "@nxext/svelte": { diff --git a/packages/stencil/project.json b/packages/stencil/project.json index b3c36553f..6db4ac56e 100644 --- a/packages/stencil/project.json +++ b/packages/stencil/project.json @@ -6,7 +6,7 @@ "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { "lintFilePatterns": [ "packages/stencil/**/*.ts", diff --git a/packages/stencil/src/generators/add-outputtarget/add-react/generator.ts b/packages/stencil/src/generators/add-outputtarget/add-react/generator.ts index 6ac6ba244..0e9267ee8 100644 --- a/packages/stencil/src/generators/add-outputtarget/add-react/generator.ts +++ b/packages/stencil/src/generators/add-outputtarget/add-react/generator.ts @@ -11,7 +11,7 @@ import { } from '@nx/devkit'; import { initGenerator as jsInitGenerator } from '@nx/js'; import { AddOutputtargetSchematicSchema } from '../schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { STENCIL_OUTPUTTARGET_VERSION } from '../../../utils/versions'; import { addToGitignore } from '../../../utils/utillities'; import * as ts from 'typescript'; diff --git a/packages/stencil/src/generators/add-outputtarget/add-svelte/generator.ts b/packages/stencil/src/generators/add-outputtarget/add-svelte/generator.ts index a7f85cf2c..c465cf23e 100644 --- a/packages/stencil/src/generators/add-outputtarget/add-svelte/generator.ts +++ b/packages/stencil/src/generators/add-outputtarget/add-svelte/generator.ts @@ -8,7 +8,7 @@ import { Tree, } from '@nx/devkit'; import { AddOutputtargetSchematicSchema } from '../schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { nxextSvelteVersion, STENCIL_OUTPUTTARGET_VERSION, diff --git a/packages/stencil/src/generators/application/generator.spec.ts b/packages/stencil/src/generators/application/generator.spec.ts index 43aa5f7d1..87b44a3cd 100644 --- a/packages/stencil/src/generators/application/generator.spec.ts +++ b/packages/stencil/src/generators/application/generator.spec.ts @@ -10,7 +10,7 @@ import { } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { applicationGenerator } from './generator'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // eslint-disable-next-line @typescript-eslint/no-var-requires const devkit = require('@nx/devkit'); diff --git a/packages/stencil/src/generators/application/lib/add-linting.ts b/packages/stencil/src/generators/application/lib/add-linting.ts index 92a14de7c..6bce8c8c0 100644 --- a/packages/stencil/src/generators/application/lib/add-linting.ts +++ b/packages/stencil/src/generators/application/lib/add-linting.ts @@ -9,7 +9,7 @@ import { runTasksInSerial, } from '@nx/devkit'; import { ApplicationSchema } from '../schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { createStencilEslintJson, extraEslintDependencies, @@ -21,8 +21,8 @@ export async function addLinting(host: Tree, options: ApplicationSchema) { return () => {}; } - await ensurePackage('@nx/linter', NX_VERSION); - const { lintProjectGenerator } = await import('@nx/linter'); + await ensurePackage('@nx/eslint', NX_VERSION); + const { lintProjectGenerator } = await import('@nx/eslint'); const tasks: GeneratorCallback[] = []; const lintTask = await lintProjectGenerator(host, { diff --git a/packages/stencil/src/generators/application/schema.d.ts b/packages/stencil/src/generators/application/schema.d.ts index 4b9cdfa52..8eed9da06 100644 --- a/packages/stencil/src/generators/application/schema.d.ts +++ b/packages/stencil/src/generators/application/schema.d.ts @@ -1,6 +1,6 @@ import { AppType } from './../../utils/typings'; import { SupportedStyles } from '../../stencil-core-utils'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface RawApplicationSchema { name: string; diff --git a/packages/stencil/src/generators/component/component.spec.ts b/packages/stencil/src/generators/component/component.spec.ts index ce365369a..690f7e786 100644 --- a/packages/stencil/src/generators/component/component.spec.ts +++ b/packages/stencil/src/generators/component/component.spec.ts @@ -1,5 +1,5 @@ import componentGenerator, { ComponentSchema } from './component'; -import { createTestUILib, testNpmScope } from '../../utils/testing'; +import { createTestUILib } from '../../utils/testing'; import { SupportedStyles } from '../../stencil-core-utils'; import { names, Tree } from '@nx/devkit'; import storybookConfigurationGenerator from '../storybook-configuration/generator'; @@ -128,7 +128,7 @@ describe('component schematic', () => { }); await componentGenerator(tree, options); - classPathValue = `@${testNpmScope}/${options.project}/${options.name}`; + classPathValue = `@proj/${options.project}/${options.name}`; className = names(options.name).className; contents = tree.read( 'libs/test-project/src/components/test-component/test-component.stories.tsx', diff --git a/packages/stencil/src/generators/init/init.spec.ts b/packages/stencil/src/generators/init/init.spec.ts index dae96f0eb..0c27ff624 100644 --- a/packages/stencil/src/generators/init/init.spec.ts +++ b/packages/stencil/src/generators/init/init.spec.ts @@ -1,10 +1,5 @@ import { AppType } from '../../utils/typings'; -import { - readJson, - readWorkspaceConfiguration, - Tree, - updateJson, -} from '@nx/devkit'; +import { readJson, Tree, updateJson } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { initGenerator } from './init'; diff --git a/packages/stencil/src/generators/ionic-pwa/generator.spec.ts b/packages/stencil/src/generators/ionic-pwa/generator.spec.ts index 21e953028..35af7a6b6 100644 --- a/packages/stencil/src/generators/ionic-pwa/generator.spec.ts +++ b/packages/stencil/src/generators/ionic-pwa/generator.spec.ts @@ -11,7 +11,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { ionicPwaGenerator } from './generator'; import { applicationGenerator } from '../application/generator'; import { RawPWASchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // eslint-disable-next-line @typescript-eslint/no-var-requires const devkit = require('@nx/devkit'); diff --git a/packages/stencil/src/generators/ionic-pwa/lib/add-linting.ts b/packages/stencil/src/generators/ionic-pwa/lib/add-linting.ts index bc51ebf98..66bab558f 100644 --- a/packages/stencil/src/generators/ionic-pwa/lib/add-linting.ts +++ b/packages/stencil/src/generators/ionic-pwa/lib/add-linting.ts @@ -9,7 +9,7 @@ import { runTasksInSerial, } from '@nx/devkit'; import { PWASchema } from '../schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { createStencilEslintJson, extraEslintDependencies, @@ -21,8 +21,8 @@ export async function addLinting(host: Tree, options: PWASchema) { return () => {}; } - await ensurePackage('@nx/linter', NX_VERSION); - const { lintProjectGenerator } = await import('@nx/linter'); + await ensurePackage('@nx/eslint', NX_VERSION); + const { lintProjectGenerator } = await import('@nx/eslint'); const tasks: GeneratorCallback[] = []; const lintTask = await lintProjectGenerator(host, { linter: options.linter, diff --git a/packages/stencil/src/generators/ionic-pwa/schema.d.ts b/packages/stencil/src/generators/ionic-pwa/schema.d.ts index ac25b8d2a..4ff434d2c 100644 --- a/packages/stencil/src/generators/ionic-pwa/schema.d.ts +++ b/packages/stencil/src/generators/ionic-pwa/schema.d.ts @@ -1,6 +1,6 @@ import { AppType } from './../../utils/typings'; import { SupportedStyles } from '../../stencil-core-utils'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface RawPWASchema { name: string; diff --git a/packages/stencil/src/generators/library/generator.ts b/packages/stencil/src/generators/library/generator.ts index 42f927415..00343b821 100644 --- a/packages/stencil/src/generators/library/generator.ts +++ b/packages/stencil/src/generators/library/generator.ts @@ -17,12 +17,14 @@ import { MakeLibBuildableSchema } from '../../generators/make-lib-buildable/sche import { updateTsConfig } from './lib/update-tsconfig'; import { addProject } from './lib/add-project'; import makeLibBuildableGenerator from '../../generators/make-lib-buildable/make-lib-buildable'; +import { getNpmScope } from '@nx/js/src/utils/package-json/get-npm-scope'; function normalizeOptions( host: Tree, options: RawLibrarySchema ): LibrarySchema { - const { libsDir, npmScope } = getWorkspaceLayout(host); + const { libsDir } = getWorkspaceLayout(host); + const npmScope = getNpmScope(host); const name = names(options.name).fileName; const projectDirectory = options.directory ? `${names(options.directory).fileName}/${name}` diff --git a/packages/stencil/src/generators/library/lib/add-linting.ts b/packages/stencil/src/generators/library/lib/add-linting.ts index af11114d2..528eb86a5 100644 --- a/packages/stencil/src/generators/library/lib/add-linting.ts +++ b/packages/stencil/src/generators/library/lib/add-linting.ts @@ -9,7 +9,7 @@ import { runTasksInSerial, } from '@nx/devkit'; import { LibrarySchema } from '../schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { createStencilEslintJson, extraEslintDependencies, @@ -21,8 +21,8 @@ export async function addLinting(host: Tree, options: LibrarySchema) { return () => {}; } - await ensurePackage('@nx/linter', NX_VERSION); - const { lintProjectGenerator } = await import('@nx/linter'); + await ensurePackage('@nx/eslint', NX_VERSION); + const { lintProjectGenerator } = await import('@nx/eslint'); const tasks: GeneratorCallback[] = []; const lintTask = await lintProjectGenerator(host, { linter: options.linter, diff --git a/packages/stencil/src/generators/library/schema.d.ts b/packages/stencil/src/generators/library/schema.d.ts index 7cdb73da3..4f3ad47f1 100644 --- a/packages/stencil/src/generators/library/schema.d.ts +++ b/packages/stencil/src/generators/library/schema.d.ts @@ -1,6 +1,6 @@ import { AppType } from './../../utils/typings'; import { SupportedStyles } from '../../stencil-core-utils'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface RawLibrarySchema { name: string; diff --git a/packages/stencil/src/generators/make-lib-buildable/lib/update-tsconfig.ts b/packages/stencil/src/generators/make-lib-buildable/lib/update-tsconfig.ts index 8ddf7bfcd..18835c497 100644 --- a/packages/stencil/src/generators/make-lib-buildable/lib/update-tsconfig.ts +++ b/packages/stencil/src/generators/make-lib-buildable/lib/update-tsconfig.ts @@ -1,6 +1,6 @@ import { MakeLibBuildableSchema } from '../schema'; import { Tree, updateJson } from '@nx/devkit'; -import { getRootTsConfigPathInTree } from '@nx/workspace/src/utilities/typescript'; +import { getRootTsConfigPathInTree } from '@nx/js'; import { getProjectTsImportPath } from '../../storybook-configuration/generator'; export function updateTsConfig(host: Tree, options: MakeLibBuildableSchema) { diff --git a/packages/stencil/src/generators/make-lib-buildable/make-lib-buildable.spec.ts b/packages/stencil/src/generators/make-lib-buildable/make-lib-buildable.spec.ts index 6eea44eaf..5a44b55db 100644 --- a/packages/stencil/src/generators/make-lib-buildable/make-lib-buildable.spec.ts +++ b/packages/stencil/src/generators/make-lib-buildable/make-lib-buildable.spec.ts @@ -1,17 +1,10 @@ import { uniq } from '@nx/plugin/testing'; import { MakeLibBuildableSchema } from './schema'; import { SupportedStyles } from '../../stencil-core-utils'; -import { - readJson, - readWorkspaceConfiguration, - Tree, - updateJson, - updateWorkspaceConfiguration, -} from '@nx/devkit'; +import { readJson, Tree, updateJson } from '@nx/devkit'; import { makeLibBuildableGenerator } from './make-lib-buildable'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { libraryGenerator } from '../library/generator'; -import { testNpmScope } from '../../utils/testing'; describe('make-lib-buildable schematic', () => { let host: Tree; @@ -26,7 +19,7 @@ describe('make-lib-buildable schematic', () => { host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); updateJson(host, '/package.json', (json) => { json.devDependencies = { - '@nx/workspace': '15.7.0', + '@nx/workspace': '17.0.0', }; return json; }); @@ -111,9 +104,6 @@ describe('make-lib-buildable schematic using defaults', () => { beforeEach(async () => { host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); - const workspaceConfiguration = readWorkspaceConfiguration(host); - workspaceConfiguration.npmScope = testNpmScope; - updateWorkspaceConfiguration(host, workspaceConfiguration); await libraryGenerator(host, { name: options.name, @@ -128,7 +118,7 @@ describe('make-lib-buildable schematic using defaults', () => { await makeLibBuildableGenerator(host, options); const tsConfig = readJson(host, 'tsconfig.base.json'); - expect(tsConfig.compilerOptions.paths[`@${testNpmScope}/${name}`]).toEqual([ + expect(tsConfig.compilerOptions.paths[`@proj/${name}`]).toEqual([ `dist/libs/${name}`, ]); }); diff --git a/packages/stencil/src/generators/storybook-configuration/generator.ts b/packages/stencil/src/generators/storybook-configuration/generator.ts index 8ea105eff..b06dc7012 100644 --- a/packages/stencil/src/generators/storybook-configuration/generator.ts +++ b/packages/stencil/src/generators/storybook-configuration/generator.ts @@ -17,14 +17,15 @@ import { writeJson, runTasksInSerial, } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { TsConfig } from '@nx/storybook/src/utils/utilities'; -import { getRootTsConfigPathInTree } from '@nx/workspace/src/utilities/typescript'; +import { getRootTsConfigPathInTree } from '@nx/js'; import { join } from 'path'; import { isBuildableStencilProject } from '../../utils/utillities'; import { updateDependencies } from './lib/add-dependencies'; import { updateLintConfig } from './lib/update-lint-config'; import { StorybookConfigureSchema } from './schema'; +import { getNpmScope } from '@nx/js/src/utils/package-json/get-npm-scope'; /** * With Nx `npmScope` (eg: nx-workspace) and `projectName` (eg: nx-project), returns a path portion to be used for import statements or @@ -35,7 +36,8 @@ import { StorybookConfigureSchema } from './schema'; */ export function getProjectTsImportPath(tree: Tree, projectName: string) { const workspaceLayout = getWorkspaceLayout(tree); - return `@${workspaceLayout.npmScope}/${projectName}`; + const npmScope = getNpmScope(tree); + return `@${npmScope}/${projectName}`; } export async function storybookConfigurationGenerator( diff --git a/packages/stencil/src/generators/storybook-configuration/schema.d.ts b/packages/stencil/src/generators/storybook-configuration/schema.d.ts index 36e720afe..8bbfd86f9 100644 --- a/packages/stencil/src/generators/storybook-configuration/schema.d.ts +++ b/packages/stencil/src/generators/storybook-configuration/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface StorybookConfigureSchema { name: string; diff --git a/packages/stencil/src/utils/targets.ts b/packages/stencil/src/utils/targets.ts index efdf48791..cd6dd7ec2 100644 --- a/packages/stencil/src/utils/targets.ts +++ b/packages/stencil/src/utils/targets.ts @@ -117,7 +117,7 @@ export function getLintTarget( projectRoot: string ): TargetConfiguration { return { - executor: '@nx/linter:eslint', + executor: '@nx/eslint:eslint', outputs: ['{options.outputFile}'], options: { lintFilePatterns: `${projectRoot}/**/*.{ts,tsx}`, diff --git a/packages/stencil/src/utils/testing.ts b/packages/stencil/src/utils/testing.ts index 079a6a350..a8eeca58c 100644 --- a/packages/stencil/src/utils/testing.ts +++ b/packages/stencil/src/utils/testing.ts @@ -1,10 +1,5 @@ import { SupportedStyles } from '../stencil-core-utils'; -import { - readWorkspaceConfiguration, - Tree, - updateJson, - updateWorkspaceConfiguration, -} from '@nx/devkit'; +import { Tree, updateJson } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { libraryGenerator } from '../generators/library/generator'; import { ProjectType } from './typings'; @@ -12,7 +7,6 @@ import { ProjectType } from './typings'; /** * The value of `npmScope` in an nx.json file */ -export const testNpmScope = 'test-workspace'; export async function createTestUILib( libName: string, @@ -22,13 +16,10 @@ export async function createTestUILib( const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); updateJson(host, '/package.json', (json) => { json.devDependencies = { - '@nx/workspace': '15.7.0', + '@nx/workspace': '17.0.0', }; return json; }); - const workspaceConfiguration = readWorkspaceConfiguration(host); - workspaceConfiguration.npmScope = testNpmScope; - updateWorkspaceConfiguration(host, workspaceConfiguration); await libraryGenerator(host, { name: libName, diff --git a/packages/svelte/package.json b/packages/svelte/package.json index 915e3880d..e432f06b9 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -27,17 +27,17 @@ "typings": "./src/index.d.ts", "schematics": "./generators.json", "peerDependencies": { - "@nx/jest": "^16.9.1", - "@nx/vite": "^16.9.1", - "@nx/js": "^16.9.1", - "@nx/linter": "^16.9.1", - "@nx/storybook": "^16.9.1", - "@nx/cypress": "^16.9.1", + "@nx/jest": "17.0.1", + "@nx/vite": "17.0.1", + "@nx/js": "17.0.1", + "@nx/storybook": "17.0.1", + "@nx/cypress": "17.0.1", "typescript": "5.1.6", - "nx": "^16.9.1" + "nx": "17.0.1", + "@nx/eslint": "17.0.1" }, "dependencies": { - "@nx/devkit": "^16.9.1", + "@nx/devkit": "17.0.1", "tslib": "^2.3.0" } } diff --git a/packages/svelte/project.json b/packages/svelte/project.json index 14dce2abe..c8a925845 100644 --- a/packages/svelte/project.json +++ b/packages/svelte/project.json @@ -6,7 +6,7 @@ "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { "lintFilePatterns": [ "packages/svelte/**/*.ts", diff --git a/packages/svelte/src/generators/application/application.spec.ts b/packages/svelte/src/generators/application/application.spec.ts index fde64fd7e..5ef43d652 100644 --- a/packages/svelte/src/generators/application/application.spec.ts +++ b/packages/svelte/src/generators/application/application.spec.ts @@ -1,5 +1,5 @@ import { Schema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import applicationGenerator from './application'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { readJson } from '@nx/devkit'; diff --git a/packages/svelte/src/generators/application/application.ts b/packages/svelte/src/generators/application/application.ts index a68db0a4c..5bb746c31 100644 --- a/packages/svelte/src/generators/application/application.ts +++ b/packages/svelte/src/generators/application/application.ts @@ -1,14 +1,11 @@ import { convertNxGenerator, formatFiles, - getWorkspaceLayout, - joinPathFragments, - names, Tree, runTasksInSerial, GeneratorCallback, } from '@nx/devkit'; -import { NormalizedSchema, Schema } from './schema'; +import { Schema } from './schema'; import { addProject } from './lib/add-project'; import { initGenerator } from '../init/init'; import { addLinting } from './lib/add-linting'; @@ -16,9 +13,9 @@ import { addCypress } from './lib/add-cypress'; import { addJest } from './lib/add-jest'; import { updateJestConfig } from './lib/update-jest-config'; import { addVite } from './lib/add-vite'; -import { updateViteConfig } from './lib/update-vite-config'; import { createApplicationFiles } from './lib/create-project-files'; import { normalizeOptions } from './lib/normalize-options'; +import { createOrEditViteConfig } from '@nx/vite'; export async function applicationGenerator( host: Tree, @@ -39,12 +36,25 @@ export async function applicationGeneratorInternal(host: Tree, schema: Schema) { await createApplicationFiles(host, options); const viteTask = await addVite(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import { svelte } from '@sveltejs/vite-plugin-svelte'`], + plugins: [`svelte()`], + }, + false + ); + const lintTask = await addLinting(host, options); const jestTask = await addJest(host, options); const cypressTask = await addCypress(host, options); updateJestConfig(host, options); - updateViteConfig(host, options); if (!options.skipFormat) { await formatFiles(host); diff --git a/packages/svelte/src/generators/application/lib/add-linting.ts b/packages/svelte/src/generators/application/lib/add-linting.ts index 520ce0b4f..ad74ff54d 100644 --- a/packages/svelte/src/generators/application/lib/add-linting.ts +++ b/packages/svelte/src/generators/application/lib/add-linting.ts @@ -5,7 +5,7 @@ import { runTasksInSerial, } from '@nx/devkit'; import { NormalizedSchema } from '../schema'; -import { lintProjectGenerator } from '@nx/linter'; +import { lintProjectGenerator } from '@nx/eslint'; import { extraEslintDependencies } from '../../utils/lint'; export async function addLinting(host: Tree, options: NormalizedSchema) { diff --git a/packages/svelte/src/generators/application/lib/update-vite-config.ts b/packages/svelte/src/generators/application/lib/update-vite-config.ts deleted file mode 100644 index c85c967ea..000000000 --- a/packages/svelte/src/generators/application/lib/update-vite-config.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - svelte(),` - ) - .replace( - `viteTsConfigPaths({`, - `viteTsConfigPaths({ - loose: true,` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import { svelte } from '@sveltejs/vite-plugin-svelte'; - ` - ); -} diff --git a/packages/svelte/src/generators/application/schema.d.ts b/packages/svelte/src/generators/application/schema.d.ts index a7900cdc0..b7ea59cf8 100644 --- a/packages/svelte/src/generators/application/schema.d.ts +++ b/packages/svelte/src/generators/application/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils'; export interface Schema { diff --git a/packages/svelte/src/generators/init/lib/add-linter-plugin.ts b/packages/svelte/src/generators/init/lib/add-linter-plugin.ts index b0ece130e..e24982fc9 100644 --- a/packages/svelte/src/generators/init/lib/add-linter-plugin.ts +++ b/packages/svelte/src/generators/init/lib/add-linter-plugin.ts @@ -1,8 +1,8 @@ import { ensurePackage, GeneratorCallback, NX_VERSION, Tree } from '@nx/devkit'; export async function addLinterPlugin(tree: Tree): Promise { - ensurePackage('@nx/linter', NX_VERSION); - const { lintInitGenerator } = await import('@nx/linter'); + ensurePackage('@nx/eslint', NX_VERSION); + const { lintInitGenerator } = await import('@nx/eslint'); return lintInitGenerator(tree, {}); } diff --git a/packages/svelte/src/generators/library/lib/add-linting.ts b/packages/svelte/src/generators/library/lib/add-linting.ts index 414a2985e..41eed07d8 100644 --- a/packages/svelte/src/generators/library/lib/add-linting.ts +++ b/packages/svelte/src/generators/library/lib/add-linting.ts @@ -10,8 +10,8 @@ import { NormalizedSchema } from '../schema'; import { extraEslintDependencies } from '../../utils/lint'; export async function addLinting(host: Tree, options: NormalizedSchema) { - const { lintProjectGenerator } = ensurePackage( - '@nx/linter', + const { lintProjectGenerator } = ensurePackage( + '@nx/eslint', NX_VERSION ); const lintTask = await lintProjectGenerator(host, { diff --git a/packages/svelte/src/generators/library/lib/update-vite-config.ts b/packages/svelte/src/generators/library/lib/update-vite-config.ts deleted file mode 100644 index 89f2a569c..000000000 --- a/packages/svelte/src/generators/library/lib/update-vite-config.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - if ( - options.buildable || - options.publishable || - options.unitTestRunner === 'vitest' - ) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); - } -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - svelte(),` - ) - .replace( - `viteTsConfigPaths({`, - `viteTsConfigPaths({ - loose: true,` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import { svelte } from '@sveltejs/vite-plugin-svelte'; - ` - ); -} diff --git a/packages/svelte/src/generators/library/library.spec.ts b/packages/svelte/src/generators/library/library.spec.ts index 21657b3a2..d5eaa9a45 100644 --- a/packages/svelte/src/generators/library/library.spec.ts +++ b/packages/svelte/src/generators/library/library.spec.ts @@ -1,5 +1,5 @@ import { SvelteLibrarySchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { readJson } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { libraryGenerator } from './library'; diff --git a/packages/svelte/src/generators/library/library.ts b/packages/svelte/src/generators/library/library.ts index e55406117..da472c403 100644 --- a/packages/svelte/src/generators/library/library.ts +++ b/packages/svelte/src/generators/library/library.ts @@ -13,10 +13,10 @@ import { addLinting } from './lib/add-linting'; import { addJest } from './lib/add-jest'; import { updateJestConfig } from './lib/update-jest-config'; import { addVite } from './lib/add-vite'; -import { updateViteConfig } from './lib/update-vite-config'; import { createProjectFiles } from './lib/create-project-files'; import { addVitest } from './lib/add-vitest'; import { normalizeOptions } from './lib/normalize-options'; +import { createOrEditViteConfig } from '@nx/vite'; function updateLibPackageNpmScope(host: Tree, options: NormalizedSchema) { return updateJson(host, `${options.projectRoot}/package.json`, (json) => { @@ -44,10 +44,23 @@ export async function libraryGenerator( const lintTask = await addLinting(host, options); const jestTask = await addJest(host, options); const viteTask = await addVite(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import { svelte } from '@sveltejs/vite-plugin-svelte'`], + plugins: [`svelte()`], + }, + false + ); + const vitestTask = await addVitest(host, options); updateTsConfig(host, options); - updateViteConfig(host, options); updateJestConfig(host, options); if (options.publishable || options.buildable) { diff --git a/packages/svelte/src/generators/library/schema.d.ts b/packages/svelte/src/generators/library/schema.d.ts index 20976c757..9f35c0e27 100644 --- a/packages/svelte/src/generators/library/schema.d.ts +++ b/packages/svelte/src/generators/library/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils'; export interface SvelteLibrarySchema { diff --git a/packages/svelte/src/generators/storybook-configuration/configuration.spec.ts b/packages/svelte/src/generators/storybook-configuration/configuration.spec.ts index 5d6b8242e..176b79091 100644 --- a/packages/svelte/src/generators/storybook-configuration/configuration.spec.ts +++ b/packages/svelte/src/generators/storybook-configuration/configuration.spec.ts @@ -111,7 +111,7 @@ xdescribe('@nxext/svelte:storybook-configuration', () => { }); expect(project.targets.lint).toEqual({ - executor: '@nx/linter:eslint', + executor: '@nx/eslint:eslint', outputs: ['{options.outputFile}'], options: { lintFilePatterns: ['libs/test-ui-lib-2/**/*.ts'], diff --git a/packages/svelte/src/generators/storybook-configuration/configuration.ts b/packages/svelte/src/generators/storybook-configuration/configuration.ts index ef77a8679..964427b15 100644 --- a/packages/svelte/src/generators/storybook-configuration/configuration.ts +++ b/packages/svelte/src/generators/storybook-configuration/configuration.ts @@ -8,7 +8,7 @@ import { runTasksInSerial, NX_VERSION, } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { StorybookConfigureSchema } from './schema'; import { svelteLoaderVersion } from '../utils/versions'; import { updateMainJs } from './lib/update-main-js'; diff --git a/packages/svelte/src/generators/storybook-configuration/schema.d.ts b/packages/svelte/src/generators/storybook-configuration/schema.d.ts index e8a06bb21..80d7c44aa 100644 --- a/packages/svelte/src/generators/storybook-configuration/schema.d.ts +++ b/packages/svelte/src/generators/storybook-configuration/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface StorybookConfigureSchema { name: string; diff --git a/packages/svelte/src/generators/utils/targets.ts b/packages/svelte/src/generators/utils/targets.ts index d2e638a65..fecfa1eef 100644 --- a/packages/svelte/src/generators/utils/targets.ts +++ b/packages/svelte/src/generators/utils/targets.ts @@ -29,7 +29,7 @@ export function createLintTarget( options: LibrarySchema | ApplicationSchema ): TargetConfiguration { return { - executor: '@nx/linter:lint', + executor: '@nx/eslint:lint', options: { linter: 'eslint', tsConfig: joinPathFragments(options.projectRoot, 'tsconfig.app.json'), diff --git a/packages/svelte/src/generators/utils/testing.ts b/packages/svelte/src/generators/utils/testing.ts index 3a0244f10..f44151146 100644 --- a/packages/svelte/src/generators/utils/testing.ts +++ b/packages/svelte/src/generators/utils/testing.ts @@ -1,7 +1,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import applicationGenerator from '../application/application'; import { Tree, ProjectType } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { libraryGenerator } from '../library/library'; export async function createTestProject( diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index 393ffa478..0fb31abef 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -23,12 +23,12 @@ "executors": "./executors.json", "dependencies": { "tslib": "^2.3.0", - "@nx/devkit": "^16.9.1", + "@nx/devkit": "17.0.1", "typescript": "5.1.6", - "nx": "^16.9.1" + "nx": "17.0.1" }, "peerDependencies": { - "@nx/linter": "^16.9.1", - "@nx/vite": "^16.9.1" + "@nx/vite": "17.0.1", + "@nx/eslint": "17.0.1" } } diff --git a/packages/sveltekit/project.json b/packages/sveltekit/project.json index 2dfa3a8f9..f4b777fc5 100644 --- a/packages/sveltekit/project.json +++ b/packages/sveltekit/project.json @@ -5,7 +5,7 @@ "projectType": "library", "targets": { "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { "lintFilePatterns": [ "packages/sveltekit/**/*.ts", diff --git a/packages/sveltekit/src/executors/add/executor.spec.ts b/packages/sveltekit/src/executors/add/executor.spec.ts index 8936004d4..6af7758db 100644 --- a/packages/sveltekit/src/executors/add/executor.spec.ts +++ b/packages/sveltekit/src/executors/add/executor.spec.ts @@ -16,7 +16,6 @@ describe('Add Executor', () => { cwd: '/root', workspace: { version: 2, - npmScope: 'proj', projects: { [projectName]: { root: '/', diff --git a/packages/sveltekit/src/executors/sveltekit/executor.spec.ts b/packages/sveltekit/src/executors/sveltekit/executor.spec.ts index 2df96d179..b2154ad67 100644 --- a/packages/sveltekit/src/executors/sveltekit/executor.spec.ts +++ b/packages/sveltekit/src/executors/sveltekit/executor.spec.ts @@ -16,7 +16,6 @@ describe('Sveltekit Executor', () => { cwd: '/root', workspace: { version: 2, - npmScope: 'proj', projects: { [projectName]: { root: '/', diff --git a/packages/sveltekit/src/generators/application/generator.spec.ts b/packages/sveltekit/src/generators/application/generator.spec.ts index 7f25068b1..2f8ef57b3 100644 --- a/packages/sveltekit/src/generators/application/generator.spec.ts +++ b/packages/sveltekit/src/generators/application/generator.spec.ts @@ -3,7 +3,7 @@ import { readProjectConfiguration, Tree } from '@nx/devkit'; import generator from './generator'; import { SveltekitGeneratorSchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; describe('sveltekit generator', () => { let tree: Tree; diff --git a/packages/sveltekit/src/generators/application/generator.ts b/packages/sveltekit/src/generators/application/generator.ts index f80e6e571..e6ed9b01c 100644 --- a/packages/sveltekit/src/generators/application/generator.ts +++ b/packages/sveltekit/src/generators/application/generator.ts @@ -16,7 +16,7 @@ import { installDependencies } from './lib/install-dependencies'; import { addFiles } from './lib/add-project-files'; import { createSvelteCheckTarget } from './lib/targets'; import { addVite } from './lib/add-vite'; -import { updateViteConfig } from './lib/update-vite-config'; +import { createOrEditViteConfig } from '@nx/vite'; function normalizeOptions( host: Tree, @@ -73,8 +73,19 @@ export async function applicationGenerator( tasks.push(lintTask); const viteTask = await addVite(host, options); tasks.push(viteTask); - - updateViteConfig(host, options); + createOrEditViteConfig( + host, + { + project: options.projectName, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import { sveltekit } from '@sveltejs/kit/vite'`], + plugins: [`sveltekit()`], + }, + false + ); if (!options.skipFormat) { await formatFiles(host); diff --git a/packages/sveltekit/src/generators/application/lib/add-linting.ts b/packages/sveltekit/src/generators/application/lib/add-linting.ts index 457e86f5b..d42d8a851 100644 --- a/packages/sveltekit/src/generators/application/lib/add-linting.ts +++ b/packages/sveltekit/src/generators/application/lib/add-linting.ts @@ -15,8 +15,8 @@ export async function addLinting(host: Tree, options: NormalizedSchema) { return () => {}; } - const { lintProjectGenerator } = ensurePackage( - '@nx/linter', + const { lintProjectGenerator } = ensurePackage( + '@nx/eslint', NX_VERSION ); const lintTask = await lintProjectGenerator(host, { diff --git a/packages/sveltekit/src/generators/application/lib/update-vite-config.ts b/packages/sveltekit/src/generators/application/lib/update-vite-config.ts deleted file mode 100644 index 16fbbe408..000000000 --- a/packages/sveltekit/src/generators/application/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - sveltekit(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import { sveltekit } from '@sveltejs/kit/vite'; - ` - ); -} diff --git a/packages/sveltekit/src/generators/application/schema.d.ts b/packages/sveltekit/src/generators/application/schema.d.ts index 806623c19..3cd8412b5 100644 --- a/packages/sveltekit/src/generators/application/schema.d.ts +++ b/packages/sveltekit/src/generators/application/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface SveltekitGeneratorSchema { name: string; diff --git a/packages/sveltekit/src/generators/utils/testing.ts b/packages/sveltekit/src/generators/utils/testing.ts index 2038f312d..2f9a7d636 100644 --- a/packages/sveltekit/src/generators/utils/testing.ts +++ b/packages/sveltekit/src/generators/utils/testing.ts @@ -1,6 +1,6 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import applicationGenerator from '../application/generator'; export async function createTestProject( diff --git a/packages/vue/package.json b/packages/vue/package.json index ce448e61b..2fce13572 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -24,20 +24,19 @@ "typings": "./src/index.d.ts", "generators": "./generators.json", "dependencies": { - "@nx/devkit": "^16.9.1", + "@nx/devkit": "17.0.1", "tslib": "^2.3.0", "typescript": "5.1.6", - "@nx/workspace": "^16.9.1", - "nx": "^16.9.1", + "nx": "17.0.1", "@nxext/core": "^16.8.0" }, "peerDependencies": { - "@nx/js": "^16.9.1", - "@nx/linter": "^16.9.1", - "@nx/vite": "^16.9.1", - "@nx/storybook": "^16.9.1", - "@nx/cypress": "^16.9.1", - "@nx/playwright": "^16.9.1" + "@nx/js": "17.0.1", + "@nx/vite": "17.0.1", + "@nx/storybook": "17.0.1", + "@nx/cypress": "17.0.1", + "@nx/playwright": "17.0.1", + "@nx/eslint": "17.0.1" }, "peerDependenciesMeta": { "@nx/storybook": { diff --git a/packages/vue/project.json b/packages/vue/project.json index f92b49326..73a8e1568 100644 --- a/packages/vue/project.json +++ b/packages/vue/project.json @@ -44,7 +44,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": [ diff --git a/packages/vue/src/generators/application/application.spec.ts b/packages/vue/src/generators/application/application.spec.ts index eac3c5b26..631aabf3d 100644 --- a/packages/vue/src/generators/application/application.spec.ts +++ b/packages/vue/src/generators/application/application.spec.ts @@ -2,7 +2,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { readJson, readProjectConfiguration, Tree } from '@nx/devkit'; import { applicationGenerator } from './application'; import { Schema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // eslint-disable-next-line @typescript-eslint/no-var-requires const devkit = require('@nx/devkit'); diff --git a/packages/vue/src/generators/application/lib/add-linting.ts b/packages/vue/src/generators/application/lib/add-linting.ts index e81cab5f1..f4aa04553 100644 --- a/packages/vue/src/generators/application/lib/add-linting.ts +++ b/packages/vue/src/generators/application/lib/add-linting.ts @@ -15,8 +15,8 @@ import { mapLintPattern } from '@nxext/core'; export async function addLinting(host: Tree, options: NormalizedSchema) { const tasks: GeneratorCallback[] = []; if (options.linter === 'eslint') { - ensurePackage('@nx/linter', NX_VERSION); - const { lintProjectGenerator } = await import('@nx/linter'); + ensurePackage('@nx/eslint', NX_VERSION); + const { lintProjectGenerator } = await import('@nx/eslint'); const lintTask = await lintProjectGenerator(host, { linter: options.linter, project: options.appProjectName, diff --git a/packages/vue/src/generators/application/lib/add-vite.ts b/packages/vue/src/generators/application/lib/add-vite.ts index 1a9b4c2d9..1edf8ce89 100644 --- a/packages/vue/src/generators/application/lib/add-vite.ts +++ b/packages/vue/src/generators/application/lib/add-vite.ts @@ -1,6 +1,6 @@ import { ensurePackage, NX_VERSION, Tree } from '@nx/devkit'; import { NormalizedSchema, Schema } from '../schema'; -import { updateViteConfig } from './update-vite-config'; +import { createOrEditViteConfig } from '@nx/vite'; export async function addVite(host: Tree, options: NormalizedSchema) { await ensurePackage('@nx/vite', NX_VERSION); @@ -13,6 +13,18 @@ export async function addVite(host: Tree, options: NormalizedSchema) { includeVitest: options.unitTestRunner === 'vitest', inSourceTests: options.inSourceTests, }); - updateViteConfig(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import vue from '@vitejs/plugin-vue'`], + plugins: [`vue()`], + }, + false + ); return viteTask; } diff --git a/packages/vue/src/generators/application/lib/update-vite-config.ts b/packages/vue/src/generators/application/lib/update-vite-config.ts deleted file mode 100644 index 2a93e5816..000000000 --- a/packages/vue/src/generators/application/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.appProjectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - vue(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import vue from '@vitejs/plugin-vue'; - ` - ); -} diff --git a/packages/vue/src/generators/application/schema.d.ts b/packages/vue/src/generators/application/schema.d.ts index 53b6951ee..dd97dee9a 100644 --- a/packages/vue/src/generators/application/schema.d.ts +++ b/packages/vue/src/generators/application/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface Schema { name: string; diff --git a/packages/vue/src/generators/component/component.spec.ts b/packages/vue/src/generators/component/component.spec.ts index 7093a51c1..300e82df8 100644 --- a/packages/vue/src/generators/component/component.spec.ts +++ b/packages/vue/src/generators/component/component.spec.ts @@ -1,6 +1,6 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { Tree } from '@nx/devkit'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { Schema } from './schema'; import { applicationGenerator } from '../application/application'; import { libraryGenerator } from '../library/library'; diff --git a/packages/vue/src/generators/library/lib/add-linting.ts b/packages/vue/src/generators/library/lib/add-linting.ts index 021c2b179..56f308b25 100644 --- a/packages/vue/src/generators/library/lib/add-linting.ts +++ b/packages/vue/src/generators/library/lib/add-linting.ts @@ -1,4 +1,4 @@ -import { Linter, lintProjectGenerator } from '@nx/linter'; +import { Linter, lintProjectGenerator } from '@nx/eslint'; import { addDependenciesToPackageJson, joinPathFragments, diff --git a/packages/vue/src/generators/library/lib/update-base-tsconfig.ts b/packages/vue/src/generators/library/lib/update-base-tsconfig.ts index c42d6d58a..4dd012d41 100644 --- a/packages/vue/src/generators/library/lib/update-base-tsconfig.ts +++ b/packages/vue/src/generators/library/lib/update-base-tsconfig.ts @@ -1,4 +1,3 @@ -import { getRootTsConfigPathInTree } from '@nx/workspace/src/utilities/typescript'; import { getWorkspaceLayout, joinPathFragments, @@ -7,6 +6,7 @@ import { } from '@nx/devkit'; import { NormalizedSchema } from '../schema'; +import { getRootTsConfigPathInTree } from '@nx/js'; export function updateBaseTsConfig(host: Tree, options: NormalizedSchema) { updateJson(host, getRootTsConfigPathInTree(host), (json) => { diff --git a/packages/vue/src/generators/library/lib/update-vite-config.ts b/packages/vue/src/generators/library/lib/update-vite-config.ts deleted file mode 100644 index 8c0246721..000000000 --- a/packages/vue/src/generators/library/lib/update-vite-config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Tree } from '@nx/devkit'; -import { NormalizedSchema } from '../schema'; - -export function updateViteConfig(host: Tree, options: NormalizedSchema) { - const configPath = `${options.projectRoot}/vite.config.ts`; - const originalContent = host.read(configPath, 'utf-8'); - const content = updateViteConfigContent(originalContent); - host.write(configPath, content); -} - -function updateViteConfigContent(content: string) { - return content - .replace( - 'plugins: [', - `plugins: [ - vue(),` - ) - .replace( - `import { defineConfig } from 'vite';`, - `import { defineConfig } from 'vite'; - import vue from '@vitejs/plugin-vue'; - ` - ); -} diff --git a/packages/vue/src/generators/library/library.spec.ts b/packages/vue/src/generators/library/library.spec.ts index 79ab070d1..a13e32d86 100644 --- a/packages/vue/src/generators/library/library.spec.ts +++ b/packages/vue/src/generators/library/library.spec.ts @@ -3,7 +3,7 @@ import { Tree, readProjectConfiguration, readJson } from '@nx/devkit'; import { libraryGenerator } from './library'; import { Schema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // eslint-disable-next-line @typescript-eslint/no-var-requires const devkit = require('@nx/devkit'); diff --git a/packages/vue/src/generators/library/library.ts b/packages/vue/src/generators/library/library.ts index 91bcf9cf2..d1258e3a2 100644 --- a/packages/vue/src/generators/library/library.ts +++ b/packages/vue/src/generators/library/library.ts @@ -9,12 +9,12 @@ import { import { Schema } from './schema'; import initGenerator from '../init/init'; import { normalizeOptions } from './lib/normalize-options'; -import { updateViteConfig } from './lib/update-vite-config'; import { addProject } from './lib/add-project'; import { createLibraryFiles } from './lib/create-library-files'; import componentGenerator from '../component/component'; import { updateBaseTsConfig } from './lib/update-base-tsconfig'; import { addLinting } from './lib/add-linting'; +import { createOrEditViteConfig } from '@nx/vite'; export async function libraryGenerator(host: Tree, schema: Schema) { const tasks: GeneratorCallback[] = []; @@ -49,8 +49,19 @@ export async function libraryGenerator(host: Tree, schema: Schema) { inSourceTests: options.inSourceTests, }); tasks.push(viteTask); - - updateViteConfig(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import vue from '@vitejs/plugin-vue'`], + plugins: [`vue()`], + }, + false + ); } if (!options.buildable && options.unitTestRunner === 'vitest') { @@ -64,7 +75,19 @@ export async function libraryGenerator(host: Tree, schema: Schema) { inSourceTests: options.inSourceTests, }); tasks.push(vitestTask); - updateViteConfig(host, options); + createOrEditViteConfig( + host, + { + project: options.name, + includeLib: false, + includeVitest: options.unitTestRunner === 'vitest', + inSourceTests: false, + rollupOptionsExternal: [], + imports: [`import vue from '@vitejs/plugin-vue'`], + plugins: [`vue()`], + }, + true + ); } const lintTask = await addLinting(host, options); diff --git a/packages/vue/src/generators/preset/preset.spec.ts b/packages/vue/src/generators/preset/preset.spec.ts index 1210a3c7c..17c294a96 100644 --- a/packages/vue/src/generators/preset/preset.spec.ts +++ b/packages/vue/src/generators/preset/preset.spec.ts @@ -3,7 +3,7 @@ import { Tree, readProjectConfiguration } from '@nx/devkit'; import generator from './preset'; import { PresetSchema } from './schema'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // eslint-disable-next-line @typescript-eslint/no-var-requires const devkit = require('@nx/devkit'); diff --git a/packages/vue/src/generators/preset/schema.d.ts b/packages/vue/src/generators/preset/schema.d.ts index 0b96fd074..2250ec7c1 100644 --- a/packages/vue/src/generators/preset/schema.d.ts +++ b/packages/vue/src/generators/preset/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { Schema } from '../application/schema'; export interface PresetSchema extends Schema { diff --git a/packages/vue/src/generators/storybook-configuration/configuration.spec.ts b/packages/vue/src/generators/storybook-configuration/configuration.spec.ts index 876fb873f..b3e026160 100644 --- a/packages/vue/src/generators/storybook-configuration/configuration.spec.ts +++ b/packages/vue/src/generators/storybook-configuration/configuration.spec.ts @@ -1,7 +1,7 @@ import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version'; import { logger, Tree } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import applicationGenerator from '../application/application'; import componentGenerator from '../component/component'; import libraryGenerator from '../library/library'; diff --git a/packages/vue/src/generators/storybook-configuration/schema.d.ts b/packages/vue/src/generators/storybook-configuration/schema.d.ts index 69c9dae06..8740d80e9 100644 --- a/packages/vue/src/generators/storybook-configuration/schema.d.ts +++ b/packages/vue/src/generators/storybook-configuration/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface StorybookConfigurationGeneratorSchema { name: string; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 997e20dc7..90f8863b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,56 +26,56 @@ devDependencies: specifier: 3.6.5 version: 3.6.5 '@nx/angular': - specifier: 16.10.0 - version: 16.10.0(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/cypress': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/devkit': - specifier: 16.10.0 - version: 16.10.0(nx@16.10.0) + specifier: 17.0.1 + version: 17.0.1(nx@17.0.1) + '@nx/eslint': + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) '@nx/eslint-plugin': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@8.8.0)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@9.0.0)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/jest': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/js': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/node': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/playwright': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) '@nx/plugin': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/react': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2) '@nx/storybook': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/vite': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.4.9)(vitest@0.34.3) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.5.0)(vitest@0.34.3) '@nx/web': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@nx/workspace': - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) '@phenomnomnominal/tsquery': specifier: ~5.0.1 version: 5.0.1(typescript@5.1.6) '@preact/preset-vite': specifier: ^2.5.0 - version: 2.5.0(@babel/core@7.22.10)(preact@10.11.2)(vite@4.4.9) + version: 2.5.0(@babel/core@7.22.10)(preact@10.11.2)(vite@4.5.0) '@schematics/angular': specifier: 16.0.0 version: 16.0.0 @@ -143,8 +143,8 @@ devDependencies: specifier: 8.46.0 version: 8.46.0 eslint-config-prettier: - specifier: 8.8.0 - version: 8.8.0(eslint@8.46.0) + specifier: 9.0.0 + version: 9.0.0(eslint@8.46.0) eslint-plugin-cypress: specifier: 2.14.0 version: 2.14.0(eslint@8.46.0) @@ -195,13 +195,10 @@ devDependencies: version: 3.6.5 nuxt: specifier: 3.6.5 - version: 3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(stylus@0.59.0)(typescript@5.1.6) + version: 3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(typescript@5.1.6) nx: - specifier: 16.10.0 - version: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) - nx-cloud: - specifier: 16.4.0 - version: 16.4.0 + specifier: 17.0.1 + version: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) prettier: specifier: 2.7.1 version: 2.7.1 @@ -213,7 +210,7 @@ devDependencies: version: 4.2.1 svelte-preprocess: specifier: ^5.0.4 - version: 5.0.4(@babel/core@7.22.10)(less@4.1.3)(postcss@8.4.28)(stylus@0.59.0)(svelte@4.2.1)(typescript@5.1.6) + version: 5.0.4(@babel/core@7.22.10)(less@4.1.3)(postcss@8.4.28)(svelte@4.2.1)(typescript@5.1.6) tcp-port-used: specifier: ^1.0.2 version: 1.0.2 @@ -240,10 +237,10 @@ devDependencies: version: 10.2.2 vite-plugin-solid: specifier: ^2.7.0 - version: 2.7.0(solid-js@1.7.11)(vite@4.4.9) + version: 2.7.0(solid-js@1.7.11)(vite@4.5.0) vitepress: - specifier: ^1.0.0-rc.20 - version: 1.0.0-rc.20(@algolia/client-search@4.19.1)(@types/node@18.15.3)(less@4.1.3)(postcss@8.4.28)(search-insights@2.7.0)(stylus@0.59.0) + specifier: ^1.0.0-rc.23 + version: 1.0.0-rc.23(@algolia/client-search@4.19.1)(@types/node@18.15.3)(less@4.1.3)(postcss@8.4.28)(search-insights@2.7.0)(typescript@5.1.6) yargs: specifier: ^17.7.2 version: 17.7.2 @@ -260,13 +257,6 @@ packages: engines: { node: '>=0.10.0' } dev: true - /@adobe/css-tools@4.2.0: - resolution: - { - integrity: sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==, - } - dev: true - /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.19.1)(algoliasearch@4.19.1)(search-insights@2.7.0): resolution: { @@ -484,7 +474,7 @@ packages: - chokidar dev: true - /@angular-devkit/build-angular@16.2.0(@angular/compiler-cli@16.2.2)(@swc/core@1.3.91)(@types/node@18.15.3)(jest-environment-jsdom@29.5.0)(jest@29.4.3)(stylus@0.59.0)(typescript@5.1.6): + /@angular-devkit/build-angular@16.2.0(@angular/compiler-cli@16.2.2)(@swc/core@1.3.91)(@types/node@18.15.3)(jest-environment-jsdom@29.5.0)(jest@29.4.3)(typescript@5.1.6): resolution: { integrity: sha512-miylwjOqvlKmYrzS84bjRaJrecZxOXH9xsPVvQE8VBe8UKePJjRAL6yyOqXUOGtzlch2YmT98RAnuni7y0FEAw==, @@ -589,7 +579,7 @@ packages: tree-kill: 1.2.2 tslib: 2.6.1 typescript: 5.1.6 - vite: 4.4.7(@types/node@18.15.3)(less@4.1.3)(sass@1.64.1)(stylus@0.59.0)(terser@5.19.2) + vite: 4.4.7(@types/node@18.15.3)(less@4.1.3)(sass@1.64.1)(terser@5.19.2) webpack: 5.88.2(@swc/core@1.3.91)(esbuild@0.18.17) webpack-dev-middleware: 6.1.1(webpack@5.88.2) webpack-dev-server: 4.15.1(webpack@5.88.2) @@ -1312,6 +1302,17 @@ packages: '@babel/types': 7.22.10 dev: true + /@babel/parser@7.23.0: + resolution: + { + integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==, + } + engines: { node: '>=6.0.0' } + hasBin: true + dependencies: + '@babel/types': 7.22.10 + dev: true + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.10): resolution: { @@ -1384,21 +1385,6 @@ packages: '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.9) dev: true - /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.10): - resolution: - { - integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==, - } - engines: { node: '>=6.9.0' } - deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead. - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.10 - '@babel/helper-create-class-features-plugin': 7.22.10(@babel/core@7.22.10) - '@babel/helper-plugin-utils': 7.22.5 - dev: true - /@babel/plugin-proposal-decorators@7.22.7(@babel/core@7.22.10): resolution: { @@ -5289,13 +5275,13 @@ packages: fastq: 1.13.0 dev: true - /@nrwl/angular@16.10.0(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/angular@17.0.1(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-MT4gYcvsHxNXTIu40CZKVmO7PD42HeJKfQpVOKPZnfRl9Zf38tRtDnC99QxMpVk/4fo9y1hM8ifoDO97WFOBOQ==, + integrity: sha512-FpkDc7ydSEvrJnewfNAQZhiiIOgZUfywXFxCOq7c4Yck1CO7CotInoSdC4fcHQhiy4NrzOQicE+azE/fCINlwA==, } dependencies: - '@nx/angular': 16.10.0(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/angular': 17.0.1(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) tslib: 2.6.1 transitivePeerDependencies: - '@angular-devkit/build-angular' @@ -5335,13 +5321,13 @@ packages: - webpack-cli dev: true - /@nrwl/cypress@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/cypress@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-ns6VQrrF08XYwZE4OduLVK2rwpN6dNrkVArw4fzJccuZ1g3YxR5JSuxpdBQA3FjKWoo2DybivuQudpIlYGq3UQ==, + integrity: sha512-13eIoTDcpWAcNAPWnwCdXldx3DHApMnpfrraFTgmeHC8e2WlmPPxAcxSasie2Y6fckyP+Mv9KRENZMhET8Vvxw==, } dependencies: - '@nx/cypress': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/cypress': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5357,24 +5343,24 @@ packages: - verdaccio dev: true - /@nrwl/devkit@16.10.0(nx@16.10.0): + /@nrwl/devkit@17.0.1(nx@17.0.1): resolution: { - integrity: sha512-fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ==, + integrity: sha512-/4wANytOG8RlGAU6QbPzka330Ud1zo0/1NxZcAvOkexW8w7lzZoT+O0ArTCVHuWVDa2h4cKjfd15+XCEglyazg==, } dependencies: - '@nx/devkit': 16.10.0(nx@16.10.0) + '@nx/devkit': 17.0.1(nx@17.0.1) transitivePeerDependencies: - nx dev: true - /@nrwl/eslint-plugin-nx@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@8.8.0)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/eslint-plugin-nx@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@9.0.0)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-w8fHXEatdPHQeP/Yompsdrgz4BJ2BSVaaaulcovzTNJ9KrCCtDyTGY7sihU7qLVcbZtUVq9xoAsSeuTQuOCTDw==, + integrity: sha512-L3rD1vnZPI637tigeHhLmSUjaNxI0Rwd3xFb8BTm2sCi1wPAR8LVxb3tERC3qjVU9EWl6v2AyLnAFaRK9birhg==, } dependencies: - '@nx/eslint-plugin': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@8.8.0)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/eslint-plugin': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@9.0.0)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5391,13 +5377,13 @@ packages: - verdaccio dev: true - /@nrwl/jest@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/jest@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-hZuIK3xXh4HaE6/Ny8hGidjkJ4aLZjnQtPDxKD/423gznQe2FdHx3avoSlbOEOx5Oc6sJ9QGGZLcvckKQ5uWww==, + integrity: sha512-FoCOtgyGTg0DRePiOXKFSOXVFQrQ3hQp+YIt/GPraXSp0xzP5hqbl7WH8i+7pghujm4YUv7lHK6sFSht9SxQWQ==, } dependencies: - '@nx/jest': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/jest': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5413,13 +5399,13 @@ packages: - verdaccio dev: true - /@nrwl/js@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/js@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-asybPpyPrxLLDWWdYzFqbgubLmDKLEhoMz8x9MPOm3CH8v2vlIE6hD0JT19GdJArBPxRB33nhjtu8wmJGz5czw==, + integrity: sha512-CUXqhvbGw7WaxzguorQllC6i1C9gpG8ha+I8/mxI6FaDJ7EJG/osoriJsYlyQsOrNWFwF4begvUiH7ko6wLyFA==, } dependencies: - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5433,33 +5419,13 @@ packages: - verdaccio dev: true - /@nrwl/linter@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0): - resolution: - { - integrity: sha512-XvMuTeIc2I3630iaqhlV4w3qgABQIo+kv8mT0DbT1HfjjZDm4ST8hrvkdWSf9mCl24vShNL8GDVQVNOX0bZY5A==, - } - dependencies: - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) - transitivePeerDependencies: - - '@babel/traverse' - - '@swc-node/register' - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - debug - - eslint - - nx - - supports-color - - verdaccio - dev: true - - /@nrwl/node@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/node@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-UZ1s02f2IpFRXzVZIBuDLXXB+obyP280RFHV9smYruhOHrj8iA5wXNSXcJJGorwpKP3WCUS/+KS49oVSHOkLUA==, + integrity: sha512-FvZ/bnZn1XE2gfYx1hxT4c96C+8W2QiEBVyJfYSQtTWeSaerAadWS01ewrVvFw39fa75vTOtjEkUCRY5CPPo3A==, } dependencies: - '@nx/node': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/node': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5476,24 +5442,13 @@ packages: - verdaccio dev: true - /@nrwl/nx-cloud@16.4.0: - resolution: - { - integrity: sha512-QitrYK6z9ceagetBlgLMZnC0T85k2JTk+oK0MxZ5p/woclqeYN7SiGNZgMzDq8TjJwt8Fm/MDnsSo3xtufmLBg==, - } - dependencies: - nx-cloud: 16.4.0 - transitivePeerDependencies: - - debug - dev: true - - /@nrwl/nx-plugin@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/nx-plugin@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-AZiQ+amECFQGcWKhvs+KbqOzGU2dcQydGd0j4Wlz3xlfkEmYfCk80dj26ypSFB+3O+0p+q+HPpJhD0fka3shtw==, + integrity: sha512-9r8EgHJca7Gn0YtShCDIaiNstWsbSV4ehnHaQ/h+ROn3wuB8zfrWoTX9UMHfkKBFcS4NjjnIU8SxFC/aU4ibDA==, } dependencies: - '@nx/plugin': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/plugin': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5510,13 +5465,13 @@ packages: - verdaccio dev: true - /@nrwl/react@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2): + /@nrwl/react@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2): resolution: { - integrity: sha512-00JmHuA97K7t2Z22fGvNqMZuhmRO/IpceLPdUhQOeAY/lb+e3ffVf+CDOBnTC/ISjrIoIyYcfmbAl4ZxxvvN7w==, + integrity: sha512-YZHSQvFqgv4/ohIOeQJlRbKAhBWd1YZd3hoKJ/wE7L+UnhCACe+OKCM1X7QZiVeB2aCmbf5DSP78ic++q8Uc/g==, } dependencies: - '@nx/react': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2) + '@nx/react': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5532,13 +5487,13 @@ packages: - webpack dev: true - /@nrwl/storybook@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/storybook@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-/S8usLsA/gEPG6LxPwciDSPCn0xGixhN0FxG39+whGkBttC1u7CDNhUstoGK3zmq0d/y8Q2v64uUCv9GPZlAWg==, + integrity: sha512-dpZ1kyPw4FrDjhPkUm76GztlXJZ1PCkIyMn/sTqj+AWcM5onNvsVWpVov7eRoIr4/CEr1Pn+vrdzm9RS7Pu8GQ==, } dependencies: - '@nx/storybook': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/storybook': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5554,14 +5509,14 @@ packages: - verdaccio dev: true - /@nrwl/tao@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91): + /@nrwl/tao@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91): resolution: { - integrity: sha512-QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q==, + integrity: sha512-UtqLJi3kCtGFY4voZ78FfQ/t3av7F9gYgWkG9/WquDmXzUMNufPgsnIX4wwzvyeifwy1ocEA0APsUfRX63d5rw==, } hasBin: true dependencies: - nx: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + nx: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) tslib: 2.6.1 transitivePeerDependencies: - '@swc-node/register' @@ -5569,13 +5524,13 @@ packages: - debug dev: true - /@nrwl/vite@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.4.9)(vitest@0.34.3): + /@nrwl/vite@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.5.0)(vitest@0.34.3): resolution: { - integrity: sha512-15ARYsaiauksgj077YJuJW5uKTOWdA7IZ4fm5ewRUWQyNNZeVSG9Fm3bkJWB9YLjnce3/Fuop+ynm0j3C01Phg==, + integrity: sha512-FVpOv5TF5BEeyOoMSJ21pC8ZWVojp/iZSAdfmew89Zwv30Ga4z8MQM2f49Zh5gbpo8goiU7QAYkDc1tvKqg7vA==, } dependencies: - '@nx/vite': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.4.9)(vitest@0.34.3) + '@nx/vite': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.5.0)(vitest@0.34.3) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5591,13 +5546,13 @@ packages: - vitest dev: true - /@nrwl/web@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/web@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-BRQGOHiuEptVhjmXnlqM47epUL00RoUMjhcsfMNjyZ7WpdY0JjwJaNx4afylt3h28mSXVi4t008oE5FEC+YfYw==, + integrity: sha512-jA4msywPngESAOaZ3LgIx1FcYNdwX3ogm3v6937N9CnMRYJ9UDwT/hL/I2VD4Luy/hXa4BxlIHAgegi/sHrwDQ==, } dependencies: - '@nx/web': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/web': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -5611,13 +5566,13 @@ packages: - verdaccio dev: true - /@nrwl/webpack@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nrwl/webpack@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-oh/8jzytaU2YM6DOvEOt2CysKWpru+fc+M31JGj6gdq1c1wr4feSs1c/rmJ4jAfvYqejrJwyZK96XX1uRo+3RQ==, + integrity: sha512-snTggVmttopym51KIt+GQdqP1ETJAYBJLHfcgbLYPHV/J9W5POc8E4z2wMSAYUWTFa3KouKYAKpLPLIXr37FtQ==, } dependencies: - '@nx/webpack': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/webpack': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@parcel/css' @@ -5646,13 +5601,13 @@ packages: - webpack-cli dev: true - /@nrwl/workspace@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91): + /@nrwl/workspace@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91): resolution: { - integrity: sha512-fZeNxhFs/2cm326NebfJIgSI3W4KZN94WGS46wlIBrUUGP5/vwHYsi09Kx6sG1kRkAuZVtgJ33uU2F6xcAWzUA==, + integrity: sha512-w5g4AzP1o+xyK/dMJbLw9vKKMLCE7L/l0oVY363A7jq1GQRpqaUO9IoBYV7aTikgL25uK7Fu9T768l2uKzVrKA==, } dependencies: - '@nx/workspace': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nx/workspace': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) transitivePeerDependencies: - '@swc-node/register' - '@swc/core' @@ -5755,7 +5710,7 @@ packages: } dev: true - /@nuxt/vite-builder@3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(stylus@0.59.0)(typescript@5.1.6)(vue@3.3.4): + /@nuxt/vite-builder@3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(typescript@5.1.6)(vue@3.3.4): resolution: { integrity: sha512-pwSpt257ApCp3XWUs8vrC7X9QHeHUv5PbbIR3+5w0n5f95XPNOQWDJa2fTPX/H6oaRJCPYAsBPqiQhQ7qW/NZQ==, @@ -5795,8 +5750,8 @@ packages: strip-literal: 1.3.0 ufo: 1.3.0 unplugin: 1.4.0 - vite: 4.3.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) - vite-node: 0.33.0(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.3.9(@types/node@18.15.3)(less@4.1.3) + vite-node: 0.33.0(@types/node@18.15.3)(less@4.1.3) vite-plugin-checker: 0.6.2(eslint@8.46.0)(typescript@5.1.6)(vite@4.3.9) vue: 3.3.4 vue-bundle-renderer: 1.0.3 @@ -5820,10 +5775,10 @@ packages: - vue-tsc dev: true - /@nx/angular@16.10.0(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/angular@17.0.1(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-NkXe6N0vYrd8YexAjDUE9yLVOBtNrXuCnp2HW+QePd0sW5AiUeNeGwy07oStCJwH9xD5Rr5nl3JPrpBFEdNlVg==, + integrity: sha512-xCYO04mEB6XwvSvniEAdYAI+lcGUi+CoB97QsmFMXp/D3JgPWs7Wn+lCkwxkywYsCNQ1PXzCFvMv9Xvds7XAIw==, } peerDependencies: '@angular-devkit/build-angular': '>= 14.0.0 < 17.0.0' @@ -5839,17 +5794,18 @@ packages: esbuild: optional: true dependencies: - '@angular-devkit/build-angular': 16.2.0(@angular/compiler-cli@16.2.2)(@swc/core@1.3.91)(@types/node@18.15.3)(jest-environment-jsdom@29.5.0)(jest@29.4.3)(stylus@0.59.0)(typescript@5.1.6) + '@angular-devkit/build-angular': 16.2.0(@angular/compiler-cli@16.2.2)(@swc/core@1.3.91)(@types/node@18.15.3)(jest-environment-jsdom@29.5.0)(jest@29.4.3)(typescript@5.1.6) '@angular-devkit/core': 16.0.0 '@angular-devkit/schematics': 16.0.0 - '@nrwl/angular': 16.10.0(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/cypress': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/jest': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) - '@nx/webpack': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/workspace': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nrwl/angular': 17.0.1(@angular-devkit/build-angular@16.2.0)(@angular-devkit/core@16.0.0)(@angular-devkit/schematics@16.0.0)(@schematics/angular@16.0.0)(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(rxjs@7.8.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/cypress': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + '@nx/jest': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/web': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/webpack': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/workspace': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) '@schematics/angular': 16.0.0 '@typescript-eslint/type-utils': 5.62.0(eslint@8.46.0)(typescript@5.1.6) @@ -5895,10 +5851,10 @@ packages: - webpack-cli dev: true - /@nx/cypress@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/cypress@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-suYc5jC6Os0D78Fn2pAIuGOkM6nhIWsSEb94PWwdZWE0XKQiWrgQJZBXDIu3x2zq6oZxYdx8OufUFli8vr4/Tw==, + integrity: sha512-Z0f+CBf1uHJHb+cvpb0fpO2iUwidAtGVRqB7NpPKMkWkdGYgbiVrXIS3IkfHlZBKVULBNuqg8ylJKIJ9aoJkRA==, } peerDependencies: cypress: '>= 3 < 14' @@ -5906,10 +5862,10 @@ packages: cypress: optional: true dependencies: - '@nrwl/cypress': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) + '@nrwl/cypress': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) detect-port: 1.5.1 semver: 7.5.3 @@ -5928,45 +5884,45 @@ packages: - verdaccio dev: true - /@nx/devkit@16.10.0(nx@16.10.0): + /@nx/devkit@17.0.1(nx@17.0.1): resolution: { - integrity: sha512-IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w==, + integrity: sha512-YMyype8zN+VrLiTbJMa3zrmMRRolLfPQ+5qGjUhAbgvpzVJlrtkXmZzI8YjYZ7dvo5e/y+NiljUYF+ZN88gpmQ==, } peerDependencies: - nx: '>= 15 <= 17' + nx: '>= 16 <= 18' dependencies: - '@nrwl/devkit': 16.10.0(nx@16.10.0) + '@nrwl/devkit': 17.0.1(nx@17.0.1) ejs: 3.1.7 enquirer: 2.3.6 ignore: 5.2.4 - nx: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + nx: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) semver: 7.5.3 tmp: 0.2.1 tslib: 2.6.1 dev: true - /@nx/eslint-plugin@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@8.8.0)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/eslint-plugin@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@9.0.0)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-fdOlCrSJK6HfCs+FVXUxzS5gobnGymTU85B3vXPYkVpJwKmq9voX7HBhx9euScRGgXdO9335DIixc/QV6zGpKA==, + integrity: sha512-XvLqg3JcLhvU/VoSXaJK/iwnlDH4xHgCubno6X9l3V6+uLzMEJew69IPHPvRptWMwGSrkhmPKBHauQQUBDkIvQ==, } peerDependencies: '@typescript-eslint/parser': ^5.60.1 - eslint-config-prettier: ^8.1.0 + eslint-config-prettier: ^9.0.0 peerDependenciesMeta: eslint-config-prettier: optional: true dependencies: - '@nrwl/eslint-plugin-nx': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@8.8.0)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nrwl/eslint-plugin-nx': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(@typescript-eslint/parser@5.62.0)(eslint-config-prettier@9.0.0)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@typescript-eslint/parser': 5.62.0(eslint@8.46.0)(typescript@5.1.6) '@typescript-eslint/type-utils': 5.62.0(eslint@8.46.0)(typescript@5.1.6) '@typescript-eslint/utils': 5.62.0(eslint@8.46.0)(typescript@5.1.6) chalk: 4.1.0 confusing-browser-globals: 1.0.11 - eslint-config-prettier: 8.8.0(eslint@8.46.0) + eslint-config-prettier: 9.0.0(eslint@8.46.0) jsonc-eslint-parser: 2.3.0 semver: 7.5.3 tslib: 2.6.1 @@ -5984,17 +5940,46 @@ packages: - verdaccio dev: true - /@nx/jest@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/eslint@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0): + resolution: + { + integrity: sha512-oSTLucDyHcAhzWSZIoJT4KHUMotvd06zWasd/mMc8GLbXTtYRO38ZiTsQUkA0YpWg4Ng/S5fxiFoHTiol6sXdA==, + } + peerDependencies: + eslint: ^8.0.0 + peerDependenciesMeta: + eslint: + optional: true + dependencies: + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/linter': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + eslint: 8.46.0 + tslib: 2.6.1 + typescript: 5.1.6 + transitivePeerDependencies: + - '@babel/traverse' + - '@swc-node/register' + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - debug + - nx + - supports-color + - verdaccio + dev: true + + /@nx/jest@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-QseeLjDrl4c9q9Dd/057SXYqd47JVLhD2VQlQDraYwjsHz3lWkzlGaaHy0ZrVu8LSzY7lUUhJMPyYO3qo8wT6A==, + integrity: sha512-DROBrzayTe1M3ud49pyrogPchRLCwdDIkfJbpuH1oYaB2K4WDVcAc7t+ijDnfxHjP+1Yv8CQ2Vp7lA+buBjBlw==, } dependencies: '@jest/reporters': 29.5.0 '@jest/test-result': 29.5.0 - '@nrwl/jest': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nrwl/jest': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) chalk: 4.1.0 identity-obj-proxy: 3.0.0 @@ -6018,10 +6003,10 @@ packages: - verdaccio dev: true - /@nx/js@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/js@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-27AH0/+XTMzOxVS6oV8Zl7/Rr1UDMYsnCVqoCU9CXp087uxcD4VnBOEjsEUlJKh1RdwGE3K0hBkk7NC1LP+vYQ==, + integrity: sha512-HfVf6zsskLCZgBlKtLu5MMpCIalGnBxsLeeqcIyRfwJVdqbCYzy1duVm87CgakXAlRg8ZpmEEf5K2eUhm56Gmw==, } peerDependencies: verdaccio: ^5.0.4 @@ -6030,15 +6015,14 @@ packages: optional: true dependencies: '@babel/core': 7.22.10 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.10) '@babel/plugin-proposal-decorators': 7.22.7(@babel/core@7.22.10) '@babel/plugin-transform-runtime': 7.22.9(@babel/core@7.22.10) '@babel/preset-env': 7.22.9(@babel/core@7.22.10) '@babel/preset-typescript': 7.22.5(@babel/core@7.22.10) '@babel/runtime': 7.22.6 - '@nrwl/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/workspace': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nrwl/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/workspace': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) babel-plugin-const-enum: 1.2.0(@babel/core@7.22.10) babel-plugin-macros: 2.8.0 @@ -6072,25 +6056,13 @@ packages: - typescript dev: true - /@nx/linter@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0): + /@nx/linter@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0): resolution: { - integrity: sha512-G6XBfuMHNHoJDc4n2Gip4fsa9KssT91V5PF2Rd4hILkg4YU8B8mlmHN71stpzwbEyUJtyhyJc5SGgVLrSpRQew==, + integrity: sha512-EpKj8W9eW+lGTG+oAd3x64yUwFKBvYvG15ObLiqVJmjSEQOSenGwqW5JanLA8leYvGouJ1sR3LGwg9I2o/vqRg==, } - peerDependencies: - eslint: ^8.0.0 - peerDependenciesMeta: - eslint: - optional: true dependencies: - '@nrwl/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) - eslint: 8.46.0 - tmp: 0.2.1 - tslib: 2.6.1 - typescript: 5.1.6 + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -6098,23 +6070,23 @@ packages: - '@swc/wasm' - '@types/node' - debug + - eslint - nx - supports-color - verdaccio dev: true - /@nx/node@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/node@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-mOGxsZzLNg9kMy/FDkCQfhb/ig3WsttHxzG9+ynCHBV5svKOIqA3F+EUp1gre6wgRyi/qrEUhk6GER5ZTX2ygw==, + integrity: sha512-TH3qJoHi2OrGFuSXgiYSs291DtLDRM5j6UR4TMK7/R62foPMV3Yc8CufdNb3pw7InjDPD5tuT5x5HilNbCtYlg==, } dependencies: - '@nrwl/node': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/jest': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) - '@nx/workspace': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nrwl/node': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + '@nx/jest': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) tslib: 2.6.1 transitivePeerDependencies: - '@babel/traverse' @@ -6132,10 +6104,10 @@ packages: - verdaccio dev: true - /@nx/nx-darwin-arm64@16.10.0: + /@nx/nx-darwin-arm64@17.0.1: resolution: { - integrity: sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==, + integrity: sha512-Ksgrtck+vZtdh4mFw+IF4ECh4VGQktuHZNT7MwzKQTzLc7gQgjt3OyC97rDWoTb8qgUNc857Hor6ZAZpqHkItA==, } engines: { node: '>= 10' } cpu: [arm64] @@ -6144,10 +6116,10 @@ packages: dev: true optional: true - /@nx/nx-darwin-x64@16.10.0: + /@nx/nx-darwin-x64@17.0.1: resolution: { - integrity: sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==, + integrity: sha512-QBGRDwh9xxBAeOI9WUgiihOqnJ3WUlNtIajf3rsH0A9UpU2hPg/7rTSzLRSJHScEPeB9ICLRoiCRnvoZ1iuQMQ==, } engines: { node: '>= 10' } cpu: [x64] @@ -6156,10 +6128,10 @@ packages: dev: true optional: true - /@nx/nx-freebsd-x64@16.10.0: + /@nx/nx-freebsd-x64@17.0.1: resolution: { - integrity: sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==, + integrity: sha512-r7cCVBdypTK73b5uPiewIQSq9klSEabcYJkhOP5H0Kzdb3n5G8eJrQBLopoXXqnkxIZnfzvIV/ATssr7nIGJJg==, } engines: { node: '>= 10' } cpu: [x64] @@ -6168,10 +6140,10 @@ packages: dev: true optional: true - /@nx/nx-linux-arm-gnueabihf@16.10.0: + /@nx/nx-linux-arm-gnueabihf@17.0.1: resolution: { - integrity: sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==, + integrity: sha512-s0EGuEMvib+yxji+A/C5BDzOe03GczVtB8ArSKWUxwSGq2jv7ybTXgZK0VdJc0odhzXu6zpwy6mEm1ZAGfshDw==, } engines: { node: '>= 10' } cpu: [arm] @@ -6180,10 +6152,10 @@ packages: dev: true optional: true - /@nx/nx-linux-arm64-gnu@16.10.0: + /@nx/nx-linux-arm64-gnu@17.0.1: resolution: { - integrity: sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==, + integrity: sha512-gB4gdBrnXh4XXqk6RC+GBDnDNZ3UnCnQRTvyVZUtlDZnJ7j9FYbNTZB+m/zoQGweBpCDYAYnpx+bJ7sK1lVwlg==, } engines: { node: '>= 10' } cpu: [arm64] @@ -6192,10 +6164,10 @@ packages: dev: true optional: true - /@nx/nx-linux-arm64-musl@16.10.0: + /@nx/nx-linux-arm64-musl@17.0.1: resolution: { - integrity: sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==, + integrity: sha512-h2258DDRwV10bp3ygmaBxLVnV/gUXo9fQc5yBLgJD679RcyhtQNIW76pCtqqJAb/ErzxJAj6s90YxQdtnnScqQ==, } engines: { node: '>= 10' } cpu: [arm64] @@ -6204,10 +6176,10 @@ packages: dev: true optional: true - /@nx/nx-linux-x64-gnu@16.10.0: + /@nx/nx-linux-x64-gnu@17.0.1: resolution: { - integrity: sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==, + integrity: sha512-KrmkK3CcROGgjO5yOtHgVa9Add2UTjrJnPGFcBES4nm6+7ZDCDwll7ukYCsPy6cwx6hhC5aHrKCARc0oTRmjOQ==, } engines: { node: '>= 10' } cpu: [x64] @@ -6216,10 +6188,10 @@ packages: dev: true optional: true - /@nx/nx-linux-x64-musl@16.10.0: + /@nx/nx-linux-x64-musl@17.0.1: resolution: { - integrity: sha512-q8sINYLdIJxK/iUx9vRk5jWAWb/2O0PAbOJFwv4qkxBv4rLoN7y+otgCZ5v0xfx/zztFgk/oNY4lg5xYjIso2Q==, + integrity: sha512-qMWAPb+dH50bkM/LgCLhgOMC1Ie0A7lEl4KsJGQcib7CE9l7ntdRso9osJGkBtmidpohL5LbfRb3W4DJunz6Vg==, } engines: { node: '>= 10' } cpu: [x64] @@ -6228,10 +6200,10 @@ packages: dev: true optional: true - /@nx/nx-win32-arm64-msvc@16.10.0: + /@nx/nx-win32-arm64-msvc@17.0.1: resolution: { - integrity: sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==, + integrity: sha512-nVsZIqUnqYeo3fkrxjivy2mHW+wbORaJPv2donxPJDCFjXgn1gPsQenKl1wlkeetw+TDCOLQmt09wMkDfpFO2w==, } engines: { node: '>= 10' } cpu: [arm64] @@ -6240,10 +6212,10 @@ packages: dev: true optional: true - /@nx/nx-win32-x64-msvc@16.10.0: + /@nx/nx-win32-x64-msvc@17.0.1: resolution: { - integrity: sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==, + integrity: sha512-0W1Hk7tbAOrou6ScTRo6hlZiIIBt0ECdn6rALEDWN4lNKheu0pb2gHZO/hSYMwGj3XUpNvApvUCCdcSTBjegRQ==, } engines: { node: '>= 10' } cpu: [x64] @@ -6252,10 +6224,10 @@ packages: dev: true optional: true - /@nx/playwright@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0): + /@nx/playwright@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0): resolution: { - integrity: sha512-E+Z+kkusaA2OnYIOwpocdwqQPSplp3II2c9W7g7MDA0sJyoHc9Xggw0Xdfncm19RXRT0OmBxA3laN5a4GdN1ZQ==, + integrity: sha512-MJhF9SDFthv9Ev1dA6kxBRujDw7h3E7GY4p3pFY+XV3IJS8cN6WDi4b1SC//Ji9BIsO9QfzVUwSAy8QTdpDa8g==, } peerDependencies: '@playwright/test': ^1.36.0 @@ -6263,8 +6235,8 @@ packages: '@playwright/test': optional: true dependencies: - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) tslib: 2.6.1 transitivePeerDependencies: - '@babel/traverse' @@ -6279,17 +6251,17 @@ packages: - verdaccio dev: true - /@nx/plugin@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/plugin@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-oTTl+yZBfj/EBvqp8vxzE/JhavT2lWaWNKBj1B8kNOYDG041Pf6jj7GazcQmPd+g1UM96Ut0HZit/rsoJOTdvQ==, + integrity: sha512-DcsJiIGB4yXQv9JOygAvt7GvEdaaMCPOvIM1Xo/HYqGQgXvJ2G1r7QZMiiNn/avA7r6HPrXBvGefr51kcuN4vQ==, } dependencies: - '@nrwl/nx-plugin': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/jest': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) + '@nrwl/nx-plugin': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + '@nx/jest': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(ts-node@10.9.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) fs-extra: 11.1.1 tslib: 2.6.1 @@ -6309,17 +6281,17 @@ packages: - verdaccio dev: true - /@nx/react@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2): + /@nx/react@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2): resolution: { - integrity: sha512-WjiXImZWqXDXguHHONO/ANWl3BzqLt6pEvN+uhrRbJGBUWKJz95z8PQfZXeiK6UVY8RFHZXkHtklV3TvTvQ64w==, + integrity: sha512-XN/ME2o5XsVsqBHmnmmPHhaOQfQz+mdh2oyQpwyfuX6XoIFefpRFXg4UrvY4CyQOTcRFfl7yJO8ptyY0mrMUBA==, } dependencies: - '@nrwl/react': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) - '@nx/web': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nrwl/react': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(webpack@5.88.2) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/web': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) '@svgr/webpack': 8.0.1 chalk: 4.1.0 @@ -6341,18 +6313,17 @@ packages: - webpack dev: true - /@nx/storybook@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/storybook@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-2Hpc9HTCIOHt4rcWhNSi9Fmd20rs+xHZ7icYTUTg1tx1tY6mKfUoF2gzpK8lG2vELVryCzxe0WWrqfUMcHWPrQ==, + integrity: sha512-vOmh2HDUSGgkGAfCkJAOubpkZTmRvZMFEvPQtSU0t0QPt+DcZWRxn1lKsIdBA6vpcbS51o/TNWV0/cuES6HvsQ==, } dependencies: - '@nrwl/storybook': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/cypress': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/linter': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@16.10.0)(verdaccio@5.18.0) - '@nx/workspace': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nrwl/storybook': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/cypress': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/eslint': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(eslint@8.46.0)(nx@17.0.1)(verdaccio@5.18.0) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) semver: 7.5.3 tslib: 2.6.1 @@ -6371,24 +6342,24 @@ packages: - verdaccio dev: true - /@nx/vite@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.4.9)(vitest@0.34.3): + /@nx/vite@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.5.0)(vitest@0.34.3): resolution: { - integrity: sha512-xJ/ME2x/ebMy3qdwrA0IUZAamsCje9wH+Ms5z3PSKzf4Xc4VEEsXHVKr4UZADC4Y9YbG0QnzCQdo+VdKCIGlIQ==, + integrity: sha512-eKB+fclFlfQR8yuqweUkQaMp2v48bqe1wZ6AGjaWMZIF9tL78ADMy87O/ABpwoli8IQVQEMPk0wR/Vvf368iNA==, } peerDependencies: vite: ^4.3.4 vitest: '>=0.31.0 <1.0.0' dependencies: - '@nrwl/vite': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.4.9)(vitest@0.34.3) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nrwl/vite': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0)(vite@4.5.0)(vitest@0.34.3) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.1.6) '@swc/helpers': 0.5.2 enquirer: 2.3.6 tsconfig-paths: 4.1.2 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) - vitest: 0.34.3(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) + vitest: 0.34.3(less@4.1.3) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -6402,15 +6373,15 @@ packages: - verdaccio dev: true - /@nx/web@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/web@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-UMGL7BOPyy6flJLePSG8JhEbfI9W4Y6oVqOziLbQODduU3HGr6woJCI38txnOX4nddbyEnL9tRuKkQ8u0YAYnw==, + integrity: sha512-YdUIR5W3tdoic37/f7eZMbTPuq6CawGGdy+NG6Nz7KczbY1fqXbm+0mXT6rp31ODeIdF7Rc26ipCmzK8d2b2Wg==, } dependencies: - '@nrwl/web': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nrwl/web': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) chalk: 4.1.0 detect-port: 1.5.1 http-server: 14.1.0 @@ -6428,16 +6399,16 @@ packages: - verdaccio dev: true - /@nx/webpack@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0): + /@nx/webpack@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0): resolution: { - integrity: sha512-rKftYWh4kW6A7svMx73Zg3fJFDS3618cKTZsCkuQWeSE+RMQXjcefeCxYhwvHXc/ehoakCIIBx7jDCR+6NIlzQ==, + integrity: sha512-kzzM834eZVbdMfkmzIektY0zVK6a/oea8HtJSdZs7oumDuMB6+ge6hqaFUnj35Uhr4kb+Ry6OvAVPrGJyoj5nQ==, } dependencies: '@babel/core': 7.22.10 - '@nrwl/webpack': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) - '@nx/devkit': 16.10.0(nx@16.10.0) - '@nx/js': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@16.10.0)(typescript@5.1.6)(verdaccio@5.18.0) + '@nrwl/webpack': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) + '@nx/devkit': 17.0.1(nx@17.0.1) + '@nx/js': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91)(@types/node@18.15.3)(nx@17.0.1)(typescript@5.1.6)(verdaccio@5.18.0) autoprefixer: 10.4.15(postcss@8.4.28) babel-loader: 9.1.3(@babel/core@7.22.10)(webpack@5.88.2) browserslist: 4.21.10 @@ -6460,8 +6431,6 @@ packages: sass-loader: 12.6.0(sass@1.64.1)(webpack@5.88.2) source-map-loader: 3.0.1(webpack@5.88.2) style-loader: 3.3.1(webpack@5.88.2) - stylus: 0.59.0 - stylus-loader: 7.1.0(stylus@0.59.0)(webpack@5.88.2) terser-webpack-plugin: 5.3.8(@swc/core@1.3.91)(webpack@5.88.2) ts-loader: 9.4.1(typescript@5.1.6)(webpack@5.88.2) tsconfig-paths-webpack-plugin: 4.0.0 @@ -6498,19 +6467,17 @@ packages: - webpack-cli dev: true - /@nx/workspace@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91): + /@nx/workspace@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91): resolution: { - integrity: sha512-95Eq36bzq2hb095Zvg+Ru8o9oIeOE62tNGGpohBkZPKoK2CUTYEq0AZtdj1suXS82ukCFCyyZ/c/fwxL62HRZA==, + integrity: sha512-QnbGZMFpa6xHHUQwD0JTfanEsRhA6OL4tgrhgI3n6tw05qOVeF3kFmT+t5Ad9er/W8zxMIIarKet07ZyN7t68Q==, } dependencies: - '@nrwl/workspace': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) - '@nx/devkit': 16.10.0(nx@16.10.0) + '@nrwl/workspace': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nx/devkit': 17.0.1(nx@17.0.1) chalk: 4.1.0 enquirer: 2.3.6 - ignore: 5.2.4 - nx: 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) - rxjs: 7.8.1 + nx: 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) tslib: 2.6.1 yargs-parser: 21.1.1 transitivePeerDependencies: @@ -6699,7 +6666,7 @@ packages: typescript: 5.1.6 dev: true - /@preact/preset-vite@2.5.0(@babel/core@7.22.10)(preact@10.11.2)(vite@4.4.9): + /@preact/preset-vite@2.5.0(@babel/core@7.22.10)(preact@10.11.2)(vite@4.5.0): resolution: { integrity: sha512-BUhfB2xQ6ex0yPkrT1Z3LbfPzjpJecOZwQ/xJrXGFSZD84+ObyS//41RdEoQCMWsM0t7UHGaujUxUBub7WM1Jw==, @@ -6711,13 +6678,13 @@ packages: '@babel/core': 7.22.10 '@babel/plugin-transform-react-jsx': 7.21.5(@babel/core@7.22.10) '@babel/plugin-transform-react-jsx-development': 7.18.6(@babel/core@7.22.10) - '@prefresh/vite': 2.2.9(preact@10.11.2)(vite@4.4.9) + '@prefresh/vite': 2.2.9(preact@10.11.2)(vite@4.5.0) '@rollup/pluginutils': 4.2.1 babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.22.10) debug: 4.3.4 kolorist: 1.5.1 resolve: 1.22.4 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) transitivePeerDependencies: - preact - supports-color @@ -6748,7 +6715,7 @@ packages: } dev: true - /@prefresh/vite@2.2.9(preact@10.11.2)(vite@4.4.9): + /@prefresh/vite@2.2.9(preact@10.11.2)(vite@4.5.0): resolution: { integrity: sha512-1ERBF85Ja9/lkrfaltmo4Gca7R2ClQPSHHDDysFgfvPzHmLUeyB0x9WHwhwov/AA1DnyPhsfYT54z3yQd8XrgA==, @@ -6763,7 +6730,7 @@ packages: '@prefresh/utils': 1.1.3 '@rollup/pluginutils': 4.2.1 preact: 10.11.2 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) transitivePeerDependencies: - supports-color dev: true @@ -7643,13 +7610,6 @@ packages: '@types/json-schema': 7.0.9 dev: true - /@types/estree@1.0.0: - resolution: - { - integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==, - } - dev: true - /@types/estree@1.0.1: resolution: { @@ -7800,10 +7760,10 @@ packages: } dev: true - /@types/markdown-it@13.0.2: + /@types/markdown-it@13.0.4: resolution: { - integrity: sha512-Tla7hH9oeXHOlJyBFdoqV61xWE9FZf/y2g+gFVwQ2vE1/eBzjUno5JCd3Hdb5oATve5OF6xNjZ/4VIZhVVx+hA==, + integrity: sha512-FAIUdEXrCDnQmAAmJC+UeW/3p0eCI4QZ/+W0lX/h83VD3v78IgTFYftjnAeXS8H0g4PFQCgipc51cQDA8tjgLw==, } dependencies: '@types/linkify-it': 3.0.3 @@ -7952,10 +7912,10 @@ packages: } dev: true - /@types/web-bluetooth@0.0.17: + /@types/web-bluetooth@0.0.18: resolution: { - integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==, + integrity: sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==, } dev: true @@ -8289,7 +8249,7 @@ packages: peerDependencies: vite: ^3.0.0 || ^4.0.0 dependencies: - vite: 4.4.7(@types/node@18.15.3)(less@4.1.3)(sass@1.64.1)(stylus@0.59.0)(terser@5.19.2) + vite: 4.4.7(@types/node@18.15.3)(less@4.1.3)(sass@1.64.1)(terser@5.19.2) dev: true /@vitejs/plugin-vue-jsx@3.0.2(vite@4.3.9)(vue@3.3.4): @@ -8305,7 +8265,7 @@ packages: '@babel/core': 7.22.10 '@babel/plugin-transform-typescript': 7.22.10(@babel/core@7.22.10) '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.22.10) - vite: 4.3.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.3.9(@types/node@18.15.3)(less@4.1.3) vue: 3.3.4 transitivePeerDependencies: - supports-color @@ -8321,7 +8281,7 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.3.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.3.9(@types/node@18.15.3)(less@4.1.3) vue: 3.3.4 dev: true @@ -8442,6 +8402,18 @@ packages: source-map-js: 1.0.2 dev: true + /@vue/compiler-core@3.3.6: + resolution: + { + integrity: sha512-2JNjemwaNwf+MkkatATVZi7oAH1Hx0B04DdPH3ZoZ8vKC1xZVP7nl4HIsk8XYd3r+/52sqqoz9TWzYc3yE9dqA==, + } + dependencies: + '@babel/parser': 7.23.0 + '@vue/shared': 3.3.6 + estree-walker: 2.0.2 + source-map-js: 1.0.2 + dev: true + /@vue/compiler-dom@3.3.4: resolution: { @@ -8452,6 +8424,16 @@ packages: '@vue/shared': 3.3.4 dev: true + /@vue/compiler-dom@3.3.6: + resolution: + { + integrity: sha512-1MxXcJYMHiTPexjLAJUkNs/Tw2eDf2tY3a0rL+LfuWyiKN2s6jvSwywH3PWD8bKICjfebX3GWx2Os8jkRDq3Ng==, + } + dependencies: + '@vue/compiler-core': 3.3.6 + '@vue/shared': 3.3.6 + dev: true + /@vue/compiler-sfc@3.3.4: resolution: { @@ -8470,6 +8452,24 @@ packages: source-map-js: 1.0.2 dev: true + /@vue/compiler-sfc@3.3.6: + resolution: + { + integrity: sha512-/Kms6du2h1VrXFreuZmlvQej8B1zenBqIohP0690IUBkJjsFvJxY0crcvVRJ0UhMgSR9dewB+khdR1DfbpArJA==, + } + dependencies: + '@babel/parser': 7.23.0 + '@vue/compiler-core': 3.3.6 + '@vue/compiler-dom': 3.3.6 + '@vue/compiler-ssr': 3.3.6 + '@vue/reactivity-transform': 3.3.6 + '@vue/shared': 3.3.6 + estree-walker: 2.0.2 + magic-string: 0.30.5 + postcss: 8.4.31 + source-map-js: 1.0.2 + dev: true + /@vue/compiler-ssr@3.3.4: resolution: { @@ -8480,10 +8480,20 @@ packages: '@vue/shared': 3.3.4 dev: true - /@vue/devtools-api@6.5.0: + /@vue/compiler-ssr@3.3.6: + resolution: + { + integrity: sha512-QTIHAfDCHhjXlYGkUg5KH7YwYtdUM1vcFl/FxFDlD6d0nXAmnjizka3HITp8DGudzHndv2PjKVS44vqqy0vP4w==, + } + dependencies: + '@vue/compiler-dom': 3.3.6 + '@vue/shared': 3.3.6 + dev: true + + /@vue/devtools-api@6.5.1: resolution: { - integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==, + integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==, } dev: true @@ -8500,6 +8510,19 @@ packages: magic-string: 0.30.3 dev: true + /@vue/reactivity-transform@3.3.6: + resolution: + { + integrity: sha512-RlJl4dHfeO7EuzU1iJOsrlqWyJfHTkJbvYz/IOJWqu8dlCNWtxWX377WI0VsbAgBizjwD+3ZjdnvSyyFW1YVng==, + } + dependencies: + '@babel/parser': 7.23.0 + '@vue/compiler-core': 3.3.6 + '@vue/shared': 3.3.6 + estree-walker: 2.0.2 + magic-string: 0.30.5 + dev: true + /@vue/reactivity@3.3.4: resolution: { @@ -8509,6 +8532,15 @@ packages: '@vue/shared': 3.3.4 dev: true + /@vue/reactivity@3.3.6: + resolution: + { + integrity: sha512-gtChAumfQz5lSy5jZXfyXbKrIYPf9XEOrIr6rxwVyeWVjFhJwmwPLtV6Yis+M9onzX++I5AVE9j+iPH60U+B8Q==, + } + dependencies: + '@vue/shared': 3.3.6 + dev: true + /@vue/runtime-core@3.3.4: resolution: { @@ -8519,6 +8551,16 @@ packages: '@vue/shared': 3.3.4 dev: true + /@vue/runtime-core@3.3.6: + resolution: + { + integrity: sha512-qp7HTP1iw1UW2ZGJ8L3zpqlngrBKvLsDAcq5lA6JvEXHmpoEmjKju7ahM9W2p/h51h0OT5F2fGlP/gMhHOmbUA==, + } + dependencies: + '@vue/reactivity': 3.3.6 + '@vue/shared': 3.3.6 + dev: true + /@vue/runtime-dom@3.3.4: resolution: { @@ -8530,6 +8572,17 @@ packages: csstype: 3.1.2 dev: true + /@vue/runtime-dom@3.3.6: + resolution: + { + integrity: sha512-AoX3Cp8NqMXjLbIG9YR6n/pPLWE9TiDdk6wTJHFnl2GpHzDFH1HLBC9wlqqQ7RlnvN3bVLpzPGAAH00SAtOxHg==, + } + dependencies: + '@vue/runtime-core': 3.3.6 + '@vue/shared': 3.3.6 + csstype: 3.1.2 + dev: true + /@vue/server-renderer@3.3.4(vue@3.3.4): resolution: { @@ -8543,6 +8596,19 @@ packages: vue: 3.3.4 dev: true + /@vue/server-renderer@3.3.6(vue@3.3.6): + resolution: + { + integrity: sha512-kgLoN43W4ERdZ6dpyy+gnk2ZHtcOaIr5Uc/WUP5DRwutgvluzu2pudsZGoD2b7AEJHByUVMa9k6Sho5lLRCykw==, + } + peerDependencies: + vue: 3.3.6 + dependencies: + '@vue/compiler-ssr': 3.3.6 + '@vue/shared': 3.3.6 + vue: 3.3.6(typescript@5.1.6) + dev: true + /@vue/shared@3.3.4: resolution: { @@ -8550,25 +8616,32 @@ packages: } dev: true - /@vueuse/core@10.4.1(vue@3.3.4): + /@vue/shared@3.3.6: + resolution: + { + integrity: sha512-Xno5pEqg8SVhomD0kTSmfh30ZEmV/+jZtyh39q6QflrjdJCXah5lrnOLi9KB6a5k5aAHXMXjoMnxlzUkCNfWLQ==, + } + dev: true + + /@vueuse/core@10.5.0(vue@3.3.6): resolution: { - integrity: sha512-DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg==, + integrity: sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A==, } dependencies: - '@types/web-bluetooth': 0.0.17 - '@vueuse/metadata': 10.4.1 - '@vueuse/shared': 10.4.1(vue@3.3.4) - vue-demi: 0.14.5(vue@3.3.4) + '@types/web-bluetooth': 0.0.18 + '@vueuse/metadata': 10.5.0 + '@vueuse/shared': 10.5.0(vue@3.3.6) + vue-demi: 0.14.6(vue@3.3.6) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.4.1(focus-trap@7.5.2)(vue@3.3.4): + /@vueuse/integrations@10.5.0(focus-trap@7.5.4)(vue@3.3.6): resolution: { - integrity: sha512-uRBPyG5Lxoh1A/J+boiioPT3ELEAPEo4t8W6Mr4yTKIQBeW/FcbsotZNPr4k9uz+3QEksMmflWloS9wCnypM7g==, + integrity: sha512-fm5sXLCK0Ww3rRnzqnCQRmfjDURaI4xMsx+T+cec0ngQqHx/JgUtm8G0vRjwtonIeTBsH1Q8L3SucE+7K7upJQ==, } peerDependencies: async-validator: '*' @@ -8609,29 +8682,29 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.4.1(vue@3.3.4) - '@vueuse/shared': 10.4.1(vue@3.3.4) - focus-trap: 7.5.2 - vue-demi: 0.14.5(vue@3.3.4) + '@vueuse/core': 10.5.0(vue@3.3.6) + '@vueuse/shared': 10.5.0(vue@3.3.6) + focus-trap: 7.5.4 + vue-demi: 0.14.6(vue@3.3.6) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/metadata@10.4.1: + /@vueuse/metadata@10.5.0: resolution: { - integrity: sha512-2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg==, + integrity: sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw==, } dev: true - /@vueuse/shared@10.4.1(vue@3.3.4): + /@vueuse/shared@10.5.0(vue@3.3.6): resolution: { - integrity: sha512-vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg==, + integrity: sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg==, } dependencies: - vue-demi: 0.14.5(vue@3.3.4) + vue-demi: 0.14.6(vue@3.3.6) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -9511,10 +9584,10 @@ packages: } dev: true - /axios@1.1.3: + /axios@1.5.1: resolution: { - integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==, + integrity: sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==, } dependencies: follow-redirects: 1.15.2 @@ -11856,14 +11929,6 @@ packages: engines: { node: '>=12' } dev: true - /dotenv@10.0.0: - resolution: - { - integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==, - } - engines: { node: '>=10' } - dev: true - /dotenv@16.3.1: resolution: { @@ -12278,10 +12343,10 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-prettier@8.8.0(eslint@8.46.0): + /eslint-config-prettier@9.0.0(eslint@8.46.0): resolution: { - integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==, + integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==, } hasBin: true peerDependencies: @@ -13129,10 +13194,10 @@ packages: } dev: true - /focus-trap@7.5.2: + /focus-trap@7.5.4: resolution: { - integrity: sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==, + integrity: sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==, } dependencies: tabbable: 6.2.0 @@ -14680,7 +14745,7 @@ packages: integrity: sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==, } dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 dev: true /is-ssh@1.4.0: @@ -16424,6 +16489,16 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true + /magic-string@0.30.5: + resolution: + { + integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==, + } + engines: { node: '>=12' } + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + /make-dir@2.1.0: resolution: { @@ -17341,7 +17416,7 @@ packages: fsevents: 2.3.3 dev: true - /nuxt@3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(stylus@0.59.0)(typescript@5.1.6): + /nuxt@3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(typescript@5.1.6): resolution: { integrity: sha512-0A7V8B1HrIXX9IlqPc2w+5ZPXi+7MYa9QVhtuGYuLvjRKoSFANhCoMPRP6pKdoxigM1MBxhLue2VmHA/VbtJCw==, @@ -17360,7 +17435,7 @@ packages: '@nuxt/schema': 3.6.5 '@nuxt/telemetry': 2.4.1 '@nuxt/ui-templates': 1.3.1 - '@nuxt/vite-builder': 3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(stylus@0.59.0)(typescript@5.1.6)(vue@3.3.4) + '@nuxt/vite-builder': 3.6.5(@types/node@18.15.3)(eslint@8.46.0)(less@4.1.3)(typescript@5.1.6)(vue@3.3.4) '@types/node': 18.15.3 '@unhead/ssr': 1.3.5 '@unhead/vue': 1.3.5(vue@3.3.4) @@ -17447,31 +17522,10 @@ packages: } dev: true - /nx-cloud@16.4.0: - resolution: - { - integrity: sha512-jbq4hWvDwRlJVpxgMgbmNSkue+6XZSn53R6Vo6qmCAWODJ9KY1BZdZ/9VRL8IX/BRKebVFiXp3SapFB1qPhH8A==, - } - hasBin: true - dependencies: - '@nrwl/nx-cloud': 16.4.0 - axios: 1.1.3 - chalk: 4.1.0 - dotenv: 10.0.0 - fs-extra: 11.1.1 - node-machine-id: 1.1.12 - open: 8.4.2 - strip-json-comments: 3.1.1 - tar: 6.1.11 - yargs-parser: 21.1.1 - transitivePeerDependencies: - - debug - dev: true - - /nx@16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91): + /nx@17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91): resolution: { - integrity: sha512-gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg==, + integrity: sha512-OA5M0oJmVAujXjjbXTN9zBG9fG0B2efaKICkfsrFy/g74QhdCxnzvEiGjO2CUQbx5nn/l8sJv0ApEBwfX+F24Q==, } hasBin: true requiresBuild: true @@ -17484,14 +17538,14 @@ packages: '@swc/core': optional: true dependencies: - '@nrwl/tao': 16.10.0(@swc-node/register@1.6.8)(@swc/core@1.3.91) + '@nrwl/tao': 17.0.1(@swc-node/register@1.6.8)(@swc/core@1.3.91) '@parcel/watcher': 2.0.4 '@swc-node/register': 1.6.8(@swc/core@1.3.91)(typescript@5.1.6) '@swc/core': 1.3.91(@swc/helpers@0.5.2) '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.6 - axios: 1.1.3 + axios: 1.5.1 chalk: 4.1.0 cli-cursor: 3.1.0 cli-spinners: 2.6.1 @@ -17523,16 +17577,16 @@ packages: yargs: 17.7.2 yargs-parser: 21.1.1 optionalDependencies: - '@nx/nx-darwin-arm64': 16.10.0 - '@nx/nx-darwin-x64': 16.10.0 - '@nx/nx-freebsd-x64': 16.10.0 - '@nx/nx-linux-arm-gnueabihf': 16.10.0 - '@nx/nx-linux-arm64-gnu': 16.10.0 - '@nx/nx-linux-arm64-musl': 16.10.0 - '@nx/nx-linux-x64-gnu': 16.10.0 - '@nx/nx-linux-x64-musl': 16.10.0 - '@nx/nx-win32-arm64-msvc': 16.10.0 - '@nx/nx-win32-x64-msvc': 16.10.0 + '@nx/nx-darwin-arm64': 17.0.1 + '@nx/nx-darwin-x64': 17.0.1 + '@nx/nx-freebsd-x64': 17.0.1 + '@nx/nx-linux-arm-gnueabihf': 17.0.1 + '@nx/nx-linux-arm64-gnu': 17.0.1 + '@nx/nx-linux-arm64-musl': 17.0.1 + '@nx/nx-linux-x64-gnu': 17.0.1 + '@nx/nx-linux-x64-musl': 17.0.1 + '@nx/nx-win32-arm64-msvc': 17.0.1 + '@nx/nx-win32-x64-msvc': 17.0.1 transitivePeerDependencies: - debug dev: true @@ -18135,7 +18189,7 @@ packages: integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==, } dependencies: - '@types/estree': 1.0.0 + '@types/estree': 1.0.1 estree-walker: 3.0.3 is-reference: 3.0.2 dev: true @@ -18842,6 +18896,18 @@ packages: source-map-js: 1.0.2 dev: true + /postcss@8.4.31: + resolution: + { + integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==, + } + engines: { node: ^10 || ^12 || >=14 } + dependencies: + nanoid: 3.3.6 + picocolors: 1.0.0 + source-map-js: 1.0.2 + dev: true + /preact@10.11.2: resolution: { @@ -19720,7 +19786,9 @@ packages: { integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==, } + requiresBuild: true dev: true + optional: true /saxes@5.0.1: resolution: @@ -20034,10 +20102,10 @@ packages: } dev: true - /shiki@0.14.4: + /shiki@0.14.5: resolution: { - integrity: sha512-IXCRip2IQzKwxArNNq1S+On4KPML3Yyn8Zzs/xRgcgOWIr8ntIK3IKzjFPfjy/7kt9ZMjc+FItfqHRBg8b6tNQ==, + integrity: sha512-1gCAYOcmCFONmErGTrS1fjzJLA7MGZmKzrBNX7apqSwhyITJg2O102uFzXUeBxNnEkDA9vHIKLyeKq0V083vIw==, } dependencies: ansi-sequence-parser: 1.1.0 @@ -20636,39 +20704,6 @@ packages: postcss-selector-parser: 6.0.13 dev: true - /stylus-loader@7.1.0(stylus@0.59.0)(webpack@5.88.2): - resolution: - { - integrity: sha512-gNUEjjozR+oZ8cuC/Fx4LVXqZOgDKvpW9t2hpXHcxjfPYqSjQftaGwZUK+wL9B0QJ26uS6p1EmoWHmvld1dF7g==, - } - engines: { node: '>= 14.15.0' } - peerDependencies: - stylus: '>=0.52.4' - webpack: ^5.0.0 - dependencies: - fast-glob: 3.3.1 - klona: 2.0.6 - normalize-path: 3.0.0 - stylus: 0.59.0 - webpack: 5.88.2(@swc/core@1.3.91) - dev: true - - /stylus@0.59.0: - resolution: - { - integrity: sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==, - } - hasBin: true - dependencies: - '@adobe/css-tools': 4.2.0 - debug: 4.3.4 - glob: 7.2.3 - sax: 1.2.4 - source-map: 0.7.4 - transitivePeerDependencies: - - supports-color - dev: true - /supports-color@5.5.0: resolution: { @@ -20715,7 +20750,7 @@ packages: engines: { node: '>= 0.4' } dev: true - /svelte-preprocess@5.0.4(@babel/core@7.22.10)(less@4.1.3)(postcss@8.4.28)(stylus@0.59.0)(svelte@4.2.1)(typescript@5.1.6): + /svelte-preprocess@5.0.4(@babel/core@7.22.10)(less@4.1.3)(postcss@8.4.28)(svelte@4.2.1)(typescript@5.1.6): resolution: { integrity: sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw==, @@ -20764,7 +20799,6 @@ packages: postcss: 8.4.28 sorcery: 0.11.0 strip-indent: 3.0.0 - stylus: 0.59.0 svelte: 4.2.1 typescript: 5.1.6 dev: true @@ -20865,21 +20899,6 @@ packages: readable-stream: 3.6.0 dev: true - /tar@6.1.11: - resolution: - { - integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==, - } - engines: { node: '>= 10' } - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 3.1.6 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - dev: true - /tar@6.1.15: resolution: { @@ -22105,7 +22124,7 @@ packages: extsprintf: 1.4.1 dev: true - /vite-node@0.33.0(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0): + /vite-node@0.33.0(@types/node@18.15.3)(less@4.1.3): resolution: { integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==, @@ -22118,7 +22137,7 @@ packages: mlly: 1.4.1 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) transitivePeerDependencies: - '@types/node' - less @@ -22130,7 +22149,7 @@ packages: - terser dev: true - /vite-node@0.34.3(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0): + /vite-node@0.34.3(@types/node@18.15.3)(less@4.1.3): resolution: { integrity: sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==, @@ -22143,7 +22162,7 @@ packages: mlly: 1.4.1 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) transitivePeerDependencies: - '@types/node' - less @@ -22204,14 +22223,14 @@ packages: strip-ansi: 6.0.1 tiny-invariant: 1.3.1 typescript: 5.1.6 - vite: 4.3.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.3.9(@types/node@18.15.3)(less@4.1.3) vscode-languageclient: 7.0.0 vscode-languageserver: 7.0.0 vscode-languageserver-textdocument: 1.0.8 vscode-uri: 3.0.7 dev: true - /vite-plugin-solid@2.7.0(solid-js@1.7.11)(vite@4.4.9): + /vite-plugin-solid@2.7.0(solid-js@1.7.11)(vite@4.5.0): resolution: { integrity: sha512-avp/Jl5zOp/Itfo67xtDB2O61U7idviaIp4mLsjhCa13PjKNasz+IID0jYTyqUp9SFx6/PmBr6v4KgDppqompg==, @@ -22227,13 +22246,13 @@ packages: merge-anything: 5.1.4 solid-js: 1.7.11 solid-refresh: 0.5.2(solid-js@1.7.11) - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) - vitefu: 0.2.3(vite@4.4.9) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) + vitefu: 0.2.3(vite@4.5.0) transitivePeerDependencies: - supports-color dev: true - /vite@4.3.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0): + /vite@4.3.9(@types/node@18.15.3)(less@4.1.3): resolution: { integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==, @@ -22266,12 +22285,11 @@ packages: less: 4.1.3 postcss: 8.4.28 rollup: 3.28.1 - stylus: 0.59.0 optionalDependencies: fsevents: 2.3.3 dev: true - /vite@4.4.7(@types/node@18.15.3)(less@4.1.3)(sass@1.64.1)(stylus@0.59.0)(terser@5.19.2): + /vite@4.4.7(@types/node@18.15.3)(less@4.1.3)(sass@1.64.1)(terser@5.19.2): resolution: { integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==, @@ -22308,16 +22326,15 @@ packages: postcss: 8.4.28 rollup: 3.28.1 sass: 1.64.1 - stylus: 0.59.0 terser: 5.19.2 optionalDependencies: fsevents: 2.3.3 dev: true - /vite@4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0): + /vite@4.5.0(@types/node@18.15.3)(less@4.1.3): resolution: { - integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==, + integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==, } engines: { node: ^14.18.0 || >=16.0.0 } hasBin: true @@ -22350,12 +22367,11 @@ packages: less: 4.1.3 postcss: 8.4.28 rollup: 3.28.1 - stylus: 0.59.0 optionalDependencies: fsevents: 2.3.3 dev: true - /vitefu@0.2.3(vite@4.4.9): + /vitefu@0.2.3(vite@4.5.0): resolution: { integrity: sha512-75l7TTuU8isAhz1QFtNKjDkqjxvndfMC1AfIMjJ0ZQ59ZD0Ow9QOIsJJX16Wv9PS8f+zMzp6fHy5cCbKG/yVUQ==, @@ -22366,18 +22382,18 @@ packages: vite: optional: true dependencies: - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) dev: true - /vitepress@1.0.0-rc.20(@algolia/client-search@4.19.1)(@types/node@18.15.3)(less@4.1.3)(postcss@8.4.28)(search-insights@2.7.0)(stylus@0.59.0): + /vitepress@1.0.0-rc.23(@algolia/client-search@4.19.1)(@types/node@18.15.3)(less@4.1.3)(postcss@8.4.28)(search-insights@2.7.0)(typescript@5.1.6): resolution: { - integrity: sha512-CykMUJ8JLxLcGWek0ew3wln4RYbsOd1+0YzXITTpajggpynm2S331TNkJVOkHrMRc6GYe3y4pS40GfgcW0ZwAw==, + integrity: sha512-0YoBt8aFgbRt2JtYaCeTqq4W21q5lbGso+g1ZwkYYS35ExJxORssRJunhFuUcby8QeN4BP/88QDgsVSIVLAfXQ==, } hasBin: true peerDependencies: markdown-it-mathjax3: ^4.3.2 - postcss: ^8.4.30 + postcss: ^8.4.31 peerDependenciesMeta: markdown-it-mathjax3: optional: true @@ -22386,17 +22402,17 @@ packages: dependencies: '@docsearch/css': 3.5.2 '@docsearch/js': 3.5.2(@algolia/client-search@4.19.1)(search-insights@2.7.0) - '@types/markdown-it': 13.0.2 - '@vue/devtools-api': 6.5.0 - '@vueuse/core': 10.4.1(vue@3.3.4) - '@vueuse/integrations': 10.4.1(focus-trap@7.5.2)(vue@3.3.4) - focus-trap: 7.5.2 + '@types/markdown-it': 13.0.4 + '@vue/devtools-api': 6.5.1 + '@vueuse/core': 10.5.0(vue@3.3.6) + '@vueuse/integrations': 10.5.0(focus-trap@7.5.4)(vue@3.3.6) + focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 6.1.0 postcss: 8.4.28 - shiki: 0.14.4 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) - vue: 3.3.4 + shiki: 0.14.5 + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) + vue: 3.3.6(typescript@5.1.6) transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -22421,10 +22437,11 @@ packages: - stylus - sugarss - terser + - typescript - universal-cookie dev: true - /vitest@0.34.3(less@4.1.3)(stylus@0.59.0): + /vitest@0.34.3(less@4.1.3): resolution: { integrity: sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==, @@ -22479,8 +22496,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.0 tinypool: 0.7.0 - vite: 4.4.9(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) - vite-node: 0.34.3(@types/node@18.15.3)(less@4.1.3)(stylus@0.59.0) + vite: 4.5.0(@types/node@18.15.3)(less@4.1.3) + vite-node: 0.34.3(@types/node@18.15.3)(less@4.1.3) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -22576,10 +22593,10 @@ packages: ufo: 1.3.0 dev: true - /vue-demi@0.14.5(vue@3.3.4): + /vue-demi@0.14.6(vue@3.3.6): resolution: { - integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==, + integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==, } engines: { node: '>=12' } hasBin: true @@ -22591,7 +22608,7 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.3.4 + vue: 3.3.6(typescript@5.1.6) dev: true /vue-devtools-stub@0.1.0: @@ -22609,7 +22626,7 @@ packages: peerDependencies: vue: ^3.2.0 dependencies: - '@vue/devtools-api': 6.5.0 + '@vue/devtools-api': 6.5.1 vue: 3.3.4 dev: true @@ -22626,6 +22643,25 @@ packages: '@vue/shared': 3.3.4 dev: true + /vue@3.3.6(typescript@5.1.6): + resolution: + { + integrity: sha512-jJIDETeWJnoY+gfn4ZtMPMS5KtbP4ax+CT4dcQFhTnWEk8xMupFyQ0JxL28nvT/M4+p4a0ptxaV2WY0LiIxvRg==, + } + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@vue/compiler-dom': 3.3.6 + '@vue/compiler-sfc': 3.3.6 + '@vue/runtime-dom': 3.3.6 + '@vue/server-renderer': 3.3.6(vue@3.3.6) + '@vue/shared': 3.3.6 + typescript: 5.1.6 + dev: true + /w3c-hr-time@1.0.2: resolution: {