Skip to content

Commit

Permalink
Merge pull request #200 from Zextras/devel-to-release-20230202
Browse files Browse the repository at this point in the history
Devel to release 20230202
  • Loading branch information
beawar authored Feb 2, 2023
2 parents 70243ba + 49ea6d9 commit d3ed8d9
Show file tree
Hide file tree
Showing 44 changed files with 2,431 additions and 1,089 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @nubsthead @giuliano176 @dhavaldodiya @Gammax92 @gnekoz @Zextras/shuffled-waffles
* @Zextras/shuffled-waffles @Zextras/smoky-beans @Zextras/the-dexters
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
/coverage/cobertura-coverage.xml
/.vscode/
/.idea/
.dev.json
.dev.json
zextras-carbonio-*.tgz
2 changes: 0 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/sh
. "$(dirname $0)/_/husky.sh"

npx pinst -e
git add package.json
npm run type-check
npm run lint -- --quiet
# reuse lint
Expand Down
10 changes: 10 additions & 0 deletions carbonio.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,15 @@ module.exports = (conf, pkg, options, mode) => {
]
};
conf.externals = {};
conf.module.rules = [
...conf.module.rules,
{
test: /\.(woff(2)?|ttf|eot)$/,
type: 'asset/resource',
generator: {
filename: './files/[name][ext]'
}
}
];
return conf;
};
Loading

0 comments on commit d3ed8d9

Please sign in to comment.