Skip to content

Commit 8dc740e

Browse files
committed
eslint: adapt to extended api on maven side
1 parent 393a4c4 commit 8dc740e

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 DiffPlug
2+
* Copyright 2016-2022 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -105,8 +105,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
105105
// create the format step
106106
PrettierConfig prettierConfig = new PrettierConfig(configFileHandler, configInline);
107107
File buildDir = stepConfig.getFileLocator().getBuildDir();
108-
NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, stepConfig.getFileLocator().getBaseDir());
109-
return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), buildDir, npmPathResolver, prettierConfig);
108+
File baseDir = stepConfig.getFileLocator().getBaseDir();
109+
NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, baseDir);
110+
return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, prettierConfig);
110111
}
111112

112113
private boolean moreThanOneNonNull(Object... objects) {

plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 DiffPlug
2+
* Copyright 2016-2022 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -120,8 +120,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
120120
}
121121

122122
File buildDir = stepConfig.getFileLocator().getBuildDir();
123-
NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, stepConfig.getFileLocator().getBaseDir());
124-
return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), buildDir, npmPathResolver, configFile, configInline);
123+
File baseDir = stepConfig.getFileLocator().getBaseDir();
124+
NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, baseDir);
125+
return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, configFile, configInline);
125126
}
126127

127128
private static IllegalArgumentException onlyOneConfig() {

0 commit comments

Comments
 (0)