From 6f2383059b2d8560cb45248b3ed1879d0c46fd0c Mon Sep 17 00:00:00 2001 From: YunYouJun Date: Wed, 4 May 2022 00:36:02 +0800 Subject: [PATCH] fix: csv data headers format --- package.json | 2 +- pnpm-lock.yaml | 63 ++++++++++++++++++++++++++++++++++----------- scripts/convert.ts | 3 ++- src/data/recipe.csv | 2 +- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index cac6aa9..3d8b99d 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "vite-plugin-pages": "^0.23.0", "vite-plugin-pwa": "^0.12.0", "vite-plugin-vue-layouts": "^0.6.0", - "vite-ssg": "^0.19.2", + "vite-ssg": "^0.20.0", "vite-ssg-sitemap": "^0.2.6", "vue-toastification": "^2.0.0-rc.5", "vue-tsc": "^0.34.11" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4be6a37..d699020 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,7 +37,7 @@ specifiers: vite-plugin-pages: ^0.23.0 vite-plugin-pwa: ^0.12.0 vite-plugin-vue-layouts: ^0.6.0 - vite-ssg: ^0.19.2 + vite-ssg: ^0.20.0 vite-ssg-sitemap: ^0.2.6 vue: ^3.2.33 vue-about-me: ^1.2.7 @@ -89,7 +89,7 @@ devDependencies: vite-plugin-pages: 0.23.0_vite@2.9.7 vite-plugin-pwa: 0.12.0_vite@2.9.7 vite-plugin-vue-layouts: 0.6.0_cy27blvoe2cwdzwso5wue736a4 - vite-ssg: 0.19.2_csn2dxpwjxhcufqcjewtaqepne + vite-ssg: 0.20.0_csn2dxpwjxhcufqcjewtaqepne vite-ssg-sitemap: 0.2.6 vue-toastification: 2.0.0-rc.5_vue@3.2.33 vue-tsc: 0.34.11_typescript@4.6.4 @@ -2635,13 +2635,13 @@ packages: engines: {node: '>= 12'} dev: true - /data-urls/3.0.1: - resolution: {integrity: sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==} + /data-urls/3.0.2: + resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==} engines: {node: '>=12'} dependencies: abab: 2.0.6 whatwg-mimetype: 3.0.0 - whatwg-url: 10.0.0 + whatwg-url: 11.0.0 dev: true /debug/2.6.9: @@ -3712,6 +3712,10 @@ packages: engines: {node: '>= 0.6'} dev: true + /eventemitter3/4.0.7: + resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} + dev: true + /execa/5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} @@ -4135,7 +4139,7 @@ packages: /html5parser/2.0.2: resolution: {integrity: sha512-L0y+IdTVxHsovmye8MBtFgBvWZnq1C9WnI/SmJszxoQjmUH1psX2uzDk21O5k5et6udxdGjwxkbmT9eVRoG05w==} dependencies: - tslib: 2.3.1 + tslib: 2.4.0 dev: true /htmlparser2/7.2.0: @@ -4542,11 +4546,11 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.7.0 + acorn: 8.7.1 acorn-globals: 6.0.0 cssom: 0.5.0 cssstyle: 2.3.0 - data-urls: 3.0.1 + data-urls: 3.0.2 decimal.js: 10.3.1 domexception: 4.0.0 escodegen: 2.0.0 @@ -4566,7 +4570,7 @@ packages: whatwg-encoding: 2.0.0 whatwg-mimetype: 3.0.0 whatwg-url: 10.0.0 - ws: 8.5.0 + ws: 8.6.0 xml-name-validator: 4.0.0 transitivePeerDependencies: - bufferutil @@ -5114,6 +5118,11 @@ packages: word-wrap: 1.2.3 dev: true + /p-finally/1.0.0: + resolution: {integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=} + engines: {node: '>=4'} + dev: true + /p-limit/1.3.0: resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==} engines: {node: '>=4'} @@ -5156,6 +5165,21 @@ packages: p-limit: 3.1.0 dev: true + /p-queue/6.6.2: + resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==} + engines: {node: '>=8'} + dependencies: + eventemitter3: 4.0.7 + p-timeout: 3.2.0 + dev: true + + /p-timeout/3.2.0: + resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==} + engines: {node: '>=8'} + dependencies: + p-finally: 1.0.0 + dev: true + /p-try/1.0.0: resolution: {integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=} engines: {node: '>=4'} @@ -6053,8 +6077,8 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true - /tslib/2.3.1: - resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} + /tslib/2.4.0: + resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} dev: true /tsutils/3.21.0_typescript@4.6.4: @@ -6432,8 +6456,8 @@ packages: resolution: {integrity: sha512-rjb+aXzaw9gb9mqoWaU1mVhwGg3SZKMR8ULraGFSLK9vaeQv52/qHFNmBAZvUiBUmgMQ4RGP2fGomTC+SwknFg==} dev: true - /vite-ssg/0.19.2_csn2dxpwjxhcufqcjewtaqepne: - resolution: {integrity: sha512-r9UJJ4OTMyu9f4nNe12PMVhVkeXYp1rUKbIl6zIOz5QDYEDgFcq8hZGUMMIAcyHhB4pH5ImmjZd1hJ2fO6hOmg==} + /vite-ssg/0.20.0_csn2dxpwjxhcufqcjewtaqepne: + resolution: {integrity: sha512-F6B6au8V0aOc9vQ/z875n8AjmGa8vkZGZnuSAidMeJzgEnVYJhIzLL5gUKU336bM9C1GCDJwz5JXmY6YPd3ukg==} engines: {node: '>=14.0.0'} hasBin: true peerDependencies: @@ -6453,6 +6477,7 @@ packages: html5parser: 2.0.2 jsdom: 19.0.0 kolorist: 1.5.1 + p-queue: 6.6.2 prettier: 2.6.2 vite: 2.9.7_sass@1.51.0 vue: 3.2.33 @@ -6629,6 +6654,14 @@ packages: webidl-conversions: 7.0.0 dev: true + /whatwg-url/11.0.0: + resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==} + engines: {node: '>=12'} + dependencies: + tr46: 3.0.0 + webidl-conversions: 7.0.0 + dev: true + /whatwg-url/7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} dependencies: @@ -6840,8 +6873,8 @@ packages: resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=} dev: true - /ws/8.5.0: - resolution: {integrity: sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==} + /ws/8.6.0: + resolution: {integrity: sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 diff --git a/scripts/convert.ts b/scripts/convert.ts index ea8b88d..0116673 100644 --- a/scripts/convert.ts +++ b/scripts/convert.ts @@ -12,7 +12,8 @@ function run() { const csvData = fs.readFileSync(recipeCsvFile, 'utf-8') const lines = csvData.split(/\r?\n/) - if (lines[0].trim() !== 'name,stuff,link,difficulty,tags,methods,tools') { + const headers = 'name,stuff,link,difficulty,tags,methods,tools,' + if (lines[0].trim() !== headers) { consola.warn(`Headers Changed: ${lines[0]}`) return } diff --git a/src/data/recipe.csv b/src/data/recipe.csv index 2f851fa..d2a20b4 100644 --- a/src/data/recipe.csv +++ b/src/data/recipe.csv @@ -1,4 +1,4 @@ -name,stuff,link,difficulty,tags,methods,tools +name,stuff,link,difficulty,tags,methods,tools, 电饭煲版广式腊肠煲饭,腊肠、米,https://www.bilibili.com/video/BV1NE411Q7Jj,简单,广式,煲,电饭煲, 电饭煲版烧鸡,鸡肉、洋葱、菌菇,https://www.bilibili.com/video/BV1T54y1U7Cu,简单,好吃,,电饭煲, 电饭煲焖面,猪肉、面食,https://www.bilibili.com/video/BV14b411q7rM,简单,筋道,,电饭煲,