diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1b532d8b..195861bd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,8 @@ updates: schedule: interval: "daily" open-pull-requests-limit: 10 + cooldown: + default-days: 7 ignore: # Ignore eslint 10 until ecosystem supports it @@ -39,6 +41,8 @@ updates: directory: / schedule: interval: daily + cooldown: + default-days: 7 groups: production-dependencies: dependency-type: "production" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93f9e21e..c48c2977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,9 @@ on: push: branches: - main + pull_request: + branches: + - main workflow_dispatch: permissions: diff --git a/package-lock.json b/package-lock.json index 869c7066..d602d628 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@fluentui/web-components": "^3.0.2", + "@fluentui/web-components": "^3.0.0", "@microsoft/applicationinsights-web": "^3.4.3", "@microsoft/office-js": "^1.1.110", "codepage": "^1.15.0", @@ -1568,9 +1568,9 @@ } }, "node_modules/@fluentui/web-components": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@fluentui/web-components/-/web-components-3.0.2.tgz", - "integrity": "sha512-K4wQniGNx9cKy9WiQDN5AwczR5uN9kDlNW5C/hqB9jupO1let3BqdrwAsi/l/rPkuWU5EIvgh8YSoKF6rXx9JA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@fluentui/web-components/-/web-components-3.0.0.tgz", + "integrity": "sha512-+LKzLAlqyD9WNYNoYmAVUageEUiJ8DlnHwiyB3/+WjPaAsozvlW4sqG7m38hXoVFm5QraB0hBRk5dqAF72K5qg==", "license": "MIT", "dependencies": { "@fluentui/tokens": "^1.0.0-alpha.23", diff --git a/package.json b/package.json index 8494b232..505734a7 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "webpack-dev-server": "^6.0.0" }, "dependencies": { - "@fluentui/web-components": "^3.0.2", + "@fluentui/web-components": "^3.0.0", "@microsoft/applicationinsights-web": "^3.4.3", "@microsoft/office-js": "^1.1.110", "codepage": "^1.15.0", diff --git a/src/Scripts/ui/mha.ts b/src/Scripts/ui/mha.ts index eb168fca..6e714570 100644 --- a/src/Scripts/ui/mha.ts +++ b/src/Scripts/ui/mha.ts @@ -1,7 +1,4 @@ -import { - fluentButton, - provideFluentDesignSystem -} from "@fluentui/web-components"; +import "@fluentui/web-components/button.js"; import "../../Content/fluentCommon.css"; import "../../Content/Office.css"; import "../../Content/classicDesktopFrame.css"; @@ -13,11 +10,6 @@ import { Strings } from "../Strings"; import { DomUtils } from "./domUtils"; import { Table } from "./Table"; -// Register Fluent UI Web Components -provideFluentDesignSystem().register( - fluentButton() -); - let viewModel: HeaderModel; let table: Table; diff --git a/src/Scripts/ui/uiToggle.ts b/src/Scripts/ui/uiToggle.ts index 25013e37..53f17f85 100644 --- a/src/Scripts/ui/uiToggle.ts +++ b/src/Scripts/ui/uiToggle.ts @@ -1,27 +1,13 @@ -import { - fluentButton, - fluentCheckbox, - fluentDialog, - fluentRadio, - fluentRadioGroup, - fluentToolbar, - provideFluentDesignSystem -} from "@fluentui/web-components"; +import "@fluentui/web-components/button.js"; +import "@fluentui/web-components/checkbox.js"; +import "@fluentui/web-components/dialog.js"; +import "@fluentui/web-components/radio.js"; +import "@fluentui/web-components/radio-group.js"; import "../../Content/fluentCommon.css"; import "../../Content/uiToggle.css"; import { ParentFrame } from "../ParentFrame"; -// Register Fluent UI Web Components -provideFluentDesignSystem().register( - fluentButton(), - fluentCheckbox(), - fluentDialog(), - fluentRadio(), - fluentRadioGroup(), - fluentToolbar() -); - Office.onReady(async (info) => { if (info.host === Office.HostType.Outlook) { await ParentFrame.initUI(); diff --git a/tsconfig.json b/tsconfig.json index f2866b84..96bd331d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "outDir": "./dist/", - "moduleResolution": "node", + "moduleResolution": "bundler", "module": "ES2022", "target": "ES2022", "lib": ["ES2022", "DOM"],