diff --git a/sites/fast-component-explorer/app/explorer.tsx b/sites/fast-component-explorer/app/explorer.tsx index 7a6626d0f1d..0483fd84ac0 100644 --- a/sites/fast-component-explorer/app/explorer.tsx +++ b/sites/fast-component-explorer/app/explorer.tsx @@ -31,8 +31,6 @@ import { ActionToggleAppearance, ActionToggleProps, Background, - Heading, - HeadingSize, Pivot, Select, SelectOption, @@ -50,6 +48,7 @@ import FASTMessageSystemWorker from "@microsoft/fast-tooling/dist/message-system import { DirectionSwitch, downChevron, + Logo, ThemeSelector, TransparencyToggle, upChevron, @@ -65,7 +64,8 @@ import { ExplorerUnhandledProps, } from "./explorer.props"; import { previewReady } from "./preview"; - +/* eslint-disable-next-line @typescript-eslint/no-var-requires */ +const FASTInlineLogo = require("@microsoft/site-utilities/statics/assets/fast-inline-logo.png"); export const previewBackgroundTransparency: string = "PREVIEW::TRANSPARENCY"; export const previewDirection: string = "PREVIEW::DIRECTION"; export const previewTheme: string = "PREVIEW::THEME"; @@ -173,19 +173,11 @@ class Explorer extends Foundation< - - FAST Explorer - + - + { loader: "babel-loader", }, }, + { + test: /\.(png|jpe?g|gif)$/i, + use: { + loader: "file-loader", + options: { + esModule: false, + }, + }, + }, { test: /message\-system\.min\.js/, use: { @@ -89,7 +98,12 @@ module.exports = (env, args) => { // new WorkboxPlugin.GenerateSW({ // exclude: [/\.map$/, /^manifest.*\.js(?:on)?$/, /\.html$/], // }), - new FaviconsWebpackPlugin(path.resolve(__dirname, "favicon.png")), + new FaviconsWebpackPlugin( + path.resolve( + rootNodeModules, + "@microsoft/site-utilities/statics/assets/fast-logo.png" + ) + ), ], resolve: { extensions: [".js", ".tsx", ".ts", ".json"], diff --git a/sites/fast-creator/app/creator.tsx b/sites/fast-creator/app/creator.tsx index 96ce5233196..fcd76b20cbe 100644 --- a/sites/fast-creator/app/creator.tsx +++ b/sites/fast-creator/app/creator.tsx @@ -1,11 +1,5 @@ import { memoize, uniqueId } from "lodash-es"; -import { - Background, - Badge, - cardSchema2, - Heading, - HeadingSize, -} from "@microsoft/fast-components-react-msft"; +import { Background } from "@microsoft/fast-components-react-msft"; import { neutralLayerL1, neutralLayerL2, @@ -55,6 +49,7 @@ import { Dimension, DirectionSwitch, fastComponentSchemas, + Logo, nativeElementSchemas, textSchema, ThemeSelector, @@ -72,7 +67,8 @@ import { divTag, linkedDataExamples } from "./configs"; import { ProjectFileTransfer } from "./components"; import { selectDeviceOverrideStyles } from "./utilities/style-overrides"; import { previewReady } from "./preview"; - +/* eslint-disable-next-line @typescript-eslint/no-var-requires */ +const FASTInlineLogo = require("@microsoft/site-utilities/statics/assets/fast-inline-logo.png"); const fastMessageSystemWorker = new FASTMessageSystemWorker(); let fastMessageSystem: MessageSystem; const schemaDictionary: SchemaDictionary = { @@ -162,20 +158,12 @@ class Creator extends Foundation { - - FAST Creator - ALPHA - + { /> - + { loader: "babel-loader", }, }, + { + test: /\.(png|jpe?g|gif)$/i, + use: { + loader: "file-loader", + options: { + esModule: false, + }, + }, + }, { test: /message\-system\.min\.js/, use: { @@ -85,7 +94,12 @@ module.exports = (env, args) => { // new WorkboxPlugin.GenerateSW({ // exclude: [/\.map$/, /^manifest.*\.js(?:on)?$/, /\.html$/], // }), - new FaviconsWebpackPlugin(path.resolve(__dirname, "favicon.png")), + new FaviconsWebpackPlugin( + path.resolve( + rootNodeModules, + "@microsoft/site-utilities/statics/assets/fast-logo.png" + ) + ), ], resolve: { extensions: [".js", ".tsx", ".ts", ".json"], diff --git a/sites/fast-tooling-examples/app/index.html b/sites/fast-tooling-examples/app/index.html index 898adf82fc7..f2f1f43d36f 100644 --- a/sites/fast-tooling-examples/app/index.html +++ b/sites/fast-tooling-examples/app/index.html @@ -17,7 +17,9 @@ href="/" appearance="lightweight" > - FAST Tooling Examples + + + Tooling Examples