From 274da30fe7c33956b024f895565bf79b38f1e0b4 Mon Sep 17 00:00:00 2001 From: Takashi Hashida Date: Fri, 17 Jan 2025 18:57:06 +0900 Subject: [PATCH 1/2] Update @microsoft/office-js --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index dda330a..b81a956 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "@microsoft/office-js": "^1.1.90", + "@microsoft/office-js": "^1.1.101", "bootstrap": "^5.3.2", "core-js": "^3.9.1", "jquery": "^3.7.1", @@ -3745,9 +3745,10 @@ } }, "node_modules/@microsoft/office-js": { - "version": "1.1.90", - "resolved": "https://registry.npmjs.org/@microsoft/office-js/-/office-js-1.1.90.tgz", - "integrity": "sha512-mxSt8XHfWI+tanlaGv0BmmKfGJp1UiWEDe/kQ1lISgutdqarZWyBoBcMaUxaQ/bzbXR1N616UiMdVBybIX9Xvw==", + "version": "1.1.101", + "resolved": "https://registry.npmjs.org/@microsoft/office-js/-/office-js-1.1.101.tgz", + "integrity": "sha512-V5kcCOWt5HihcIvo1bcZs9qGrjF0zL1jPIcmbuvK9obMqj8xYieV5FmX1scOJMWH7h2u9KTKLdWphV6kUPGIpQ==", + "license": "LICENSE", "engines": { "node": ">=6.9.4" } diff --git a/package.json b/package.json index 9be01c8..f1b4a7d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "watch:run-test-server": "webpack --mode production --watch --output-path tests/run-test-server/web --watch-options-poll=10000" }, "dependencies": { - "@microsoft/office-js": "^1.1.90", + "@microsoft/office-js": "^1.1.101", "bootstrap": "^5.3.2", "core-js": "^3.9.1", "jquery": "^3.7.1", From 313329ddf9ca410ef60431d6324d750f1fe32b5e Mon Sep 17 00:00:00 2001 From: Takashi Hashida Date: Mon, 20 Jan 2025 10:55:59 +0900 Subject: [PATCH 2/2] Do not use CDN, use bundled libraries --- package-lock.json | 68 +++++++++++++++++++++++++++++++++++++++-- package.json | 1 + src/web/app.html | 2 +- src/web/confirm.html | 6 ++-- src/web/count-down.html | 6 ++-- webpack.config.js | 20 ++++++++++++ 6 files changed, 94 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index b81a956..58e9bdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.1", "license": "MIT", "dependencies": { + "@fluentui/web-components": "^2.6.1", "@microsoft/office-js": "^1.1.101", "bootstrap": "^5.3.2", "core-js": "^3.9.1", @@ -2377,6 +2378,19 @@ "node": ">= 10" } }, + "node_modules/@fluentui/web-components": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@fluentui/web-components/-/web-components-2.6.1.tgz", + "integrity": "sha512-coyV+QZBVqcrJbncR2iyL0ZMXGFRJmP+JYUlewkYBt8bgmTMIwKBdUX0cN9S6KUp8JHoC2OSRqL8MYgT3T+YLQ==", + "license": "MIT", + "dependencies": { + "@microsoft/fast-colors": "^5.3.0", + "@microsoft/fast-element": "^1.13.0", + "@microsoft/fast-foundation": "^2.49.6", + "@microsoft/fast-web-utilities": "^5.4.0", + "tslib": "^2.1.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", @@ -3691,6 +3705,45 @@ "vscode-jsonrpc": "^4.0.0" } }, + "node_modules/@microsoft/fast-colors": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@microsoft/fast-colors/-/fast-colors-5.3.1.tgz", + "integrity": "sha512-72RZXVfCbwQzvo5sXXkuLXLT7rMeYaSf5r/6ewQiv/trBtqpWRm4DEH2EilHw/iWTBKOXs1qZNQndgUMa5n4LA==", + "license": "MIT" + }, + "node_modules/@microsoft/fast-element": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@microsoft/fast-element/-/fast-element-1.14.0.tgz", + "integrity": "sha512-zXvuSOzvsu8zDTy9eby8ix8VqLop2rwKRgp++ZN2kTCsoB3+QJVoaGD2T/Cyso2ViZQFXNpiNCVKfnmxBvmWkQ==", + "license": "MIT" + }, + "node_modules/@microsoft/fast-foundation": { + "version": "2.50.0", + "resolved": "https://registry.npmjs.org/@microsoft/fast-foundation/-/fast-foundation-2.50.0.tgz", + "integrity": "sha512-8mFYG88Xea1jZf2TI9Lm/jzZ6RWR8x29r24mGuLojNYqIR2Bl8+hnswoV6laApKdCbGMPKnsAL/O68Q0sRxeVg==", + "license": "MIT", + "dependencies": { + "@microsoft/fast-element": "^1.14.0", + "@microsoft/fast-web-utilities": "^5.4.1", + "tabbable": "^5.2.0", + "tslib": "^1.13.0" + } + }, + "node_modules/@microsoft/fast-foundation/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "license": "0BSD" + }, + "node_modules/@microsoft/fast-web-utilities": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/@microsoft/fast-web-utilities/-/fast-web-utilities-5.4.1.tgz", + "integrity": "sha512-ReWYncndjV3c8D8iq9tp7NcFNc1vbVHvcBFPME2nNFKNbS1XCesYZGlIlf3ot5EmuOXPlrzUHOWzQ2vFpIkqDg==", + "license": "MIT", + "dependencies": { + "exenv-es6": "^1.1.1" + } + }, "node_modules/@microsoft/m365-spec-parser": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/@microsoft/m365-spec-parser/-/m365-spec-parser-0.2.1.tgz", @@ -8698,6 +8751,12 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, + "node_modules/exenv-es6": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exenv-es6/-/exenv-es6-1.1.1.tgz", + "integrity": "sha512-vlVu3N8d6yEMpMsEm+7sUBAI81aqYYuEvfK0jNqmdb/OPXzzH7QWDDnVjMvDSY47JdHEqx/dfC/q8WkfoTmpGQ==", + "license": "MIT" + }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -14674,6 +14733,12 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/tabbable": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz", + "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==", + "license": "MIT" + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -14929,8 +14994,7 @@ "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", diff --git a/package.json b/package.json index f1b4a7d..3a7774c 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "watch:run-test-server": "webpack --mode production --watch --output-path tests/run-test-server/web --watch-options-poll=10000" }, "dependencies": { + "@fluentui/web-components": "^2.6.1", "@microsoft/office-js": "^1.1.101", "bootstrap": "^5.3.2", "core-js": "^3.9.1", diff --git a/src/web/app.html b/src/web/app.html index 717bd4c..fa62c13 100644 --- a/src/web/app.html +++ b/src/web/app.html @@ -3,7 +3,7 @@ No title - + diff --git a/src/web/confirm.html b/src/web/confirm.html index 4e96b4a..424ed37 100644 --- a/src/web/confirm.html +++ b/src/web/confirm.html @@ -3,9 +3,9 @@ Confirmation - - - + + + diff --git a/src/web/count-down.html b/src/web/count-down.html index 475adf2..253d6e6 100644 --- a/src/web/count-down.html +++ b/src/web/count-down.html @@ -3,9 +3,9 @@ Confirmation - - - + + + diff --git a/webpack.config.js b/webpack.config.js index 61f01e6..bc52353 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -79,6 +79,26 @@ module.exports = async (env, options) => { } }, }, + { + from: "node_modules/@microsoft/office-js/dist", + to: "lib/office-js", + }, + { + from: "node_modules/@microsoft/office-js/LICENSE.md", + to: "lib/office-js/LICENSE.md", + }, + { + from: "node_modules/jquery/dist/jquery.min.js", + to: "lib/jquery/jquery.min.js", + }, + { + from: "node_modules/jquery/LICENSE.txt", + to: "lib/jquery/LICENSE.txt", + }, + { + from: "node_modules/@fluentui/web-components/dist/web-components.min.js", + to: "lib/fluentui/web-components/web-components.min.js", + }, ], }), new HtmlWebpackPlugin({