fix: fix command acceptance test dummy app addon install

Author: davewasmer

lib/project.ts

@@ -3,7 +3,7 @@ import * as rimraf from 'rimraf';
 import printSlowNodes from 'broccoli-slow-trees';
 import { sync as copyDereferenceSync } from 'copy-dereference';
 import * as createDebug from 'debug';
-import { sync as glob } from 'glob';
+import { sync as glob } from 'globby';
 import * as NestedError from 'nested-error-stacks';
 import Builder, { BuilderOptions } from './builders/base';
 import Watcher from './watcher';

lib/test/command-acceptance.ts

@@ -3,7 +3,7 @@ import * as assert from 'assert';
 import * as path from 'path';
 import { spawn, ChildProcess } from 'child_process';
 import * as tmp from 'tmp';
-import { sync as glob } from 'glob';
+import { sync as glob } from 'globby';
 import * as dedent from 'dedent-js';
 import * as createDebug from 'debug';
 import symlinkAll from '../utils/symlink-all';
@@ -126,17 +126,15 @@ export default class CommandAcceptanceTest {
     fs.mkdirSync(tmpNodeModules);
     // We symlink all the node_modules from our addon into the throwaway's node_modules
     symlinkAll(path.join(this.projectRoot, 'node_modules'), tmpNodeModules);
-    // Then we copy the addon itself over as a dependency of the dummy app
-    // (just the publishable parts)
-    [
-      'package.json',
-      '*.md',
-      'dist/**/*',
-      'denali-build.js'
-    ].forEach((pattern) => {
-      glob(pattern, { cwd: this.projectRoot }).forEach((file) => {
-        fs.copySync(path.join(this.projectRoot, file), path.join(tmpNodeModules, projectPkg.name, file));
-      });
+    // Then we copy the addon itself over as a dependency of the dummy app.
+    // We want to treat it like a git dep in case the command tries to build
+    // the dummy app, which might try to build this addon. So copy over
+    // everything that isn't gitignored, but also copy dist in case we can
+    // use it.
+    glob('**/*', { cwd: this.projectRoot, gitignore: true })
+    .concat(glob('dist/**/*', { cwd: this.projectRoot }))
+    .forEach((file: string) => {
+      fs.copySync(path.join(this.projectRoot, file), path.join(tmpNodeModules, projectPkg.name, file));
     });
   }
 

lib/trees/unit-tests.ts

@@ -4,7 +4,7 @@ import * as Plugin from 'broccoli-plugin';
 import { Tree } from 'broccoli';
 import * as SourceMapConcatenator from 'fast-sourcemap-concat';
 import { all } from 'bluebird';
-import * as glob from 'glob';
+import { sync as glob } from 'globby';
 import { template } from 'lodash';
 
 const unitTestOpen = template(fs.readFileSync(path.join(__dirname, '..', 'templates', 'unit-test-open.ejs'), 'utf-8'));
@@ -28,7 +28,7 @@ export default class UnitTestFilter extends (<new(...args: any[]) => Tree>Plugin
   }
 
   async build() {
-    let files = glob.sync('**/*.js', { nodir: true, cwd: this.inputPaths[0] });
+    let files = glob('**/*.js', { cwd: this.inputPaths[0] });
     let fileConcats = files.map(this.wrapFile.bind(this));
     return await all(fileConcats);
   }

lib/typings.d.ts

@@ -31,10 +31,7 @@ declare module "symlink-or-copy";
 declare module "broccoli-stew";
 declare module "broccoli-file-creator";
 declare module "broccoli-merge-trees";
-declare module "yarn/lib/constants" {
-  export const GLOBAL_MODULE_DIRECTORY: string;
-  export const LINK_REGISTRY_DIRECTORY: string;
-}
+declare module "globby";
 declare module "command-exists";
 declare module "broccoli/lib" {
   class Watcher {

package.json

@@ -52,7 +52,6 @@
     "@types/dotenv": "^4.0.2",
     "@types/flat": "^0.0.28",
     "@types/fs-extra": "^5.0.0",
-    "@types/glob": "^5.0.35",
     "@types/lodash": "^4.14.100",
     "@types/mkdirp": "^0.5.2",
     "@types/node": "^9.4.0",
@@ -80,7 +79,7 @@
     "fast-sourcemap-concat": "^1.2.3",
     "find-plugins": "^1.1.6",
     "fs-extra": "^5.0.0",
-    "glob": "^7.1.2",
+    "globby": "^7.1.1",
     "is-directory": "^0.3.1",
     "lodash": "^4.17.5",
     "mkdirp": "^0.5.1",

yarn.lock

@@ -1732,6 +1732,13 @@ diff@^3.2.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
 
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
@@ -2326,6 +2333,17 @@ globby@^6.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -2514,6 +2532,10 @@ ignore-by-default@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
+ignore@^3.3.5:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"