fixes package.json

신원형
Commit 05678cc226b2567fe304a4d7eaa35c175ec1819f 05678cc2 1 parent 6d470d43
Showing 3 changed files with 22 additions and 98 deletions
main.js
package-lock.json
package.json
--- a/main.js
View file @05678cc
+++ b/main.js
View file @05678cc
-<<<<<<< HEAD
-import fs from 'fs/promises'
-import { login, load, logout } from './khcanvas.js';
-
-=======
->>>>>>> weather
--- a/package-lock.json
View file @05678cc
+++ b/package-lock.json
View file @05678cc
@@ -10,17 +10,7 @@
       "dependencies": {
         "@types/axios": "^0.14.0",
         "@types/selenium-webdriver": "^4.1.0",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        "csv-parser": "^3.0.0",
-        "eslint": "^8.15.0",
-=======
->>>>>>> 6c6e356fa8269fbbdee92f54a6f2f16ffe2ba729
-=======
-=======
         "axios": "^0.27.2",
->>>>>>> weather
->>>>>>> 039e1a43c37157ea46e8f87599a93f75536a140e
         "mocha": "^10.0.0",
         "selenium-webdriver": "^4.1.2"
       },
@@ -112,8 +102,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
-<<<<<<< HEAD
-=======
     },
     "node_modules/@types/axios": {
       "version": "0.14.0",
@@ -123,7 +111,6 @@
       "dependencies": {
         "axios": "*"
       }
->>>>>>> weather
     },
     "node_modules/@types/node": {
       "version": "17.0.35",
@@ -419,20 +406,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/csv-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-3.0.0.tgz",
-      "integrity": "sha512-s6OYSXAK3IdKqYO33y09jhypG/bSDHPuyCme/IdEHfWpLf/jKcpitVFyOC6UemgGk8v7Q5u2XE0vvwmanxhGlQ==",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "csv-parser": "bin/csv-parser"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -470,8 +443,6 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
-<<<<<<< HEAD
-=======
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
@@ -480,7 +451,6 @@
       "engines": {
         "node": ">=0.4.0"
       }
->>>>>>> weather
     },
     "node_modules/diff": {
       "version": "5.0.0",
@@ -799,8 +769,6 @@
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
       "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
       "dev": true
-<<<<<<< HEAD
-=======
     },
     "node_modules/follow-redirects": {
       "version": "1.15.0",
@@ -833,7 +801,6 @@
       "engines": {
         "node": ">= 6"
       }
->>>>>>> weather
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
@@ -1197,11 +1164,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
     "node_modules/mocha": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
@@ -1890,8 +1852,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
-<<<<<<< HEAD
-=======
     },
     "@types/axios": {
       "version": "0.14.0",
@@ -1900,7 +1860,6 @@
       "requires": {
         "axios": "*"
       }
->>>>>>> weather
     },
     "@types/node": {
       "version": "17.0.35",
@@ -2127,14 +2086,6 @@
         "which": "^2.0.1"
       }
     },
-    "csv-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-3.0.0.tgz",
-      "integrity": "sha512-s6OYSXAK3IdKqYO33y09jhypG/bSDHPuyCme/IdEHfWpLf/jKcpitVFyOC6UemgGk8v7Q5u2XE0vvwmanxhGlQ==",
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
     "debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -2160,14 +2111,11 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
-<<<<<<< HEAD
-=======
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
->>>>>>> weather
     },
     "diff": {
       "version": "5.0.0",
@@ -2409,8 +2357,6 @@
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
       "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
       "dev": true
-<<<<<<< HEAD
-=======
     },
     "follow-redirects": {
       "version": "1.15.0",
@@ -2426,7 +2372,6 @@
         "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
->>>>>>> weather
     },
     "fs.realpath": {
       "version": "1.0.0",
@@ -2695,11 +2640,6 @@
         "brace-expansion": "^2.0.1"
       }
     },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
     "mocha": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
--- a/package.json
View file @05678cc
+++ b/package.json
View file @05678cc
 {
-  "name": "study-or-enjoy",
+  "name":"study-or-enjoy",
-  "version": "1.0.0",
+  "version":"1.0.0",
-  "description": "",
+  "description":"",
-  "main": "main.js",
+  "main":"main.js",
-  "scripts": {
+  "scripts":{
-    "test": "mocha --debug-brk"
+     "test":"mocha --debug-brk"
   },
-  "repository": {
+  "repository":{
-    "type": "git",
+     "type":"git",
-    "url": "http://khuhub.khu.ac.kr/2018102202/study-or-enjoy"
+     "url":"http://khuhub.khu.ac.kr/2018102202/study-or-enjoy"
   },
-  "author": "",
+  "author":"",
-  "license": "",
+  "license":"",
-  "dependencies": {
+  "dependencies":{
-    "@types/axios": "^0.14.0",
+     "@types/axios":"^0.14.0",
-    "@types/selenium-webdriver": "^4.1.0",
+     "@types/selenium-webdriver":"^4.1.0",
-<<<<<<< HEAD
+     "axios":"^0.27.2",
-<<<<<<< HEAD
+     "mocha":"^10.0.0",
-    "csv-parser": "^3.0.0",
+     "selenium-webdriver":"^4.1.2"
-    "eslint": "^8.15.0",
-=======
->>>>>>> 6c6e356fa8269fbbdee92f54a6f2f16ffe2ba729
-=======
-=======
-    "axios": "^0.27.2",
->>>>>>> weather
->>>>>>> 039e1a43c37157ea46e8f87599a93f75536a140e
-    "mocha": "^10.0.0",
-    "selenium-webdriver": "^4.1.2"
   },
-  "type": "module",
+  "type":"module",
-  "devDependencies": {
+  "devDependencies":{
-    "@types/node": "^17.0.35",
+     "@types/node":"^17.0.35",
-    "eslint": "^8.16.0"
+     "eslint":"^8.16.0"
   }
-}
+}
\ No newline at end of file