jordanliu
diff --git a/‎package-lock.json
Lines changed: 329 additions & 0 deletions b/‎package-lock.json
Lines changed: 329 additions & 0 deletions
diff --git a/‎package.json
Lines changed: 3 additions & 1 deletion b/‎package.json
Lines changed: 3 additions & 1 deletion
diff --git a/‎resources/public/favicon.ico
-3.78 KB b/‎resources/public/favicon.ico
-3.78 KB
diff --git a/‎resources/public/index.html
Lines changed: 0 additions & 40 deletions b/‎resources/public/index.html
Lines changed: 0 additions & 40 deletions
diff --git a/‎resources/public/manifest.json
Lines changed: 0 additions & 15 deletions b/‎resources/public/manifest.json
Lines changed: 0 additions & 15 deletions
diff --git a/‎scripts/fixFontPaths.js
Lines changed: 26 additions & 0 deletions b/‎scripts/fixFontPaths.js
Lines changed: 26 additions & 0 deletions
diff --git a/‎tsconfig.json
Lines changed: 1 addition & 1 deletion b/‎tsconfig.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-app/.storybook/config.ts
Lines changed: 1 addition & 1 deletion b/‎web-app/.storybook/config.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-app/src/containers/LoadingPage.tsx
Lines changed: 0 additions & 2 deletions b/‎web-app/src/containers/LoadingPage.tsx
Lines changed: 0 additions & 2 deletions
diff --git a/‎web-app/src/index.tsx
Lines changed: 1 addition & 1 deletion b/‎web-app/src/index.tsx
Lines changed: 1 addition & 1 deletion
@@ -20,7 +20,7 @@
     "build": "rm -rf build && npm run build:ext && npm run build:web",
     "build:ext": "tsc -p ./",
     "build:web": "cd web-app && npm run build",
-    "postbuild:web": "cp -R ./web-app/build/ ./build/",
+    "postbuild:web": "cp -R ./web-app/build/ ./build/ && node scripts/fixFontPaths.js",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "lint": "eslint src/**/*ts",
     "machine": "node ./out/state/index.js",
@@ -50,8 +50,10 @@
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-prettier": "^3.1.2",
+    "glob": "^7.1.6",
     "graphql": "^14.6.0",
     "prettier": "^1.19.1",
+    "resolve-url-loader": "^3.1.1",
     "ts-jest": "^25.1.0",
     "typescript": "^3.7.5",
     "vscode": "^1.1.36",
 
@@ -0,0 +1,26 @@
+/*
+ * css url font paths do not match up from the web-app as it is moved inside of build
+ * in order to load fonts and icons, these paths must be reconciled.
+ */
+const fs = require('fs') // eslint-disable-line
+
+// find the generated main css file
+const getMainCSSFile = () => {
+  const regex = /^main.[a-z0-9]+.chunk.css$/
+  const mainCss = fs.readdirSync('build/static/css').filter(filename => filename.match(regex))
+  if (!mainCss.length) {
+    throw new Error('No main.css file found in build/static/css')
+  }
+  return mainCss[0]
+}
+
+// remap the font paths from the borken /fonts/ => ../../fonts/
+const remapFontPaths = () => {
+  const mainCSSFile = getMainCSSFile()
+  const file = fs.readFileSync(`build/static/css/${mainCSSFile}`, 'utf8')
+  const fontUrlRegex = /url\(\/fonts\//g
+  const remappedFile = file.replace(fontUrlRegex, 'url(../../fonts/')
+  fs.writeFileSync(`build/static/css/${mainCSSFile}`, remappedFile)
+}
+
+remapFontPaths()
@@ -25,5 +25,5 @@
     "allowJs": true,
     "removeComments": true
   },
-  "exclude": ["node_modules", ".vscode-test", "build", "resources", "web-app", "*.js", "*.test.ts"]
+  "exclude": ["node_modules", ".vscode-test", "build", "resources", "web-app", "*.js", "*.test.ts", "scripts"]
 }
@@ -1,5 +1,5 @@
 import { configure } from '@storybook/react'
-import '../src/styles/index.scss'
+import '../src/styles/index.css'
 
 // setup acquireVsCodeApi mock
 // @ts-ignore
 
@@ -2,7 +2,6 @@ import * as React from 'react'
 import * as T from 'typings'
 import { css, jsx } from '@emotion/core'
 import Loading from '../components/Loading'
-import { Icon } from '@alifd/next'
 import Message from '../components/Message'
 
 interface Props {
@@ -32,7 +31,6 @@ const LoadingPage = ({ text, context }: Props) => {
   }
   return (
     <div css={styles.page}>
-      <Icon type="smile" />
       <Loading text={text} />
     </div>
   )
 
@@ -5,7 +5,7 @@ import App from './App'
 // init error logging
 import './services/sentry/init'
 // init initial styles
-import './styles/index.scss'
+import './styles/index.css'
 // init listeners
 import './services/listeners'
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@`
`25`	`25`	`"allowJs": true,`
`26`	`26`	`"removeComments": true`
`27`	`27`	`},`
`28`		`- "exclude": ["node_modules", ".vscode-test", "build", "resources", "web-app", ".js", ".test.ts"]`
	`28`	`+ "exclude": ["node_modules", ".vscode-test", "build", "resources", "web-app", ".js", ".test.ts", "scripts"]`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import * as React from 'react'`
`2`	`2`	`import * as T from 'typings'`
`3`	`3`	`import { css, jsx } from '@emotion/core'`
`4`	`4`	`import Loading from '../components/Loading'`
`5`		`-import { Icon } from '@alifd/next'`
`6`	`5`	`import Message from '../components/Message'`
`7`	`6`
`8`	`7`	`interface Props {`
`@@ -32,7 +31,6 @@ const LoadingPage = ({ text, context }: Props) => {`
`32`	`31`	`}`
`33`	`32`	`return (`
`34`	`33`	`<div css={styles.page}>`
`35`		`- <Icon type="smile" />`
`36`	`34`	`<Loading text={text} />`
`37`	`35`	`</div>`
`38`	`36`	`)`