diff --git a/docs/components/atoms/icons/IconCloud.vue b/docs/components/atoms/icons/IconCloud.vue index 6af6ac41c6..311ddc5c23 100644 --- a/docs/components/atoms/icons/IconCloud.vue +++ b/docs/components/atoms/icons/IconCloud.vue @@ -1,56 +1,10 @@ diff --git a/package.json b/package.json index eeb5a7ed92..6ee97e05cf 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,14 @@ "lint": "eslint --ext .vue,.ts,.js,.mjs .", "lint:docs": "markdownlint ./docs/content && case-police 'docs/content**/*.md'", "lint:docs:fix": "markdownlint ./docs/content --fix && case-police 'docs/content**/*.md' --fix", - "nuxi": "node ./packages/nuxi/bin/nuxi.mjs", - "nuxt": "node ./packages/nuxi/bin/nuxi.mjs", + "nuxi": "NUXT_TELEMETRY_DISABLED=1 node ./packages/nuxi/bin/nuxi.mjs", + "nuxt": "NUXT_TELEMETRY_DISABLED=1 node ./packages/nuxi/bin/nuxi.mjs", "play": "echo use yarn dev && exit 1", "release": "yarn && yarn lint && FORCE_COLOR=1 lerna publish -m \"chore: release\" && yarn stub", "stub": "lerna run prepack -- --stub", - "test:fixtures": "yarn nuxi prepare test/fixtures/basic && JITI_ESM_RESOLVE=1 vitest run --dir test", - "test:fixtures:dev": "NUXT_TEST_DEV=true yarn test:fixtures", - "test:fixtures:webpack": "TEST_WITH_WEBPACK=1 yarn test:fixtures", + "test:fixtures": "NUXT_TELEMETRY_DISABLED=1 yarn nuxi prepare test/fixtures/basic && JITI_ESM_RESOLVE=1 vitest run --dir test", + "test:fixtures:dev": "NUXT_TELEMETRY_DISABLED=1 NUXT_TEST_DEV=true yarn test:fixtures", + "test:fixtures:webpack": "NUXT_TELEMETRY_DISABLED=1 TEST_WITH_WEBPACK=1 yarn test:fixtures", "test:types": "yarn run nuxi prepare test/fixtures/basic && cd test/fixtures/basic && npx vue-tsc --noEmit", "test:unit": "JITI_ESM_RESOLVE=1 yarn vitest run --dir packages", "version": "yarn && git add yarn.lock" diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index be5236ffc8..e1493fc1bf 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -32,6 +32,7 @@ "dependencies": { "@nuxt/kit": "3.0.0-rc.0", "@nuxt/schema": "3.0.0-rc.0", + "@nuxt/telemetry": "^2.1.2", "@nuxt/ui-templates": "^0.1.0", "@nuxt/vite-builder": "3.0.0-rc.0", "@vue/reactivity": "^3.2.33", diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts index ea842f27f0..42d7c33bd9 100644 --- a/packages/nuxt/src/core/nuxt.ts +++ b/packages/nuxt/src/core/nuxt.ts @@ -138,6 +138,9 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise { options.build.transpile.push('@nuxt/ui-templates') options.alias['vue-demi'] = resolve(options.appDir, 'compat/vue-demi') options.alias['@vue/composition-api'] = resolve(options.appDir, 'compat/capi') + if (options.telemetry !== false && !process.env.NUXT_TELEMETRY_DISABLED) { + options._modules.push('@nuxt/telemetry') + } const nuxt = createNuxt(options) diff --git a/packages/schema/src/config/_adhoc.ts b/packages/schema/src/config/_adhoc.ts index 130e77a04b..15bed36308 100644 --- a/packages/schema/src/config/_adhoc.ts +++ b/packages/schema/src/config/_adhoc.ts @@ -43,5 +43,15 @@ export default { * @type {boolean} * @version 3 */ - pages: undefined + pages: undefined, + + /** + * Manually disable nuxt telemetry + * + * @see [Nuxt Telemetry](https://github.com/nuxt/telemetry) for more information. + * + * @type {boolean} + * @version 3 + */ + telemetry: undefined } diff --git a/yarn.lock b/yarn.lock index 89d24d100a..9df6c2b087 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1518,6 +1518,36 @@ __metadata: languageName: unknown linkType: soft +"@nuxt/telemetry@npm:^2.1.2": + version: 2.1.2 + resolution: "@nuxt/telemetry@npm:2.1.2" + dependencies: + "@nuxt/kit": 3.0.0-rc.0 + chalk: ^5.0.1 + ci-info: ^3.3.0 + consola: ^2.15.3 + create-require: ^1.1.1 + defu: ^6.0.0 + destr: ^1.1.1 + dotenv: ^16.0.0 + fs-extra: ^10.1.0 + git-url-parse: ^11.6.0 + inquirer: ^8.2.2 + is-docker: ^3.0.0 + jiti: ^1.13.0 + mri: ^1.2.0 + nanoid: ^3.3.3 + node-fetch: ^3.2.3 + ohmyfetch: ^0.4.15 + parse-git-config: ^3.0.0 + rc9: ^1.2.2 + std-env: ^3.1.1 + bin: + nuxt-telemetry: bin/nuxt-telemetry.mjs + checksum: 146a705a7940a86184b3c772332ccb4360d859f90bc0216a204ffeeeff012a0cde3852e0d4e95776a8a704fee74778636254d88ab68ac3aa5833fb7edd176aab + languageName: node + linkType: hard + "@nuxt/test-utils@workspace:packages/test-utils": version: 0.0.0-use.local resolution: "@nuxt/test-utils@workspace:packages/test-utils" @@ -3668,7 +3698,7 @@ __metadata: languageName: node linkType: hard -"bl@npm:^4.0.3": +"bl@npm:^4.0.3, bl@npm:^4.1.0": version: 4.1.0 resolution: "bl@npm:4.1.0" dependencies: @@ -4085,6 +4115,13 @@ __metadata: languageName: node linkType: hard +"cli-spinners@npm:^2.5.0": + version: 2.6.1 + resolution: "cli-spinners@npm:2.6.1" + checksum: 423409baaa7a58e5104b46ca1745fbfc5888bbd0b0c5a626e052ae1387060839c8efd512fb127e25769b3dc9562db1dc1b5add6e0b93b7ef64f477feb6416a45 + languageName: node + linkType: hard + "cli-width@npm:^3.0.0": version: 3.0.0 resolution: "cli-width@npm:3.0.0" @@ -7022,6 +7059,13 @@ __metadata: languageName: node linkType: hard +"git-config-path@npm:^2.0.0": + version: 2.0.0 + resolution: "git-config-path@npm:2.0.0" + checksum: f67bee619b76a339d39dee6094c4db914512e3ca7e5ec0a05421b81a6ad0221d6fccfcc0b1c5127cf5af4ed3a49184279bde91b61c003f1cff58ac61e7139cfc + languageName: node + linkType: hard + "git-raw-commits@npm:^2.0.8": version: 2.0.11 resolution: "git-raw-commits@npm:2.0.11" @@ -7069,7 +7113,7 @@ __metadata: languageName: node linkType: hard -"git-url-parse@npm:^11.4.4": +"git-url-parse@npm:^11.4.4, git-url-parse@npm:^11.6.0": version: 11.6.0 resolution: "git-url-parse@npm:11.6.0" dependencies: @@ -7633,7 +7677,7 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:~1.3.0": +"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3 @@ -7683,6 +7727,28 @@ __metadata: languageName: node linkType: hard +"inquirer@npm:^8.2.2": + version: 8.2.2 + resolution: "inquirer@npm:8.2.2" + dependencies: + ansi-escapes: ^4.2.1 + chalk: ^4.1.1 + cli-cursor: ^3.1.0 + cli-width: ^3.0.0 + external-editor: ^3.0.3 + figures: ^3.0.0 + lodash: ^4.17.21 + mute-stream: 0.0.8 + ora: ^5.4.1 + run-async: ^2.4.0 + rxjs: ^7.5.5 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + through: ^2.3.6 + checksum: 69a2cf32f51af0e94dd66c597fdca42b890ff521b537dbfe1fd532c19a751d54893b7896523691ec30357f6212a80a2417fec7bf34411f369bbf151bdbc95ae9 + languageName: node + linkType: hard + "internal-slot@npm:^1.0.3": version: 1.0.3 resolution: "internal-slot@npm:1.0.3" @@ -7819,6 +7885,15 @@ __metadata: languageName: node linkType: hard +"is-docker@npm:^3.0.0": + version: 3.0.0 + resolution: "is-docker@npm:3.0.0" + bin: + is-docker: cli.js + checksum: b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90 + languageName: node + linkType: hard + "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -7860,6 +7935,13 @@ __metadata: languageName: node linkType: hard +"is-interactive@npm:^1.0.0": + version: 1.0.0 + resolution: "is-interactive@npm:1.0.0" + checksum: 824808776e2d468b2916cdd6c16acacebce060d844c35ca6d82267da692e92c3a16fdba624c50b54a63f38bdc4016055b6f443ce57d7147240de4f8cdabaf6f9 + languageName: node + linkType: hard + "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -8046,6 +8128,13 @@ __metadata: languageName: node linkType: hard +"is-unicode-supported@npm:^0.1.0": + version: 0.1.0 + resolution: "is-unicode-supported@npm:0.1.0" + checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52 + languageName: node + linkType: hard + "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -8642,6 +8731,16 @@ __metadata: languageName: node linkType: hard +"log-symbols@npm:^4.1.0": + version: 4.1.0 + resolution: "log-symbols@npm:4.1.0" + dependencies: + chalk: ^4.1.0 + is-unicode-supported: ^0.1.0 + checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74 + languageName: node + linkType: hard + "loupe@npm:^2.3.1": version: 2.3.4 resolution: "loupe@npm:2.3.4" @@ -9303,7 +9402,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.1.32, nanoid@npm:^3.3.1": +"nanoid@npm:^3.1.32, nanoid@npm:^3.3.1, nanoid@npm:^3.3.3": version: 3.3.3 resolution: "nanoid@npm:3.3.3" bin: @@ -9912,6 +10011,7 @@ __metadata: dependencies: "@nuxt/kit": 3.0.0-rc.0 "@nuxt/schema": 3.0.0-rc.0 + "@nuxt/telemetry": ^2.1.2 "@nuxt/ui-templates": ^0.1.0 "@nuxt/vite-builder": 3.0.0-rc.0 "@types/fs-extra": ^9.0.13 @@ -10116,6 +10216,23 @@ __metadata: languageName: node linkType: hard +"ora@npm:^5.4.1": + version: 5.4.1 + resolution: "ora@npm:5.4.1" + dependencies: + bl: ^4.1.0 + chalk: ^4.1.0 + cli-cursor: ^3.1.0 + cli-spinners: ^2.5.0 + is-interactive: ^1.0.0 + is-unicode-supported: ^0.1.0 + log-symbols: ^4.1.0 + strip-ansi: ^6.0.0 + wcwidth: ^1.0.1 + checksum: 28d476ee6c1049d68368c0dc922e7225e3b5600c3ede88fade8052837f9ed342625fdaa84a6209302587c8ddd9b664f71f0759833cbdb3a4cf81344057e63c63 + languageName: node + linkType: hard + "os-homedir@npm:^1.0.0": version: 1.0.2 resolution: "os-homedir@npm:1.0.2" @@ -10318,6 +10435,16 @@ __metadata: languageName: node linkType: hard +"parse-git-config@npm:^3.0.0": + version: 3.0.0 + resolution: "parse-git-config@npm:3.0.0" + dependencies: + git-config-path: ^2.0.0 + ini: ^1.3.5 + checksum: 243aa781d08f3208e94708a59e3410af90a7e831054c08775e7aeccaa23fc03240092ffd829412ee3dbe57f33ae876883b7e63171499041d4522e92d7d624c13 + languageName: node + linkType: hard + "parse-json@npm:^4.0.0": version: 4.0.0 resolution: "parse-json@npm:4.0.0" @@ -11233,7 +11360,7 @@ __metadata: languageName: node linkType: hard -"rc9@npm:^1.2.1": +"rc9@npm:^1.2.1, rc9@npm:^1.2.2": version: 1.2.2 resolution: "rc9@npm:1.2.2" dependencies: @@ -11757,6 +11884,15 @@ __metadata: languageName: node linkType: hard +"rxjs@npm:^7.5.5": + version: 7.5.5 + resolution: "rxjs@npm:7.5.5" + dependencies: + tslib: ^2.1.0 + checksum: e034f60805210cce756dd2f49664a8108780b117cf5d0e2281506e9e6387f7b4f1532d974a8c8b09314fa7a16dd2f6cff3462072a5789672b5dcb45c4173f3c6 + languageName: node + linkType: hard + "safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -12910,7 +13046,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.3.1": +"tslib@npm:^2.1.0, tslib@npm:^2.3.1": version: 2.3.1 resolution: "tslib@npm:2.3.1" checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9 @@ -13733,7 +13869,7 @@ __metadata: languageName: node linkType: hard -"wcwidth@npm:^1.0.0": +"wcwidth@npm:^1.0.0, wcwidth@npm:^1.0.1": version: 1.0.1 resolution: "wcwidth@npm:1.0.1" dependencies: