[pull] main from renovatebot:main

docs/usage/getting-started/installing-onboarding.md

@@ -5,7 +5,7 @@
 Read the [Security and Permissions](../security-and-permissions.md) page to learn more about:
 
 - Renovate's security stance
-- What do if you need to use certified software
+- What to do if you need to use certified software
 - The security/disclosure process
 - Permissions
 - Privacy

lib/config/options/index.ts

@@ -659,7 +659,7 @@ const options: Readonly<RenovateOptions>[] = [
     description:
       'Change this value to override the default Renovate sidecar image.',
     type: 'string',
-    default: 'ghcr.io/renovatebot/base-image:13.33.1',
+    default: 'ghcr.io/renovatebot/base-image:13.33.2',
     globalOnly: true,
     deprecationMsg:
       'The usage of `binarySource=docker` is deprecated, and will be removed in the future',

lib/modules/manager/gomod/artifacts.spec.ts

@@ -21,7 +21,7 @@ vi.mock('../../../util/http/index.ts');
 vi.mock('../../../util/fs/index.ts', async () => {
   // restore
   return mockDeep({
-    isValidLocalPath: (await vi.importActual<FS>('../../../util/fs'))
+    isValidLocalPath: (await vi.importActual<FS>('../../../util/fs/index.ts'))
       .isValidLocalPath,
   });
 });

lib/modules/manager/npm/extract/common/package-file.spec.ts

@@ -5,8 +5,8 @@ import { hasPackageManager } from './package-file.ts';
 
 vi.mock('fs-extra', async () =>
   (
-    await vi.importActual<typeof import('~test/fixtures.js')>(
-      '~test/fixtures.js',
+    await vi.importActual<typeof import('~test/fixtures.ts')>(
+      '~test/fixtures.ts',
     )
   ).fsExtra(),
 );

lib/modules/manager/npm/extract/index.spec.ts

@@ -27,7 +27,9 @@ const invalidNameContent = Fixtures.get('invalid-name.json', '..');
 describe('modules/manager/npm/extract/index', () => {
   describe('.extractPackageFile()', () => {
     beforeEach(async () => {
-      const realFs = await vi.importActual<typeof fs>('../../../../util/fs');
+      const realFs = await vi.importActual<typeof fs>(
+        '../../../../util/fs/index.ts',
+      );
       fs.readLocalFile.mockResolvedValue(null);
       fs.localPathExists.mockResolvedValue(false);
       fs.getSiblingFileName.mockImplementation(realFs.getSiblingFileName);

lib/modules/manager/npm/extract/pnpm.spec.ts

@@ -95,7 +95,9 @@ describe('modules/manager/npm/extract/pnpm', () => {
 
   describe('.detectPnpmWorkspaces()', () => {
     beforeEach(async () => {
-      const realFs = await vi.importActual<typeof fs>('../../../../util/fs');
+      const realFs = await vi.importActual<typeof fs>(
+        '../../../../util/fs/index.ts',
+      );
 
       // The real implementations of these functions are used for this block;
       // they do static path manipulation.

lib/modules/manager/npm/extract/post/locked-versions.spec.ts

@@ -12,7 +12,7 @@ const yarn = vi.mocked(_yarn);
 
 vi.mock('../npm.ts');
 vi.mock('../yarn.ts', async () => ({
-  ...(await vi.importActual<typeof import('../yarn.ts')>('../yarn')),
+  ...(await vi.importActual<typeof import('../yarn.ts')>('../yarn.ts')),
   getYarnLock: vi.fn(),
 }));
 vi.mock('../pnpm.ts');

lib/modules/manager/npm/npmrc.spec.ts

@@ -8,7 +8,9 @@ vi.mock('../../../util/fs/index.ts');
 describe('modules/manager/npm/npmrc', () => {
   describe('resolveNpmrc', () => {
     beforeEach(async () => {
-      const realFs = await vi.importActual<typeof fs>('../../../util/fs');
+      const realFs = await vi.importActual<typeof fs>(
+        '../../../util/fs/index.ts',
+      );
       fs.readLocalFile.mockResolvedValue(null);
       fs.findLocalSiblingOrParent.mockResolvedValue(null);
       fs.getSiblingFileName.mockImplementation(realFs.getSiblingFileName);

lib/modules/manager/npm/post-update/yarn.spec.ts

@@ -14,8 +14,8 @@ import * as yarnHelper from './yarn.ts';
 
 vi.mock('fs-extra', async () =>
   (
-    await vi.importActual<typeof import('~test/fixtures.js')>(
-      '~test/fixtures.js',
+    await vi.importActual<typeof import('~test/fixtures.ts')>(
+      '~test/fixtures.ts',
     )
   ).fsExtra(),
 );

lib/modules/manager/npm/utils.spec.ts

@@ -1,7 +1,7 @@
 vi.mock('fs-extra', async () =>
   (
-    await vi.importActual<typeof import('~test/fixtures.js')>(
-      '~test/fixtures.js',
+    await vi.importActual<typeof import('~test/fixtures.ts')>(
+      '~test/fixtures.ts',
     )
   ).fsExtra(),
 );

lib/modules/manager/nuget/package-tree.spec.ts

@@ -7,8 +7,8 @@ import { getDependentPackageFiles } from './package-tree.ts';
 
 vi.mock('fs-extra', async () =>
   (
-    await vi.importActual<typeof import('~test/fixtures.js')>(
-      '~test/fixtures.js',
+    await vi.importActual<typeof import('~test/fixtures.ts')>(
+      '~test/fixtures.ts',
     )
   ).fsExtra(),
 );

lib/modules/manager/swift/artifacts.spec.ts

@@ -199,6 +199,31 @@ describe('modules/manager/swift/artifacts', () => {
     );
   });
 
+  it('does not write `from:` range to Package.resolved', async () => {
+    scm.getFileList.mockResolvedValue(['Package.resolved']);
+    fs.readLocalFile.mockResolvedValue(v2Fixture);
+    vi.mocked(datasource.getDigest).mockResolvedValue('newrevisionsha123');
+
+    const result = await updateArtifacts({
+      packageFileName: 'Package.swift',
+      updatedDeps: [
+        {
+          depName: 'Alamofire/Alamofire',
+          datasource: GithubTagsDatasource.id,
+          newVersion: '5.10.0',
+          newValue: 'from: "5.10.0"',
+        },
+      ],
+      newPackageFileContent: '',
+      config: {},
+    });
+
+    expect(result).toHaveLength(1);
+    const { contents } = result![0].file as { contents: string };
+    expect(contents).toContain('"version": "5.10.0"');
+    expect(contents).not.toContain('from:');
+  });
+
   it('updates multiple pins in one call', async () => {
     scm.getFileList.mockResolvedValue(['Package.resolved']);
     fs.readLocalFile.mockResolvedValue(v2Fixture);

lib/modules/manager/swift/artifacts.ts

@@ -208,17 +208,19 @@ export async function updateArtifacts({
         continue;
       }
 
+      const resolvedVersion = dep.newVersion.replace(regEx(/^v/), '');
+
       // Skip if already up-to-date
-      if (pin.state.version === newValue) {
+      if (pin.state.version === resolvedVersion) {
         logger.debug(
-          { depName: dep.depName, newValue },
+          { depName: dep.depName, resolvedVersion },
           'swift: pin already at target version',
         );
         continue;
       }
 
       const newRevision = await resolveCommitSha(dep, dep.newVersion);
-      updated = updatePinInJson(updated, pin, newValue, newRevision);
+      updated = updatePinInJson(updated, pin, resolvedVersion, newRevision);
     }
 
     if (updated !== content) {

lib/modules/platform/azure/index.spec.ts

@@ -44,16 +44,16 @@ describe('modules/platform/azure/index', () => {
   beforeEach(async () => {
     // reset module
     vi.resetModules();
-    hostRules = await vi.importMock('../../../util/host-rules');
-    azure = await vi.importActual('.');
-    azureApi = await vi.importMock('./azure-got-wrapper');
-    azureHelper = await vi.importMock('./azure-helper');
+    hostRules = await vi.importMock('../../../util/host-rules.ts');
+    azure = await vi.importActual('./index.ts');
+    azureApi = await vi.importMock('./azure-got-wrapper.ts');
+    azureHelper = await vi.importMock('./azure-helper.ts');
     logger = (
       await vi.importMock<typeof import('../../../logger/index.ts')>(
-        '../../../logger',
+        '../../../logger/index.ts',
       )
     ).logger;
-    git = await vi.importMock('../../../util/git');
+    git = await vi.importMock('../../../util/git/index.ts');
     git.branchExists.mockReturnValue(true);
     git.isBranchBehindBase.mockResolvedValue(false);
     hostRules.find.mockReturnValue({

lib/modules/platform/codecommit/index.spec.ts

@@ -27,6 +27,7 @@ import {
 } from '../../../constants/error-messages.ts';
 import type { Platform } from '../types.ts';
 import { getCodeCommitUrl } from './codecommit-client.ts';
+import * as codeCommit from './index.ts';
 
 const codeCommitClient = mockClient(CodeCommitClient);
 
@@ -44,10 +45,7 @@ async function reInitRepo(codeCommit: Platform): Promise<void> {
 }
 
 describe('modules/platform/codecommit/index', () => {
-  let codeCommit: Platform;
-
   beforeAll(async () => {
-    codeCommit = await vi.importActual('.');
     await codeCommit.initPlatform({
       endpoint: 'https://git-codecommit.eu-central-1.amazonaws.com/',
       username: 'accessKeyId',

lib/util/exec/containerbase.ts

@@ -241,13 +241,13 @@ const allToolConfig: Record<string, ToolConfig> = {
 };
 
 let _getPkgReleases: Promise<
-  typeof import('../../modules/datasource/index.js')
+  typeof import('../../modules/datasource/index.ts')
 > | null = null;
 
 async function getPkgReleases(
   toolConfig: ToolConfig,
 ): Promise<ReleaseResult | null> {
-  _getPkgReleases ??= import('../../modules/datasource/index.js');
+  _getPkgReleases ??= import('../../modules/datasource/index.ts');
   const { getPkgReleases } = await _getPkgReleases;
   return getPkgReleases(toolConfig);
 }

lib/util/exec/index.spec.ts

@@ -21,7 +21,7 @@ import { asRawCommand } from './utils.ts';
 const getHermitEnvsMock = vi.mocked(getHermitEnvs);
 
 vi.mock('./hermit.ts', async () => ({
-  ...(await vi.importActual<typeof import('./hermit.ts')>('./hermit')),
+  ...(await vi.importActual<typeof import('./hermit.ts')>('./hermit.ts')),
   getHermitEnvs: vi.fn(),
 }));
 vi.mock('../../modules/datasource/index.ts', () => mockDeep());

lib/util/git/private-key.spec.ts

@@ -16,8 +16,8 @@ import {
 
 vi.mock('fs-extra', async () =>
   (
-    await vi.importActual<typeof import('~test/fixtures.js')>(
-      '~test/fixtures.js',
+    await vi.importActual<typeof import('~test/fixtures.ts')>(
+      '~test/fixtures.ts',
     )
   ).fsExtra(),
 );

lib/workers/global/config/parse/index.spec.ts

@@ -28,7 +28,7 @@ describe('workers/global/config/parse/index', () => {
     let defaultEnv: NodeJS.ProcessEnv;
 
     beforeEach(async () => {
-      configParser = await vi.importActual('./index');
+      configParser = await vi.importActual('./index.ts');
       defaultArgv = getArgv();
       defaultEnv = {
         RENOVATE_CONFIG_FILE: upath.resolve(

package.json

@@ -183,7 +183,7 @@
     "@pnpm/parse-overrides": "1001.0.4",
     "@qnighy/marshal": "0.1.3",
     "@redis/client": "5.11.0",
-    "@renovatebot/detect-tools": "2.0.0",
+    "@renovatebot/detect-tools": "3.0.0",
     "@renovatebot/good-enough-parser": "2.0.0",
     "@renovatebot/osv-offline": "2.4.0",
     "@renovatebot/pep440": "4.2.2",
@@ -354,7 +354,7 @@
     "semantic-release": "25.0.3",
     "tar": "7.5.13",
     "tmp-promise": "3.0.3",
-    "tsdown": "0.21.4",
+    "tsdown": "0.21.5",
     "type-fest": "5.5.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.57.2",