From c18dfab24e305d618cd92c52695e17029d7d80f2 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 22 Jan 2021 15:19:20 +1100 Subject: [PATCH 01/10] chore(scripts): Consolidate build/compile/dist scripts into dist --- examples/e2e/README.md | 2 +- package.json | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/e2e/README.md b/examples/e2e/README.md index 9b660b9af..d4fd8c6dc 100644 --- a/examples/e2e/README.md +++ b/examples/e2e/README.md @@ -34,7 +34,7 @@ Given an animal profile, recommends a suitable partner based on similar interest ## Running the tests 1. `npm install` (on the root project directory) -1. `npm run compile` (on the root project directory) +1. `npm run dist` (on the root project directory) 1. `npm run test:consumer` (from e2e directory) - Run consumer tests 1. `npm run test:publish` (from e2e directory) - Publish contracts to the broker 1. `npm run test:provider` (from e2e directory) - Run provider tests diff --git a/package.json b/package.json index 5b6d4eb73..5377157a6 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,11 @@ "main": "./pact.js", "types": "./pact.d.ts", "scripts": { - "build": "npm run lint && npm run compile", - "compile": "rimraf dist && tsc", "clean": "rimraf docs dist dist-web coverage .nyc_output logs pacts jscpd.json", "coverage": "nyc report --reporter=lcov", "deploy:package": "tar -czf pactjs.tar.gz config dist src package.json README.md LICENSE", "deploy:prepare": "npm i --production && npm run deploy:package", - "dist": "npm run compile && webpack --config ./config/webpack.web.config.js && cp package.json ./dist", + "dist": "tsc && webpack --config ./config/webpack.web.config.js && cp package.json ./dist", "jscpd": "jscpd -p src -r json -o jscpd.json", "lint": "npm run lint:prettier:ts && npm run lint:prettier:js && tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", "lint:fix": "prettier --parser typescript --write \"{src,test,examples}/**/*.ts\" && prettier --write \"{src,test,examples}/**/*.js\"", From 6da8337d88e0abdf64a1270058dd77eeca8dc0d9 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 22 Jan 2021 15:21:09 +1100 Subject: [PATCH 02/10] chore(scripts): DRY out prettier scripts --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5377157a6..6a64ff290 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "deploy:prepare": "npm i --production && npm run deploy:package", "dist": "tsc && webpack --config ./config/webpack.web.config.js && cp package.json ./dist", "jscpd": "jscpd -p src -r json -o jscpd.json", - "lint": "npm run lint:prettier:ts && npm run lint:prettier:js && tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", - "lint:fix": "prettier --parser typescript --write \"{src,test,examples}/**/*.ts\" && prettier --write \"{src,test,examples}/**/*.js\"", - "lint:prettier:ts": "prettier --parser typescript --check \"{src,test,examples}/**/*.ts\"", - "lint:prettier:js": "prettier --check \"{src,test,examples}/**/*.js\"", + "lint": "npm run format:check && tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", + "format:base": "prettier \"{src,test,examples}/**/*.ts\"", + "format:fix": "npm run format:base -- --fix", + "format:check": "npm run format:base -- --check", "postdist": "npm test", "predist": "npm run clean && npm run lint && npm run jscpd", "release": "standard-version", From 996c23a6d2d743d12da6c8a5803b3a9222c56361 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 22 Jan 2021 15:26:04 +1100 Subject: [PATCH 03/10] chore(scripts): Remove unused deploy:* scripts (they were used, but the output was not) --- package.json | 2 -- scripts/ci/release-beta.sh | 1 - scripts/ci/release.sh | 1 - 3 files changed, 4 deletions(-) diff --git a/package.json b/package.json index 6a64ff290..7bc759b14 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,6 @@ "scripts": { "clean": "rimraf docs dist dist-web coverage .nyc_output logs pacts jscpd.json", "coverage": "nyc report --reporter=lcov", - "deploy:package": "tar -czf pactjs.tar.gz config dist src package.json README.md LICENSE", - "deploy:prepare": "npm i --production && npm run deploy:package", "dist": "tsc && webpack --config ./config/webpack.web.config.js && cp package.json ./dist", "jscpd": "jscpd -p src -r json -o jscpd.json", "lint": "npm run format:check && tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", diff --git a/scripts/ci/release-beta.sh b/scripts/ci/release-beta.sh index e704c20f4..b04e1f874 100755 --- a/scripts/ci/release-beta.sh +++ b/scripts/ci/release-beta.sh @@ -29,7 +29,6 @@ echo "::set-output name=notes::$RELEASE_NOTES" npm ci "$SCRIPT_DIR"/build-and-test.sh npm run release -npm run deploy:prepare # Emit version to next step VERSION="$("$SCRIPT_DIR/lib/get-version.sh")" diff --git a/scripts/ci/release.sh b/scripts/ci/release.sh index c1dd668ed..f6dd3a56f 100755 --- a/scripts/ci/release.sh +++ b/scripts/ci/release.sh @@ -29,7 +29,6 @@ echo "::set-output name=notes::$RELEASE_NOTES" npm ci "$SCRIPT_DIR"/build-and-test.sh npm run release -npm run deploy:prepare # Emit version to next step VERSION="$("$SCRIPT_DIR/lib/get-version.sh")" From e4d83afe45c8f63d1ae3a115c58b7dd5e2016e54 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 22 Jan 2021 15:33:25 +1100 Subject: [PATCH 04/10] chore(scripts): Add lint:fix and separate format from lint --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7bc759b14..6678c3bd8 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,13 @@ "coverage": "nyc report --reporter=lcov", "dist": "tsc && webpack --config ./config/webpack.web.config.js && cp package.json ./dist", "jscpd": "jscpd -p src -r json -o jscpd.json", - "lint": "npm run format:check && tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", + "lint": "tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", + "lint:fix": "npm run lint -- --fix", "format:base": "prettier \"{src,test,examples}/**/*.ts\"", "format:fix": "npm run format:base -- --fix", "format:check": "npm run format:base -- --check", "postdist": "npm test", - "predist": "npm run clean && npm run lint && npm run jscpd", + "predist": "npm run clean && npm run format:check && npm run lint && npm run jscpd", "release": "standard-version", "test": "nyc --check-coverage --reporter=html --reporter=text-summary mocha", "test:examples": "npm run test:e2e-examples && npm run test:jest-examples && npm run test:mocha-examples && npm run test:ava-examples && npm run test:ts-examples && npm run test:message-examples && npm run test:serverless-examples && npm run test:graphql-examples", From 6eb2dc6598242bf886313b6b58f2c8910f4a7e51 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 22 Jan 2021 15:38:09 +1100 Subject: [PATCH 05/10] chore(scripts): Use copyfiles instead of cp to allow windows development --- package-lock.json | 206 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 3 +- 2 files changed, 208 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0b7bbfa0a..148761370 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3378,6 +3378,164 @@ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, + "copyfiles": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz", + "integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==", + "dev": true, + "requires": { + "glob": "^7.0.5", + "minimatch": "^3.0.3", + "mkdirp": "^1.0.4", + "noms": "0.0.0", + "through2": "^2.0.1", + "untildify": "^4.0.0", + "yargs": "^16.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", + "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", + "dev": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true + } + } + }, "core-js-compat": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz", @@ -4107,6 +4265,12 @@ "es6-symbol": "^3.1.1" } }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -8340,6 +8504,42 @@ "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==", "dev": true }, + "noms": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz", + "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "readable-stream": "~1.0.31" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -11180,6 +11380,12 @@ } } }, + "untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true + }, "unzipper": { "version": "0.10.11", "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", diff --git a/package.json b/package.json index 6678c3bd8..ec3269f98 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "clean": "rimraf docs dist dist-web coverage .nyc_output logs pacts jscpd.json", "coverage": "nyc report --reporter=lcov", - "dist": "tsc && webpack --config ./config/webpack.web.config.js && cp package.json ./dist", + "dist": "tsc && webpack --config ./config/webpack.web.config.js && copyfiles package.json ./dist", "jscpd": "jscpd -p src -r json -o jscpd.json", "lint": "tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", "lint:fix": "npm run lint -- --fix", @@ -156,6 +156,7 @@ "babel-loader": "^8.0.6", "chai": "~4.1.2", "chai-as-promised": "^7.1.1", + "copyfiles": "^2.4.1", "coveralls": "^3.0.2", "enhanced-resolve": "^3.4.1", "eslint": "^5.6.1", From 02a527ed2b95e7430b28fb37dd55f278a9415711 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 22 Jan 2021 15:38:55 +1100 Subject: [PATCH 06/10] chore(scripts): Tell prettier to format js files too --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec3269f98..3a5d5708f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "jscpd": "jscpd -p src -r json -o jscpd.json", "lint": "tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", "lint:fix": "npm run lint -- --fix", - "format:base": "prettier \"{src,test,examples}/**/*.ts\"", + "format:base": "prettier \"{src,test,examples}/**/*.{ts,js}\"", "format:fix": "npm run format:base -- --fix", "format:check": "npm run format:base -- --check", "postdist": "npm test", From 428968b70445a3da464ff5aebb4eff1b12175603 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Thu, 28 Jan 2021 15:33:05 +1100 Subject: [PATCH 07/10] chore(prettier): Correct pretter fix command to 'write' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3a5d5708f..34e5b234d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "lint": "tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", "lint:fix": "npm run lint -- --fix", "format:base": "prettier \"{src,test,examples}/**/*.{ts,js}\"", - "format:fix": "npm run format:base -- --fix", + "format:fix": "npm run format:base -- --write", "format:check": "npm run format:base -- --check", "postdist": "npm test", "predist": "npm run clean && npm run format:check && npm run lint && npm run jscpd", From d431331bb0177f2f550b0c431863f7ecb0da968e Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Thu, 28 Jan 2021 15:34:44 +1100 Subject: [PATCH 08/10] chore(scripts): Remove jscpd as it's no longer required --- package-lock.json | 167 +--------------------------------------------- package.json | 4 +- 2 files changed, 2 insertions(+), 169 deletions(-) diff --git a/package-lock.json b/package-lock.json index 148761370..1dc418131 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2111,24 +2111,6 @@ "file-uri-to-path": "1.0.0" } }, - "blamer": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/blamer/-/blamer-0.1.13.tgz", - "integrity": "sha1-YfIV8jYb0FTmJYwMXgCG8EB05nA=", - "dev": true, - "requires": { - "bluebird": "~2.3.x", - "xml2js": "~0.4.x" - }, - "dependencies": { - "bluebird": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz", - "integrity": "sha1-Fbt47TKr8nsJBkDA+F5LkfYVyLY=", - "dev": true - } - } - }, "bluebird": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", @@ -2641,32 +2623,6 @@ "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true }, - "cli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", - "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", - "dev": true, - "requires": { - "exit": "0.1.2", - "glob": "^7.1.1" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, "cli-color": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz", @@ -2689,23 +2645,6 @@ "restore-cursor": "^2.0.0" } }, - "cli-table": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", - "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=", - "dev": true, - "requires": { - "colors": "1.0.3" - }, - "dependencies": { - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - } - } - }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", @@ -2763,12 +2702,6 @@ } } }, - "codemirror": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.37.0.tgz", - "integrity": "sha512-dQaayDJCLU4UJcwg2RM44oFrs0dMNndTp6qxQJF6XI71l1xN3RB4IqiKES0b0rccbARbrD/UBB4t8DNknfaOTw==", - "dev": true - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -2797,12 +2730,6 @@ "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", "dev": true }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3752,12 +3679,6 @@ "array-find-index": "^1.0.1" } }, - "cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", - "dev": true - }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -4602,12 +4523,6 @@ "safe-buffer": "^5.1.1" } }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true - }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -4803,12 +4718,6 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, - "eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", - "dev": true - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -6042,6 +5951,7 @@ "version": "6.0.4", "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "optional": true, "requires": { "inflight": "^1.0.4", "inherits": "2", @@ -7093,25 +7003,6 @@ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, - "jscpd": { - "version": "0.6.22", - "resolved": "https://registry.npmjs.org/jscpd/-/jscpd-0.6.22.tgz", - "integrity": "sha512-uKns3puDqR4czhI+VRoWFwFiKdZcHSpDokCBtWLNT7OsptEAdom7Su7Lv9RFqXtd3CoVhj89nikTypyLHvoecg==", - "dev": true, - "requires": { - "blamer": "^0.1.9", - "bluebird": "^3.0.5", - "cli": ">=0.10.x", - "cli-table": "^0.3.1", - "codemirror": "5.37.0", - "colors": "^1.1.2", - "glob": ">=5.0.x", - "js-yaml": ">=3.4.x", - "minimatch": "^3.0.4", - "underscore": ">=1.8.x", - "winston": "2.4.0" - } - }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -9863,12 +9754,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, "schema-utils": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz", @@ -10399,12 +10284,6 @@ "figgy-pudding": "^3.5.1" } }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "dev": true - }, "standard-version": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.1.0.tgz", @@ -11933,34 +11812,6 @@ "string-width": "^1.0.2 || 2" } }, - "winston": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz", - "integrity": "sha1-gIBQuT1SZh7Z+2wms/DIJnCLCu4=", - "dev": true, - "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "dependencies": { - "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=", - "dev": true - }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - } - } - }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -12095,22 +11946,6 @@ "typedarray-to-buffer": "^3.1.5" } }, - "xml2js": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", - "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", - "dev": true, - "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - } - }, - "xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", - "dev": true - }, "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 34e5b234d..6e7b8ca68 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,13 @@ "clean": "rimraf docs dist dist-web coverage .nyc_output logs pacts jscpd.json", "coverage": "nyc report --reporter=lcov", "dist": "tsc && webpack --config ./config/webpack.web.config.js && copyfiles package.json ./dist", - "jscpd": "jscpd -p src -r json -o jscpd.json", "lint": "tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'", "lint:fix": "npm run lint -- --fix", "format:base": "prettier \"{src,test,examples}/**/*.{ts,js}\"", "format:fix": "npm run format:base -- --write", "format:check": "npm run format:base -- --check", "postdist": "npm test", - "predist": "npm run clean && npm run format:check && npm run lint && npm run jscpd", + "predist": "npm run clean && npm run format:check && npm run lint", "release": "standard-version", "test": "nyc --check-coverage --reporter=html --reporter=text-summary mocha", "test:examples": "npm run test:e2e-examples && npm run test:jest-examples && npm run test:mocha-examples && npm run test:ava-examples && npm run test:ts-examples && npm run test:message-examples && npm run test:serverless-examples && npm run test:graphql-examples", @@ -165,7 +164,6 @@ "imports-loader": "~0.7.1", "istanbul": "~0.4.5", "jasmine-core": "~2.9.1", - "jscpd": "0.6.22", "json-loader": "~0.5.7", "loader-utils": "^1.1.0", "mocha": "^7.2.0", From 8f1ace589eec9a84fcaef5e85cc05959c26d3ab1 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Thu, 28 Jan 2021 15:35:20 +1100 Subject: [PATCH 09/10] chore(scripts): Remove boilerplate scripts for examples as they are unused --- package.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/package.json b/package.json index 6e7b8ca68..da4c8fe4a 100644 --- a/package.json +++ b/package.json @@ -17,18 +17,6 @@ "predist": "npm run clean && npm run format:check && npm run lint", "release": "standard-version", "test": "nyc --check-coverage --reporter=html --reporter=text-summary mocha", - "test:examples": "npm run test:e2e-examples && npm run test:jest-examples && npm run test:mocha-examples && npm run test:ava-examples && npm run test:ts-examples && npm run test:message-examples && npm run test:serverless-examples && npm run test:graphql-examples", - "test:e2e-examples": "cd examples/e2e && npm it", - "test:ava-examples": "cd examples/ava && npm it", - "test:jest-examples": "cd examples/jest && npm it", - "test:mocha-examples": "cd examples/mocha && npm it", - "test:ts-examples": "cd examples/typescript && npm it", - "test:message-examples": "cd examples/messages && npm it", - "test:serverless-examples": "cd examples/serverless && npm it", - "test:graphql-examples": "cd examples/graphql && npm it", - "test:karma": "npm run test:karma:jasmine && npm run test:karma:mocha", - "test:karma:jasmine": "cd examples/karma && npm i && npm run test:jasmine", - "test:karma:mocha": "cd examples/karma && npm i && npm run test:mocha", "webpack": "webpack --config ./config/webpack.web.config.js" }, "repository": { From 97c5b05038e7e5daa381d7fffaf67d1dfe080e9e Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Thu, 28 Jan 2021 15:35:56 +1100 Subject: [PATCH 10/10] chore(scripts): Update clean command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da4c8fe4a..78019c5cc 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "./pact.js", "types": "./pact.d.ts", "scripts": { - "clean": "rimraf docs dist dist-web coverage .nyc_output logs pacts jscpd.json", + "clean": "rimraf docs dist dist-web coverage .nyc_output logs pacts", "coverage": "nyc report --reporter=lcov", "dist": "tsc && webpack --config ./config/webpack.web.config.js && copyfiles package.json ./dist", "lint": "tslint -c tslint.json '{src,test,examples}/**/*.ts' -e '**/node_modules/**/*.ts'",