Skip to content

Commit

Permalink
[hygiene] upgrade dependencies
Browse files Browse the repository at this point in the history
* formatting changes are a result of upgrading eslint-config-prettier
  • Loading branch information
stefanpenner committed Jun 11, 2021
1 parent f7d8ee7 commit e3e983a
Show file tree
Hide file tree
Showing 13 changed files with 887 additions and 885 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
"**/qunit": "^2.14.1"
},
"devDependencies": {
"@types/jest": "^24.0.11",
"@types/jest": "^26.0.23",
"@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": "^27.0.4",
"prettier": "2.3.1",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0",
"release-it-yarn-workspaces": "^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/addon-shim/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = {
sourceType: 'module',
},
plugins: ['@typescript-eslint'],
extends: ['prettier/@typescript-eslint'],
extends: ['prettier'],
rules: {
'@typescript-eslint/naming-convention': [
'error',
Expand Down
2 changes: 1 addition & 1 deletion packages/compat/src/audit-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
};

Expand Down
2 changes: 1 addition & 1 deletion packages/compat/src/compat-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/portable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,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)) };
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/wait-for-trees.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/hbs-loader/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/macros/src/macros-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
6 changes: 2 additions & 4 deletions packages/macros/tests/babel/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
});
};
Expand Down
3 changes: 2 additions & 1 deletion packages/macros/tests/runtime.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
3 changes: 1 addition & 2 deletions packages/util/addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ function handleString(name, thingWithOwner) {
false,
{
id: 'ensure-safe-component.string',
url:
'https://github.com/embroider-build/embroider/blob/master/ADDON-AUTHOR-GUIDE.md#when-youre-passing-a-component-to-someone-else',
url: 'https://github.com/embroider-build/embroider/blob/master/ADDON-AUTHOR-GUIDE.md#when-youre-passing-a-component-to-someone-else',
until: 'embroider',
for: '@embroider/util',
since: '0.27.0',
Expand Down
Loading

0 comments on commit e3e983a

Please sign in to comment.