diff options
| author | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2019-11-28 11:18:45 +0100 |
|---|---|---|
| committer | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2019-11-28 11:18:45 +0100 |
| commit | 7051b88fd36e56dcfab7b73b80811c93bc1d0921 (patch) | |
| tree | fec99da81e654e710a2df1f0cb66cff1c4406a7b /package.json | |
| parent | 1b70d2f3c1dbed43317c1da7ed8092daac27168d (diff) | |
| parent | e12c489d3ad6111c78c9cb4d4b8ab77b053c49ad (diff) | |
| download | puszcza-7051b88fd36e56dcfab7b73b80811c93bc1d0921.tar.gz puszcza-7051b88fd36e56dcfab7b73b80811c93bc1d0921.zip | |
Merge remote-tracking branch 'origin/develop' into feature/ranking
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
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", |