Using remappings in a combination of Openzeppelin (normal) contracts and upgradable contracts

[gagiuntoli]

Hello, I am wondering how to deal with combinations of @openzeppelin/contracts and @openzeppelin/contracts-upgradeable when I use the foundry install openzeppelin command (git submodules inside the lib/ directory).

For example, I have the following tree structure:

lib/
├── forge-std
├── openzeppelin-contracts
├── openzeppelin-contracts-upgradeable

And in the contracts (I was using npm before):

import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

I would like to keep the contracts the same using the remappings. Currently, remappings.txt looks like:

@openzeppelin/=lib/openzeppelin-contracts/contracts/
@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/

This doesn't work:

[⠊] Compiling...
Error: 
Failed to resolve file: "/home/.../evm/lib/openzeppelin-contracts/contracts/contracts-upgradeable/access/OwnableUpgradeable.sol": No such file or directory (os error 2).
    --> "/home/.../evm/contracts/v1/markets/ConditionalTokens.sol"
        "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"
    Check configured remappings.

Is there a way to configure the remappings so I can keep the contracts the same?

[gagiuntoli]

Please delete this discussion when possible; I found it was an error on my side (inconsistency of path across contracts)