orc-scripts 1.2.0-dev.1 → 1.3.0-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orc-scripts",
-  "version": "1.2.0-dev.1",
+  "version": "1.3.0-dev.2",
   "description": "Scripts toolbox for Orckestra",
   "type": "commonjs",
   "bin": {

package/src/config/babel-whitelist.json

@@ -1,8 +1 @@
-[
-	"orc-[a-z]+/src",
-	"ansi-regex",
-	"strip-ansi",
-	"connected-react-router",
-	"react-intl",
-	"@formatjs"
-]
+["orc-[a-z]+/src", "ansi-regex", "strip-ansi", "connected-react-router", "react-intl", "@formatjs"]

package/src/config/babelrc.js

@@ -4,11 +4,7 @@ const isTest = process.env.NODE_ENV === "test" || process.env.BABEL_ENV === "tes
 const isWebpack = parseEnv("BUILD_WEBPACK", false);
 const isReact = parseEnv("BUILD_REACT", isWebpack);
 
-const envTargets = isTest
-	? "current node, last 2 chrome version"
-	: isReact
-	? "defaults, IE 11"
-	: "node 10";
+const envTargets = isTest ? "current node, last 2 chrome version" : isReact ? "defaults, IE 11" : "node 10";
 
 console.log("Using targets", envTargets);
 
@@ -35,10 +31,7 @@ module.exports = {
 		isTest || isReact ? require.resolve("@loadable/babel-plugin") : null,
 		isTest || isReact ? require.resolve("@babel/plugin-transform-react-jsx") : null,
 		isTest || isReact
-			? [
-					require.resolve("babel-plugin-react-intl-auto"),
-					{ removePrefix: "src", filebase: true },
-			  ]
+			? [require.resolve("babel-plugin-react-intl-auto"), { removePrefix: "src", filebase: true }]
 			: null,
 		require.resolve("@babel/plugin-transform-computed-properties"),
 	].filter(x => !!x),

package/src/config/eslintrc.js

@@ -5,7 +5,7 @@ const eslintrc = {
 	},
 	globals: {
 		SUPPORTED_LOCALES: false,
-		OVERTURE_MODULE: false,
+		OVERTURE_APPLICATION: false,
 		DEPENDENCIES: false,
 		BUILD_ID: false,
 		BUILD_NUMBER: false,

package/src/config/jest.config.js

@@ -23,7 +23,7 @@ const jestConfig = {
 	globals: {
 		BUILD_ID: "000",
 		BUILD_NUMBER: "000",
-		OVERTURE_MODULE: "aModule",
+		OVERTURE_APPLICATION: "anApplication",
 		DEPENDENCIES: { someDependant: "1.1.1" },
 	},
 	setupFiles: [require.resolve("whatwg-fetch")],

package/src/config/unexpected-form.js

@@ -83,26 +83,18 @@ module.exports = {
 			return expect(subject, "to satisfy", pattern);
 		});
 
-		expect.addAssertion("<object> to be a form combination field", function (
-			expect,
-			subject,
-		) {
+		expect.addAssertion("<object> to be a form combination field", function (expect, subject) {
 			if (subject.type !== "Combination") {
 				expect.fail();
 			}
 			const pattern = {
 				type: "Combination",
-				fields: expect
-					.it("to be an array")
-					.and("to have items satisfying", "to be a form field"),
+				fields: expect.it("to be an array").and("to have items satisfying", "to be a form field"),
 			};
 			if (subject.hasOwnProperty("proportions")) {
 				pattern.proportions = expect
 					.it("to be an array")
-					.and(
-						"to have items satisfying",
-						expect.it("to be a string").or("to be a number"),
-					)
+					.and("to have items satisfying", expect.it("to be a string").or("to be a number"))
 					.and("to be shorter than or same length as", subject.fields);
 			}
 			return expect(subject, "to satisfy", pattern);
@@ -148,19 +140,13 @@ module.exports = {
 					.it("to be an array")
 					.and(
 						"to have items satisfying",
-						expect
-							.it("to be a form field")
-							.or("to be a form combination field")
-							.or("to be a form list"),
+						expect.it("to be a form field").or("to be a form combination field").or("to be a form list"),
 					),
 			};
 			expect(subject, "to satisfy", pattern);
 		});
 
-		expect.addAssertion("<array-like> to be a form definition", function (
-			expect,
-			subject,
-		) {
+		expect.addAssertion("<array-like> to be a form definition", function (expect, subject) {
 			return expect(
 				subject,
 				"to have items satisfying",

package/src/config/unexpected-form.test.js

@@ -3,18 +3,11 @@ expect.output.preferredWidth = 80;
 describe("<array-like> to be a form definition", () => {
 	describe("<object> to be a form field", () => {
 		it("passes with a name only", () =>
-			expect(
-				() => expect({ name: "field1", type: "CheckboxInput" }, "to be a form field"),
-				"not to throw",
-			));
+			expect(() => expect({ name: "field1", type: "CheckboxInput" }, "to be a form field"), "not to throw"));
 
 		it("passes with a name and string label", () =>
 			expect(
-				() =>
-					expect(
-						{ name: "field1", type: "CheckboxInput", label: "A field" },
-						"to be a form field",
-					),
+				() => expect({ name: "field1", type: "CheckboxInput", label: "A field" }, "to be a form field"),
 				"not to throw",
 			));
 
@@ -56,8 +49,7 @@ describe("<array-like> to be a form definition", () => {
 			expect(
 				() => expect({ name: "field1", type: "InvalidType" }, "to be a form field"),
 				"to throw",
-				"expected { name: 'field1', type: 'InvalidType' } to be a form field\n" +
-					"  Invalid type 'InvalidType'",
+				"expected { name: 'field1', type: 'InvalidType' } to be a form field\n  Invalid type 'InvalidType'",
 			));
 
 		describe("type 'Button'", () => {
@@ -625,10 +617,7 @@ describe("<array-like> to be a form definition", () => {
 
 		describe("type 'LineLabel'", () => {
 			it("passes with a name only", () =>
-				expect(
-					() => expect({ name: "field1", type: "LineLabel" }, "to be a form field"),
-					"not to throw",
-				));
+				expect(() => expect({ name: "field1", type: "LineLabel" }, "to be a form field"), "not to throw"));
 		});
 
 		describe("type 'NumberInput'", () => {
@@ -763,10 +752,7 @@ describe("<array-like> to be a form definition", () => {
 
 		describe("type 'ReadOnly'", () => {
 			it("passes with a name only", () =>
-				expect(
-					() => expect({ name: "field1", type: "ReadOnly" }, "to be a form field"),
-					"not to throw",
-				));
+				expect(() => expect({ name: "field1", type: "ReadOnly" }, "to be a form field"), "not to throw"));
 		});
 
 		describe("type 'Selector'", () => {
@@ -1670,8 +1656,7 @@ describe("<array-like> to be a form definition", () => {
 
 		it("fails if field array empty", () =>
 			expect(
-				() =>
-					expect({ type: "Combination", fields: [] }, "to be a form combination field"),
+				() => expect({ type: "Combination", fields: [] }, "to be a form combination field"),
 				"to throw",
 				"expected { type: 'Combination', fields: [] } to be a form combination field\n" +
 					"\n" +

package/src/config/unexpected-module.js

@@ -5,9 +5,7 @@ module.exports = {
 			.addAssertion("<object> to be a component", function (expect, subject) {
 				return expect(
 					subject,
-					expect
-						.it("to have property", "$$typeof", Symbol.for("react.memo"))
-						.or("to be a function"),
+					expect.it("to have property", "$$typeof", Symbol.for("react.memo")).or("to be a function"),
 				);
 			})
 			.addAssertion("<any> to be a component", function (expect) {
@@ -34,10 +32,7 @@ module.exports = {
 					pattern.label = expect.it("to be an object").and("to be a label");
 					pattern.dataPath = expect
 						.it("to be an array")
-						.and(
-							"to have items satisfying",
-							expect.it("to be a string").or("to be a number"),
-						);
+						.and("to have items satisfying", expect.it("to be a string").or("to be a number"));
 					if (subject.dataIdParam) {
 						pattern.dataIdParam = expect.it("to match", /^\w+$/);
 					}
@@ -57,10 +52,7 @@ module.exports = {
 						label: expect.it("to be an object").and("to be a label"),
 						dataPath: expect
 							.it("to be an array")
-							.and(
-								"to have items satisfying",
-								expect.it("to be a string").or("to be a number"),
-							),
+							.and("to have items satisfying", expect.it("to be a string").or("to be a number")),
 					};
 					if (subject.dataIdParam) {
 						pattern.dataIdParam = expect.it("to match", /^\w+$/);

package/src/config/unexpected-module.test.js

@@ -16,22 +16,13 @@ describe("Module structure plugin for Unexpected", () => {
 
 		it("accepts class components", () => expect(ClassComponent, "to be a component"));
 
-		it("accepts memoized components", () =>
-			expect(React.memo(FakeComponent), "to be a component"));
+		it("accepts memoized components", () => expect(React.memo(FakeComponent), "to be a component"));
 
 		it("fails with undefined", () =>
-			expect(
-				() => expect(undefined, "to be a component"),
-				"to throw",
-				"expected undefined to be a component",
-			));
+			expect(() => expect(undefined, "to be a component"), "to throw", "expected undefined to be a component"));
 
 		it("fails with null", () =>
-			expect(
-				() => expect(null, "to be a component"),
-				"to throw",
-				"expected null to be a component",
-			));
+			expect(() => expect(null, "to be a component"), "to throw", "expected null to be a component"));
 
 		it("fails with string", () =>
 			expect(
@@ -43,10 +34,7 @@ describe("Module structure plugin for Unexpected", () => {
 
 	describe("<object> to be a subpage", () => {
 		it("handles a minimal subpage", () =>
-			expect(
-				() => expect({ component: FakeComponent }, "to be a subpage"),
-				"not to throw",
-			));
+			expect(() => expect({ component: FakeComponent }, "to be a subpage"), "not to throw"));
 
 		it("does not accept subpages with pages", () =>
 			expect(
@@ -132,21 +120,13 @@ describe("Module structure plugin for Unexpected", () => {
 
 		it("handles a subpage with toolbar", () =>
 			expect(
-				() =>
-					expect(
-						{ component: FakeComponent, toolStateSelector: fakeSelector },
-						"to be a subpage",
-					),
+				() => expect({ component: FakeComponent, toolStateSelector: fakeSelector }, "to be a subpage"),
 				"not to throw",
 			));
 
 		it("throws if toolbar state selector not function", () =>
 			expect(
-				() =>
-					expect(
-						{ component: FakeComponent, toolStateSelector: "fakeSelector" },
-						"to be a subpage",
-					),
+				() => expect({ component: FakeComponent, toolStateSelector: "fakeSelector" }, "to be a subpage"),
 				"to throw",
 				"expected { component: () => null, toolStateSelector: 'fakeSelector' }\n" +
 					"to be a subpage\n" +
@@ -159,21 +139,13 @@ describe("Module structure plugin for Unexpected", () => {
 
 		it("handles a subpage with toolbar functions", () =>
 			expect(
-				() =>
-					expect(
-						{ component: FakeComponent, toolFuncSelector: fakeSelector },
-						"to be a subpage",
-					),
+				() => expect({ component: FakeComponent, toolFuncSelector: fakeSelector }, "to be a subpage"),
 				"not to throw",
 			));
 
 		it("throws if toolbar function selector not function", () =>
 			expect(
-				() =>
-					expect(
-						{ component: FakeComponent, toolFuncSelector: "fakeSelector" },
-						"to be a subpage",
-					),
+				() => expect({ component: FakeComponent, toolFuncSelector: "fakeSelector" }, "to be a subpage"),
 				"to throw",
 				"expected { component: () => null, toolFuncSelector: 'fakeSelector' }\n" +
 					"to be a subpage\n" +
@@ -230,11 +202,7 @@ describe("Module structure plugin for Unexpected", () => {
 			));
 
 		it("fails when subject is an empty object", () =>
-			expect(
-				() => expect({}, "to be a subpage list"),
-				"to throw",
-				"expected {} to be a subpage list",
-			));
+			expect(() => expect({}, "to be a subpage list"), "to throw", "expected {} to be a subpage list"));
 
 		it("fails when subject contains something not a subpage", () =>
 			expect(
@@ -269,10 +237,7 @@ describe("Module structure plugin for Unexpected", () => {
 
 	describe("<object> to be a segment", () => {
 		it("passes with a string label and component", () =>
-			expect(
-				() => expect({ component: FakeComponent, label: "A label" }, "to be a segment"),
-				"not to throw",
-			));
+			expect(() => expect({ component: FakeComponent, label: "A label" }, "to be a segment"), "not to throw"));
 
 		it("passes with an object label, component and subpage list", () =>
 			expect(
@@ -672,11 +637,7 @@ describe("Module structure plugin for Unexpected", () => {
 			));
 
 		it("fails when subject is an empty object", () =>
-			expect(
-				() => expect({}, "to be a segment list"),
-				"to throw",
-				"expected {} to be a segment list",
-			));
+			expect(() => expect({}, "to be a segment list"), "to throw", "expected {} to be a segment list"));
 
 		it("fails when subject contains something not a segment", () =>
 			expect(
@@ -717,10 +678,7 @@ describe("Module structure plugin for Unexpected", () => {
 
 	describe("<object> to be a page", () => {
 		it("passes with a string label and component", () =>
-			expect(
-				() => expect({ component: FakeComponent, label: "A label" }, "to be a page"),
-				"not to throw",
-			));
+			expect(() => expect({ component: FakeComponent, label: "A label" }, "to be a page"), "not to throw"));
 
 		it("passes with a label, component and subpage list", () =>
 			expect(
@@ -1035,11 +993,7 @@ describe("Module structure plugin for Unexpected", () => {
 			));
 
 		it("fails when subject is an empty object", () =>
-			expect(
-				() => expect({}, "to be a page list"),
-				"to throw",
-				"expected {} to be a page list",
-			));
+			expect(() => expect({}, "to be a page list"), "to throw", "expected {} to be a page list"));
 
 		it("fails when subject contains something not a page", () =>
 			expect(

package/src/config/unexpected-styles.js

@@ -20,12 +20,9 @@ module.exports = {
 			return declarations;
 		};
 
-		expect.addAssertion(
-			"<string> as a selector to have style rules <assertion?>",
-			function (expect, selector) {
-				return expect.shift(getStyleDeclarations(selector));
-			},
-		);
+		expect.addAssertion("<string> as a selector to have style rules <assertion?>", function (expect, selector) {
+			return expect.shift(getStyleDeclarations(selector));
+		});
 
 		expect.addAssertion(
 			"<DOMElement> to have style rules satisfying <assertion>",

package/src/config/unexpected.js

@@ -29,31 +29,17 @@ global.expect = unexpected
 			}
 		},
 	)
-	.addAssertion("<function> to be a reducer with initial state <object>", function (
-		expect,
-		subject,
-		initialState,
-	) {
+	.addAssertion("<function> to be a reducer with initial state <object>", function (expect, subject, initialState) {
 		expect.errorMode = "nested";
 		const oldState = Immutable.Map();
-		return expect(
-			subject,
-			"when called with",
-			[oldState, { type: "NOT_A_USEFUL_ACTION" }],
-			"to be",
-			oldState,
-		).and(
+		return expect(subject, "when called with", [oldState, { type: "NOT_A_USEFUL_ACTION" }], "to be", oldState).and(
 			"when called with",
 			[undefined, { type: "@@INIT" }],
 			"to equal",
 			Immutable.fromJS(initialState),
 		);
 	})
-	.addAssertion("<function> as a React component <assertion?>", function (
-		expect,
-		Subject,
-		assertions,
-	) {
+	.addAssertion("<function> as a React component <assertion?>", function (expect, Subject, assertions) {
 		expect.errorMode = "bubble";
 		try {
 			const element = React.createElement(Subject);
@@ -81,10 +67,7 @@ global.expect = unexpected
 				fieldName: expect
 					.it("to be a string")
 					.or("to be an array")
-					.and(
-						"to have items satisfying",
-						expect.it("to be a string").or("to be a number"),
-					),
+					.and("to have items satisfying", expect.it("to be a string").or("to be a number")),
 			};
 			if (subject.hasOwnProperty("width")) {
 				pattern.width = expect.it("to be a string").and("not to match", /[;:{[]/);

package/src/config/unexpected.test.js

@@ -8,8 +8,7 @@ const TestComp = () => <div />;
 // "<function> as a React component <assertion?>"
 
 describe("<any> to be a label", () => {
-	it("passes if subject is a string", () =>
-		expect(() => expect("Label", "to be a label"), "not to throw"));
+	it("passes if subject is a string", () => expect(() => expect("Label", "to be a label"), "not to throw"));
 
 	it("passes if subject is a react-intl descriptor", () =>
 		expect(
@@ -52,10 +51,7 @@ describe("<any> to be a label", () => {
 
 describe("<object> to be a column definition", () => {
 	it("passes with a select column", () =>
-		expect(
-			() => expect({ type: "select" }, "to be a column definition"),
-			"not to throw",
-		));
+		expect(() => expect({ type: "select" }, "to be a column definition"), "not to throw"));
 
 	it("fails if select column has other parameters", () =>
 		expect(

package/src/config/webpack.config.js

@@ -79,13 +79,13 @@ const config = {
 };
 
 const locales = packageJson.locales;
-const overtureModule = packageJson.overtureModule;
+const overtureApplication = packageJson.overtureApplication;
 const dependencies = packageJson.dependencies;
 
 config.plugins.push(
 	new webpack.DefinePlugin({
 		SUPPORTED_LOCALES: JSON.stringify(locales && locales.length ? locales : null),
-		OVERTURE_MODULE: JSON.stringify((overtureModule && overtureModule.name) || ""),
+		OVERTURE_APPLICATION: JSON.stringify((overtureApplication && overtureApplication.name) || ""),
 		DEPENDENCIES: JSON.stringify(dependencies || {}),
 	}),
 );

package/src/scripts/build/cli.js

@@ -12,12 +12,8 @@ const outDir = useSpecifiedOutDir ? [] : ["--out-dir", "dist"];
 const copyFiles = args.includes("--no-copy-files") ? [] : ["--copy-files"];
 
 const useBuiltinConfig =
-	!args.includes("--presets") &&
-	(!hasFile(".babelrc") || !hasFile("babel.config.js")) &&
-	!hasPkgProp("babel");
-const config = useBuiltinConfig
-	? ["--presets", here("../../config/babel-preset.js")]
-	: [];
+	!args.includes("--presets") && (!hasFile(".babelrc") || !hasFile("babel.config.js")) && !hasPkgProp("babel");
+const config = useBuiltinConfig ? ["--presets", here("../../config/babel-preset.js")] : [];
 
 const verbosity = args.includes("--quiet") ? [] : ["--verbose"];
 
@@ -29,9 +25,7 @@ const filteredArgs = args.filter(arg => !babelUnacceptedArgs.includes(arg));
 
 const child = spawn(
 	resolveBin("@babel/cli", { executable: "babel" }),
-	[...outDir, ...copyFiles, ...ignore, ...verbosity, ...config, "src"].concat(
-		filteredArgs,
-	),
+	[...outDir, ...copyFiles, ...ignore, ...verbosity, ...config, "src"].concat(filteredArgs),
 	{ stdio: "inherit" },
 );
 

package/src/scripts/prep.js

@@ -21,11 +21,7 @@ async function prep() {
 	if (process.env.NODE_ENV === "production") process.exit(0);
 	try {
 		const files = await readdir(staticDir);
-		await Promise.all(
-			files.map(file =>
-				copyFile(path.resolve(staticDir, file), path.resolve(distDir, file)),
-			),
-		);
+		await Promise.all(files.map(file => copyFile(path.resolve(staticDir, file), path.resolve(distDir, file))));
 	} catch (_) {}
 }
 

package/src/utils.js

@@ -4,8 +4,7 @@ const arrify = require("arrify");
 const which = require("which");
 const readPkgUp = require("read-pkg-up");
 
-const hasOwn = (obj, key) =>
-	obj.hasOwnProperty(key) && obj[key] !== null && obj[key] !== undefined;
+const hasOwn = (obj, key) => obj.hasOwnProperty(key) && obj[key] !== null && obj[key] !== undefined;
 
 const hasPath = (obj, keys) => {
 	const [key, ...tail] = keys;
@@ -34,8 +33,7 @@ const hasFile = (...p) => fs.existsSync(fromRoot(...p));
 
 const hasPkgProp = props => arrify(props).some(prop => has(pkg, prop));
 
-const hasPkgSubProp = pkgProp => props =>
-	hasPkgProp(arrify(props).map(p => `${pkgProp}.${p}`));
+const hasPkgSubProp = pkgProp => props => hasPkgProp(arrify(props).map(p => `${pkgProp}.${p}`));
 
 const hasPeerDep = hasPkgSubProp("peerDependencies");
 const hasDep = hasPkgSubProp("dependencies");
@@ -56,11 +54,7 @@ function parseEnv(name, def) {
 }
 
 function envIsSet(name) {
-	return (
-		process.env.hasOwnProperty(name) &&
-		process.env[name] &&
-		process.env[name] !== "undefined"
-	);
+	return process.env.hasOwnProperty(name) && process.env[name] && process.env[name] !== "undefined";
 }
 
 function resolveBin(modName, { executable = modName, cwd = process.cwd() } = {}) {

package/src/utils.test.js

@@ -1,11 +1,4 @@
-const {
-	fromRoot,
-	hasFile,
-	hasPkgProp,
-	ifAnyDep,
-	parseEnv,
-	resolveBin,
-} = require("./utils");
+const { fromRoot, hasFile, hasPkgProp, ifAnyDep, parseEnv, resolveBin } = require("./utils");
 const path = require("path");
 
 describe("utils", () => {
@@ -36,22 +29,10 @@ describe("utils", () => {
 		it("exists", () => expect(hasPkgProp, "to be a function"));
 
 		it("returns true if local package.json has at least one of the given first-level keys", () =>
-			expect(
-				hasPkgProp,
-				"when called with",
-				[["no", "lint-staged", "dont-have"]],
-				"to equal",
-				true,
-			));
+			expect(hasPkgProp, "when called with", [["no", "lint-staged", "dont-have"]], "to equal", true));
 
 		it("returns false if local package.json does not have any of the given first-level keys", () =>
-			expect(
-				hasPkgProp,
-				"when called with",
-				[["no-such-key", "nuh-uh", "nope-not-here"]],
-				"to equal",
-				false,
-			));
+			expect(hasPkgProp, "when called with", [["no-such-key", "nuh-uh", "nope-not-here"]], "to equal", false));
 	});
 
 	describe("ifAnyDep", () => {
@@ -83,13 +64,7 @@ describe("utils", () => {
 			expect(parseEnv, "when called with", ["BABEL_ENV", "wrong"], "to equal", "test"));
 
 		it("returns default value if it does not exist", () =>
-			expect(
-				parseEnv,
-				"when called with",
-				["NO_SUCH_variable", "wrong"],
-				"to equal",
-				"wrong",
-			));
+			expect(parseEnv, "when called with", ["NO_SUCH_variable", "wrong"], "to equal", "wrong"));
 	});
 
 	describe("resolveBin", () => {