Vaadin Elements not working with the latest Angular CLI

Vaading was working, but after I had upgraded my Angular CLI to 1.0.0-beta.25.5, I get the errors below:

“Tried to find bootstrap code, but could not. Specify either statically analyzable bootstrap code or pass in an entryModule to the plugins options.
Error: Tried to find bootstrap code, but could not. Specify either statically analyzable bootstrap code or pass in an entryModule to the plugins options.
at Object.resolveEntryModuleFromMain (R:\Project\node_modules@ngtools\webpack\src\entry_resolver.js:121:15)”

If I change the the main file under angular-cli.json to point to main.ts instead of main-polymer.ts, the project works again, but without vaadin elements, of course.
Did someone could make it work with the newest angular-cli?
Thanks/Bruno.