From 1b70d2f3c1dbed43317c1da7ed8092daac27168d Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 28 Nov 2019 11:08:37 +0100 Subject: Add ranking rules --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0237ed5..dc4be67 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,10 @@ "test": "jest" }, "dependencies": { - "nuxt": "^2.0.0", "@nuxtjs/axios": "^5.3.6", - "@nuxtjs/pwa": "^3.0.0-0" + "@nuxtjs/markdownit": "^1.2.7", + "@nuxtjs/pwa": "^3.0.0-0", + "nuxt": "^2.0.0" }, "devDependencies": { "@vue/test-utils": "^1.0.0-beta.27", -- cgit 1.4.1 From 399ddd7e7d9f1105657aa65ddf82c4c0199ffe7f Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 28 Nov 2019 11:19:03 +0100 Subject: Fix conflicts --- package-lock.json | 63 ------------------------------------------------------- package.json | 7 +------ 2 files changed, 1 insertion(+), 69 deletions(-) (limited to 'package.json') diff --git a/package-lock.json b/package-lock.json index bcf0064..6478f3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4263,7 +4263,6 @@ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", "requires": { -<<<<<<< HEAD "abab": "2.0.1", "whatwg-mimetype": "2.3.0", "whatwg-url": "7.0.0" @@ -4280,11 +4279,6 @@ "webidl-conversions": "4.0.2" } } -======= - "abab": "^2.0.0", - "whatwg-mimetype": "^2.2.0", - "whatwg-url": "^7.0.0" ->>>>>>> origin/develop } }, "date-now": { @@ -6501,14 +6495,6 @@ "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", "dev": true, "requires": { -<<<<<<< HEAD - "@jest/environment": "24.9.0", - "@jest/fake-timers": "24.9.0", - "@jest/types": "24.9.0", - "jest-mock": "24.9.0", - "jest-util": "24.9.0", - "jsdom": "11.12.0" -======= "@jest/environment": "^24.9.0", "@jest/fake-timers": "^24.9.0", "@jest/types": "^24.9.0", @@ -6593,7 +6579,6 @@ "async-limiter": "~1.0.0" } } ->>>>>>> origin/develop } }, "jest-environment-node": { @@ -7545,7 +7530,6 @@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz", "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==", "requires": { -<<<<<<< HEAD "abab": "2.0.1", "acorn": "5.7.3", "acorn-globals": "4.3.3", @@ -7572,34 +7556,6 @@ "whatwg-url": "6.5.0", "ws": "5.2.2", "xml-name-validator": "3.0.0" -======= - "abab": "^2.0.0", - "acorn": "^6.1.1", - "acorn-globals": "^4.3.2", - "array-equal": "^1.0.0", - "cssom": "^0.3.6", - "cssstyle": "^1.2.2", - "data-urls": "^1.1.0", - "domexception": "^1.0.1", - "escodegen": "^1.11.1", - "html-encoding-sniffer": "^1.0.2", - "nwsapi": "^2.1.4", - "parse5": "5.1.0", - "pn": "^1.1.0", - "request": "^2.88.0", - "request-promise-native": "^1.0.7", - "saxes": "^3.1.9", - "symbol-tree": "^3.2.2", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.1", - "w3c-xmlserializer": "^1.1.2", - "webidl-conversions": "^4.0.2", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^7.0.0", - "ws": "^7.0.0", - "xml-name-validator": "^3.0.0" ->>>>>>> origin/develop }, "dependencies": { "ws": { @@ -7607,11 +7563,7 @@ "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz", "integrity": "sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==", "requires": { -<<<<<<< HEAD - "async-limiter": "1.0.1" -======= "async-limiter": "^1.0.0" ->>>>>>> origin/develop } } } @@ -10214,13 +10166,8 @@ "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz", "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==", "requires": { -<<<<<<< HEAD "loader-utils": "1.2.3", "schema-utils": "2.1.0" -======= - "loader-utils": "^1.1.0", - "schema-utils": "^2.0.1" ->>>>>>> origin/develop } }, "react-is": { @@ -10494,10 +10441,6 @@ "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==", "requires": { "request-promise-core": "1.1.2", -<<<<<<< HEAD - "stealthy-require": "1.1.1", - "tough-cookie": "2.5.0" -======= "stealthy-require": "^1.1.1", "tough-cookie": "^2.3.3" }, @@ -10511,7 +10454,6 @@ "punycode": "^2.1.1" } } ->>>>>>> origin/develop } }, "require-directory": { @@ -11651,14 +11593,9 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", "requires": { -<<<<<<< HEAD - "psl": "1.3.0", - "punycode": "2.1.1" -======= "ip-regex": "^2.1.0", "psl": "^1.1.28", "punycode": "^2.1.1" ->>>>>>> origin/develop } }, "tr46": { diff --git a/package.json b/package.json index 4776e69..f315b62 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,8 @@ }, "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", + "@nuxtjs/markdownit": "^1.2.7", "esm": "^3.2.25", "front-matter": "^3.0.2", "jsdom": "^15.1.1", @@ -27,7 +23,6 @@ "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", -- cgit 1.4.1 From a7017ce6b0b4e74182e121d6ad1466944f3d100a Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 28 Nov 2019 11:24:14 +0100 Subject: Fix missing package --- package-lock.json | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 5 +++-- 2 files changed, 61 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package-lock.json b/package-lock.json index 57ee030..9cd42e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6028,6 +6028,11 @@ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" + }, "ipaddr.js": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", @@ -7554,14 +7559,19 @@ "escodegen": "1.12.0", "html-encoding-sniffer": "1.0.2", "nwsapi": "2.1.4", + "parse5": "5.1.0", "pn": "1.1.0", "request": "2.88.0", "request-promise-native": "1.0.7", + "saxes": "3.1.11", "symbol-tree": "3.2.4", + "tough-cookie": "3.0.1", "w3c-hr-time": "1.0.1", + "w3c-xmlserializer": "1.1.2", "webidl-conversions": "4.0.2", "whatwg-encoding": "1.0.5", "whatwg-mimetype": "2.3.0", + "whatwg-url": "7.1.0", "ws": "7.1.2", "xml-name-validator": "3.0.0" }, @@ -8752,6 +8762,11 @@ "json-parse-better-errors": "1.0.2" } }, + "parse5": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==" + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -10594,6 +10609,14 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "saxes": { + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", + "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==", + "requires": { + "xmlchars": "2.2.0" + } + }, "schema-utils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz", @@ -11556,6 +11579,16 @@ "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=" }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "requires": { + "ip-regex": "2.1.0", + "psl": "1.3.0", + "punycode": "2.1.1" + } + }, "tr46": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", @@ -12167,6 +12200,16 @@ "browser-process-hrtime": "0.1.3" } }, + "w3c-xmlserializer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz", + "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==", + "requires": { + "domexception": "1.0.1", + "webidl-conversions": "4.0.2", + "xml-name-validator": "3.0.0" + } + }, "walker": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", @@ -12954,6 +12997,16 @@ "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" }, + "whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "requires": { + "lodash.sortby": "4.7.0", + "tr46": "1.0.1", + "webidl-conversions": "4.0.2" + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -13122,6 +13175,11 @@ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index f315b62..7e56f7b 100644 --- a/package.json +++ b/package.json @@ -14,15 +14,16 @@ }, "dependencies": { "@nuxtjs/axios": "^5.3.6", - "@nuxtjs/pwa": "^3.0.0-0", "@nuxtjs/markdownit": "^1.2.7", + "@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" + "raw-loader": "^3.1.0", + "tough-cookie": "^3.0.1" }, "devDependencies": { "@vue/test-utils": "^1.0.0-beta.27", -- cgit 1.4.1 From be3b0d78facd014c5b197438e8c739b0b022d4d6 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 28 Nov 2019 12:41:39 +0100 Subject: Remove unnecessary packages --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7e56f7b..ff4b694 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ }, "dependencies": { "@nuxtjs/axios": "^5.3.6", - "@nuxtjs/markdownit": "^1.2.7", "@nuxtjs/pwa": "^3.0.0-0", "esm": "^3.2.25", "front-matter": "^3.0.2", -- cgit 1.4.1