@joystick.js/cli-canary 0.0.0-canary.1007 → 0.0.0-canary.1009

package/dist/lib/build/get_files_to_build.js

@@ -1 +1 @@
-import s from"fs";import f from"../get_files_in_path.js";import i from"./master_ignore_list.js";const{stat:p}=s.promises,c=async(l=[],r=null)=>{const n=await f("./",[]),o=r&&r==="start"?i?.filter(e=>!e.includes("settings")):i;return n.filter(e=>!l.some(t=>e.includes(t))).filter(e=>!o.some(t=>e.includes(t))).filter(e=>!s.lstatSync(e).isDirectory())};var g=c;export{g as default};
+import s from"fs";import l from"../get_files_in_path.js";import c from"./master_ignore_list.js";const{stat:p}=s.promises,u=async(i=[],o=[])=>{const n=await l("./",[]),_=c;return n.filter(e=>!o.some(t=>e.includes(t))).filter(e=>!i.some(t=>e.includes(t))).filter(e=>!_.some(t=>e.includes(t))).filter(e=>!s.lstatSync(e).isDirectory())};var x=u;export{x as default};

package/dist/lib/build/index.js

@@ -1,3 +1,3 @@
-import y from"chalk";import w from"child_process";import s from"fs";import{dirname as $}from"path";import x from"util";import z from"./build_files.js";import v from"./get_files_to_build.js";import k from"./get_file_operation.js";import F from"./get_path_platform.js";import j from"./get_tar_ignore_list.js";import B from"../load_settings.js";import P from"../loader.js";import f from"../path_exists.js";import S from"../../lib/encrypt_buffer.js";const{mkdir:A,copyFile:D,readFile:L,writeFile:q,readdir:C}=s.promises,l=x.promisify(w.exec),E=(r=[])=>r?.map(a=>({path:a,operation:k(a),platform:F(a)})),G=async(r={})=>{const a=new P,e=r?.type||"tar",p=r?.environment||"production";a.print(`Building app to ${e} for ${p}...`);const n=await B(p),u=n?.config?.build?.excluded_paths||n?.config?.build?.excludedPaths,m=await v(u),o=e==="tar"?".build/.tar":".build",_=E(m);await f(".build")&&await l("rm -rf .build");const c=[];for(let t=0;t<n?.config?.build?.copy_paths?.length;t+=1){const i=n?.config?.build?.copy_paths[t];if(s.existsSync(i))if(s.lstatSync(i).isDirectory()){const h=await C(i,{recursive:!0});c.push(...(h||[])?.map(g=>`${i}/${g}`))}else c.push(i)}console.log(c);const d=[..._?.filter(t=>t?.operation==="copy_file"),...(c||[])?.map(t=>({path:t}))],b=_?.filter(t=>t?.operation==="build_file");for(let t=0;t<d?.length;t+=1){const i=d[t];await A($(`${o}/${i?.path}`),{recursive:!0}),await D(i?.path,`${o}/${i?.path}`)}if(await z({files:b,environment:p,output_path:o}).catch(t=>{console.warn(t)}),e==="tar"){const t=j(n?.config?.build?.excludedPaths);await l(`cd ${o} && tar --exclude=${t} -czf ../build.tar.gz .`),await l(`rm -rf ${o}`)}if(e==="tar"&&r?.encrypt_build){const t=o?.replace("/.tar","/build.tar.gz"),i=S(await L(t),r?.encryption_key);await q(".build/build.encrypted.tar.gz",i)}r?.silence_confirmation||console.log(y.greenBright(`
+import y from"chalk";import w from"child_process";import s from"fs";import{dirname as $}from"path";import x from"util";import z from"./build_files.js";import v from"./get_files_to_build.js";import k from"./get_file_operation.js";import F from"./get_path_platform.js";import j from"./get_tar_ignore_list.js";import B from"../load_settings.js";import P from"../loader.js";import f from"../path_exists.js";import S from"../../lib/encrypt_buffer.js";const{mkdir:A,copyFile:D,readFile:L,writeFile:q,readdir:C}=s.promises,l=x.promisify(w.exec),E=(r=[])=>r?.map(a=>({path:a,operation:k(a),platform:F(a)})),G=async(r={})=>{const a=new P,e=r?.type||"tar",p=r?.environment||"production";a.print(`Building app to ${e} for ${p}...`);const n=await B(p),u=n?.config?.build?.excluded_paths||n?.config?.build?.excludedPaths,c=[];for(let t=0;t<n?.config?.build?.copy_paths?.length;t+=1){const i=n?.config?.build?.copy_paths[t];if(s.existsSync(i))if(s.lstatSync(i).isDirectory()){const h=await C(i,{recursive:!0});c.push(...(h||[])?.map(g=>`${i}/${g}`))}else c.push(i)}const m=await v(u,c),o=e==="tar"?".build/.tar":".build",_=E(m);await f(".build")&&await l("rm -rf .build");const d=[..._?.filter(t=>t?.operation==="copy_file"),...(c||[])?.map(t=>({path:t}))],b=_?.filter(t=>t?.operation==="build_file");for(let t=0;t<d?.length;t+=1){const i=d[t];await A($(`${o}/${i?.path}`),{recursive:!0}),await D(i?.path,`${o}/${i?.path}`)}if(await z({files:b,environment:p,output_path:o}).catch(t=>{console.warn(t)}),e==="tar"){const t=j(n?.config?.build?.excludedPaths);await l(`cd ${o} && tar --exclude=${t} -czf ../build.tar.gz .`),await l(`rm -rf ${o}`)}if(e==="tar"&&r?.encrypt_build){const t=o?.replace("/.tar","/build.tar.gz"),i=S(await L(t),r?.encryption_key);await q(".build/build.encrypted.tar.gz",i)}r?.silence_confirmation||console.log(y.greenBright(`
 \u2714 App built as ${e} to ${e==="tar"?o?.replace("/.tar","/build.tar.gz"):o}!
 `)),await f(".build/component_id_cache.json")&&await l("rm -rf .build/component_id_cache.json")};var Z=G;export{Z as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1007",
-  "canary_version": "0.0.0-canary.1006",
+  "version": "0.0.0-canary.1009",
+  "canary_version": "0.0.0-canary.1008",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/lib/build/get_files_to_build.js

@@ -4,14 +4,19 @@ import master_ignore_list from "./master_ignore_list.js";
 
 const { stat } = fs.promises;
 
-const get_files_to_build = async (excluded_paths = [], context = null) => {
+const get_files_to_build = async (excluded_paths = [], custom_copy_paths = []) => {
   const files = await get_files_in_path("./", []);
 
-  const master_ignore_list_filtered_for_context = context && context === 'start' ? master_ignore_list?.filter((file_to_ignore) => {
-    return !file_to_ignore.includes('settings');
-  }) : master_ignore_list;
+  const master_ignore_list_filtered_for_context = master_ignore_list;
 
   const filtered_files = files
+    .filter((path) => {
+      const is_custom_copy_path = custom_copy_paths.some((custom_copy_path) => {
+        return path.includes(custom_copy_path);
+      });
+
+      return !is_custom_copy_path;
+    })
     .filter((path) => {
       const is_excluded = excluded_paths.some((excluded_path) => {
         return path.includes(excluded_path);

package/src/lib/build/index.js

@@ -36,14 +36,6 @@ const build = async (options = {}) => {
 
   const settings = await load_settings(environment);
   const excluded_paths = settings?.config?.build?.excluded_paths || settings?.config?.build?.excludedPaths;
-  const files_for_build = await get_files_to_build(excluded_paths);
-  const output_path = build_type === 'tar' ? '.build/.tar' : '.build';
-  const files_to_build_with_operation_and_platform = get_files_to_build_with_operation_and_platform(files_for_build);
-
-  if (await path_exists('.build')) {
-    await exec(`rm -rf .build`);
-  }
-
   const custom_copy_paths = [];
 
   for (let i = 0; i < settings?.config?.build?.copy_paths?.length; i += 1) {
@@ -65,7 +57,13 @@ const build = async (options = {}) => {
     }
   }
 
-  console.log(custom_copy_paths);
+  const files_for_build = await get_files_to_build(excluded_paths, custom_copy_paths);
+  const output_path = build_type === 'tar' ? '.build/.tar' : '.build';
+  const files_to_build_with_operation_and_platform = get_files_to_build_with_operation_and_platform(files_for_build);
+
+  if (await path_exists('.build')) {
+    await exec(`rm -rf .build`);
+  }
 
   const files_to_copy = [
     ...files_to_build_with_operation_and_platform?.filter((file) => {