about summary refs log tree commit diff
path: root/package.json
diff options
context:
space:
mode:
Diffstat (limited to 'package.json')
-rw-r--r--package.json16
1 files changed, 14 insertions, 2 deletions
diff --git a/package.json b/package.json
index dc4be67..4776e69 100644
--- a/package.json
+++ b/package.json
@@ -6,16 +6,28 @@
   "private": true,
   "scripts": {
     "dev": "nuxt",
-    "build": "nuxt build",
+    "prebuild": "./scripts/prebuild.sh",
+    "build": "nuxt generate",
+    "postbuild": "./scripts/postbuild.sh",
     "start": "nuxt start",
-    "generate": "nuxt generate",
     "test": "jest"
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.3.6",
+<<<<<<< HEAD
     "@nuxtjs/markdownit": "^1.2.7",
     "@nuxtjs/pwa": "^3.0.0-0",
     "nuxt": "^2.0.0"
+=======
+    "@nuxtjs/pwa": "^3.0.0-0",
+    "esm": "^3.2.25",
+    "front-matter": "^3.0.2",
+    "jsdom": "^15.1.1",
+    "kronikarz": "^0.1.3",
+    "markdown-it": "^10.0.0",
+    "nuxt": "^2.0.0",
+    "raw-loader": "^3.1.0"
+>>>>>>> origin/develop
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.27",