Update transpilation process

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Breaking changes
 
+- `Initializable` and `UUPSUpgradeable` are no longer transpiled, and are now absent from the `@openzeppelin/contracts-upgradeable` package. Imports must be updated to get these files from `@openzeppelin/contracts` instead.
 - `SignerERC7702` is renamed as `SignerEIP7702`. Imports and inheritance must be updated to that new name and path. Behavior is unmodified.
 - Update minimum pragma to 0.8.24 in `Votes`, `VotesExtended`, `ERC20Votes`, `Strings`, `ERC1155URIStorage`, `MessageHashUtils`, `ERC721URIStorage`, `ERC721Votes`, `ERC721Wrapper`, `ERC721Burnable`, `ERC721Consecutive`, `ERC721Enumerable`, `ERC721Pausable`, `ERC721Royalty`, `ERC721Wrapper`, `EIP712`, and `ERC7739`. ([#5726](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5726))
 

contracts/proxy/utils/UUPSUpgradeable.sol

@@ -15,6 +15,8 @@ import {ERC1967Utils} from "../ERC1967/ERC1967Utils.sol";
  * `UUPSUpgradeable` with a custom implementation of upgrades.
  *
  * The {_authorizeUpgrade} function must be overridden to include access restriction to the upgrade mechanism.
+ *
+ * @custom:stateless
  */
 abstract contract UUPSUpgradeable is IERC1822Proxiable {
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable

package.json

@@ -62,7 +62,7 @@
     "@nomicfoundation/hardhat-network-helpers": "^1.0.13",
     "@openzeppelin/docs-utils": "^0.1.5",
     "@openzeppelin/merkle-tree": "^1.0.7",
-    "@openzeppelin/upgrade-safe-transpiler": "^0.3.32",
+    "@openzeppelin/upgrade-safe-transpiler": "^0.4.0",
     "@openzeppelin/upgrades-core": "^1.20.6",
     "chai": "^4.2.0",
     "eslint": "^9.0.0",

scripts/upgradeable/transpile.sh

@@ -23,7 +23,7 @@ fi
 # -D: delete original and excluded files
 # -b: use this build info file
 # -i: use included Initializable
-# -x: exclude proxy-related contracts with a few exceptions
+# -x: exclude some proxy-related contracts
 # -p: emit public initializer
 # -n: use namespaces
 # -N: exclude from namespaces transformation
@@ -32,12 +32,8 @@ npx @openzeppelin/upgrade-safe-transpiler -D \
   -b "$build_info" \
   -i contracts/proxy/utils/Initializable.sol \
   -x 'contracts-exposed/**/*' \
-  -x 'contracts/proxy/**/*' \
-  -x '!contracts/proxy/Clones.sol' \
-  -x '!contracts/proxy/ERC1967/ERC1967Storage.sol' \
-  -x '!contracts/proxy/ERC1967/ERC1967Utils.sol' \
-  -x '!contracts/proxy/utils/UUPSUpgradeable.sol' \
-  -x '!contracts/proxy/beacon/IBeacon.sol' \
+  -x 'contracts/proxy/**/*Proxy*.sol' \
+  -x 'contracts/proxy/beacon/UpgradeableBeacon.sol' \
   -p 'contracts/access/manager/AccessManager.sol' \
   -p 'contracts/finance/VestingWallet.sol' \
   -p 'contracts/governance/TimelockController.sol' \