From 673abc9276ade2d3ab74e8af3a7c33d1bc914c3f Mon Sep 17 00:00:00 2001 From: Damian Bielecki Date: Sat, 18 Feb 2023 11:52:17 +0100 Subject: [PATCH] chore: remove deprecated methods --- .../src/generators/init/generator.ts | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/nx-serverless/src/generators/init/generator.ts b/packages/nx-serverless/src/generators/init/generator.ts index 89302bd8..73c129fb 100644 --- a/packages/nx-serverless/src/generators/init/generator.ts +++ b/packages/nx-serverless/src/generators/init/generator.ts @@ -2,9 +2,9 @@ import { addDependenciesToPackageJson, formatFiles, GeneratorCallback, - readWorkspaceConfiguration, + readNxJson, Tree, - updateWorkspaceConfiguration, + updateNxJson, } from '@nrwl/devkit'; import { jestInitGenerator } from '@nrwl/jest'; import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; @@ -62,31 +62,31 @@ function updateGitignore(host: Tree) { } function addCacheableOperation(tree: Tree) { - const workspace = readWorkspaceConfiguration(tree); - if (!workspace.tasksRunnerOptions || !workspace.tasksRunnerOptions.default) { + const nxJson = readNxJson(tree); + if (!nxJson.tasksRunnerOptions || !nxJson.tasksRunnerOptions.default) { return; } - workspace.tasksRunnerOptions.default.options ??= {}; - workspace.tasksRunnerOptions.default.options.cacheableOperations ??= []; + nxJson.tasksRunnerOptions.default.options ??= {}; + nxJson.tasksRunnerOptions.default.options.cacheableOperations ??= []; - if (!workspace.tasksRunnerOptions.default.options.cacheableOperations.includes('package')) { - workspace.tasksRunnerOptions.default.options.cacheableOperations.push('package'); + if (!nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('package')) { + nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('package'); } - if (!workspace.tasksRunnerOptions.default.options.cacheableOperations.includes('deploy')) { - workspace.tasksRunnerOptions.default.options.cacheableOperations.push('deploy'); + if (!nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('deploy')) { + nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('deploy'); } - updateWorkspaceConfiguration(tree, workspace); + updateNxJson(tree, nxJson); } function setupTargetDefaults(tree: Tree) { - const workspaceConfiguration = readWorkspaceConfiguration(tree); + const nxJson = readNxJson(tree); - if (!workspaceConfiguration.namedInputs) { - workspaceConfiguration.namedInputs ??= {}; - workspaceConfiguration.namedInputs.default ??= ['{projectRoot}/**/*']; - workspaceConfiguration.namedInputs.production ??= [ + if (!nxJson.namedInputs) { + nxJson.namedInputs ??= {}; + nxJson.namedInputs.default ??= ['{projectRoot}/**/*']; + nxJson.namedInputs.production ??= [ 'default', '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)', '!{projectRoot}/tsconfig.spec.json', @@ -103,12 +103,12 @@ function setupTargetDefaults(tree: Tree) { }, ]; - workspaceConfiguration.targetDefaults ??= {}; - workspaceConfiguration.targetDefaults.deploy ??= {}; - workspaceConfiguration.targetDefaults.deploy.inputs ??= inputs; + nxJson.targetDefaults ??= {}; + nxJson.targetDefaults.deploy ??= {}; + nxJson.targetDefaults.deploy.inputs ??= inputs; - workspaceConfiguration.targetDefaults.package ??= {}; - workspaceConfiguration.targetDefaults.package.inputs ??= inputs; + nxJson.targetDefaults.package ??= {}; + nxJson.targetDefaults.package.inputs ??= inputs; - updateWorkspaceConfiguration(tree, workspaceConfiguration); + updateNxJson(tree, nxJson); }