Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into PM-12036
Browse files Browse the repository at this point in the history
cd-bitwarden authored Jan 28, 2025
2 parents 9c54d29 + 222392d commit ced9b7c
Showing 174 changed files with 1,508 additions and 830 deletions.
29 changes: 0 additions & 29 deletions .eslintignore

This file was deleted.

258 changes: 0 additions & 258 deletions .eslintrc.json

This file was deleted.

25 changes: 22 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -69,6 +69,26 @@
"commitMessagePrefix": "[deps] Auth:",
"reviewers": ["team:team-auth-dev"]
},
{
"matchPackageNames": [
"@angular-eslint/schematics",
"angular-eslint",
"eslint-config-prettier",
"eslint-import-resolver-typescript",
"eslint-plugin-import",
"eslint-plugin-rxjs-angular",
"eslint-plugin-rxjs",
"eslint-plugin-storybook",
"eslint-plugin-tailwindcss",
"eslint",
"husky",
"lint-staged",
"typescript-eslint"
],
"description": "Architecture owned dependencies",
"commitMessagePrefix": "[deps] Architecture:",
"reviewers": ["team:dept-architecture"]
},
{
"matchPackageNames": [
"@angular-eslint/eslint-plugin-template",
@@ -88,9 +108,8 @@
"husky",
"lint-staged"
],
"description": "Architecture owned dependencies",
"commitMessagePrefix": "[deps] Architecture:",
"reviewers": ["team:dept-architecture"]
"groupName": "Linting minor-patch",
"matchUpdateTypes": ["minor", "patch"]
},
{
"matchPackageNames": [
5 changes: 4 additions & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { dirname, join } from "path";

import { StorybookConfig } from "@storybook/angular";
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
import remarkGfm from "remark-gfm";
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";

const config: StorybookConfig = {
stories: [
@@ -29,6 +30,8 @@ const config: StorybookConfig = {
getAbsolutePath("@storybook/addon-designs"),
getAbsolutePath("@storybook/addon-interactions"),
{
// @storybook/addon-docs is part of @storybook/addon-essentials
// eslint-disable-next-line storybook/no-uninstalled-addons
name: "@storybook/addon-docs",
options: {
mdxPluginOptions: {
8 changes: 6 additions & 2 deletions .storybook/manager.js
Original file line number Diff line number Diff line change
@@ -50,10 +50,14 @@ const darkTheme = create({
});

export const getPreferredColorScheme = () => {
if (!globalThis || !globalThis.matchMedia) return "light";
if (!globalThis || !globalThis.matchMedia) {
return "light";
}

const isDarkThemePreferred = globalThis.matchMedia("(prefers-color-scheme: dark)").matches;
if (isDarkThemePreferred) return "dark";
if (isDarkThemePreferred) {
return "dark";
}

return "light";
};
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -7,5 +7,6 @@
"**/_locales/*[^n]/messages.json": true
},
"rust-analyzer.linkedProjects": ["apps/desktop/desktop_native/Cargo.toml"],
"typescript.tsdk": "node_modules/typescript/lib"
"typescript.tsdk": "node_modules/typescript/lib",
"eslint.useFlatConfig": true
}
26 changes: 0 additions & 26 deletions apps/browser/.eslintrc.json

This file was deleted.

Loading

0 comments on commit ced9b7c

Please sign in to comment.