Merge pull request #323 from ef4/dep-upgrades

ef4 · web-flow · commit bce99027232d · 2020-12-02T21:14:54.000-05:00
updating some deps
diff --git a/packages/ember-auto-import/package.json b/packages/ember-auto-import/package.json
@@ -31,19 +31,20 @@
     "@babel/preset-env": "^7.10.2",
     "@babel/traverse": "^7.1.6",
     "@babel/types": "^7.1.6",
-    "@embroider/core": "^0.23.0",
+    "@embroider/core": "^0.33.0",
     "babel-core": "^6.26.3",
     "babel-loader": "^8.0.6",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-template": "^6.26.0",
     "babylon": "^6.18.0",
     "broccoli-debug": "^0.6.4",
-    "broccoli-plugin": "^1.3.0",
+    "broccoli-node-api": "^1.7.0",
+    "broccoli-plugin": "^4.0.0",
     "debug": "^3.1.0",
     "ember-cli-babel": "^7.0.0",
     "enhanced-resolve": "^4.0.0",
     "fs-extra": "^6.0.1",
-    "fs-tree-diff": "^1.0.0",
+    "fs-tree-diff": "^2.0.0",
     "handlebars": "^4.3.1",
     "js-string-escape": "^1.0.1",
     "lodash": "^4.17.19",
@@ -76,7 +77,7 @@
     "babel-eslint": "^8.2.5",
     "broccoli": "^3.2.0",
     "broccoli-asset-rev": "^2.4.5",
-    "broccoli-source": "^1.1.0",
+    "broccoli-source": "^3.0.0",
     "ember-ajax": "^3.0.0",
     "ember-cli": "^3.6.0",
     "ember-cli-dependency-checker": "^2.0.0",
diff --git a/packages/ember-auto-import/ts/analyzer.ts b/packages/ember-auto-import/ts/analyzer.ts
@@ -1,4 +1,5 @@
-import Plugin, { Tree } from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
+import Plugin from 'broccoli-plugin';
 import walkSync from 'walk-sync';
 import { unlinkSync, rmdirSync, mkdirSync, readFileSync, removeSync } from 'fs-extra';
 import FSTree from 'fs-tree-diff';
@@ -44,7 +45,7 @@ export default class Analyzer extends Plugin {
 
   private parse: undefined | ((source: string) => File);
 
-  constructor(inputTree: Tree, private pack: Package) {
+  constructor(inputTree: Node, private pack: Package) {
     super([inputTree], {
       annotation: 'ember-auto-import-analyzer',
       persistentOutput: true
diff --git a/packages/ember-auto-import/ts/auto-import.ts b/packages/ember-auto-import/ts/auto-import.ts
@@ -5,7 +5,7 @@ import Package from './package';
 import { buildDebugCallback } from 'broccoli-debug';
 import BundleConfig from './bundle-config';
 import Append from './broccoli-append';
-import { Tree } from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
 
 const debugTree = buildDebugCallback('ember-auto-import');
 const protocol = '__ember_auto_import_protocol_v1__';
@@ -52,7 +52,7 @@ export default class AutoImport {
     return this.primaryPackage === appOrAddon;
   }
 
-  analyze(tree: Tree, appOrAddon: any) {
+  analyze(tree: Node, appOrAddon: any) {
     let pack = Package.lookup(appOrAddon);
     this.packages.add(pack);
     let analyzer = new Analyzer(
@@ -63,7 +63,7 @@ export default class AutoImport {
     return analyzer;
   }
 
-  makeBundler(allAppTree: Tree) {
+  makeBundler(allAppTree: Node) {
     // The Splitter takes the set of imports from the Analyzer and
     // decides which ones to include in which bundles
     let splitter = new Splitter({
@@ -83,7 +83,7 @@ export default class AutoImport {
     });
   }
 
-  addTo(allAppTree: Tree) {
+  addTo(allAppTree: Node) {
     let bundler = debugTree(this.makeBundler(allAppTree), 'output');
 
     let mappings = new Map();
@@ -121,7 +121,7 @@ export default class AutoImport {
     // So we are forced to monkey patch EmberApp. We insert ourselves right at
     // the beginning of addonPostprocessTree.
     let original = host.addonPostprocessTree.bind(host);
-    host.addonPostprocessTree = (which: string, tree: Tree) => {
+    host.addonPostprocessTree = (which: string, tree: Node) => {
       if (which === 'all') {
         tree = this.addTo(tree);
       }
diff --git a/packages/ember-auto-import/ts/broccoli-append.ts b/packages/ember-auto-import/ts/broccoli-append.ts
@@ -1,4 +1,5 @@
-import Plugin, { Tree } from 'broccoli-plugin';
+import Plugin from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
 import { join, extname } from 'path';
 import walkSync, { WalkSyncEntry } from 'walk-sync';
 import { unlinkSync, rmdirSync, mkdirSync, readFileSync, existsSync, writeFileSync, removeSync, readdirSync } from 'fs-extra';
@@ -35,7 +36,7 @@ export default class Append extends Plugin {
   private reverseMappings: Map<string, string>;
   private passthrough: Map<string, string>;
 
-  constructor(upstreamTree: Tree, appendedTree: Tree, options: AppendOptions) {
+  constructor(upstreamTree: Node, appendedTree: Node, options: AppendOptions) {
     super([upstreamTree, appendedTree], {
       annotation: 'ember-auto-import-analyzer',
       persistentOutput: true
diff --git a/packages/ember-auto-import/ts/bundler.ts b/packages/ember-auto-import/ts/bundler.ts
@@ -1,4 +1,5 @@
-import Plugin, { Tree } from 'broccoli-plugin';
+import Plugin from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
 import makeDebug from 'debug';
 import WebpackBundler from './webpack';
 import Splitter, { BundleDependencies } from './splitter';
@@ -35,7 +36,7 @@ export default class Bundler extends Plugin {
   private cachedBundlerHook: BundlerHook | undefined;
   private didEnsureDirs = false;
 
-  constructor(allAppTree: Tree, private options: BundlerPluginOptions) {
+  constructor(allAppTree: Node, private options: BundlerPluginOptions) {
     super([allAppTree], {
       persistentOutput: true,
       needsCache: true,
@@ -97,7 +98,7 @@ export default class Bundler extends Plugin {
         this.publicAssetURL,
         this.skipBabel,
         this.options.targets,
-        this.cachePath
+        this.cachePath! // cast is OK because we passed needsCache: true to super constructor
       );
     }
     return this.cachedBundlerHook;
diff --git a/packages/ember-auto-import/ts/index.ts b/packages/ember-auto-import/ts/index.ts
@@ -1,5 +1,5 @@
 import AutoImport from './auto-import';
-import { Tree } from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
 
 module.exports = {
   name: 'ember-auto-import',
@@ -16,7 +16,7 @@ module.exports = {
     // it will see all the consumer app or addon's javascript
     registry.add('js', {
       name: 'ember-auto-import-analyzer',
-      toTree: (tree: Tree) => {
+      toTree: (tree: Node) => {
         return AutoImport.lookup(this).analyze(tree, this);
       }
     });
diff --git a/types/broccoli-debug/index.d.ts b/types/broccoli-debug/index.d.ts
@@ -1,8 +1,8 @@
 declare module 'broccoli-debug' {
-  import { Tree } from "broccoli-plugin";
+  import { InputNode, Node } from "broccoli-plugin";
   export default class BroccoliDebug implements Tree {
-    constructor(inputTree: Tree, name: 'string');
+    constructor(inputTree: InputNode, name: 'string');
     __broccoliGetInfo__(): any;
   }
-  export function buildDebugCallback(name: string): (inputTree: Tree, name: string) => Tree;
+  export function buildDebugCallback(name: string): (inputTree: InputNode, name: string) => Node;
 }
diff --git a/types/broccoli-plugin/index.d.ts b/types/broccoli-plugin/index.d.ts
diff --git a/types/broccoli-source/index.d.ts b/types/broccoli-source/index.d.ts
diff --git a/types/broccoli/index.d.ts b/types/broccoli/index.d.ts
@@ -1,7 +1,7 @@
 declare module 'broccoli' {
-  import { Tree } from "broccoli-plugin";
+  import { InputNode } from "broccoli-node-api";
   export class Builder {
-    constructor(tree: Tree);
+    constructor(tree: InputNode);
     build(): Promise<void>;
     outputPath: string;
     cleanup(): Promise<void>;
diff --git a/types/fs-tree-diff/index.d.ts b/types/fs-tree-diff/index.d.ts
diff --git a/types/fs-tree-diff/package.json b/types/fs-tree-diff/package.json
diff --git a/yarn.lock b/yarn.lock
@@ -3420,6 +3420,15 @@ broccoli-output-wrapper@^2.0.0:
   dependencies:
     heimdalljs-logger "^0.1.10"
 
+broccoli-output-wrapper@^3.2.1:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
+  integrity sha512-bQAtwjSrF4Nu0CK0JOy5OZqw9t5U0zzv2555EA/cF8/a8SLDTIetk9UgrtMVw7qKLKdSpOZ2liZNeZZDaKgayw==
+  dependencies:
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
+
 broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.3:
   version "1.4.6"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
@@ -3502,6 +3511,19 @@ broccoli-plugin@^3.0.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
+broccoli-plugin@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.3.tgz#9dcfbfb6a1b27a37cc22e65c071719ce9f92bc1e"
+  integrity sha512-CtAIEYq5K+4yQv8c/BHymOteuyjDAJfvy/asu4LudIWcMSS7dTn3yGI5gNBkwHG+qlRangYkHJNVAcDZMQbSVQ==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+    broccoli-output-wrapper "^3.2.1"
+    fs-merger "^3.1.0"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.3.0"
+
 broccoli-slow-trees@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz#9bf2a9e2f8eb3ed3a3f2abdde988da437ccdc9b4"
@@ -6627,7 +6649,7 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-merger@^3.0.1:
+fs-merger@^3.0.1, fs-merger@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.1.0.tgz#f30f74f6c70b2ff7333ec074f3d2f22298152f3b"
   integrity sha512-RZ9JtqugaE8Rkt7idO5NSwcxEGSDZpLmVFjtVQUm3f+bWun7JAU6fKyU6ZJUeUnKdJwGx8uaro+K4QQfOR7vpA==
@@ -6656,16 +6678,6 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5
     path-posix "^1.0.0"
     symlink-or-copy "^1.1.8"
 
-fs-tree-diff@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
-  integrity sha512-Zro2ACaPVDgVOx9+s5s5AfPlAD0kMJdbwGvTGF6KC1SjxjiGWxJvV4mUTDkFVSy3OUw2C/f1qpdjF81hGqSBAw==
-  dependencies:
-    heimdalljs-logger "^0.1.7"
-    object-assign "^4.1.0"
-    path-posix "^1.0.0"
-    symlink-or-copy "^1.1.8"
-
 fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
@@ -10059,7 +10071,7 @@ rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimra
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.1:
+rimraf@^3.0.0, rimraf@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -10812,6 +10824,11 @@ symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393"
   integrity sha512-W31+GLiBmU/ZR02Ii0mVZICuNEN9daZ63xZMPDsYgPgNjMtg+atqLEGI7PPI936jYSQZxoLb/63xos8Adrx4Eg==
 
+symlink-or-copy@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+
 sync-disk-cache@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.3.tgz#481933461623fdc2bdf46cfc87872ba215a7e246"

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`declare module 'broccoli-debug' {`
`2`		`- import { Tree } from "broccoli-plugin";`
	`2`	`+ import { InputNode, Node } from "broccoli-plugin";`
`3`	`3`	`export default class BroccoliDebug implements Tree {`
`4`		`- constructor(inputTree: Tree, name: 'string');`
	`4`	`+ constructor(inputTree: InputNode, name: 'string');`
`5`	`5`	`__broccoliGetInfo__(): any;`
`6`	`6`	`}`
`7`		`- export function buildDebugCallback(name: string): (inputTree: Tree, name: string) => Tree;`
	`7`	`+ export function buildDebugCallback(name: string): (inputTree: InputNode, name: string) => Node;`
`8`	`8`	`}`