Merge pull request #844 from embroider-build/update-depedencies

[hygiene] upgrade dependencies

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
     sourceType: 'module',
   },
   plugins: ['import', 'prettier', '@typescript-eslint'],
-  extends: ['prettier', 'prettier/@typescript-eslint'],
+  extends: ['prettier'],
   rules: {
     eqeqeq: ['error', 'smart'],
     'no-debugger': 'error',

package.json

@@ -40,16 +40,16 @@
     "**/qunit": "^2.14.1"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.11",
+    "@types/jest": "^24.0.0",
     "@typescript-eslint/eslint-plugin": "^4.1.1",
     "@typescript-eslint/parser": "^4.1.1",
     "cross-env": "^7.0.3",
     "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-prettier": "^3.1.4",
-    "jest": "^24.5.0",
-    "prettier": "2.1.2",
+    "jest": "^24.9.0",
+    "prettier": "^2.3.1",
     "release-it": "^14.2.1",
     "release-it-lerna-changelog": "^3.1.0",
     "release-it-yarn-workspaces": "^2.0.0"

packages/addon-shim/.eslintrc.js

@@ -58,7 +58,7 @@ module.exports = {
         sourceType: 'module',
       },
       plugins: ['@typescript-eslint'],
-      extends: ['prettier/@typescript-eslint'],
+      extends: ['prettier'],
       rules: {
         '@typescript-eslint/naming-convention': [
           'error',

packages/addon-shim/package.json

@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@embroider/shared-internals": "^0.41.0",
-    "ember-auto-import": "^2.0.0",
-    "semver": "^7.3.4"
+    "ember-auto-import": "^2.0.1",
+    "semver": "^7.3.5"
   },
   "devDependencies": {
-    "@types/semver": "^7.3.4"
+    "@types/semver": "^7.3.6"
   },
   "engines": {
     "node": "10.* || >= 12"

packages/compat/package.json

@@ -24,59 +24,59 @@
     "test": "jest"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.10.4",
-    "@babel/core": "^7.12.3",
+    "@babel/code-frame": "^7.14.5",
+    "@babel/core": "^7.14.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/traverse": "^7.12.1",
-    "@babel/types": "^7.12.1",
+    "@babel/preset-env": "^7.14.5",
+    "@babel/traverse": "^7.14.5",
+    "@babel/types": "^7.14.5",
     "@embroider/macros": "0.41.0",
     "@types/babel__code-frame": "^7.0.2",
-    "@types/yargs": "^15.0.9",
+    "@types/yargs": "^17.0.0",
     "assert-never": "^1.1.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babylon": "^6.18.0",
     "bind-decorator": "^1.0.11",
-    "broccoli": "^3.4.2",
-    "broccoli-concat": "^3.7.3",
+    "broccoli": "^3.5.2",
+    "broccoli-concat": "^4.2.5",
     "broccoli-file-creator": "^2.1.1",
-    "broccoli-funnel": "^3.0.5",
-    "broccoli-merge-trees": "^3.0.0",
+    "broccoli-funnel": "^3.0.7",
+    "broccoli-merge-trees": "^4.2.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",
-    "broccoli-source": "^3.0.0",
-    "chalk": "^4.1.0",
-    "debug": "^3.1.0",
-    "fs-extra": "^7.0.0",
-    "fs-tree-diff": "^2.0.0",
-    "jsdom": "^16.4.0",
-    "lodash": "^4.17.10",
+    "broccoli-source": "^3.0.1",
+    "chalk": "^4.1.1",
+    "debug": "^4.3.2",
+    "fs-extra": "^9.1.0",
+    "fs-tree-diff": "^2.0.1",
+    "jsdom": "^16.6.0",
+    "lodash": "^4.17.21",
     "pkg-up": "^3.1.0",
-    "resolve": "^1.8.1",
-    "resolve-package-path": "^1.2.2",
-    "semver": "^7.3.2",
-    "symlink-or-copy": "^1.2.0",
-    "tree-sync": "^2.0.0",
-    "typescript-memoize": "^1.0.0",
-    "walk-sync": "^1.1.3",
-    "yargs": "^16.1.0"
+    "resolve": "^1.20.0",
+    "resolve-package-path": "^4.0.1",
+    "semver": "^7.3.5",
+    "symlink-or-copy": "^1.3.1",
+    "tree-sync": "^2.1.0",
+    "typescript-memoize": "^1.0.1",
+    "walk-sync": "^3.0.0",
+    "yargs": "^17.0.1"
   },
   "devDependencies": {
     "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0",
-    "@types/babel__core": "^7.1.10",
+    "@types/babel__core": "^7.1.14",
     "@types/babel__generator": "^7.6.2",
-    "@types/babel__template": "^7.0.3",
-    "@types/babylon": "^6.16.4",
-    "@types/debug": "^0.0.31",
-    "@types/fs-extra": "^5.0.4",
+    "@types/babel__template": "^7.4.0",
+    "@types/babylon": "^6.16.5",
+    "@types/debug": "^4.1.5",
+    "@types/fs-extra": "^9.0.11",
     "@types/js-string-escape": "^1.0.0",
-    "@types/jsdom": "^16.2.4",
-    "@types/lodash": "^4.14.116",
-    "@types/node": "^10.5.2",
-    "@types/resolve": "^0.0.8",
-    "@types/semver": "^7.3.4",
-    "@types/strip-bom": "^3.0.0",
+    "@types/jsdom": "^16.2.11",
+    "@types/lodash": "^4.14.170",
+    "@types/node": "^15.12.2",
+    "@types/resolve": "^1.20.0",
+    "@types/semver": "^7.3.6",
+    "@types/strip-bom": "^4.0.1",
     "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-htmlbars-3": "npm:ember-cli-htmlbars@3",
     "typescript": "~4.0.0"

packages/compat/src/audit-cli.ts

@@ -7,7 +7,7 @@ import { Audit, AuditResults, Finding, isBuildError } from './audit';
 
 // slightly wacky because yargs types don't cover this, but you can't access the
 // other documented place to find `hideBin` on node < 12.17
-const { hideBin } = (yargs as any) as {
+const { hideBin } = yargs as any as {
   hideBin(argv: readonly string[]): readonly string[];
 };
 

packages/compat/src/compat-app.ts

@@ -128,7 +128,7 @@ class CompatAppAdapter implements AppAdapter<TreeNames> {
             kind: 'on-disk',
             relativePath: entry.relativePath,
             sourcePath: entry.fullPath,
-            mtime: (entry.mtime as unknown) as number, // https://github.com/joliss/node-walk-sync/pull/38
+            mtime: entry.mtime as unknown as number, // https://github.com/joliss/node-walk-sync/pull/38
             size: entry.size,
           });
         });

packages/core/package.json

@@ -30,52 +30,52 @@
     "test": "jest"
   },
   "dependencies": {
-    "@babel/core": "^7.12.3",
-    "@babel/parser": "^7.12.3",
+    "@babel/core": "^7.14.5",
+    "@babel/parser": "^7.14.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.12.1",
-    "@babel/runtime": "^7.12.5",
-    "@babel/traverse": "^7.12.1",
-    "@babel/types": "^7.12.1",
+    "@babel/plugin-transform-runtime": "^7.14.5",
+    "@babel/runtime": "^7.14.5",
+    "@babel/traverse": "^7.14.5",
+    "@babel/types": "^7.14.5",
     "@embroider/macros": "0.41.0",
     "@embroider/shared-internals": "0.41.0",
-    "assert-never": "^1.1.0",
+    "assert-never": "^1.2.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",
-    "broccoli-source": "^3.0.0",
-    "debug": "^3.1.0",
+    "broccoli-source": "^3.0.1",
+    "debug": "^4.3.2",
     "escape-string-regexp": "^4.0.0",
     "fast-sourcemap-concat": "^1.4.0",
-    "filesize": "^4.1.2",
-    "fs-extra": "^7.0.1",
-    "fs-tree-diff": "^2.0.0",
-    "handlebars": "^4.4.2",
+    "filesize": "^5.0.0",
+    "fs-extra": "^9.1.0",
+    "fs-tree-diff": "^2.0.1",
+    "handlebars": "^4.7.7",
     "js-string-escape": "^1.0.1",
-    "jsdom": "^16.4.0",
-    "lodash": "^4.17.10",
+    "jsdom": "^16.6.0",
+    "lodash": "^4.17.21",
     "pkg-up": "^3.1.0",
-    "resolve": "^1.8.1",
+    "resolve": "^1.20.0",
     "resolve-package-path": "^4.0.1",
-    "strip-bom": "^3.0.0",
-    "typescript-memoize": "^1.0.0",
-    "walk-sync": "^1.1.3",
+    "strip-bom": "^4.0.0",
+    "typescript-memoize": "^1.0.1",
+    "walk-sync": "^3.0.0",
     "wrap-legacy-hbs-plugin-if-needed": "^1.0.1"
   },
   "devDependencies": {
     "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0",
-    "@types/babel__core": "^7.1.10",
-    "@types/debug": "^0.0.31",
-    "@types/filesize": "^4.1.0",
-    "@types/jsdom": "^16.2.4",
-    "@types/lodash": "^4.14.116",
-    "@types/node": "^10.5.2",
-    "@types/resolve": "^0.0.8",
-    "@types/strip-bom": "^3.0.0",
+    "@types/babel__core": "^7.1.14",
+    "@types/debug": "^4.1.5",
+    "@types/filesize": "^4.0.0",
+    "@types/jsdom": "^16.2.11",
+    "@types/lodash": "^4.14.170",
+    "@types/node": "^15.12.2",
+    "@types/resolve": "^1.20.0",
+    "@types/strip-bom": "^4.0.1",
     "@types/tmp": "^0.1.0",
-    "fixturify": "^1.2.0",
+    "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "~4.0.0"
   },

packages/core/src/portable.ts

@@ -187,7 +187,7 @@ interface HTMLBarsParallelPlaceholder {
 type Placeholder = GlobalPlaceholder | BroccoliParallelPlaceholder | HTMLBarsParallelPlaceholder;
 
 function setupGlobals() {
-  let G = (global as any) as { [protocol]: { globalValues: any[]; nonce: number } };
+  let G = global as any as { [protocol]: { globalValues: any[]; nonce: number } };
   if (!G[protocol]) {
     G[protocol] = { globalValues: [], nonce: Math.floor(Math.random() * Math.pow(2, 32)) };
   }

packages/core/src/wait-for-trees.ts

@@ -58,7 +58,7 @@ export default class WaitForTrees<NamedTrees> extends BroccoliPlugin {
         });
       }
     }
-    return this.buildHook((result as unknown) as OutputPaths<NamedTrees>, changedMap);
+    return this.buildHook(result as unknown as OutputPaths<NamedTrees>, changedMap);
   }
 }
 

packages/hbs-loader/package.json

@@ -20,11 +20,11 @@
     "prepare": "tsc"
   },
   "dependencies": {
-    "loader-utils": "^1.1.0"
+    "loader-utils": "^2.0.0"
   },
   "devDependencies": {
-    "@types/loader-utils": "^1.1.3",
-    "@types/node": "^10.5.2",
+    "@types/loader-utils": "^2.0.2",
+    "@types/node": "^15.12.2",
     "typescript": "~4.0.0"
   },
   "peerDependencies": {

packages/hbs-loader/src/index.ts

@@ -10,7 +10,7 @@ export interface HbsLoaderConfig {
 type LoaderContext = any;
 
 export default function hbsLoader(this: LoaderContext, templateContent: string) {
-  let { templateCompilerFile, variant } = (getOptions(this) as unknown) as HbsLoaderConfig;
+  let { templateCompilerFile, variant } = getOptions(this) as unknown as HbsLoaderConfig;
 
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   let templateCompiler = applyVariantToTemplateCompiler(variant, require(templateCompilerFile)).compile;

packages/macros/package.json

@@ -25,24 +25,24 @@
   },
   "dependencies": {
     "@embroider/shared-internals": "0.41.0",
-    "assert-never": "^1.1.0",
-    "ember-cli-babel": "^7.23.0",
-    "lodash": "^4.17.10",
-    "resolve": "^1.8.1",
+    "assert-never": "^1.2.1",
+    "ember-cli-babel": "^7.26.6",
+    "lodash": "^4.17.21",
+    "resolve": "^1.20.0",
     "semver": "^7.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.3",
-    "@babel/traverse": "^7.12.1",
+    "@babel/core": "^7.14.5",
+    "@babel/traverse": "^7.14.5",
     "@babel/types": "^7.12.1",
     "@embroider/core": "0.41.0",
     "@embroider/test-support": "0.36.0",
-    "@types/babel__core": "^7.1.10",
+    "@types/babel__core": "^7.1.14",
     "@types/babel__generator": "^7.6.2",
-    "@types/babel__template": "^7.0.3",
-    "@types/node": "^10.5.2",
-    "@types/resolve": "^0.0.8",
-    "@types/semver": "^7.3.4",
+    "@types/babel__template": "^7.4.0",
+    "@types/node": "^15.12.2",
+    "@types/resolve": "^1.20.0",
+    "@types/semver": "^7.3.6",
     "typescript": "~4.0.0"
   },
   "engines": {

packages/macros/src/macros-config.ts

@@ -32,7 +32,7 @@ export default class MacrosConfig {
       return found;
     }
 
-    let g = (global as any) as { __embroider_macros_global__: GlobalSharedState | undefined };
+    let g = global as any as { __embroider_macros_global__: GlobalSharedState | undefined };
     if (!g.__embroider_macros_global__) {
       g.__embroider_macros_global__ = new WeakMap();
     }

packages/macros/tests/babel/helpers.ts

@@ -41,10 +41,8 @@ export function makeRunner(transform: Transform) {
     }
     return runDefault(code, {
       dependencies: {
-        [explicitRelative(
-          dirname(optsWithDefaults.filename),
-          runtimeFilename.replace(/\.[tj]s$/, '')
-        )]: cachedMacrosPackage,
+        [explicitRelative(dirname(optsWithDefaults.filename), runtimeFilename.replace(/\.[tj]s$/, ''))]:
+          cachedMacrosPackage,
       },
     });
   };

packages/macros/tests/runtime.test.ts

@@ -9,7 +9,8 @@ import {
   moduleExists,
 } from '../src/index';
 
-const ERROR_REGEX = /this method is really implemented at compile time via a babel plugin. If you're seeing this exception, something went wrong/;
+const ERROR_REGEX =
+  /this method is really implemented at compile time via a babel plugin. If you're seeing this exception, something went wrong/;
 
 describe(`type-only exports`, function () {
   test('dependencySatisfies exists', function () {

packages/shared-internals/package.json

@@ -28,17 +28,17 @@
   },
   "dependencies": {
     "ember-rfc176-data": "^0.3.17",
-    "resolve-package-path": "^1.2.2",
+    "resolve-package-path": "^4.0.1",
     "pkg-up": "^3.1.0",
-    "typescript-memoize": "^1.0.0-alpha.3",
-    "fs-extra": "^7.0.1",
-    "lodash": "^4.17.10",
-    "semver": "^7.3.2"
+    "typescript-memoize": "^1.0.1",
+    "fs-extra": "^9.1.0",
+    "lodash": "^4.17.21",
+    "semver": "^7.3.5"
   },
   "devDependencies": {
-    "@types/semver": "^7.3.4",
+    "@types/semver": "^7.3.6",
     "@types/tmp": "^0.1.0",
-    "fixturify": "^1.2.0",
+    "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "~4.0.0"
   },

packages/test-setup/package.json

@@ -12,8 +12,8 @@
     "src/index.js"
   ],
   "dependencies": {
-    "lodash": "^4.17.20",
-    "resolve": "^1.17.0"
+    "lodash": "^4.17.21",
+    "resolve": "^1.20.0"
   },
   "devDependencies": {
     "@embroider/compat": "0.41.0"