From d230ca2d6f1dd9b1d22cb4cabba6590c2f5ce1da Mon Sep 17 00:00:00 2001 From: jenna-badanowski Date: Fri, 4 Jan 2019 15:26:16 -0800 Subject: [PATCH 1/2] fix merge conflicts --- package-lock.json | 434 ---------------------------------------------- package.json | 107 ------------ 2 files changed, 541 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6937dd505..73a3c59f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,6 @@ { "name": "fundamental-react", -<<<<<<< HEAD - "version": "0.0.12", -======= "version": "0.0.13", ->>>>>>> master "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1134,13 +1130,8 @@ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "requires": { -<<<<<<< HEAD - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" -======= "jsonparse": "1.3.1", "through": "2.3.8" ->>>>>>> master } }, "abab": { @@ -3215,13 +3206,8 @@ "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", "dev": true, "requires": { -<<<<<<< HEAD - "array-ify": "^1.0.0", - "dot-prop": "^3.0.0" -======= "array-ify": "1.0.0", "dot-prop": "3.0.0" ->>>>>>> master }, "dependencies": { "dot-prop": { @@ -3230,11 +3216,7 @@ "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", "dev": true, "requires": { -<<<<<<< HEAD - "is-obj": "^1.0.0" -======= "is-obj": "1.0.1" ->>>>>>> master } } } @@ -3345,8 +3327,6 @@ "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz", "integrity": "sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==", "dev": true, -<<<<<<< HEAD -======= "requires": { "conventional-changelog-angular": "1.6.6", "conventional-changelog-atom": "0.2.8", @@ -3793,7 +3773,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", ->>>>>>> master "requires": { "conventional-changelog-angular": "^1.6.6", "conventional-changelog-atom": "^0.2.8", @@ -4675,11 +4654,7 @@ "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=", "dev": true, "requires": { -<<<<<<< HEAD - "number-is-nan": "^1.0.0" -======= "number-is-nan": "1.0.1" ->>>>>>> master } }, "dashdash": { @@ -4730,13 +4705,8 @@ "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", "dev": true, "requires": { -<<<<<<< HEAD - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" -======= "decamelize": "1.2.0", "map-obj": "1.0.1" ->>>>>>> master } }, "decode-uri-component": { @@ -5098,13 +5068,8 @@ "integrity": "sha512-eu5XjSstm0WXQsARgo6kPjkINYZlOUW+z/KtAAIBjHa5mUpMPrxJytbPIndWz6GubBuuuH5ljtVcXKnVnH5q8w==", "dev": true, "requires": { -<<<<<<< HEAD - "find-up": "^2.1.0", - "minimatch": "^3.0.4" -======= "find-up": "2.1.0", "minimatch": "3.0.4" ->>>>>>> master } }, "duplexer": { @@ -7383,19 +7348,11 @@ "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=", "dev": true, "requires": { -<<<<<<< HEAD - "hosted-git-info": "^2.1.4", - "meow": "^3.3.0", - "normalize-package-data": "^2.3.0", - "parse-github-repo-url": "^1.3.0", - "through2": "^2.0.0" -======= "hosted-git-info": "2.7.1", "meow": "3.7.0", "normalize-package-data": "2.4.0", "parse-github-repo-url": "1.4.1", "through2": "2.0.5" ->>>>>>> master } }, "get-stdin": { @@ -7443,9 +7400,6 @@ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { -<<<<<<< HEAD - "lodash": "^4.17.10" -======= "lodash": "4.17.11" } }, @@ -7715,276 +7669,6 @@ "load-json-file": "4.0.0", "normalize-package-data": "2.4.0", "path-type": "3.0.0" ->>>>>>> master - } - }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { -<<<<<<< HEAD - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "git-raw-commits": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz", - "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==", - "dev": true, - "requires": { - "dargs": "^4.0.1", - "lodash.template": "^4.0.2", - "meow": "^4.0.0", - "split2": "^2.0.0", - "through2": "^2.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "camelcase-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", - "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", - "dev": true, - "requires": { - "camelcase": "^4.1.0", - "map-obj": "^2.0.0", - "quick-lru": "^1.0.0" - } - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", - "dev": true - }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "map-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", - "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", - "dev": true - }, - "meow": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", - "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", - "dev": true, - "requires": { - "camelcase-keys": "^4.0.0", - "decamelize-keys": "^1.0.0", - "loud-rejection": "^1.0.0", - "minimist": "^1.1.3", - "minimist-options": "^3.0.1", - "normalize-package-data": "^2.3.4", - "read-pkg-up": "^3.0.0", - "redent": "^2.0.0", - "trim-newlines": "^2.0.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - } - }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - } - }, - "redent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", - "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", - "dev": true, - "requires": { - "indent-string": "^3.0.0", - "strip-indent": "^2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-indent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", - "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", - "dev": true - }, - "trim-newlines": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", - "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=", - "dev": true - } - } - }, - "git-remote-origin-url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", - "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=", - "dev": true, - "requires": { - "gitconfiglocal": "^1.0.0", - "pify": "^2.3.0" - } - }, - "git-semver-tags": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz", - "integrity": "sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==", - "dev": true, - "requires": { - "meow": "^4.0.0", - "semver": "^5.5.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "camelcase-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", - "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", - "dev": true, - "requires": { - "camelcase": "^4.1.0", - "map-obj": "^2.0.0", - "quick-lru": "^1.0.0" - } - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", - "dev": true - }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "map-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", - "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", - "dev": true - }, - "meow": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", - "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", - "dev": true, - "requires": { - "camelcase-keys": "^4.0.0", - "decamelize-keys": "^1.0.0", - "loud-rejection": "^1.0.0", - "minimist": "^1.1.3", - "minimist-options": "^3.0.1", - "normalize-package-data": "^2.3.4", - "read-pkg-up": "^3.0.0", - "redent": "^2.0.0", - "trim-newlines": "^2.0.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" } }, "read-pkg-up": { @@ -7993,12 +7677,8 @@ "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" -======= "find-up": "2.1.0", "read-pkg": "3.0.0" ->>>>>>> master } }, "redent": { @@ -8007,13 +7687,8 @@ "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", "dev": true, "requires": { -<<<<<<< HEAD - "indent-string": "^3.0.0", - "strip-indent": "^2.0.0" -======= "indent-string": "3.2.0", "strip-indent": "2.0.0" ->>>>>>> master } }, "strip-bom": { @@ -8042,11 +7717,7 @@ "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=", "dev": true, "requires": { -<<<<<<< HEAD - "ini": "^1.3.2" -======= "ini": "1.3.5" ->>>>>>> master } }, "glob": { @@ -11162,13 +10833,8 @@ "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", "dev": true, "requires": { -<<<<<<< HEAD - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0" -======= "arrify": "1.0.1", "is-plain-obj": "1.1.0" ->>>>>>> master } }, "mississippi": { @@ -16197,11 +15863,7 @@ "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", "dev": true, "requires": { -<<<<<<< HEAD - "through": "2" -======= "through": "2.3.8" ->>>>>>> master } }, "split-string": { @@ -16276,16 +15938,6 @@ "integrity": "sha512-jJ8FZhnmh9xJRQLnaXiGRLaAUNItIH29lOQZGpL5fd4+jUHto9Ij6SPCYN86h6ZNNXkYq2TYiIVVF7gVyC+pcQ==", "dev": true, "requires": { -<<<<<<< HEAD - "chalk": "^1.1.3", - "conventional-changelog": "^1.1.0", - "conventional-recommended-bump": "^1.0.0", - "dotgitignore": "^1.0.3", - "figures": "^1.5.0", - "fs-access": "^1.0.0", - "semver": "^5.1.0", - "yargs": "^8.0.1" -======= "chalk": "1.1.3", "conventional-changelog": "1.1.24", "conventional-recommended-bump": "1.2.1", @@ -16294,7 +15946,6 @@ "fs-access": "1.0.1", "semver": "5.6.0", "yargs": "8.0.2" ->>>>>>> master }, "dependencies": { "ansi-styles": { @@ -16315,19 +15966,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" -======= "ansi-styles": "2.2.1", "escape-string-regexp": "1.0.5", "has-ansi": "2.0.0", "strip-ansi": "3.0.1", "supports-color": "2.0.0" ->>>>>>> master } }, "cross-spawn": { @@ -16336,15 +15979,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { -<<<<<<< HEAD - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" -======= "lru-cache": "4.1.5", "shebang-command": "1.2.0", "which": "1.3.1" ->>>>>>> master } }, "execa": { @@ -16353,15 +15990,6 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { -<<<<<<< HEAD - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" -======= "cross-spawn": "5.1.0", "get-stream": "3.0.0", "is-stream": "1.1.0", @@ -16369,7 +15997,6 @@ "p-finally": "1.0.0", "signal-exit": "3.0.2", "strip-eof": "1.0.0" ->>>>>>> master } }, "figures": { @@ -16378,13 +16005,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { -<<<<<<< HEAD - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" -======= "escape-string-regexp": "1.0.5", "object-assign": "4.1.1" ->>>>>>> master } }, "load-json-file": { @@ -16393,17 +16015,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { -<<<<<<< HEAD - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" -======= "graceful-fs": "4.1.15", "parse-json": "2.2.0", "pify": "2.3.0", "strip-bom": "3.0.0" ->>>>>>> master } }, "mem": { @@ -16412,11 +16027,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { -<<<<<<< HEAD - "mimic-fn": "^1.0.0" -======= "mimic-fn": "1.2.0" ->>>>>>> master } }, "os-locale": { @@ -16425,15 +16036,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { -<<<<<<< HEAD - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" -======= "execa": "0.7.0", "lcid": "1.0.0", "mem": "1.1.0" ->>>>>>> master } }, "parse-json": { @@ -16442,11 +16047,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { -<<<<<<< HEAD - "error-ex": "^1.2.0" -======= "error-ex": "1.3.2" ->>>>>>> master } }, "path-type": { @@ -16455,11 +16056,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { -<<<<<<< HEAD - "pify": "^2.0.0" -======= "pify": "2.3.0" ->>>>>>> master } }, "read-pkg": { @@ -16468,15 +16065,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { -<<<<<<< HEAD - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" -======= "load-json-file": "2.0.0", "normalize-package-data": "2.4.0", "path-type": "2.0.0" ->>>>>>> master } }, "read-pkg-up": { @@ -16485,13 +16076,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { -<<<<<<< HEAD - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" -======= "find-up": "2.1.0", "read-pkg": "2.0.0" ->>>>>>> master } }, "strip-bom": { @@ -16518,21 +16104,6 @@ "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" -======= "camelcase": "4.1.0", "cliui": "3.2.0", "decamelize": "1.2.0", @@ -16546,7 +16117,6 @@ "which-module": "2.0.0", "y18n": "3.2.1", "yargs-parser": "7.0.0" ->>>>>>> master } }, "yargs-parser": { @@ -16555,11 +16125,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "^4.1.0" -======= "camelcase": "4.1.0" ->>>>>>> master } } } diff --git a/package.json b/package.json index ad0049e7c..d419669de 100644 --- a/package.json +++ b/package.json @@ -1,110 +1,4 @@ { -<<<<<<< HEAD - "name": "fundamental-react", - "version": "0.0.12", - "private": false, - "license": "Apache-2.0", - "homepage": "http://sap.github.io/fundamental-react", - "repository": { - "type": "git", - "url": "http://sap.github.io/fundamental-react" - }, - "scripts": { - "build-css": "node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/", - "build-doc": "node scripts/build.js", - "build-js": "node scripts/build.js", - "build:lint:fix": "eslint --fix 'src/**' --ext .js,.jsx --env browser,node", - "build:lint": "eslint 'src/**' --ext .js,.jsx --env browser,node", - "build": "rm -rf dist && NODE_ENV=production babel src --out-dir dist --copy-files --ignore __tests__,spec.js,test.js,__snapshots__,Component.js", - "deploy": "gh-pages -d build", - "lint:fix": "npm run build:lint:fix", - "lint:pre-commit": "printf \"running pre-commit lint...\" && npm run lint && printf \"done!\n\"", - "lint": "npm run build:lint", - "predeploy": "npm run build", - "start-js": "node scripts/start.js", - "start": "node scripts/start.js", - "std-version": "standard-version -m \"chore(release): version %s build ${TRAVIS_BUILD_NUMBER} [ci skip]\"", - "test:coverage": "jest --coverage", - "test:dev": "jest", - "test": "node scripts/test.js", - "watch-css": "npm run build-css && node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/ --watch --recursive" - }, - "dependencies": { - "@babel/core": "7.1.0", - "@svgr/webpack": "2.4.1", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "9.0.0", - "babel-jest": "23.6.0", - "babel-loader": "8.0.4", - "babel-plugin-named-asset-import": "^0.2.3", - "babel-preset-react-app": "^6.1.0", - "bfj": "6.1.1", - "case-sensitive-paths-webpack-plugin": "2.1.2", - "chalk": "2.4.1", - "css-loader": "1.0.0", - "dotenv": "6.0.0", - "dotenv-expand": "4.2.0", - "eslint": "5.6.0", - "eslint-config-react-app": "^3.0.5", - "eslint-loader": "2.1.1", - "eslint-plugin-flowtype": "2.50.1", - "eslint-plugin-import": "2.14.0", - "eslint-plugin-jsx-a11y": "6.1.2", - "eslint-plugin-loosely-restrict-imports": "^0.1.15", - "eslint-plugin-react": "7.11.1", - "file-loader": "2.0.0", - "fork-ts-checker-webpack-plugin-alt": "0.4.14", - "fs-extra": "7.0.0", - "html-webpack-plugin": "4.0.0-alpha.2", - "identity-obj-proxy": "3.0.0", - "mini-css-extract-plugin": "0.4.3", - "node-sass-chokidar": "^1.3.4", - "npm-run-all": "^4.1.5", - "optimize-css-assets-webpack-plugin": "5.0.1", - "pnp-webpack-plugin": "1.1.0", - "postcss-flexbugs-fixes": "4.1.0", - "postcss-loader": "3.0.0", - "postcss-preset-env": "6.0.6", - "postcss-safe-parser": "4.0.1", - "react-app-polyfill": "^0.1.3", - "react-dev-utils": "^6.1.1", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", - "react-syntax-highlighter": "^9.0.1", - "resolve": "1.8.1", - "sass-loader": "7.1.0", - "style-loader": "0.23.0", - "terser-webpack-plugin": "1.1.0", - "url-loader": "1.1.1", - "webpack": "4.19.1", - "webpack-dev-server": "3.1.9", - "webpack-manifest-plugin": "2.0.4", - "workbox-webpack-plugin": "3.6.3" - }, - "devDependencies": { - "@babel/cli": "^7.1.5", - "@babel/polyfill": "^7.1.5", - "enzyme": "^3.7.0", - "enzyme-adapter-react-16": "^1.7.0", - "eslint-plugin-ie11": "^1.0.0", - "fiori-fundamentals": "^1.4.0", - "gh-pages": "^2.0.1", - "jest": "23.6.0", - "jest-pnp-resolver": "1.0.1", - "jest-resolve": "23.6.0", - "pre-commit": "^1.2.2", - "react": "^16.6.3", - "react-dom": "^16.6.3", - "react-test-renderer": "^16.6.3", - "standard-version": "^4.4.0" - }, - "pre-commit": { - "colors": true, - "run": [ - "lint:pre-commit" - ], - "silent": false -======= "name": "fundamental-react", "version": "0.0.13", "private": false, @@ -237,7 +131,6 @@ "^.+\\.(js|jsx|ts|tsx)$": "/node_modules/babel-jest", "^.+\\.css$": "/config/jest/cssTransform.js", "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "/config/jest/fileTransform.js" ->>>>>>> master }, "transformIgnorePatterns": [ "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$", From 833969bce78dfa9c3c6a78ac9df6cc49cfab449e Mon Sep 17 00:00:00 2001 From: jenna-badanowski Date: Fri, 4 Jan 2019 15:28:39 -0800 Subject: [PATCH 2/2] prevent pushing merge conflicts --- ci-scripts/publish.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/publish.sh b/ci-scripts/publish.sh index ea211dfa5..630646ee7 100644 --- a/ci-scripts/publish.sh +++ b/ci-scripts/publish.sh @@ -14,8 +14,8 @@ git push --quiet --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" # commit changes made by standard-version to develop branch git checkout develop -git merge master -git commit -a -m "chore: merge master into develop [ci skip]" +# git merge master +# git commit -a -m "chore: merge master into develop [ci skip]" git push --quiet --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" develop > /dev/null 2>&1; # publish master to npm git checkout master