@putdotio/taizn 1.1.0 → 1.2.0

package/README.md

@@ -85,6 +85,7 @@ TAIZN_SDB=~/tizen-studio/tools/sdb
   },
   "widget": {
     "configXml": "platforms/tizen/config.xml",
+    "excludeFiles": ["js/main.js.map", "css/main.css.map"],
     "indexHtml": "platforms/tizen/index.html",
     "injectWebapis": true,
     "rewriteAssetUrls": false,
@@ -99,15 +100,24 @@ TAIZN_SDB=~/tizen-studio/tools/sdb
       "production": {
         "applicationId": "Example.app",
         "bundleName": "example",
+        "excludeFiles": ["js/main.js.LICENSE.txt"],
         "icon": "platforms/tizen/icon.png",
+        "indexHtml": "platforms/tizen/hosted.html",
+        "injectWebapis": true,
         "name": "Example",
-        "packageId": "Example"
+        "packageId": "Example",
+        "rewriteAssetUrls": false
       }
     }
   }
 }
 ```
 
+Variant `indexHtml`, `injectWebapis`, and `rewriteAssetUrls` values override
+the top-level `widget` values. Variant `excludeFiles` values are added to
+top-level `widget.excludeFiles`. Use them when development packages should
+bundle local app assets but production packages should load hosted asset URLs.
+
 ## Docs
 
 - [Contributing](./CONTRIBUTING.md)

package/dist/taizn.mjs

@@ -102,9 +102,13 @@ const readSecret = (prompt) => new Promise((resolve) => {
 const TizenVariantSchema = Schema.Struct({
 	applicationId: Schema.NonEmptyString,
 	bundleName: Schema.NonEmptyString,
+	excludeFiles: Schema.optional(Schema.Array(Schema.NonEmptyString)),
 	icon: Schema.NonEmptyString,
+	indexHtml: Schema.optional(Schema.NonEmptyString),
+	injectWebapis: Schema.optional(Schema.Boolean),
 	name: Schema.NonEmptyString,
-	packageId: Schema.NonEmptyString
+	packageId: Schema.NonEmptyString,
+	rewriteAssetUrls: Schema.optional(Schema.Boolean)
 });
 const TizenConfigSchema = Schema.Struct({
 	build: Schema.Struct({
@@ -118,6 +122,7 @@ const TizenConfigSchema = Schema.Struct({
 	}),
 	widget: Schema.Struct({
 		configXml: Schema.NonEmptyString,
+		excludeFiles: Schema.optional(Schema.Array(Schema.NonEmptyString)),
 		indexHtml: Schema.NonEmptyString,
 		injectWebapis: Schema.optional(Schema.Boolean),
 		rewriteAssetUrls: Schema.optional(Schema.Boolean),
@@ -229,8 +234,9 @@ const createProfile = async ({ config, env }) => {
 };
 const packageWidget = ({ config, env }) => {
 	const [command, ...args] = config.build.command;
+	const variant = getVariant(config, env.variant);
 	run(command, args, { env: appBuildEnv() });
-	stageWidget(config, getVariant(config, env.variant));
+	stageWidget(config, variant);
 	run(tizenCli(env.tizenCli), [
 		"package",
 		"-t",
@@ -243,7 +249,7 @@ const packageWidget = ({ config, env }) => {
 		stageDir
 	]);
 	const built = findBuiltWidget();
-	const installable = join(outputDir, `${getVariant(config, env.variant).bundleName}.wgt`);
+	const installable = join(outputDir, `${variant.bundleName}.wgt`);
 	if (built !== installable) copyFileSync(built, installable);
 	console.log(`Packaged ${installable}`);
 	return installable;
@@ -261,6 +267,12 @@ const installWidget = (context) => {
 	run(tizenCli(context.env.tizenCli), installArgs);
 };
 const getVariant = (config, variant) => config.widget.variants[variant];
+const getWidgetStageOptions = (config, variant) => ({
+	excludeFiles: [...config.widget.excludeFiles ?? [], ...variant.excludeFiles ?? []],
+	indexHtml: variant.indexHtml ?? config.widget.indexHtml,
+	injectWebapis: variant.injectWebapis ?? config.widget.injectWebapis,
+	rewriteAssetUrls: variant.rewriteAssetUrls ?? config.widget.rewriteAssetUrls
+});
 const getCertificates = (config) => {
 	const certificatesDir = appPath(config.signing.certificateDir);
 	return {
@@ -275,12 +287,12 @@ const rewriteConfigForWidget = (variant) => {
 	widgetConfig = widgetConfig.replace(/<name>[^<]*<\/name>/, `<name>${escapeXml(variant.name)}</name>`);
 	writeFileSync(targetPath, widgetConfig);
 };
-const rewriteIndexForWidget = (config) => {
+const rewriteIndexForWidget = (options) => {
 	const targetPath = join(stageDir, "index.html");
 	const webapisScript = "<script src=\"$WEBAPIS/webapis/webapis.js\"><\/script>";
-	let html = readFileSync(appPath(config.widget.indexHtml), "utf8");
-	if (config.widget.rewriteAssetUrls) html = html.replaceAll("href=\"/", "href=\"./").replaceAll("src=\"/", "src=\"./");
-	if (config.widget.injectWebapis !== false && !html.includes("$WEBAPIS/webapis/webapis.js")) html = html.replace("</head>", `${webapisScript}</head>`);
+	let html = readFileSync(appPath(options.indexHtml), "utf8");
+	if (options.rewriteAssetUrls) html = html.replaceAll("href=\"/", "href=\"./").replaceAll("src=\"/", "src=\"./");
+	if (options.injectWebapis !== false && !html.includes("$WEBAPIS/webapis/webapis.js")) html = html.replace("</head>", `${webapisScript}</head>`);
 	writeFileSync(targetPath, html);
 };
 const assertBuildOutput = (config) => {
@@ -289,8 +301,15 @@ const assertBuildOutput = (config) => {
 	for (const requiredFile of config.build.requiredFiles || []) requireFile(join(sourceDir, requiredFile), `Tizen build output ${requiredFile}`);
 	return sourceDir;
 };
+const removeExcludedStageFiles = (excludeFiles) => {
+	for (const file of excludeFiles) rmSync(join(stageDir, file), {
+		force: true,
+		recursive: true
+	});
+};
 const stageWidget = (config, variant) => {
 	const sourceDir = assertBuildOutput(config);
+	const options = getWidgetStageOptions(config, variant);
 	rmSync(stageDir, {
 		force: true,
 		recursive: true
@@ -304,8 +323,9 @@ const stageWidget = (config, variant) => {
 	cpSync(sourceDir, stageDir, { recursive: true });
 	copyFileSync(appPath(config.widget.configXml), join(stageDir, "config.xml"));
 	copyFileSync(requireFile(appPath(variant.icon), "Tizen widget icon"), join(stageDir, "icon.png"));
+	removeExcludedStageFiles(options.excludeFiles);
 	rewriteConfigForWidget(variant);
-	rewriteIndexForWidget(config);
+	rewriteIndexForWidget(options);
 };
 const findBuiltWidget = () => {
 	const built = execFileSync("find", [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putdotio/taizn",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A tiny CLI companion for interacting with Tizen ecosystem.",
   "keywords": [
     "cli",