From 9af7d718b907d71e985eae8c73fdba182205a624 Mon Sep 17 00:00:00 2001
From: yuto ichinose <yuto.0526.sano@gmail.com>
Date: Wed, 26 Apr 2023 13:17:40 +0900
Subject: [PATCH] =?UTF-8?q?#29=20.gitignore=E3=82=92=E5=85=83=E3=81=ABnode?=
 =?UTF-8?q?=5Fmodule=E3=81=AA=E3=81=A9=E3=81=AE=E5=A4=A7=E8=A6=8F=E6=A8=A1?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=82=92=E7=84=A1=E8=A6=96?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=AB=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/utils.ts | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index f8d8537..5dbcc14 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -5,7 +5,6 @@ import { existsSync, readFileSync, readdirSync, statSync } from "fs";
 import { join } from "path";
 import * as micromatch from "micromatch";
 
-
 /**
  * 共通のモジュール
  */
@@ -98,11 +97,11 @@ export const readDirRecursive = (
     const folderName = path.split("/").pop() as string;
     const children = readdirSync(path)
       .filter((child) => !/(^|\/)\.[^\/\.]/g.test(child)) // ドットで始まるフォルダを除外する
-      .filter((child) => !/(^|\/)node_modules($|\/)/g.test(child)) // node_modulesフォルダを除外する
-      .filter((child) => !/(^|\/)mysql($|\/)/g.test(child)) // mysqlフォルダを除外する
-      .filter((child) => ignores.indexOf(child) === -1) // ignoresに記載されたファイルを除外する
+      // .filter((child) => !/(^|\/)node_modules($|\/)/g.test(child)) // node_modulesフォルダを除外する
+      // .filter((child) => !/(^|\/)mysql($|\/)/g.test(child)) // mysqlフォルダを除外する
+      .filter((child) => ignores.indexOf(join("/", child)) === -1) // ignoresに記載されたフォルダを除外する
       .map((child) => readDirRecursive(join(path, child), ignores));
-    
+
     return { label: folderName, nodes: children };
   } else {
     return { label: path.split("/").pop() as string };
@@ -111,17 +110,17 @@ export const readDirRecursive = (
 
 /**
  * gitignoreの内容取得
- * @param workspacePath 
- * @returns 
+ * @param workspacePath
+ * @returns
  */
 export const getGitignorePatterns = (workspacePath: string): string[] => {
-  const gitignorePath = join(workspacePath, '.gitignore');
+  const gitignorePath = join(workspacePath, ".gitignore");
 
   if (existsSync(gitignorePath)) {
-    const gitignoreContent = readFileSync(gitignorePath, 'utf8');
+    const gitignoreContent = readFileSync(gitignorePath, "utf8");
     return gitignoreContent
-      .split('\n')
-      .filter((line) => !line.startsWith('#') && line.trim() !== '');
+      .split("\n")
+      .filter((line) => !line.startsWith("#") && line.trim() !== "");
   } else {
     return [];
   }
@@ -196,7 +195,6 @@ export const selectFile = async (): Promise<string | undefined> => {
 };
 
 /**
- *
  * Windows用の正規表現パターン
  */
 const winPattern =