@akanjs/devkit 0.9.12 → 0.9.14

package/cjs/src/executors.js

@@ -862,17 +862,28 @@ class AppExecutor extends SysExecutor {
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    if (import_fs.default.existsSync(projectPublicLibPath))
-      await import_promises.default.rm(projectPublicLibPath, { recursive: true });
+    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
+    await Promise.all([
+      import_fs.default.existsSync(projectPublicLibPath) && import_promises.default.rm(projectPublicLibPath, { recursive: true }),
+      import_fs.default.existsSync(projectAssetsLibPath) && import_promises.default.rm(projectAssetsLibPath, { recursive: true })
+    ]);
     const targetDeps = libDeps.filter((dep) => import_fs.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
-    await Promise.all(targetDeps.map((dep) => import_promises.default.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })));
-    await Promise.all(
-      targetDeps.map(
-        (dep) => import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+    await Promise.all([
+      ...targetDeps.map((dep) => import_promises.default.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
+      ...targetDeps.map((dep) => import_promises.default.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
+    ]);
+    await Promise.all([
+      ...targetDeps.map(
+        (dep) => import_fs.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`) && import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+          recursive: true
+        })
+      ),
+      ...targetDeps.map(
+        (dep) => import_fs.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`) && import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
           recursive: true
         })
       )
-    );
+    ]);
   }
 }
 class LibExecutor extends SysExecutor {

package/cjs/src/extractDeps.js

@@ -74,7 +74,7 @@ const extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) =
     ...pacakgeJson.dependencies ?? {},
     ...pacakgeJson.devDependencies ?? {}
   };
-  const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
+  const requireRegex = /(?:require\s*\(|import\s*(?:[\w\s{},*]*\s+from\s*)?|import\s*\()\s*['"`]([^'"`]+)['"`]/g;
   for (const { text } of filepaths.filter(({ path }) => path.endsWith(".js"))) {
     let requireMatch;
     while ((requireMatch = requireRegex.exec(text)) !== null) {

package/esm/src/executors.js

@@ -826,17 +826,28 @@ class AppExecutor extends SysExecutor {
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    if (fs.existsSync(projectPublicLibPath))
-      await fsPromise.rm(projectPublicLibPath, { recursive: true });
+    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
+    await Promise.all([
+      fs.existsSync(projectPublicLibPath) && fsPromise.rm(projectPublicLibPath, { recursive: true }),
+      fs.existsSync(projectAssetsLibPath) && fsPromise.rm(projectAssetsLibPath, { recursive: true })
+    ]);
     const targetDeps = libDeps.filter((dep) => fs.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
-    await Promise.all(targetDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })));
-    await Promise.all(
-      targetDeps.map(
-        (dep) => fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+    await Promise.all([
+      ...targetDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
+      ...targetDeps.map((dep) => fsPromise.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
+    ]);
+    await Promise.all([
+      ...targetDeps.map(
+        (dep) => fs.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`) && fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+          recursive: true
+        })
+      ),
+      ...targetDeps.map(
+        (dep) => fs.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`) && fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
           recursive: true
         })
       )
-    );
+    ]);
   }
 }
 class LibExecutor extends SysExecutor {

package/esm/src/extractDeps.js

@@ -52,7 +52,7 @@ const extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) =
     ...pacakgeJson.dependencies ?? {},
     ...pacakgeJson.devDependencies ?? {}
   };
-  const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
+  const requireRegex = /(?:require\s*\(|import\s*(?:[\w\s{},*]*\s+from\s*)?|import\s*\()\s*['"`]([^'"`]+)['"`]/g;
   for (const { text } of filepaths.filter(({ path }) => path.endsWith(".js"))) {
     let requireMatch;
     while ((requireMatch = requireRegex.exec(text)) !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/executors.d.ts

@@ -104,7 +104,7 @@ export declare class WorkspaceExecutor extends Executor {
     getBaseDevEnv(): {
         repoName: string;
         serveDomain: string;
-        env: "debug" | "testing" | "local" | "develop" | "main";
+        env: "testing" | "local" | "debug" | "develop" | "main";
         name?: string | undefined;
     };
     scan(): Promise<WorkspaceScanResult>;
@@ -217,7 +217,7 @@ export declare class AppExecutor extends SysExecutor {
     emoji: string;
     constructor({ workspace, name }: AppExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): AppExecutor;
-    getEnv(): "debug" | "testing" | "local" | "develop" | "main";
+    getEnv(): "testing" | "local" | "debug" | "develop" | "main";
     getConfig(command?: string): Promise<AppConfigResult>;
     syncAssets(libDeps: string[]): Promise<void>;
 }