Fix honoured gitignore (codesandbox#3003)

* add ignore

* ignore files

Author: yeion7

packages/app/package.json

@@ -129,6 +129,7 @@
     "http-browserify": "^1.7.0",
     "https-browserify": "^1.0.0",
     "humps": "CompuIves/humps",
+    "ignore": "^5.1.4",
     "immer": "^3.2.0",
     "immutability-helper": "^2.6.6",
     "instantsearch.css": "^7.1.0",

packages/app/src/app/overmind/effects/git/export-to-github.ts

@@ -9,7 +9,8 @@ export default async function deploy(sandbox: Sandbox) {
     sandbox,
     sandbox.modules,
     sandbox.directories,
-    false
+    false,
+    true
   );
 
   if (!zipFile) {

packages/app/src/app/overmind/effects/zip/create-zip/create-react-app-typescript/index.ts

@@ -45,7 +45,6 @@ export default function createZip(
     await Promise.all(
       modules
         .filter(x => x.directoryShortid == null)
-        .filter(x => x.title !== 'yarn.lock' && x.title !== 'package-lock.json')
         .map(x => {
           if (x.title === 'package.json' && x.directoryShortid == null) {
             return createFile(alterPackageJSON(x), src);

packages/app/src/app/overmind/effects/zip/create-zip/full/index.ts

@@ -11,7 +11,6 @@ export default async function createZip(
   await Promise.all(
     modules
       .filter(x => x.directoryShortid == null)
-      .filter(x => x.title !== 'yarn.lock' && x.title !== 'package-lock.json')
       .map(x => createFile(x, zip, downloadBlobs))
   );
 

packages/app/src/app/overmind/effects/zip/create-zip/index.ts

@@ -1,5 +1,6 @@
 import JSZip from 'jszip';
 import { saveAs } from 'file-saver';
+import ignore from 'ignore';
 import { Sandbox, Module, Directory } from '@codesandbox/common/lib/types';
 import {
   react,
@@ -8,7 +9,10 @@ import {
   preact,
   svelte,
 } from '@codesandbox/common/lib/templates/index';
-import { resolveModule } from '@codesandbox/common/lib/sandbox/modules';
+import {
+  resolveModule,
+  getModulePath,
+} from '@codesandbox/common/lib/sandbox/modules';
 
 export const BLOB_ID = 'blob-url://';
 
@@ -192,17 +196,42 @@ export async function createDirectoryWithFiles(
   );
 }
 
+const DEFAULT_IGNORE = ['yarn.lock', 'package-lock.json'];
+
 export async function createZip(
   sandbox: Sandbox,
   modules: Array<Module>,
   directories: Array<Directory>,
-  downloadBlobs: boolean = true
+  downloadBlobs: boolean = true,
+  useGitIgnore: boolean = false
 ) {
   const zip = new JSZip();
+  const ignorer = ignore().add(DEFAULT_IGNORE);
+
+  if (useGitIgnore) {
+    const gitIgnore = modules.find(
+      module =>
+        module.title === '.gitignore' && module.directoryShortid === null
+    );
+
+    ignorer.add(gitIgnore ? gitIgnore.code : '');
+  }
+
+  const filteredModules = modules.filter(module => {
+    // Relative path
+    const path = getModulePath(modules, directories, module.id).substring(1);
+    return !ignorer.ignores(path);
+  });
 
   const fullPromise = () =>
     import(/* webpackChunkName: 'full-zip' */ './full').then(generator =>
-      generator.default(zip, sandbox, modules, directories, downloadBlobs)
+      generator.default(
+        zip,
+        sandbox,
+        filteredModules,
+        directories,
+        downloadBlobs
+      )
     );
 
   let promise = null;
@@ -218,11 +247,15 @@ export async function createZip(
   } else if (sandbox.template === react.name) {
     promise = import(
       /* webpackChunkName: 'create-react-app-zip' */ './create-react-app'
-    ).then(generator => generator.default(zip, sandbox, modules, directories));
+    ).then(generator =>
+      generator.default(zip, sandbox, filteredModules, directories)
+    );
   } else if (sandbox.template === reactTs.name) {
     promise = import(
       /* webpackChunkName: 'create-react-app-typescript-zip' */ './create-react-app-typescript'
-    ).then(generator => generator.default(zip, sandbox, modules, directories));
+    ).then(generator =>
+      generator.default(zip, sandbox, filteredModules, directories)
+    );
   } else if (sandbox.template === vue.name) {
     try {
       const packageJSONModule = sandbox.modules.find(
@@ -238,30 +271,38 @@ export async function createZip(
         promise = fullPromise();
       } else {
         promise = import(/* webpackChunkName: 'vue-zip' */ './vue-cli').then(
-          generator => generator.default(zip, sandbox, modules, directories)
+          generator =>
+            generator.default(zip, sandbox, filteredModules, directories)
         );
       }
     } catch (e) {
       promise = fullPromise();
     }
   } else if (sandbox.template === preact.name) {
     promise = import(/* webpackChunkName: 'preact-zip' */ './preact-cli').then(
-      generator => generator.default(zip, sandbox, modules, directories)
+      generator => generator.default(zip, sandbox, filteredModules, directories)
     );
   } else if (sandbox.template === svelte.name) {
     promise = import(/* webpackChunkName: 'svelte-zip' */ './svelte').then(
-      generator => generator.default(zip, sandbox, modules, directories)
+      generator => generator.default(zip, sandbox, filteredModules, directories)
     );
   } else {
     // If no specific zip generator is found we will default to the full generator
     promise = import(/* webpackChunkName: 'full-zip' */ './full').then(
       generator =>
-        generator.default(zip, sandbox, modules, directories, downloadBlobs)
+        generator.default(
+          zip,
+          sandbox,
+          filteredModules,
+          directories,
+          downloadBlobs
+        )
     );
   }
 
   if (promise) {
     await promise;
+
     const file = await zip.generateAsync({ type: 'blob' });
 
     return file;

packages/app/src/app/overmind/effects/zip/create-zip/vue-cli/index.ts

@@ -13,7 +13,6 @@ export default function createZip(
     await Promise.all(
       modules
         .filter(x => x.directoryShortid == null)
-        .filter(x => x.title !== 'yarn.lock' && x.title !== 'package-lock.json')
         .map(x => createFile(x, src))
     );
 

yarn.lock

@@ -8206,7 +8206,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 console-feed@CompuIves/console-feed#build2, console-feed@^2.8.5:
-  version "2.8.8"
+  version "2.8.9"
   resolved "https://codeload.github.com/CompuIves/console-feed/tar.gz/42f10eb3063f0f26ee9745c4c9e4542cb5591f46"
   dependencies:
     emotion "^9.1.1"
@@ -14011,7 +14011,7 @@ ignore@^4.0.3, ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1:
+ignore@^5.1.1, ignore@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==