mirror of
https://github.com/chinchang/web-maker.git
synced 2025-08-04 20:37:29 +02:00
Merge branch 'v5' of github.com:chinchang/web-maker into v5
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
"version": "4.2.0",
|
"version": "4.2.0",
|
||||||
"description": "A blazing fast & offline web playground",
|
"description": "A blazing fast & offline web playground",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "npm run -s dev",
|
"start": "concurrently --kill-others \"gulp start-preview-server\" \"npm run -s dev\"",
|
||||||
"build": "preact build --template src/index.html --prerender false",
|
"build": "preact build --template src/index.html --prerender false",
|
||||||
"dev": "preact watch --template src/index.html",
|
"dev": "preact watch --template src/index.html",
|
||||||
"serve-website": "cd packages/website; npm start",
|
"serve-website": "cd packages/website; npm start",
|
||||||
@@ -41,6 +41,7 @@
|
|||||||
"babel-eslint": "^7.2.3",
|
"babel-eslint": "^7.2.3",
|
||||||
"babel-minify": "^0.2.0",
|
"babel-minify": "^0.2.0",
|
||||||
"babel-plugin-macros": "^2.6.1",
|
"babel-plugin-macros": "^2.6.1",
|
||||||
|
"concurrently": "^7.0.0",
|
||||||
"eslint": "^4.9.0",
|
"eslint": "^4.9.0",
|
||||||
"eslint-config-prettier": "^2.3.0",
|
"eslint-config-prettier": "^2.3.0",
|
||||||
"eslint-config-synacor": "^2.0.2",
|
"eslint-config-synacor": "^2.0.2",
|
||||||
|
@@ -31,7 +31,7 @@ const Modal = ({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
window.addEventListener('keydown', onKeyDownHandler);
|
window.addEventListener('keydown', onKeyDownHandler);
|
||||||
return () => {
|
return () => {
|
||||||
window.removeEventListener('keydown', this.onKeyDownHandler.bind(this));
|
window.removeEventListener('keydown', onKeyDownHandler.bind(this));
|
||||||
if (focusGrabberRef.current) {
|
if (focusGrabberRef.current) {
|
||||||
focusGrabberRef.current.remove();
|
focusGrabberRef.current.remove();
|
||||||
focusGrabberRef.current = null;
|
focusGrabberRef.current = null;
|
||||||
|
@@ -66,7 +66,6 @@ import {
|
|||||||
SHOW_KEYBOARD_SHORTCUTS_EVENT
|
SHOW_KEYBOARD_SHORTCUTS_EVENT
|
||||||
} from '../commands';
|
} from '../commands';
|
||||||
import { commandPaletteService } from '../commandPaletteService';
|
import { commandPaletteService } from '../commandPaletteService';
|
||||||
import './../style.css';
|
|
||||||
|
|
||||||
import { I18nProvider } from '@lingui/react';
|
import { I18nProvider } from '@lingui/react';
|
||||||
|
|
||||||
|
@@ -9,7 +9,7 @@ window.addEventListener('message', e => {
|
|||||||
frame.contentDocument.close();
|
frame.contentDocument.close();
|
||||||
}, 10);
|
}, 10);
|
||||||
}
|
}
|
||||||
if (e.data && e.data.url && e.data.url.match(/preview\.html/)) {
|
if (e.data && e.data.url && e.data.url.match(/index\.html/)) {
|
||||||
document.querySelector('iframe').src = e.data.url;
|
document.querySelector('iframe').src = e.data.url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -35,25 +35,12 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!-- build:css vendor.css -->
|
|
||||||
<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css" />
|
|
||||||
<link rel="stylesheet" href="lib/codemirror/addon/hint/show-hint.css" />
|
|
||||||
<link rel="stylesheet" href="lib/codemirror/addon/fold/foldgutter.css" />
|
|
||||||
<link rel="stylesheet" href="lib/codemirror/addon/dialog/dialog.css" />
|
|
||||||
<link rel="stylesheet" href="lib/hint.min.css" />
|
|
||||||
<link rel="stylesheet" href="lib/inlet.css" />
|
|
||||||
<!-- endbuild -->
|
|
||||||
|
|
||||||
<link
|
<link
|
||||||
rel="stylesheet"
|
rel="stylesheet"
|
||||||
id="editorThemeLinkTag"
|
id="editorThemeLinkTag"
|
||||||
href="lib/codemirror/theme/monokai.css"
|
href="lib/codemirror/theme/monokai.css"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- build:css style.css -->
|
|
||||||
<link rel="stylesheet" href="style.css" />
|
|
||||||
<!-- endbuild -->
|
|
||||||
|
|
||||||
<style id="fontStyleTemplate" type="template">
|
<style id="fontStyleTemplate" type="template">
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'fontname';
|
font-family: 'fontname';
|
||||||
|
@@ -6,5 +6,6 @@ import './lib/codemirror/addon/fold/foldgutter.css';
|
|||||||
import './lib/codemirror/addon/dialog/dialog.css';
|
import './lib/codemirror/addon/dialog/dialog.css';
|
||||||
import './lib/hint.min.css';
|
import './lib/hint.min.css';
|
||||||
import './lib/inlet.css';
|
import './lib/inlet.css';
|
||||||
|
import './style.css';
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
Reference in New Issue
Block a user