A set of laws Gov. Gavin Newsom signed today extends California clean-energy programs while taking steps to shore up oil and gas production. It also opens the door to a Western energy grid.

Under the new plan, the state would almost eliminate oil and shift to renewable sources over the next two decades, but offers no update on the controversial polluting-trading market known as cap-and-trade.