From 49669a159ef061e13cdac7cee2984655ccc675e6 Mon Sep 17 00:00:00 2001 From: myoungjinGo-FE Date: Mon, 18 Nov 2024 11:22:57 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20yarn=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EB=B3=91=ED=95=A9=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +- yarn.lock | 502 --------------------------------------------------- 2 files changed, 4 insertions(+), 506 deletions(-) diff --git a/package.json b/package.json index 78181731..602a0ca6 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,8 @@ "styled-normalize": "^8.1.1" }, "devDependencies": { - "@eslint/compat": "^1.2.3", - "react-icons": "^5.3.0", - "recoil": "^0.7.7", - "styled-components": "^6.1.13", "@chromatic-com/storybook": "^3.2.2", + "@eslint/compat": "^1.2.3", "@eslint/js": "^9.13.0", "@storybook/addon-essentials": "^8.4.4", "@storybook/addon-interactions": "^8.4.4", @@ -52,7 +49,10 @@ "eslint-plugin-storybook": "^0.11.0", "globals": "^15.11.0", "prettier": "^3.3.3", + "react-icons": "^5.3.0", + "recoil": "^0.7.7", "storybook": "^8.4.4", + "styled-components": "^6.1.13", "typescript": "~5.6.2", "typescript-eslint": "^8.11.0", "vite": "^5.4.10", diff --git a/yarn.lock b/yarn.lock index 4ea16d03..25809c51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,11 +22,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0": -======= -"@babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 7.26.2 resolution: "@babel/code-frame@npm:7.26.2" dependencies: @@ -44,11 +40,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@babel/core@npm:^7.18.9, @babel/core@npm:^7.21.3, @babel/core@npm:^7.25.2": -======= -"@babel/core@npm:^7.18.9, @babel/core@npm:^7.25.2": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 7.26.0 resolution: "@babel/core@npm:7.26.0" dependencies: @@ -226,11 +218,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0": -======= -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 7.26.0 resolution: "@babel/types@npm:7.26.0" dependencies: @@ -625,7 +613,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@eslint/compat@npm:^1.2.3": version: 1.2.3 resolution: "@eslint/compat@npm:1.2.3" @@ -641,16 +628,10 @@ __metadata: "@eslint/config-array@npm:^0.19.0": version: 0.19.0 resolution: "@eslint/config-array@npm:0.19.0" -======= -"@eslint/config-array@npm:^0.18.0": - version: 0.18.0 - resolution: "@eslint/config-array@npm:0.18.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) dependencies: "@eslint/object-schema": "npm:^2.1.4" debug: "npm:^4.3.1" minimatch: "npm:^3.1.2" -<<<<<<< HEAD checksum: 10c0/def23c6c67a8f98dc88f1b87e17a5668e5028f5ab9459661aabfe08e08f2acd557474bbaf9ba227be0921ae4db232c62773dbb7739815f8415678eb8f592dbf5 languageName: node linkType: hard @@ -665,22 +646,6 @@ __metadata: "@eslint/eslintrc@npm:^3.2.0": version: 3.2.0 resolution: "@eslint/eslintrc@npm:3.2.0" -======= - checksum: 10c0/0234aeb3e6b052ad2402a647d0b4f8a6aa71524bafe1adad0b8db1dfe94d7f5f26d67c80f79bb37ac61361a1d4b14bb8fb475efe501de37263cf55eabb79868f - languageName: node - linkType: hard - -"@eslint/core@npm:^0.7.0": - version: 0.7.0 - resolution: "@eslint/core@npm:0.7.0" - checksum: 10c0/3cdee8bc6cbb96ac6103d3ead42e59830019435839583c9eb352b94ed558bd78e7ffad5286dc710df21ec1e7bd8f52aa6574c62457a4dd0f01f3736fa4a7d87a - languageName: node - linkType: hard - -"@eslint/eslintrc@npm:^3.1.0": - version: 3.1.0 - resolution: "@eslint/eslintrc@npm:3.1.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) dependencies: ajv: "npm:^6.12.4" debug: "npm:^4.3.2" @@ -691,7 +656,6 @@ __metadata: js-yaml: "npm:^4.1.0" minimatch: "npm:^3.1.2" strip-json-comments: "npm:^3.1.1" -<<<<<<< HEAD checksum: 10c0/43867a07ff9884d895d9855edba41acf325ef7664a8df41d957135a81a477ff4df4196f5f74dc3382627e5cc8b7ad6b815c2cea1b58f04a75aced7c43414ab8b languageName: node linkType: hard @@ -700,16 +664,6 @@ __metadata: version: 9.15.0 resolution: "@eslint/js@npm:9.15.0" checksum: 10c0/56552966ab1aa95332f70d0e006db5746b511c5f8b5e0c6a9b2d6764ff6d964e0b2622731877cbc4e3f0e74c5b39191290d5f48147be19175292575130d499ab -======= - checksum: 10c0/5b7332ed781edcfc98caa8dedbbb843abfb9bda2e86538529c843473f580e40c69eb894410eddc6702f487e9ee8f8cfa8df83213d43a8fdb549f23ce06699167 - languageName: node - linkType: hard - -"@eslint/js@npm:9.14.0, @eslint/js@npm:^9.13.0": - version: 9.14.0 - resolution: "@eslint/js@npm:9.14.0" - checksum: 10c0/a423dd435e10aa3b461599aa02f6cbadd4b5128cb122467ee4e2c798e7ca4f9bb1fce4dcea003b29b983090238cf120899c1af657cf86300b399e4f996b83ddc ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) languageName: node linkType: hard @@ -720,21 +674,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@eslint/plugin-kit@npm:^0.2.3": version: 0.2.3 resolution: "@eslint/plugin-kit@npm:0.2.3" dependencies: levn: "npm:^0.4.1" checksum: 10c0/89a8035976bb1780e3fa8ffe682df013bd25f7d102d991cecd3b7c297f4ce8c1a1b6805e76dd16465b5353455b670b545eff2b4ec3133e0eab81a5f9e99bd90f -======= -"@eslint/plugin-kit@npm:^0.2.0": - version: 0.2.2 - resolution: "@eslint/plugin-kit@npm:0.2.2" - dependencies: - levn: "npm:^0.4.1" - checksum: 10c0/ec533ccc99f2ab003d6f64495cff853730fb7d8bc0eaf031ffccc68de7c34c74a2eda50dfa759cacfb409f014c98d306714c995348d5383c9d3140f9f80a5895 ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) languageName: node linkType: hard @@ -769,11 +714,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@humanwhocodes/retry@npm:^0.4.1": -======= -"@humanwhocodes/retry@npm:^0.4.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 0.4.1 resolution: "@humanwhocodes/retry@npm:0.4.1" checksum: 10c0/be7bb6841c4c01d0b767d9bb1ec1c9359ee61421ce8ba66c249d035c5acdfd080f32d55a5c9e859cdd7868788b8935774f65b2caf24ec0b7bd7bf333791f063b @@ -922,7 +863,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@pkgr/core@npm:^0.1.0": version: 0.1.1 resolution: "@pkgr/core@npm:0.1.1" @@ -938,9 +878,6 @@ __metadata: linkType: hard "@rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.1.3": -======= -"@rollup/pluginutils@npm:^5.0.2": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 5.1.3 resolution: "@rollup/pluginutils@npm:5.1.3" dependencies: @@ -956,236 +893,128 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-android-arm-eabi@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-android-arm-eabi@npm:4.27.2" -======= -"@rollup/rollup-android-arm-eabi@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=android & cpu=arm languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-android-arm64@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-android-arm64@npm:4.27.2" -======= -"@rollup/rollup-android-arm64@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-android-arm64@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=android & cpu=arm64 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-darwin-arm64@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-darwin-arm64@npm:4.27.2" -======= -"@rollup/rollup-darwin-arm64@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-darwin-x64@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-darwin-x64@npm:4.27.2" -======= -"@rollup/rollup-darwin-x64@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=darwin & cpu=x64 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-freebsd-arm64@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-freebsd-arm64@npm:4.27.2" -======= -"@rollup/rollup-freebsd-arm64@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-freebsd-arm64@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-freebsd-x64@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-freebsd-x64@npm:4.27.2" -======= -"@rollup/rollup-freebsd-x64@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-freebsd-x64@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-arm-gnueabihf@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.27.2" -======= -"@rollup/rollup-linux-arm-gnueabihf@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=arm & libc=glibc languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-arm-musleabihf@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.27.2" -======= -"@rollup/rollup-linux-arm-musleabihf@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=arm & libc=musl languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-arm64-gnu@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.27.2" -======= -"@rollup/rollup-linux-arm64-gnu@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-arm64-musl@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-arm64-musl@npm:4.27.2" -======= -"@rollup/rollup-linux-arm64-musl@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.2" -======= -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-riscv64-gnu@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.27.2" -======= -"@rollup/rollup-linux-riscv64-gnu@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-s390x-gnu@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.27.2" -======= -"@rollup/rollup-linux-s390x-gnu@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-x64-gnu@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-x64-gnu@npm:4.27.2" -======= -"@rollup/rollup-linux-x64-gnu@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-linux-x64-musl@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-linux-x64-musl@npm:4.27.2" -======= -"@rollup/rollup-linux-x64-musl@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-win32-arm64-msvc@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.27.2" -======= -"@rollup/rollup-win32-arm64-msvc@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-win32-ia32-msvc@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.27.2" -======= -"@rollup/rollup-win32-ia32-msvc@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -<<<<<<< HEAD "@rollup/rollup-win32-x64-msvc@npm:4.27.2": version: 4.27.2 resolution: "@rollup/rollup-win32-x64-msvc@npm:4.27.2" -======= -"@rollup/rollup-win32-x64-msvc@npm:4.26.0": - version: 4.26.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1568,7 +1397,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0": version: 8.0.0 resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0" @@ -1696,8 +1524,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "@testing-library/dom@npm:10.4.0": version: 10.4.0 resolution: "@testing-library/dom@npm:10.4.0" @@ -1810,7 +1636,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@types/history@npm:^4.7.11": version: 4.7.11 resolution: "@types/history@npm:4.7.11" @@ -1818,8 +1643,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "@types/hoist-non-react-statics@npm:*": version: 3.3.5 resolution: "@types/hoist-non-react-statics@npm:3.3.5" @@ -1876,7 +1699,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "@types/react-router-dom@npm:^5.3.3": version: 5.3.3 resolution: "@types/react-router-dom@npm:5.3.3" @@ -1898,8 +1720,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "@types/react@npm:*, @types/react@npm:^18.3.12": version: 18.3.12 resolution: "@types/react@npm:18.3.12" @@ -2244,18 +2064,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "aria-query@npm:^5.0.0, aria-query@npm:^5.3.2": -======= -"aria-query@npm:^5.0.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 5.3.2 resolution: "aria-query@npm:5.3.2" checksum: 10c0/003c7e3e2cff5540bf7a7893775fc614de82b0c5dde8ae823d47b7a28a9d4da1f7ed85f340bdb93d5649caa927755f0e31ecc7ab63edfdfc00c8ef07e505e03e languageName: node linkType: hard -<<<<<<< HEAD "array-buffer-byte-length@npm:^1.0.1": version: 1.0.1 resolution: "array-buffer-byte-length@npm:1.0.1" @@ -2347,8 +2162,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "assertion-error@npm:^2.0.1": version: 2.0.1 resolution: "assertion-error@npm:2.0.1" @@ -2356,7 +2169,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "ast-types-flow@npm:^0.0.8": version: 0.0.8 resolution: "ast-types-flow@npm:0.0.8" @@ -2364,8 +2176,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "ast-types@npm:^0.16.1": version: 0.16.1 resolution: "ast-types@npm:0.16.1" @@ -2384,7 +2194,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "axe-core@npm:^4.10.0": version: 4.10.2 resolution: "axe-core@npm:4.10.2" @@ -2399,8 +2208,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "balanced-match@npm:^1.0.0": version: 1.0.2 resolution: "balanced-match@npm:1.0.2" @@ -2486,11 +2293,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7": -======= -"call-bind@npm:^1.0.2, call-bind@npm:^1.0.7": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.0.7 resolution: "call-bind@npm:1.0.7" dependencies: @@ -2510,7 +2313,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "camelcase@npm:^6.2.0": version: 6.3.0 resolution: "camelcase@npm:6.3.0" @@ -2518,8 +2320,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "camelize@npm:^1.0.0": version: 1.0.1 resolution: "camelize@npm:1.0.1" @@ -2637,7 +2437,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "cosmiconfig@npm:^8.1.3": version: 8.3.6 resolution: "cosmiconfig@npm:8.3.6" @@ -2656,9 +2455,6 @@ __metadata: linkType: hard "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.5": -======= -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 7.0.5 resolution: "cross-spawn@npm:7.0.5" dependencies: @@ -2701,7 +2497,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "damerau-levenshtein@npm:^1.0.8": version: 1.0.8 resolution: "damerau-levenshtein@npm:1.0.8" @@ -2742,8 +2537,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": version: 4.3.7 resolution: "debug@npm:4.3.7" @@ -2770,11 +2563,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4": -======= -"define-data-property@npm:^1.1.4": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.1.4 resolution: "define-data-property@npm:1.1.4" dependencies: @@ -2792,7 +2581,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": version: 1.2.1 resolution: "define-properties@npm:1.2.1" @@ -2804,8 +2592,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "dequal@npm:^2.0.2, dequal@npm:^2.0.3": version: 2.0.3 resolution: "dequal@npm:2.0.3" @@ -2813,7 +2599,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "doctrine@npm:^2.1.0": version: 2.1.0 resolution: "doctrine@npm:2.1.0" @@ -2823,8 +2608,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "doctrine@npm:^3.0.0": version: 3.0.0 resolution: "doctrine@npm:3.0.0" @@ -2848,7 +2631,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "dot-case@npm:^3.0.4": version: 3.0.4 resolution: "dot-case@npm:3.0.4" @@ -2859,8 +2641,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "eastasianwidth@npm:^0.2.0": version: 0.2.0 resolution: "eastasianwidth@npm:0.2.0" @@ -2869,15 +2649,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.41": -<<<<<<< HEAD version: 1.5.62 resolution: "electron-to-chromium@npm:1.5.62" checksum: 10c0/93dc628f0359df0cae475cf5e91fa0cf357611f14da7cf15c28fe92f89dede7def20c04b24787e6166181ae582b060d02b252e906d7ec84020485579a95bc8e9 -======= - version: 1.5.57 - resolution: "electron-to-chromium@npm:1.5.57" - checksum: 10c0/42b969681985016be6069ae68cf29e84ba3f2191fcb7f9d3355e83e81da8dbd100e4b5c9d69b88637003e06dc1860125a50332ec0caee49fd9c2c4ab62feb288 ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) languageName: node linkType: hard @@ -2904,7 +2678,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "entities@npm:^4.4.0": version: 4.5.0 resolution: "entities@npm:4.5.0" @@ -2912,8 +2685,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -2928,7 +2699,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "error-ex@npm:^1.3.1": version: 1.3.2 resolution: "error-ex@npm:1.3.2" @@ -2992,8 +2762,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "es-define-property@npm:^1.0.0": version: 1.0.0 resolution: "es-define-property@npm:1.0.0" @@ -3003,18 +2771,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "es-errors@npm:^1.2.1, es-errors@npm:^1.3.0": -======= -"es-errors@npm:^1.3.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.3.0 resolution: "es-errors@npm:1.3.0" checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 languageName: node linkType: hard -<<<<<<< HEAD "es-iterator-helpers@npm:^1.1.0": version: 1.2.0 resolution: "es-iterator-helpers@npm:1.2.0" @@ -3078,8 +2841,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "esbuild-register@npm:^3.5.0": version: 3.6.0 resolution: "esbuild-register@npm:3.6.0" @@ -3268,7 +3029,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "eslint-config-prettier@npm:^9.1.0": version: 9.1.0 resolution: "eslint-config-prettier@npm:9.1.0" @@ -3337,8 +3097,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "eslint-plugin-react-hooks@npm:^5.0.0": version: 5.0.0 resolution: "eslint-plugin-react-hooks@npm:5.0.0" @@ -3357,7 +3115,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "eslint-plugin-react@npm:^7.37.2": version: 7.37.2 resolution: "eslint-plugin-react@npm:7.37.2" @@ -3386,8 +3143,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "eslint-plugin-storybook@npm:^0.11.0": version: 0.11.0 resolution: "eslint-plugin-storybook@npm:0.11.0" @@ -3426,7 +3181,6 @@ __metadata: linkType: hard "eslint@npm:^9.13.0": -<<<<<<< HEAD version: 9.15.0 resolution: "eslint@npm:9.15.0" dependencies: @@ -3440,30 +3194,11 @@ __metadata: "@humanfs/node": "npm:^0.16.6" "@humanwhocodes/module-importer": "npm:^1.0.1" "@humanwhocodes/retry": "npm:^0.4.1" -======= - version: 9.14.0 - resolution: "eslint@npm:9.14.0" - dependencies: - "@eslint-community/eslint-utils": "npm:^4.2.0" - "@eslint-community/regexpp": "npm:^4.12.1" - "@eslint/config-array": "npm:^0.18.0" - "@eslint/core": "npm:^0.7.0" - "@eslint/eslintrc": "npm:^3.1.0" - "@eslint/js": "npm:9.14.0" - "@eslint/plugin-kit": "npm:^0.2.0" - "@humanfs/node": "npm:^0.16.6" - "@humanwhocodes/module-importer": "npm:^1.0.1" - "@humanwhocodes/retry": "npm:^0.4.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "@types/estree": "npm:^1.0.6" "@types/json-schema": "npm:^7.0.15" ajv: "npm:^6.12.4" chalk: "npm:^4.0.0" -<<<<<<< HEAD cross-spawn: "npm:^7.0.5" -======= - cross-spawn: "npm:^7.0.2" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) debug: "npm:^4.3.2" escape-string-regexp: "npm:^4.0.0" eslint-scope: "npm:^8.2.0" @@ -3483,10 +3218,6 @@ __metadata: minimatch: "npm:^3.1.2" natural-compare: "npm:^1.4.0" optionator: "npm:^0.9.3" -<<<<<<< HEAD -======= - text-table: "npm:^0.2.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) peerDependencies: jiti: "*" peerDependenciesMeta: @@ -3494,11 +3225,7 @@ __metadata: optional: true bin: eslint: bin/eslint.js -<<<<<<< HEAD checksum: 10c0/d0d7606f36bfcccb1c3703d0a24df32067b207a616f17efe5fb1765a91d13f085afffc4fc97ecde4ab9c9f4edd64d9b4ce750e13ff7937a25074b24bee15b20f -======= - checksum: 10c0/e1cbf571b75519ad0b24c27e66a6575e57cab2671ef5296e7b345d9ac3adc1a549118dcc74a05b651a7a13a5e61ebb680be6a3e04a80e1f22eba1931921b5187 ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) languageName: node linkType: hard @@ -3541,11 +3268,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0": -======= -"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 5.3.0 resolution: "estraverse@npm:5.3.0" checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107 @@ -3589,7 +3312,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "fast-diff@npm:^1.1.2": version: 1.3.0 resolution: "fast-diff@npm:1.3.0" @@ -3597,8 +3319,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "fast-glob@npm:^3.3.2": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" @@ -3757,7 +3477,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "function.prototype.name@npm:^1.1.6": version: 1.1.6 resolution: "function.prototype.name@npm:1.1.6" @@ -3777,8 +3496,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -3786,11 +3503,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4": -======= -"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.4": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.2.4 resolution: "get-intrinsic@npm:1.2.4" dependencies: @@ -3803,7 +3516,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "get-symbol-description@npm:^1.0.2": version: 1.0.2 resolution: "get-symbol-description@npm:1.0.2" @@ -3815,8 +3527,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "glob-parent@npm:^5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" @@ -3897,7 +3607,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "globalthis@npm:^1.0.3, globalthis@npm:^1.0.4": version: 1.0.4 resolution: "globalthis@npm:1.0.4" @@ -3908,8 +3617,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -3940,7 +3647,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2": version: 1.0.2 resolution: "has-bigints@npm:1.0.2" @@ -3948,8 +3654,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "has-flag@npm:^4.0.0": version: 4.0.0 resolution: "has-flag@npm:4.0.0" @@ -3957,11 +3661,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2": -======= -"has-property-descriptors@npm:^1.0.2": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.0.2 resolution: "has-property-descriptors@npm:1.0.2" dependencies: @@ -3970,22 +3670,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "has-proto@npm:^1.0.1, has-proto@npm:^1.0.3": -======= -"has-proto@npm:^1.0.1": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.0.3 resolution: "has-proto@npm:1.0.3" checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205 languageName: node linkType: hard -<<<<<<< HEAD "has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": -======= -"has-symbols@npm:^1.0.3": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.0.3 resolution: "has-symbols@npm:1.0.3" checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3 @@ -4001,11 +3693,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2": -======= -"hasown@npm:^2.0.0, hasown@npm:^2.0.2": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 2.0.2 resolution: "hasown@npm:2.0.2" dependencies: @@ -4066,11 +3754,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": -======= -"import-fresh@npm:^3.2.1": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -4111,7 +3795,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "internal-slot@npm:^1.0.7": version: 1.0.7 resolution: "internal-slot@npm:1.0.7" @@ -4123,8 +3806,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "ip-address@npm:^9.0.5": version: 9.0.5 resolution: "ip-address@npm:9.0.5" @@ -4145,7 +3826,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-array-buffer@npm:^3.0.4": version: 3.0.4 resolution: "is-array-buffer@npm:3.0.4" @@ -4192,9 +3872,6 @@ __metadata: linkType: hard "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": -======= -"is-callable@npm:^1.1.3": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.2.7 resolution: "is-callable@npm:1.2.7" checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f @@ -4210,7 +3887,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-data-view@npm:^1.0.1": version: 1.0.1 resolution: "is-data-view@npm:1.0.1" @@ -4229,8 +3905,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "is-docker@npm:^2.0.0, is-docker@npm:^2.1.1": version: 2.2.1 resolution: "is-docker@npm:2.2.1" @@ -4247,7 +3921,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-finalizationregistry@npm:^1.0.2": version: 1.0.2 resolution: "is-finalizationregistry@npm:1.0.2" @@ -4257,8 +3930,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "is-fullwidth-code-point@npm:^3.0.0": version: 3.0.0 resolution: "is-fullwidth-code-point@npm:3.0.0" @@ -4266,11 +3937,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7": -======= -"is-generator-function@npm:^1.0.7": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.0.10 resolution: "is-generator-function@npm:1.0.10" dependencies: @@ -4295,7 +3962,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-map@npm:^2.0.3": version: 2.0.3 resolution: "is-map@npm:2.0.3" @@ -4319,8 +3985,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -4328,7 +3992,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" @@ -4374,9 +4037,6 @@ __metadata: linkType: hard "is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3": -======= -"is-typed-array@npm:^1.1.3": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.1.13 resolution: "is-typed-array@npm:1.1.13" dependencies: @@ -4385,7 +4045,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "is-weakmap@npm:^2.0.2": version: 2.0.2 resolution: "is-weakmap@npm:2.0.2" @@ -4412,8 +4071,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "is-wsl@npm:^2.2.0": version: 2.2.0 resolution: "is-wsl@npm:2.2.0" @@ -4423,7 +4080,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" @@ -4431,8 +4087,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -4447,7 +4101,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "iterator.prototype@npm:^1.1.3": version: 1.1.3 resolution: "iterator.prototype@npm:1.1.3" @@ -4461,8 +4114,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "jackspeak@npm:^3.1.2": version: 3.4.3 resolution: "jackspeak@npm:3.4.3" @@ -4524,7 +4175,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "json-parse-even-better-errors@npm:^2.3.0": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" @@ -4532,8 +4182,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "json-schema-traverse@npm:^0.4.1": version: 0.4.1 resolution: "json-schema-traverse@npm:0.4.1" @@ -4570,7 +4218,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5": version: 3.3.5 resolution: "jsx-ast-utils@npm:3.3.5" @@ -4583,8 +4230,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "keyv@npm:^4.5.4": version: 4.5.4 resolution: "keyv@npm:4.5.4" @@ -4594,7 +4239,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "language-subtag-registry@npm:^0.3.20": version: 0.3.23 resolution: "language-subtag-registry@npm:0.3.23" @@ -4611,8 +4255,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "levn@npm:^0.4.1": version: 0.4.1 resolution: "levn@npm:0.4.1" @@ -4623,7 +4265,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -4631,8 +4272,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "locate-path@npm:^6.0.0": version: 6.0.0 resolution: "locate-path@npm:6.0.0" @@ -4656,11 +4295,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": -======= -"loose-envify@npm:^1.1.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.4.0 resolution: "loose-envify@npm:1.4.0" dependencies: @@ -4678,7 +4313,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "lower-case@npm:^2.0.2": version: 2.0.2 resolution: "lower-case@npm:2.0.2" @@ -4688,8 +4322,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": version: 10.4.3 resolution: "lru-cache@npm:10.4.3" @@ -4941,7 +4573,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "no-case@npm:^3.0.4": version: 3.0.4 resolution: "no-case@npm:3.0.4" @@ -4952,8 +4583,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "node-gyp@npm:latest": version: 10.2.0 resolution: "node-gyp@npm:10.2.0" @@ -4992,7 +4621,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" @@ -5060,8 +4688,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "once@npm:^1.3.0": version: 1.4.0 resolution: "once@npm:1.4.0" @@ -5139,7 +4765,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "parse-json@npm:^5.2.0": version: 5.2.0 resolution: "parse-json@npm:5.2.0" @@ -5152,8 +4777,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -5192,7 +4815,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" @@ -5200,8 +4822,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "pathval@npm:^2.0.0": version: 2.0.0 resolution: "pathval@npm:2.0.0" @@ -5214,10 +4834,7 @@ __metadata: resolution: "pawfit-fe@workspace:." dependencies: "@chromatic-com/storybook": "npm:^3.2.2" -<<<<<<< HEAD "@eslint/compat": "npm:^1.2.3" -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "@eslint/js": "npm:^9.13.0" "@storybook/addon-essentials": "npm:^8.4.4" "@storybook/addon-interactions": "npm:^8.4.4" @@ -5229,7 +4846,6 @@ __metadata: "@storybook/test": "npm:^8.4.4" "@types/react": "npm:^18.3.12" "@types/react-dom": "npm:^18.3.1" -<<<<<<< HEAD "@types/react-router-dom": "npm:^5.3.3" "@types/styled-components": "npm:^5.1.34" "@vitejs/plugin-react": "npm:^4.3.3" @@ -5239,16 +4855,10 @@ __metadata: eslint-plugin-jsx-a11y: "npm:^6.10.2" eslint-plugin-prettier: "npm:^5.2.1" eslint-plugin-react: "npm:^7.37.2" -======= - "@types/styled-components": "npm:^5.1.34" - "@vitejs/plugin-react": "npm:^4.3.3" - eslint: "npm:^9.13.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) eslint-plugin-react-hooks: "npm:^5.0.0" eslint-plugin-react-refresh: "npm:^0.4.14" eslint-plugin-storybook: "npm:^0.11.0" globals: "npm:^15.11.0" -<<<<<<< HEAD prettier: "npm:^3.3.3" react: "npm:^18.3.1" react-dom: "npm:^18.3.1" @@ -5262,17 +4872,6 @@ __metadata: typescript-eslint: "npm:^8.11.0" vite: "npm:^5.4.10" vite-plugin-svgr: "npm:^4.3.0" -======= - react: "npm:^18.3.1" - react-dom: "npm:^18.3.1" - react-icons: "npm:^5.3.0" - recoil: "npm:^0.7.7" - storybook: "npm:^8.4.4" - styled-components: "npm:^6.1.13" - typescript: "npm:~5.6.2" - typescript-eslint: "npm:^8.11.0" - vite: "npm:^5.4.10" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) languageName: unknown linkType: soft @@ -5349,7 +4948,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "prettier-linter-helpers@npm:^1.0.0": version: 1.0.0 resolution: "prettier-linter-helpers@npm:1.0.0" @@ -5368,8 +4966,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "pretty-format@npm:^27.0.2": version: 27.5.1 resolution: "pretty-format@npm:27.5.1" @@ -5405,7 +5001,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" @@ -5417,8 +5012,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "punycode@npm:^2.1.0": version: 2.3.1 resolution: "punycode@npm:2.3.1" @@ -5492,11 +5085,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "react-is@npm:^16.13.1, react-is@npm:^16.7.0": -======= -"react-is@npm:^16.7.0": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 16.13.1 resolution: "react-is@npm:16.13.1" checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1 @@ -5517,7 +5106,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "react-router-dom@npm:^6.28.0": version: 6.28.0 resolution: "react-router-dom@npm:6.28.0" @@ -5542,8 +5130,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.3.1": version: 18.3.1 resolution: "react@npm:18.3.1" @@ -5592,7 +5178,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "reflect.getprototypeof@npm:^1.0.4": version: 1.0.6 resolution: "reflect.getprototypeof@npm:1.0.6" @@ -5608,8 +5193,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "regenerator-runtime@npm:^0.14.0": version: 0.14.1 resolution: "regenerator-runtime@npm:0.14.1" @@ -5617,7 +5200,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "regexp.prototype.flags@npm:^1.5.2, regexp.prototype.flags@npm:^1.5.3": version: 1.5.3 resolution: "regexp.prototype.flags@npm:1.5.3" @@ -5630,8 +5212,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0" @@ -5652,7 +5232,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "resolve@npm:^2.0.0-next.5": version: 2.0.0-next.5 resolution: "resolve@npm:2.0.0-next.5" @@ -5666,8 +5245,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" @@ -5681,7 +5258,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin": version: 2.0.0-next.5 resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin::version=2.0.0-next.5&hash=c3c19d" @@ -5695,8 +5271,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -5712,7 +5286,6 @@ __metadata: linkType: hard "rollup@npm:^4.20.0": -<<<<<<< HEAD version: 4.27.2 resolution: "rollup@npm:4.27.2" dependencies: @@ -5734,29 +5307,6 @@ __metadata: "@rollup/rollup-win32-arm64-msvc": "npm:4.27.2" "@rollup/rollup-win32-ia32-msvc": "npm:4.27.2" "@rollup/rollup-win32-x64-msvc": "npm:4.27.2" -======= - version: 4.26.0 - resolution: "rollup@npm:4.26.0" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.26.0" - "@rollup/rollup-android-arm64": "npm:4.26.0" - "@rollup/rollup-darwin-arm64": "npm:4.26.0" - "@rollup/rollup-darwin-x64": "npm:4.26.0" - "@rollup/rollup-freebsd-arm64": "npm:4.26.0" - "@rollup/rollup-freebsd-x64": "npm:4.26.0" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.26.0" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.26.0" - "@rollup/rollup-linux-arm64-gnu": "npm:4.26.0" - "@rollup/rollup-linux-arm64-musl": "npm:4.26.0" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.26.0" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.26.0" - "@rollup/rollup-linux-s390x-gnu": "npm:4.26.0" - "@rollup/rollup-linux-x64-gnu": "npm:4.26.0" - "@rollup/rollup-linux-x64-musl": "npm:4.26.0" - "@rollup/rollup-win32-arm64-msvc": "npm:4.26.0" - "@rollup/rollup-win32-ia32-msvc": "npm:4.26.0" - "@rollup/rollup-win32-x64-msvc": "npm:4.26.0" ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "@types/estree": "npm:1.0.6" fsevents: "npm:~2.3.2" dependenciesMeta: @@ -5800,11 +5350,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup -<<<<<<< HEAD checksum: 10c0/563c43d064b7af64156621b52997d2c8a4609774dea4deb06c0fbc1f18450f1b65036404224e81a6bbc80a316a558452151fe9be2214b1898aa66bdd93209496 -======= - checksum: 10c0/a4375787b95bc3b55d38bbb8dec5f6a63862b08369b9562a2d38efadd400ca42a79406b8f09670a0deb0cc9cd72cca1c0be317302190d1f7feff597003d951bc ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) languageName: node linkType: hard @@ -5817,7 +5363,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "safe-array-concat@npm:^1.1.2": version: 1.1.2 resolution: "safe-array-concat@npm:1.1.2" @@ -5841,8 +5386,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -5891,7 +5434,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2": version: 2.0.2 resolution: "set-function-name@npm:2.0.2" @@ -5904,8 +5446,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "shallowequal@npm:1.1.0": version: 1.1.0 resolution: "shallowequal@npm:1.1.0" @@ -5929,7 +5469,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "side-channel@npm:^1.0.4, side-channel@npm:^1.0.6": version: 1.0.6 resolution: "side-channel@npm:1.0.6" @@ -5942,8 +5481,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "signal-exit@npm:^4.0.1": version: 4.1.0 resolution: "signal-exit@npm:4.1.0" @@ -5958,7 +5495,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "snake-case@npm:^3.0.4": version: 3.0.4 resolution: "snake-case@npm:3.0.4" @@ -5969,8 +5505,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "socks-proxy-agent@npm:^8.0.3": version: 8.0.4 resolution: "socks-proxy-agent@npm:8.0.4" @@ -6062,7 +5596,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "string.prototype.includes@npm:^2.0.1": version: 2.0.1 resolution: "string.prototype.includes@npm:2.0.1" @@ -6138,8 +5671,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" @@ -6210,7 +5741,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "styled-normalize@npm:^8.1.1": version: 8.1.1 resolution: "styled-normalize@npm:8.1.1" @@ -6220,8 +5750,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "stylis@npm:4.3.2": version: 4.3.2 resolution: "stylis@npm:4.3.2" @@ -6245,7 +5773,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "svg-parser@npm:^2.0.4": version: 2.0.4 resolution: "svg-parser@npm:2.0.4" @@ -6263,8 +5790,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "tar@npm:^6.1.11, tar@npm:^6.2.1": version: 6.2.1 resolution: "tar@npm:6.2.1" @@ -6279,16 +5804,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= -"text-table@npm:^0.2.0": - version: 0.2.0 - resolution: "text-table@npm:0.2.0" - checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c - languageName: node - linkType: hard - ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "tiny-invariant@npm:^1.3.1, tiny-invariant@npm:^1.3.3": version: 1.3.3 resolution: "tiny-invariant@npm:1.3.3" @@ -6353,11 +5868,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.6.2": -======= -"tslib@npm:^2.0.1": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 2.8.1 resolution: "tslib@npm:2.8.1" checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62 @@ -6387,7 +5898,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "typed-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "typed-array-buffer@npm:1.0.2" @@ -6440,8 +5950,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "typescript-eslint@npm:^8.11.0": version: 8.14.0 resolution: "typescript-eslint@npm:8.14.0" @@ -6476,7 +5984,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "unbox-primitive@npm:^1.0.2": version: 1.0.2 resolution: "unbox-primitive@npm:1.0.2" @@ -6489,8 +5996,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "undici-types@npm:~6.19.8": version: 6.19.8 resolution: "undici-types@npm:6.19.8" @@ -6578,7 +6083,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "vite-plugin-svgr@npm:^4.3.0": version: 4.3.0 resolution: "vite-plugin-svgr@npm:4.3.0" @@ -6592,8 +6096,6 @@ __metadata: languageName: node linkType: hard -======= ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) "vite@npm:^5.4.10": version: 5.4.11 resolution: "vite@npm:5.4.11" @@ -6644,7 +6146,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2" @@ -6691,9 +6192,6 @@ __metadata: linkType: hard "which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2": -======= -"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.2": ->>>>>>> b53053f (Feat: Button, Input, Block, ProgressBar 추가) version: 1.1.15 resolution: "which-typed-array@npm:1.1.15" dependencies: