mirror of
https://github.com/ritz078/transform.git
synced 2026-11-21 00:32:56 +03:00
move prettier to worker
This commit is contained in:
1 parent
44104a82c3
commit
ba305352f5
5 files changed
+62
-32
No files matched your search
@@ -3,6 +3,7 @@ import cn from "classnames";
|
||||
import isBrowser from "is-in-browser";
|
||||
import copy from "copy-text-to-clipboard";
|
||||
import unfetch from "unfetch";
|
||||
import loadWorker from '../utils/loadWorker'
|
||||
|
||||
let CodeMirror;
|
||||
if (isBrowser) {
|
||||
@@ -100,20 +101,30 @@ export default class ConversionPanel extends PureComponent {
|
||||
|
||||
this.onChange(defaultText, splitValue);
|
||||
|
||||
const MyWorker = require('worker-loader?inline!../workers/prettier.js')
|
||||
this.worker = new MyWorker()
|
||||
const {worker, promiseWorker} = loadWorker('prettier.js')
|
||||
this.worker = worker
|
||||
this.promiseWorker = promiseWorker
|
||||
|
||||
this.worker.onmessage = this.setPrettyResult
|
||||
this.worker.onmessage = this.setPrettierAvailability
|
||||
}
|
||||
|
||||
setPrettyResult = ({ data }) => {
|
||||
const {available, prettyCode, section} = data
|
||||
setPrettierAvailability = ({ data }) => {
|
||||
this.setState({
|
||||
isPrettierAvailable: available,
|
||||
[section]: prettyCode
|
||||
isPrettierAvailable: data.available
|
||||
})
|
||||
}
|
||||
|
||||
passCodeToWorker = (code, mode, section) => {
|
||||
this.promiseWorker.postMessage({ code, mode, section })
|
||||
.then(response => {
|
||||
const {available, prettyCode, section} = response
|
||||
this.setState({
|
||||
isPrettierAvailable: available,
|
||||
[section]: prettyCode
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
fetchJSON = async () => {
|
||||
const url = window.prompt("Enter URL to fetch JSON from a remote server.");
|
||||
if (!url) return;
|
||||
@@ -129,12 +140,8 @@ export default class ConversionPanel extends PureComponent {
|
||||
}
|
||||
};
|
||||
|
||||
prettify = (code, mode, section) => {
|
||||
this.worker.postMessage({ code, mode, section })
|
||||
}
|
||||
|
||||
onChange = async (newValue, leftSplitValue) => {
|
||||
const { prettifyRightPanel } = this.props
|
||||
const { prettifyRightPanel, rightMode } = this.props
|
||||
|
||||
const nValue = newValue || this.state.value;
|
||||
const splitValue =
|
||||
@@ -145,11 +152,7 @@ export default class ConversionPanel extends PureComponent {
|
||||
try {
|
||||
const code = await this.props.getTransformedValue(nValue, splitValue);
|
||||
if (prettifyRightPanel) {
|
||||
this.worker.postMessage({
|
||||
code,
|
||||
mode: this.props.rightMode,
|
||||
section: 'resultValue'
|
||||
})
|
||||
this.passCodeToWorker(code, rightMode, 'resultValue')
|
||||
} else {
|
||||
this.setState({
|
||||
resultValue: code
|
||||
@@ -186,11 +189,7 @@ export default class ConversionPanel extends PureComponent {
|
||||
const { leftMode } = this.props;
|
||||
const { value } = this.state;
|
||||
|
||||
this.worker.postMessage({
|
||||
code: value,
|
||||
mode: leftMode,
|
||||
section: 'value'
|
||||
})
|
||||
this.passCodeToWorker(value, leftMode, 'value')
|
||||
};
|
||||
|
||||
prettifySplitCode = () => {
|
||||
@@ -198,11 +197,7 @@ export default class ConversionPanel extends PureComponent {
|
||||
const { splitMode } = this.props;
|
||||
const { splitValue } = this.state;
|
||||
|
||||
this.worker.postMessage({
|
||||
code: splitValue,
|
||||
mode: splitMode,
|
||||
section: 'splitValue'
|
||||
})
|
||||
this.passCodeToWorker(splitValue, splitMode, 'splitValue')
|
||||
};
|
||||
|
||||
copyCode = () => {
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
"lodash": "^4.17.4",
|
||||
"next": "^3.2.1",
|
||||
"nprogress": "^0.2.0",
|
||||
"promise-worker": "^1.1.1",
|
||||
"prop-types": "^15.5.10",
|
||||
"rc-collapse": "^1.7.6",
|
||||
"react": "^15.6.1",
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
export default function (fileName) {
|
||||
const PromiseWorker = require('promise-worker')
|
||||
const MyWorker = require(`worker-loader?inline!../workers/${fileName}`)
|
||||
const worker = new MyWorker()
|
||||
const promiseWorker = new PromiseWorker(worker)
|
||||
|
||||
return { worker, promiseWorker }
|
||||
}
|
||||
+14
-5
@@ -1,3 +1,5 @@
|
||||
import registerPromiseWorker from 'promise-worker/register'
|
||||
|
||||
try {
|
||||
importScripts('https://bundle.run/prettier@1.6.1')
|
||||
} catch (e) {
|
||||
@@ -18,7 +20,7 @@ if (self.prettier) {
|
||||
postMessage({ available: true })
|
||||
}
|
||||
|
||||
onmessage = function ({ data }) {
|
||||
function getPrettyCode (data) {
|
||||
const {code, mode, section } = data
|
||||
|
||||
const prettyCode = self.prettier &&
|
||||
@@ -28,9 +30,16 @@ onmessage = function ({ data }) {
|
||||
parser: prettierParsers[mode],
|
||||
printWidth: 70
|
||||
})
|
||||
) : (
|
||||
code
|
||||
)
|
||||
) : code
|
||||
|
||||
postMessage({ available: !!self.prettier, prettyCode, section })
|
||||
|
||||
return { available: !!self.prettier, prettyCode, section }
|
||||
}
|
||||
|
||||
registerPromiseWorker(message => new Promise(resolve => {
|
||||
resolve(getPrettyCode(message))
|
||||
}))
|
||||
|
||||
onmessage = function ({ data }) {
|
||||
postMessage(getPrettyCode(data))
|
||||
}
|
||||
@@ -2871,6 +2871,10 @@ ieee754@^1.1.4:
|
||||
version "1.1.8"
|
||||
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
|
||||
|
||||
immediate@~3.0.5:
|
||||
version "3.0.6"
|
||||
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
|
||||
|
||||
imurmurhash@^0.1.4:
|
||||
version "0.1.4"
|
||||
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
|
||||
@@ -3317,6 +3321,12 @@ lcid@^1.0.0:
|
||||
dependencies:
|
||||
invert-kv "^1.0.0"
|
||||
|
||||
lie@^3.0.2:
|
||||
version "3.1.1"
|
||||
resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
|
||||
dependencies:
|
||||
immediate "~3.0.5"
|
||||
|
||||
load-json-file@^1.0.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
|
||||
@@ -4440,6 +4450,13 @@ process@~0.5.1:
|
||||
version "0.5.2"
|
||||
resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
|
||||
|
||||
promise-worker@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/promise-worker/-/promise-worker-1.1.1.tgz#c2b75d045d249625c02264e2dff9ad22e031c69b"
|
||||
dependencies:
|
||||
is-promise "^2.1.0"
|
||||
lie "^3.0.2"
|
||||
|
||||
promise@^7.0.1, promise@^7.1.1:
|
||||
version "7.3.1"
|
||||
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
|
||||
|
||||
Reference in new issue
Block a user