From 2050d1bfa3fb6d70f32bef68a6b62b0e6e9abe56 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Thu, 19 Oct 2023 16:20:11 +0200
Subject: [PATCH] chore: upgrade to c12 1.5 with configurable layers (#23782)

---
 packages/kit/package.json            |  2 +-
 packages/nuxt/package.json           |  2 +-
 packages/schema/build.config.ts      |  1 +
 packages/schema/package.json         |  1 +
 packages/schema/src/config/common.ts |  8 ++++++--
 pnpm-lock.yaml                       | 30 ++++++++--------------------
 6 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/packages/kit/package.json b/packages/kit/package.json
index f91b0b6549..0c19287c20 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@nuxt/schema": "workspace:*",
-    "c12": "^1.4.2",
+    "c12": "^1.5.1",
     "consola": "^3.2.3",
     "defu": "^6.1.2",
     "globby": "^13.2.2",
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index e2515c6ed3..742a4fa417 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -65,7 +65,7 @@
     "@unhead/vue": "^1.7.4",
     "@vue/shared": "^3.3.4",
     "acorn": "8.10.0",
-    "c12": "^1.4.2",
+    "c12": "^1.5.1",
     "chokidar": "^3.5.3",
     "cookie-es": "^1.0.0",
     "defu": "^6.1.2",
diff --git a/packages/schema/build.config.ts b/packages/schema/build.config.ts
index 708081b43f..179fe33a72 100644
--- a/packages/schema/build.config.ts
+++ b/packages/schema/build.config.ts
@@ -49,6 +49,7 @@ export default defineBuildConfig({
     'file-loader',
     'pug',
     'sass-loader',
+    'c12',
     // Implicit
     '@vue/compiler-core',
     '@vue/shared',
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 57edb5226d..311b8c368c 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -37,6 +37,7 @@
     "@vitejs/plugin-vue": "4.4.0",
     "@vitejs/plugin-vue-jsx": "3.0.2",
     "@vue/compiler-core": "3.3.4",
+    "c12": "1.5.1",
     "esbuild-loader": "4.0.2",
     "h3": "1.8.2",
     "ignore": "5.2.4",
diff --git a/packages/schema/src/config/common.ts b/packages/schema/src/config/common.ts
index 66762b69b6..26522a4a71 100644
--- a/packages/schema/src/config/common.ts
+++ b/packages/schema/src/config/common.ts
@@ -11,8 +11,12 @@ export default defineUntypedSchema({
    *
    * Value should be either a string or array of strings pointing to source directories or config path relative to current config.
    *
-   * You can use `github:`, `gitlab:`, `bitbucket:` or `https://` to extend from a remote git repository.
-   * @type {string|string[]}
+   * You can use `github:`, `gh:` `gitlab:` or `bitbucket:`.
+   *
+   * @see https://github.com/unjs/c12#extending-config-layer-from-remote-sources
+   * @see https://github.com/unjs/giget
+   *
+   * @type {(string|string|[string, typeof import('c12').SourceOptions?])[]}
    */
   extends: null,
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1b07b3232a..b4332b2670 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -146,8 +146,8 @@ importers:
         specifier: workspace:*
         version: link:../schema
       c12:
-        specifier: ^1.4.2
-        version: 1.4.2
+        specifier: ^1.5.1
+        version: 1.5.1
       consola:
         specifier: ^3.2.3
         version: 3.2.3
@@ -267,8 +267,8 @@ importers:
         specifier: 8.10.0
         version: 8.10.0
       c12:
-        specifier: ^1.4.2
-        version: 1.4.2
+        specifier: ^1.5.1
+        version: 1.5.1
       chokidar:
         specifier: ^3.5.3
         version: 3.5.3
@@ -478,6 +478,9 @@ importers:
       '@vue/compiler-core':
         specifier: 3.3.4
         version: 3.3.4
+      c12:
+        specifier: 1.5.1
+        version: 1.5.1
       esbuild-loader:
         specifier: 4.0.2
         version: 4.0.2(webpack@5.89.0)
@@ -3821,23 +3824,6 @@ packages:
     dependencies:
       run-applescript: 5.0.0
 
-  /c12@1.4.2:
-    resolution: {integrity: sha512-3IP/MuamSVRVw8W8+CHWAz9gKN4gd+voF2zm/Ln6D25C2RhytEZ1ABbC8MjKr4BR9rhoV1JQ7jJA158LDiTkLg==}
-    dependencies:
-      chokidar: 3.5.3
-      defu: 6.1.2
-      dotenv: 16.3.1
-      giget: 1.1.3
-      jiti: 1.20.0
-      mlly: 1.4.2
-      ohash: 1.1.3
-      pathe: 1.1.1
-      perfect-debounce: 1.0.0
-      pkg-types: 1.0.3
-      rc9: 2.1.1
-    transitivePeerDependencies:
-      - supports-color
-
   /c12@1.5.1:
     resolution: {integrity: sha512-BWZRJgDEveT8uI+cliCwvYSSSSvb4xKoiiu5S0jaDbKBopQLQF7E+bq9xKk1pTcG+mUa3yXuFO7bD9d8Lr9Xxg==}
     dependencies:
@@ -3967,7 +3953,7 @@ packages:
     resolution: {integrity: sha512-IzgToIJ/R9NhVKmL+PW33ozYkv53bXvufDNUSH3GTKXq1iCHGgkbgbtqEWbo8tnWNnt7nPDpjL8PwSG2iS8RVw==}
     hasBin: true
     dependencies:
-      c12: 1.4.2
+      c12: 1.5.1
       colorette: 2.0.20
       consola: 3.2.3
       convert-gitmoji: 0.1.3