From 24cfd199e251e5105708190fc720fb094f5d902e Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 21 May 2020 22:55:58 -0700 Subject: [PATCH 1/4] Remove unnecessary npxes --- build.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.toml b/build.toml index cdb4ed1..1d092d4 100755 --- a/build.toml +++ b/build.toml @@ -13,16 +13,16 @@ deps = [ [test_default] deps = ["dist/index.cjs"] -exec = "npx ava" +exec = "ava" [test_contract_production] -exec = "NODE_ENV=production npx ava test/contract_test.js" +exec = "NODE_ENV=production ava test/contract_test.js" [test_contract_development] -exec = "NODE_ENV=development npx ava test/contract_test.js" +exec = "NODE_ENV=development ava test/contract_test.js" [test_contract_no_env] -exec = "NODE_ENV= npx ava test/contract_test.js" +exec = "NODE_ENV= ava test/contract_test.js" ["perf.csv"] deps = ["src/node/perf.js", "src/common/optimizer.js"] @@ -39,7 +39,7 @@ deps = [ "src/common/contract.js", "src/common/random.js", ] -exec = "npx rollup --config $<" +exec = "rollup --config $<" [publish] deps = ["dist/index.cjs"] From 1a2a2bc3bf8de5cf4915bd24edc903e036902146 Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 21 May 2020 23:05:18 -0700 Subject: [PATCH 2/4] Update to latest bajel. --- build.toml | 9 ++++++--- package-lock.json | 18 ++++++++++++++---- package.json | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/build.toml b/build.toml index 1d092d4..4facae2 100755 --- a/build.toml +++ b/build.toml @@ -1,4 +1,7 @@ #!node_modules/bajel/cli.js test + +TEST="ava test/contract_test.js" + [serve] deps = ["dist/index.cjs"] exec = "python -m SimpleHTTPServer 8888" @@ -16,13 +19,13 @@ deps = ["dist/index.cjs"] exec = "ava" [test_contract_production] -exec = "NODE_ENV=production ava test/contract_test.js" +exec = "NODE_ENV=production $(TEST)" [test_contract_development] -exec = "NODE_ENV=development ava test/contract_test.js" +exec = "NODE_ENV=development $(TEST)" [test_contract_no_env] -exec = "NODE_ENV= ava test/contract_test.js" +exec = "NODE_ENV= $(TEST)" ["perf.csv"] deps = ["src/node/perf.js", "src/common/optimizer.js"] diff --git a/package-lock.json b/package-lock.json index 7af6d77..8c51d10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "maxichrome", - "version": "0.2.1", + "version": "0.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -406,9 +406,9 @@ } }, "bajel": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/bajel/-/bajel-0.3.7.tgz", - "integrity": "sha512-tn+4YrgE7NdMYjbywpqfN2Jejn9zgoknHe8TzuV8aUteyobeTe13Zl5peaVvyHZPH0MWIgeHVDVGG9qvgLPTzg==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/bajel/-/bajel-0.6.0.tgz", + "integrity": "sha512-au4QZowdw1m/RXkb7+QzceWQLuEIZvIbcSh+l31ULV5bWmL3b6Gm7Ao6NKArQnFw36jdDFv2iI9InOzqnT+v4g==", "dev": true, "requires": { "getopts": "^2.2.5", @@ -416,6 +416,7 @@ "js-yaml": "^3.13.1", "remove": "^0.1.5", "semver": "^7.2.1", + "tmp": "^0.2.1", "toml": "^3.0.0" }, "dependencies": { @@ -2475,6 +2476,15 @@ "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", "dev": true }, + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "requires": { + "rimraf": "^3.0.0" + } + }, "to-readable-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", diff --git a/package.json b/package.json index 8213d9a..ccee9a3 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@rollup/plugin-node-resolve": "^7.1.3", "ava": "^3.7.1", - "bajel": "^0.3.7", + "bajel": "^0.6.0", "rollup": "^2.7.3", "rollup-plugin-terser": "^5.3.0" } From f29ad4b5517944cec07c07921e32ef55f02aed9d Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Mon, 12 Oct 2020 22:08:19 -0700 Subject: [PATCH 3/4] uppercase BUILD --- BUILD.yaml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ build.toml | 52 ---------------------------------------------------- 2 files changed, 54 insertions(+), 52 deletions(-) create mode 100755 BUILD.yaml delete mode 100755 build.toml diff --git a/BUILD.yaml b/BUILD.yaml new file mode 100755 index 0000000..2326a06 --- /dev/null +++ b/BUILD.yaml @@ -0,0 +1,54 @@ +#!node_modules/bajel/cli.js test + +TEST: ava test/contract_test.js + +serve: + deps: + - dist/index.cjs + exec: python -m SimpleHTTPServer 8888 + +test: + deps: + - test_default + - test_contract_production + - test_contract_development + - test_contract_no_env + +test_default: + deps: + - dist/index.cjs + exec: ava + +test_contract_production: + exec: NODE_ENV=production $(TEST) + +test_contract_development: + exec: NODE_ENV=development $(TEST) + +test_contract_no_env: + exec: NODE_ENV= $(TEST) + +"perf.csv": + deps: + - src/node/perf.js", "src/common/optimizer.js"] + exec: node $< + +"dist/index.cjs": + deps: + - rollup.config.js + - src/node/index.js + - src/common/index.js + - src/common/random.js + - src/common/color.js + - src/common/optimizer.js + - src/common/contract.js + - src/common/random.js + exec: rollup --config $< + +publish: + deps: + - dist/index.cjs + exec: npm publish + +clean: + exec: rm -rf dist diff --git a/build.toml b/build.toml deleted file mode 100755 index 4facae2..0000000 --- a/build.toml +++ /dev/null @@ -1,52 +0,0 @@ -#!node_modules/bajel/cli.js test - -TEST="ava test/contract_test.js" - -[serve] -deps = ["dist/index.cjs"] -exec = "python -m SimpleHTTPServer 8888" - -[test] -deps = [ - "test_default", - "test_contract_production", - "test_contract_development", - "test_contract_no_env", -] - -[test_default] -deps = ["dist/index.cjs"] -exec = "ava" - -[test_contract_production] -exec = "NODE_ENV=production $(TEST)" - -[test_contract_development] -exec = "NODE_ENV=development $(TEST)" - -[test_contract_no_env] -exec = "NODE_ENV= $(TEST)" - -["perf.csv"] -deps = ["src/node/perf.js", "src/common/optimizer.js"] -exec = "node $<" - -["dist/index.cjs"] -deps = [ - "rollup.config.js", - "src/node/index.js", - "src/common/index.js", - "src/common/random.js", - "src/common/color.js", - "src/common/optimizer.js", - "src/common/contract.js", - "src/common/random.js", -] -exec = "rollup --config $<" - -[publish] -deps = ["dist/index.cjs"] -exec = "npm publish" - -[clean] -exec = "rm -rf dist" From 5e61184d7b09e6ff0ccc48b697f0bd8e5bab2f81 Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Mon, 12 Oct 2020 22:10:57 -0700 Subject: [PATCH 4/4] Upgrate bakel to v1.0.0 --- package-lock.json | 19 +++++++++++++------ package.json | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c51d10..fbd8814 100644 --- a/package-lock.json +++ b/package-lock.json @@ -406,14 +406,15 @@ } }, "bajel": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/bajel/-/bajel-0.6.0.tgz", - "integrity": "sha512-au4QZowdw1m/RXkb7+QzceWQLuEIZvIbcSh+l31ULV5bWmL3b6Gm7Ao6NKArQnFw36jdDFv2iI9InOzqnT+v4g==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bajel/-/bajel-1.0.0.tgz", + "integrity": "sha512-vkJ5wKI3uYh3pN0WkGpf2q6ehYCNL+MZ/NlZvRD3akJ7EonSOg75B1FF0rfxRZBvJXAVswYUgccECqY7vdk0sg==", "dev": true, "requires": { "getopts": "^2.2.5", "install": "^0.13.0", "js-yaml": "^3.13.1", + "passprint": "0.0.1", "remove": "^0.1.5", "semver": "^7.2.1", "tmp": "^0.2.1", @@ -1500,9 +1501,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "lodash.clonedeep": { @@ -1884,6 +1885,12 @@ "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", "dev": true }, + "passprint": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/passprint/-/passprint-0.0.1.tgz", + "integrity": "sha512-+scrdoqoamGYMfXXGMxf410CgeEUI3EOaDe/QtVwZrd1FeaUz3XH8vs9UH6vZX/W/TGH/6/K/wTJqN+QsF1gcQ==", + "dev": true + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", diff --git a/package.json b/package.json index ccee9a3..73499b8 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@rollup/plugin-node-resolve": "^7.1.3", "ava": "^3.7.1", - "bajel": "^0.6.0", + "bajel": "^1.0.0", "rollup": "^2.7.3", "rollup-plugin-terser": "^5.3.0" }