mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-11 03:32:46 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[Settings] Fix HTML settings build (#10307)

Browse Source
This commit is contained in:
Andrey Nekrasov 2021-03-18 17:14:37 +03:00 committed by GitHub
parent fa5ce634e1
commit 7c28459673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 939 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installer/PowerToysSetup/Product.wxs
View File

@ -754,6 +754,9 @@
<Component Id="settings_js_bundle" Guid="9EF539C1-2F50-421E-B074-C58ED3A9785C" Win64="yes"> <Component Id="settings_js_bundle" Guid="9EF539C1-2F50-421E-B074-C58ED3A9785C" Win64="yes">
<File Source="$(var.RepoDir)\src\settings\settings-html\dist\bundle.js" KeyPath="yes" /> <File Source="$(var.RepoDir)\src\settings\settings-html\dist\bundle.js" KeyPath="yes" />
</Component> </Component>
<Component Id="settings_css" Guid="9B8EBF56-A7A7-4D83-B53C-75A692E2F95A" Win64="yes">
<File Source="$(var.RepoDir)\src\settings\settings-html\dist\layout.css" KeyPath="yes" />
</Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="DesktopFolder"> <DirectoryRef Id="DesktopFolder">
@ -814,6 +817,7 @@
<ComponentRef Id="settings_html" /> <ComponentRef Id="settings_html" />
<ComponentRef Id="settings_dark_html" /> <ComponentRef Id="settings_dark_html" />
<ComponentRef Id="settings_js_bundle" /> <ComponentRef Id="settings_js_bundle" />
<ComponentRef Id="settings_css" />
</ComponentGroup> </ComponentGroup>
<ComponentGroup Id="ToolComponents" Directory="ToolsFolder"> <ComponentGroup Id="ToolComponents" Directory="ToolsFolder">
<ComponentRef Id="BugReportTool_exe" /> <ComponentRef Id="BugReportTool_exe" />

1
src/settings-web/index-dark.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link rel="stylesheet" href="dist/layout.css" />
<script> <script>
window.output_from_webview = function(arg) { window.output_from_webview = function(arg) {
if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) { if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) {

1
src/settings-web/index.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link rel="stylesheet" href="dist/layout.css" />
<script> <script>
window.output_from_webview = function(arg) { window.output_from_webview = function(arg) {
if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) { if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) {

850
src/settings-web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

7
src/settings-web/package.json
View File

@ -15,7 +15,7 @@
"preinstall": "npx npm-force-resolutions", "preinstall": "npx npm-force-resolutions",
"just": "just-scripts", "just": "just-scripts",
"clean": "rimraf build lib lib-commonjs && just-scripts clean", "clean": "rimraf build lib lib-commonjs && just-scripts clean",
"build": "rimraf build && just-scripts build --min --production && copy *.html build && react-snap && xcopy build\\* ..\\settings\\settings-html /sy", "build": "rimraf build && just-scripts build --min --production && copy *.html build && copy src\\css\\layout.css build\\dist && react-snap && xcopy build\\* ..\\settings\\settings-html /sy",
"test": "just-scripts test", "test": "just-scripts test",
"test:update": "just-scripts jest -u", "test:update": "just-scripts jest -u",
"test:start": "just-scripts start-test", "test:start": "just-scripts start-test",
@ -43,7 +43,10 @@
"just-scripts": "^0.18.0", "just-scripts": "^0.18.0",
"just-stack-uifabric": "^1.0.2", "just-stack-uifabric": "^1.0.2",
"react-snap": "^1.23.0", "react-snap": "^1.23.0",
"rimraf": "^3.0.2" "rimraf": "^3.0.2",
"ts-loader": "^8.0.18",
"typescript": "^4.2.3",
"webpack": "^5.26.3"
}, },
"just": { "just": {
"stack": "just-stack-uifabric" "stack": "just-stack-uifabric"

1
src/settings-web/src/components/App.tsx
View File

@ -2,7 +2,6 @@ import React from 'react';
import {Stack, Text, Nav, DefaultButton, PrimaryButton, ScrollablePane, INavLink, Spinner, SpinnerSize, Dialog, DialogType, DialogFooter, getTheme} from 'office-ui-fabric-react'; import {Stack, Text, Nav, DefaultButton, PrimaryButton, ScrollablePane, INavLink, Spinner, SpinnerSize, Dialog, DialogType, DialogFooter, getTheme} from 'office-ui-fabric-react';
import {GeneralSettings} from './GeneralSettings'; import {GeneralSettings} from './GeneralSettings';
import {ModuleSettings} from './ModuleSettings'; import {ModuleSettings} from './ModuleSettings';
import '../css/layout.css';
import {setup_powertoys_icons} from '../setup_icons'; import {setup_powertoys_icons} from '../setup_icons';
// Register fabric UI icons and powertoys logos as icons. // Register fabric UI icons and powertoys logos as icons.

4
src/settings-web/webpack.config.js
View File

@ -1,5 +1,5 @@
const path = require('path') const path = require('path')
const { webpackMerge, basicWebpackConfig, stylesOverlay, tsOverlay } = require('just-scripts'); const { webpackMerge, basicWebpackConfig, tsOverlay } = require('just-scripts');
// Overrides the Just file overlay so that SVGs can be used as a React Component. // Overrides the Just file overlay so that SVGs can be used as a React Component.
powertoys_fileOverlay = { powertoys_fileOverlay = {
@ -20,4 +20,4 @@ powertoys_fileOverlay = {
} }
}; };
module.exports = webpackMerge(basicWebpackConfig, stylesOverlay, tsOverlay, powertoys_fileOverlay); module.exports = webpackMerge(basicWebpackConfig, tsOverlay, powertoys_fileOverlay);

33
src/settings/settings-html/dist/bundle.js vendored
View File

File diff suppressed because one or more lines are too long

32
src/settings/settings-html/dist/bundle.js.LICENSE.txt vendored Normal file
View File

@ -0,0 +1,32 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/
/** @license React v0.13.6
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/** @license React v16.8.6
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/** @license React v16.8.6
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

63
src/settings/settings-html/dist/layout.css vendored Normal file
View File

@ -0,0 +1,63 @@
.body {
display: flex;
flex-direction: row;
height: 100%;
}
.body .sidebar {
order: -1;
max-width: 228px;
min-width: 228px;
flex-basis: 228px;
display: flex;
flex-direction: column;
}
.body .sidebar.collapsed {
max-width: 48px;
min-width: 48px;
flex-basis: 48px;
}
.body .editorzone {
display: flex;
flex-direction: column;
flex-grow: 1;
}
.body .editorzone .editorhead {
display: flex;
flex-direction: row;
flex-grow: 1;
min-height: 50px;
max-height: 50px;
border-bottom: 1px solid #f3f2f1;
padding-left: 16px;
padding-right: 16px;
}
.body .editorzone .editorhead .editortitle {
align-self: center;
flex-basis: 0;
flex-grow: 1;
flex-shrink: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.body .editorzone .editorhead .editorheadbuttons {
justify-self: right;
justify-content: right;
align-self: center;
}
.body .editorzone .editorbody {
display: flex;
position: relative;
flex-direction: column;
flex-grow: 1;
}
.SubHeader{
font-weight: bold;
}

4
src/settings/settings-html/index-dark.html
View File

File diff suppressed because one or more lines are too long

4
src/settings/settings-html/index.html
View File

File diff suppressed because one or more lines are too long