diff --git a/Jenkinsfile b/Jenkinsfile index e21665f..8ce0539 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ node('node') { sh 'npm install' sh 'npm run compile-docs-wrapper' sh 'npm run generate-model-tables' - sh 'sudo bundle install' + sh 'sudo bundle install' // 🤢🤮 sh 'bundle exec middleman build --clean' } diff --git a/package-lock.json b/package-lock.json index 620c08d..a0cccac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,17 @@ "requires": true, "dependencies": { "@babel/runtime": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", - "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz", + "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==", "requires": { "regenerator-runtime": "^0.13.2" }, "dependencies": { "regenerator-runtime": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", - "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==" } } }, @@ -46,9 +46,9 @@ } }, "@mapcreator/maps4news": { - "version": "1.6.12", - "resolved": "https://registry.npmjs.org/@mapcreator/maps4news/-/maps4news-1.6.12.tgz", - "integrity": "sha512-MT0NZvXoAF1ogbIQMMpTAuECGQWZ//lXQqYZpBcy+myZwrNtmYd8AuZnyfnzDGMjjQLfSL6PLRqTG6wY9E9fkA==", + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@mapcreator/maps4news/-/maps4news-1.6.22.tgz", + "integrity": "sha512-Y4YXj3gKhYg2gMUpzfu5YP4UggAaDyrc5im6Qp72OmCUZn+JrVfTwFLE1a60SA6lw6dzWGbNuWjmfby5UGK+FQ==", "requires": { "@babel/runtime": "^7.2.0", "axios": "^0.18.0", @@ -306,9 +306,9 @@ } }, "case": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/case/-/case-1.6.1.tgz", - "integrity": "sha512-N0rDB5ftMDKANGsIBRWPWcG0VIKtirgqcXb2vKFi66ySAjXVEwbfCN7ass1mkdXO8fbol3RfbWlQ9KyBX2F/Gg==" + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/case/-/case-1.6.2.tgz", + "integrity": "sha512-ll380ZRoraT7mUK2G92UbH+FJVD5AwdVIAYk9xhV1tauh0carDgYByUD1HhjCWsWgxrfQvCeHvtfj7IYR6TKeg==" }, "caseless": { "version": "0.12.0", @@ -779,6 +779,62 @@ "resolved": "https://registry.npmjs.org/esdoc-importpath-plugin/-/esdoc-importpath-plugin-1.0.2.tgz", "integrity": "sha512-o9/EIk8YyufjzDBrTZu7/6he2No515b51Nnd8QGzXvdTM+rekQjZ7wxVjcqTUQ68bbYLFKqaxZBNltYUbD5aUQ==" }, + "esdoc-inject-script-plugin": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esdoc-inject-script-plugin/-/esdoc-inject-script-plugin-1.0.0.tgz", + "integrity": "sha1-HW1unNdOhjrL6e7HvI7RNbh0Li8=", + "dev": true, + "requires": { + "cheerio": "0.22.0", + "fs-extra": "1.0.0" + }, + "dependencies": { + "cheerio": { + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", + "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", + "dev": true, + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" + } + }, + "fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0" + } + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + } + } + }, "esdoc-integrate-manual-plugin": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/esdoc-integrate-manual-plugin/-/esdoc-integrate-manual-plugin-1.0.0.tgz", @@ -1042,9 +1098,9 @@ "optional": true }, "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -1416,6 +1472,15 @@ "verror": "1.10.0" } }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.9" + } + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", diff --git a/package.json b/package.json index cfbaa44..4fc55d4 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "generate-model-tables": "node scripts/generateTables.js" }, "dependencies": { - "@mapcreator/maps4news": "^1.6.12", + "@mapcreator/maps4news": "^1.6.22", "esdoc": "^1.1.0", "esdoc-ecmascript-proposal-plugin": "^1.0.0", "esdoc-importpath-plugin": "^1.0.2", @@ -41,6 +41,16 @@ "brand": { "title": "Maps4News Api Wrapper", "description": "Maps4News Api Javascript Wrapper" + }, + "manual": { + "asset": "./node_modules/@mapcreator/maps4news/manual/assets", + "index": "./node_modules/@mapcreator/maps4news/README.md", + "files": [ + "./node_modules/@mapcreator/maps4news/manual/examples.md", + "./node_modules/@mapcreator/maps4news/manual/examples.authentication.md", + "./node_modules/@mapcreator/maps4news/manual/building.md", + "./node_modules/@mapcreator/maps4news/manual/installation.md" + ] } } }, @@ -61,7 +71,19 @@ } ] } + }, + { + "name": "esdoc-inject-script-plugin", + "option": { + "enable": true, + "scripts": [ + "./node_modules/@mapcreator/maps4news/dist/bundle.browser.js", + ] + } } ] + }, + "devDependencies": { + "esdoc-inject-script-plugin": "^1.0.0" } }