Prevent ignored files in out dir (#10831)

Co-Authored-By: Brian Ng <bng412@gmail.com>
babel · Dec 18, 2019 · 2b35909 · 2b35909
1 parent b3c7df9
commit 2b35909
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 4 deletions.
diff --git a/packages/babel-cli/src/babel/dir.js b/packages/babel-cli/src/babel/dir.js
@@ -84,8 +84,16 @@ export default async function({
 
   async function handleFile(src: string, base: string): Promise<boolean> {
     const written = await write(src, base);
-
-    if (!written && cliOptions.copyFiles) {
+    const relative = path.relative(base, src);
+    const isCompilableExtension = util.isCompilableExtension(
+      relative,
+      cliOptions.extensions,
+    );
+    if (
+      !written &&
+      ((!isCompilableExtension && cliOptions.copyFiles) ||
+        cliOptions.includeIgnored)
+    ) {
       const filename = path.relative(base, src);
       const dest = getDest(filename, base);
       outputFileSync(dest, fs.readFileSync(src));

diff --git a/packages/babel-cli/src/babel/options.js b/packages/babel-cli/src/babel/options.js
@@ -161,6 +161,11 @@ commander.option(
   "Delete the out directory before compilation.",
 );
 
+commander.option(
+  "--include-ignored",
+  "Include ignored files when copying non-compilable files.",
+);
+
 commander.version(pkg.version + " (@babel/core " + version + ")");
 commander.usage("[options] <files ...>");
 // register an empty action handler so that commander.js can throw on
@@ -304,6 +309,7 @@ export default function parseArgv(args: Array<string>): CmdOptions | null {
       quiet: opts.quiet,
       deleteDirOnStart: opts.deleteDirOnStart,
       sourceMapTarget: opts.sourceMapTarget,
+      includeIgnored: opts.includeIgnored,
     },
   };
 }

diff --git a/...test/fixtures/babel/--copy-files --include-dotfiles with ignore/out-files/lib/foo/.foo.js b/...test/fixtures/babel/--copy-files --include-dotfiles with ignore/out-files/lib/foo/.foo.js
diff --git a/...-cli/test/fixtures/babel/--copy-files with ignore with includeIgnored/in-files/src/.foorc b/...-cli/test/fixtures/babel/--copy-files with ignore with includeIgnored/in-files/src/.foorc
diff --git a/...tures/babel/--copy-files with ignore with includeIgnored/in-files/src/README.md b/...tures/babel/--copy-files with ignore with includeIgnored/in-files/src/README.md
diff --git a/...iles with ignore/out-files/lib/foo/bar.js → ...th includeIgnored/in-files/src/foo/bar.js b/...iles with ignore/out-files/lib/foo/bar.js → ...th includeIgnored/in-files/src/foo/bar.js
diff --git a/...dotfiles with only/out-files/lib/index.js → ...with includeIgnored/in-files/src/index.js b/...dotfiles with only/out-files/lib/index.js → ...with includeIgnored/in-files/src/index.js
diff --git a/...s/babel-cli/test/fixtures/babel/--copy-files with ignore with includeIgnored/options.json b/...s/babel-cli/test/fixtures/babel/--copy-files with ignore with includeIgnored/options.json
@@ -0,0 +1,12 @@
+{
+  "args": [
+    "src",
+    "--out-dir",
+    "lib",
+    "--copy-files",
+    "--ignore",
+    "src/foo/*",
+    "--include-ignored",
+    "--verbose"
+  ]
+}
diff --git a/...ures/babel/--copy-files with ignore with includeIgnored/out-files/lib/README.md b/...ures/babel/--copy-files with ignore with includeIgnored/out-files/lib/README.md
diff --git a/...es with ignore/out-files/lib/foo/index.js → ...h includeIgnored/out-files/lib/foo/bar.js b/...es with ignore/out-files/lib/foo/index.js → ...h includeIgnored/out-files/lib/foo/bar.js
diff --git a/...i/test/fixtures/babel/--copy-files with ignore with includeIgnored/out-files/lib/index.js b/...i/test/fixtures/babel/--copy-files with ignore with includeIgnored/out-files/lib/index.js
@@ -0,0 +1,3 @@
+"use strict";
+
+index;
diff --git a/...ges/babel-cli/test/fixtures/babel/--copy-files with ignore with includeIgnored/stdout.txt b/...ges/babel-cli/test/fixtures/babel/--copy-files with ignore with includeIgnored/stdout.txt
@@ -0,0 +1,2 @@
+src/index.js -> lib/index.js
+Successfully compiled 1 file with Babel.
diff --git a/packages/babel-cli/test/fixtures/babel/--copy-files with only/out-files/lib/index.js b/packages/babel-cli/test/fixtures/babel/--copy-files with only/out-files/lib/index.js