diff --git a/npm/ng-packs/packages/schematics/src/commands/api/index.ts b/npm/ng-packs/packages/schematics/src/commands/api/index.ts index bc97d8031b..a344381b77 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/api/index.ts @@ -4,7 +4,6 @@ import { branchAndMerge, chain, move, - SchematicContext, SchematicsException, Tree, url, @@ -36,7 +35,7 @@ export default function (schema: GenerateProxySchema) { const moduleName = params.module || 'app'; return chain([ - async (tree: Tree, _context: SchematicContext) => { + async (tree: Tree) => { const getRootNamespace = createRootNamespaceGetter(params); const solution = await getRootNamespace(tree); diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template index 1407202dd0..5b574d313d 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template @@ -3,7 +3,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/lib", - "target": "es2015", + "target": "es2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts b/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts index 1bc4c7a905..e92800ddd5 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts @@ -4,7 +4,6 @@ import { move, noop, Rule, - SchematicContext, SchematicsException, Tree, url, @@ -59,7 +58,7 @@ async function checkLibExist(options: GenerateLibSchema, tree: Tree) { } function createLibrary(options: GenerateLibSchema): Rule { - return async (tree: Tree, _context: SchematicContext) => { + return async (tree: Tree) => { const target = await resolveProject(tree, options.packageName, null); if (!target || options.override) { if (options.isModuleTemplate) { @@ -83,9 +82,7 @@ async function resolvePackagesDirFromAngularJson(host: Tree) { function readFirstLibInAngularJson(workspace: WorkspaceDefinition): ProjectDefinition | undefined { // eslint-disable-next-line @typescript-eslint/no-unused-vars - const [_, props] = - Array.from(workspace.projects.entries()).find(([_, value]) => isLibrary(value)) || []; - return props; + return Array.from(workspace.projects.values()).find(value => isLibrary(value)); } async function createLibFromModuleTemplate(tree: Tree, options: GenerateLibSchema) { @@ -107,7 +104,7 @@ async function createLibFromModuleTemplate(tree: Tree, options: GenerateLibSchem } export function addLibToWorkspaceIfNotExist(name: string, packagesDir: string): Rule { - return async (tree: Tree, _: SchematicContext) => { + return async (tree: Tree) => { const workspace = await getWorkspace(tree); const packageName = kebab(name); const isProjectExist = workspace.projects.has(packageName); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts index 9ea893e1f8..3c621ddb87 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts @@ -1,4 +1,4 @@ -import { chain, SchematicContext, Tree } from '@angular-devkit/schematics'; +import { chain, Tree } from '@angular-devkit/schematics'; import { GenerateProxySchema } from '../../models'; import { buildTargetPath, @@ -19,7 +19,7 @@ export default function (schema: GenerateProxySchema) { const moduleName = params.module || 'app'; return chain([ - async (host: Tree, _context: SchematicContext) => { + async (host: Tree) => { const target = await resolveProject(host, params.target!); const targetPath = buildTargetPath(target.definition, params.entryPoint); const readProxyConfig = createProxyConfigReader(targetPath); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts index 473dbbe63e..0858d2407f 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts @@ -1,4 +1,4 @@ -import { SchematicContext, Tree } from '@angular-devkit/schematics'; +import { Tree } from '@angular-devkit/schematics'; import { buildTargetPath, createProxyIndexGenerator, @@ -9,7 +9,7 @@ import { export default function (schema: { target?: string; entryPoint?: string }) { const params = removeDefaultPlaceholders(schema); - return async (host: Tree, _context: SchematicContext) => { + return async (host: Tree) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const target = await resolveProject(host, params.target!); const targetPath = buildTargetPath(target.definition, params.entryPoint); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts index cf905738b4..dcea70bb39 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts @@ -1,4 +1,4 @@ -import { chain, SchematicContext, Tree } from '@angular-devkit/schematics'; +import { chain, Tree } from '@angular-devkit/schematics'; import { GenerateProxySchema } from '../../models'; import { buildTargetPath, @@ -16,7 +16,7 @@ import { export default function (schema: GenerateProxySchema) { const params = removeDefaultPlaceholders(schema); - return async (host: Tree, _context: SchematicContext) => { + return async (host: Tree) => { const target = await resolveProject(host, params.target!); const targetPath = buildTargetPath(target.definition, params.entryPoint); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts index 5e1980b3f7..23864b730d 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts @@ -1,4 +1,4 @@ -import { chain, SchematicContext, Tree } from '@angular-devkit/schematics'; +import { chain, Tree } from '@angular-devkit/schematics'; import { GenerateProxySchema } from '../../models'; import { buildTargetPath, @@ -17,7 +17,7 @@ export default function (schema: GenerateProxySchema) { const params = removeDefaultPlaceholders(schema); const moduleName = params.module || 'app'; - return async (host: Tree, _context: SchematicContext) => { + return async (host: Tree) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const target = await resolveProject(host, params.target!); const targetPath = buildTargetPath(target.definition, params.entryPoint); diff --git a/npm/ng-packs/packages/schematics/src/models/api-definition.ts b/npm/ng-packs/packages/schematics/src/models/api-definition.ts index 68a607ac1c..15f6ef1d0b 100644 --- a/npm/ng-packs/packages/schematics/src/models/api-definition.ts +++ b/npm/ng-packs/packages/schematics/src/models/api-definition.ts @@ -56,6 +56,8 @@ export interface ParameterInSignature { type: string; typeSimple: string; isOptional: boolean; + // eslint-disable-next-line + // @typescript-eslint/no-explicit-any defaultValue: any; } @@ -66,6 +68,8 @@ export interface ParameterInBody { type: string; typeSimple: string; isOptional: boolean; + // eslint-disable-next-line + // @typescript-eslint/no-explicit-any defaultValue: any; constraintTypes: string[] | null; bindingSourceId: eBindingSourceId; diff --git a/npm/ng-packs/packages/schematics/src/utils/index.ts b/npm/ng-packs/packages/schematics/src/utils/index.ts index 53950e8a87..eeb12e6d9e 100644 --- a/npm/ng-packs/packages/schematics/src/utils/index.ts +++ b/npm/ng-packs/packages/schematics/src/utils/index.ts @@ -7,7 +7,6 @@ export * from './enum'; export * from './file'; export * from './generics'; export * from './import'; -export * from './lib'; export * from './methods'; export * from './model'; export * from './namespace'; diff --git a/npm/ng-packs/packages/schematics/src/utils/lib.ts b/npm/ng-packs/packages/schematics/src/utils/lib.ts deleted file mode 100644 index d083c6c206..0000000000 --- a/npm/ng-packs/packages/schematics/src/utils/lib.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Tree } from '@angular-devkit/schematics'; -import { resolveProject } from "./workspace"; -export async function createTargetLibIfNotExist(tree: Tree, target: string) { - const lib = await resolveProject(tree, target, null); - - if (!lib) { - - } -} diff --git a/npm/ng-packs/packages/schematics/src/utils/workspace.ts b/npm/ng-packs/packages/schematics/src/utils/workspace.ts index 6a22768f73..2daaf8b2b6 100644 --- a/npm/ng-packs/packages/schematics/src/utils/workspace.ts +++ b/npm/ng-packs/packages/schematics/src/utils/workspace.ts @@ -35,9 +35,13 @@ export function readWorkspaceSchema(tree: Tree) { return workspaceSchema; } +// eslint-disable-next-line +// @typescript-eslint/no-explicit-any export async function resolveProject( tree: Tree, name: string, + // eslint-disable-next-line + // @typescript-eslint/no-explicit-any notFoundValue: T = NOT_FOUND_VALUE as unknown as any, ): Promise { name = name || readWorkspaceSchema(tree).defaultProject!; @@ -83,7 +87,8 @@ export function getWorkspaceSchema(host: Tree): WorkspaceSchema { throw new SchematicsException(`Could not find (${path})`); } const content = configBuffer.toString(); - + // eslint-disable-next-line + // @typescript-eslint/no-explicit-any return parseJson(content) as Record as WorkspaceSchema; }