Skip to content

Commit d67e314

Browse files
committed
Merge remote-tracking branch 'github4science/main' into task/main/DURACOM-327
# Conflicts: # src/app/shared/form/builder/parsers/field-parser.ts
2 parents ad8ff15 + 1fa00ac commit d67e314

10 files changed

Lines changed: 1272 additions & 1987 deletions

File tree

lint/src/util/theme-support.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ class ThemeableComponentRegistry {
150150
traverse(source);
151151
}
152152

153-
const glob = require('glob');
153+
const { globSync } = require('glob');
154154

155155
// note: this outputs Unix-style paths on Windows
156-
const wrappers: string[] = glob.GlobSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' }).found;
156+
const wrappers: string[] = globSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' });
157157

158158
for (const wrapper of wrappers) {
159159
registerWrapper(wrapper);

0 commit comments

Comments
 (0)