mirror of
https://github.com/ritz078/transform.git
synced 2026-11-21 00:32:56 +03:00
move babel to worker
This commit is contained in:
1 parent
ba305352f5
commit
7c69fb4ce5
7 files changed
+109
-82
No files matched your search
@@ -3,7 +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'
|
||||
import loadWorker from "../utils/loadWorker";
|
||||
|
||||
let CodeMirror;
|
||||
if (isBrowser) {
|
||||
@@ -77,6 +77,19 @@ type Props = {
|
||||
export default class ConversionPanel extends PureComponent {
|
||||
props: Props;
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
resultValue: "",
|
||||
value: props.defaultText,
|
||||
splitValue: "",
|
||||
info: "",
|
||||
infoType: "",
|
||||
isPrettierAvailable: true
|
||||
};
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
leftMode: "javascript",
|
||||
rightMode: "javascript",
|
||||
@@ -87,43 +100,35 @@ export default class ConversionPanel extends PureComponent {
|
||||
fetchButtonText: "Fetch JSON from URL"
|
||||
};
|
||||
|
||||
state = {
|
||||
resultValue: "",
|
||||
value: "",
|
||||
splitValue: "",
|
||||
info: "",
|
||||
infoType: "",
|
||||
isPrettierAvailable: false
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
const { defaultText, splitValue } = this.props;
|
||||
|
||||
this.onChange(defaultText, splitValue);
|
||||
|
||||
const {worker, promiseWorker} = loadWorker('prettier.js')
|
||||
this.worker = worker
|
||||
this.promiseWorker = promiseWorker
|
||||
const { worker, promiseWorker } = loadWorker("prettier.js");
|
||||
this.worker = worker;
|
||||
this.promiseWorker = promiseWorker;
|
||||
|
||||
this.worker.onmessage = this.setPrettierAvailability
|
||||
this.worker.onmessage = this.setPrettierAvailability;
|
||||
}
|
||||
|
||||
setPrettierAvailability = ({ data }) => {
|
||||
if (!data.available || this.state.isPrettierAvailable === data.available)
|
||||
return;
|
||||
this.setState({
|
||||
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
|
||||
})
|
||||
})
|
||||
}
|
||||
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.");
|
||||
@@ -141,7 +146,7 @@ export default class ConversionPanel extends PureComponent {
|
||||
};
|
||||
|
||||
onChange = async (newValue, leftSplitValue) => {
|
||||
const { prettifyRightPanel, rightMode } = this.props
|
||||
const { prettifyRightPanel, rightMode } = this.props;
|
||||
|
||||
const nValue = newValue || this.state.value;
|
||||
const splitValue =
|
||||
@@ -150,13 +155,14 @@ export default class ConversionPanel extends PureComponent {
|
||||
: this.state.splitValue;
|
||||
|
||||
try {
|
||||
const code = await this.props.getTransformedValue(nValue, splitValue);
|
||||
let code = await this.props.getTransformedValue(nValue, splitValue);
|
||||
code = code.prettyCode || code;
|
||||
if (prettifyRightPanel) {
|
||||
this.passCodeToWorker(code, rightMode, 'resultValue')
|
||||
this.passCodeToWorker(code, rightMode, "resultValue");
|
||||
} else {
|
||||
this.setState({
|
||||
resultValue: code
|
||||
})
|
||||
});
|
||||
}
|
||||
this.setState({
|
||||
info: "",
|
||||
@@ -189,7 +195,7 @@ export default class ConversionPanel extends PureComponent {
|
||||
const { leftMode } = this.props;
|
||||
const { value } = this.state;
|
||||
|
||||
this.passCodeToWorker(value, leftMode, 'value')
|
||||
this.passCodeToWorker(value, leftMode, "value");
|
||||
};
|
||||
|
||||
prettifySplitCode = () => {
|
||||
@@ -197,7 +203,7 @@ export default class ConversionPanel extends PureComponent {
|
||||
const { splitMode } = this.props;
|
||||
const { splitValue } = this.state;
|
||||
|
||||
this.passCodeToWorker(splitValue, splitMode, 'splitValue')
|
||||
this.passCodeToWorker(splitValue, splitMode, "splitValue");
|
||||
};
|
||||
|
||||
copyCode = () => {
|
||||
@@ -214,8 +220,8 @@ export default class ConversionPanel extends PureComponent {
|
||||
getPrettifyClass = () => {
|
||||
return cn("btn", {
|
||||
disabled: !this.state.isPrettierAvailable
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
render() {
|
||||
const {
|
||||
@@ -443,7 +449,10 @@ export default class ConversionPanel extends PureComponent {
|
||||
</button>
|
||||
)}
|
||||
{prettierParsers[leftMode] && (
|
||||
<button className={this.getPrettifyClass()} onClick={this.prettifyCode}>
|
||||
<button
|
||||
className={this.getPrettifyClass()}
|
||||
onClick={this.prettifyCode}
|
||||
>
|
||||
Prettify
|
||||
</button>
|
||||
)}
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
"all-contributors-cli": "^4.4.0",
|
||||
"babili-webpack-plugin": "^0.1.2",
|
||||
"css-loader": "^0.28.7",
|
||||
"deep-diff": "^0.3.8",
|
||||
"glob": "^7.1.2",
|
||||
"prettier": "^1.6.1",
|
||||
"style-loader": "^0.18.2",
|
||||
|
||||
+9
-17
@@ -1,10 +1,8 @@
|
||||
import React, { PureComponent } from "react";
|
||||
import jsonToProptypes from "babel-plugin-json-to-proptypes";
|
||||
import immutablePropsPlugin from "../utils/babel-plugin-js-to-immutable-prop-types";
|
||||
import Layout from "../components/Layout";
|
||||
import { transform } from "babel-standalone";
|
||||
import defaultText from "../utils/dummy-json";
|
||||
import merge from "lodash/merge";
|
||||
import loadWorker from "../utils/loadWorker";
|
||||
|
||||
import ConversionPanel from "../components/ConversionPanel";
|
||||
|
||||
@@ -14,21 +12,16 @@ export default class Main extends PureComponent {
|
||||
};
|
||||
|
||||
getTransformedValue = newValue => {
|
||||
let x = JSON.parse(newValue);
|
||||
if (typeof x !== "object" || Array.isArray(x)) {
|
||||
x = merge({}, ...x);
|
||||
let code = JSON.parse(newValue);
|
||||
if (typeof code !== "object" || Array.isArray(code)) {
|
||||
code = merge({}, ...code);
|
||||
}
|
||||
x = "const propTypes = " + JSON.stringify(x);
|
||||
const plugin = this.state.isImmutable
|
||||
? immutablePropsPlugin
|
||||
: jsonToProptypes;
|
||||
const { code } = transform(x, {
|
||||
plugins: [plugin]
|
||||
code = "const propTypes = " + JSON.stringify(code);
|
||||
this.promiseWorker = loadWorker("json-to-proptypes.js", this).promiseWorker;
|
||||
return this.promiseWorker.postMessage({
|
||||
isImmutable: this.state.isImmutable,
|
||||
code
|
||||
});
|
||||
|
||||
return `import PropTypes from "prop-types";
|
||||
|
||||
${code}`;
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
@@ -50,7 +43,6 @@ export default class Main extends PureComponent {
|
||||
<ConversionPanel
|
||||
leftTitle="JSON"
|
||||
rightTitle="PropTypes"
|
||||
url={this.props.url}
|
||||
leftMode="json"
|
||||
getTransformedValue={this.getTransformedValue}
|
||||
name={"prop_types"}
|
||||
|
||||
+8
-7
@@ -1,8 +1,9 @@
|
||||
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)
|
||||
export default function(fileName, self) {
|
||||
if (self && self.promiseWorker) return { promiseWorker: self.promiseWorker };
|
||||
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 }
|
||||
}
|
||||
return { worker, promiseWorker };
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
import { transform } from "babel-standalone";
|
||||
import jsonToProptypes from "babel-plugin-json-to-proptypes";
|
||||
import immutablePropsPlugin from "../utils/babel-plugin-js-to-immutable-prop-types";
|
||||
import registerPromiseWorker from "promise-worker/register";
|
||||
|
||||
registerPromiseWorker(
|
||||
message =>
|
||||
new Promise(resolve => {
|
||||
const { isImmutable, code } = message;
|
||||
const plugin = isImmutable ? immutablePropsPlugin : jsonToProptypes;
|
||||
const newCode = transform(code, {
|
||||
plugins: [plugin]
|
||||
}).code;
|
||||
|
||||
resolve(`import PropTypes from "prop-types";
|
||||
|
||||
${newCode}`);
|
||||
})
|
||||
);
|
||||
+25
-24
@@ -1,9 +1,9 @@
|
||||
import registerPromiseWorker from 'promise-worker/register'
|
||||
import registerPromiseWorker from "promise-worker/register";
|
||||
|
||||
try {
|
||||
importScripts('https://bundle.run/prettier@1.6.1')
|
||||
importScripts("https://bundle.run/prettier@1.6.1");
|
||||
} catch (e) {
|
||||
self.postMessage({ available: false })
|
||||
self.postMessage({ available: false });
|
||||
}
|
||||
|
||||
const prettierParsers = {
|
||||
@@ -17,29 +17,30 @@ const prettierParsers = {
|
||||
};
|
||||
|
||||
if (self.prettier) {
|
||||
postMessage({ available: true })
|
||||
postMessage({ available: true });
|
||||
}
|
||||
|
||||
function getPrettyCode (data) {
|
||||
const {code, mode, section } = data
|
||||
function getPrettyCode(data) {
|
||||
const { code, mode, section } = data;
|
||||
|
||||
const prettyCode = self.prettier &&
|
||||
prettierParsers[mode] &&
|
||||
code ? (
|
||||
self.prettier.format(code, {
|
||||
parser: prettierParsers[mode],
|
||||
printWidth: 70
|
||||
const prettyCode =
|
||||
self.prettier && prettierParsers[mode] && code
|
||||
? self.prettier.format(code, {
|
||||
parser: prettierParsers[mode],
|
||||
printWidth: 70
|
||||
})
|
||||
: code;
|
||||
|
||||
return { available: !!self.prettier, prettyCode, section };
|
||||
}
|
||||
|
||||
registerPromiseWorker(
|
||||
message =>
|
||||
new Promise(resolve => {
|
||||
resolve(getPrettyCode(message));
|
||||
})
|
||||
) : code
|
||||
);
|
||||
|
||||
|
||||
return { available: !!self.prettier, prettyCode, section }
|
||||
}
|
||||
|
||||
registerPromiseWorker(message => new Promise(resolve => {
|
||||
resolve(getPrettyCode(message))
|
||||
}))
|
||||
|
||||
onmessage = function ({ data }) {
|
||||
postMessage(getPrettyCode(data))
|
||||
}
|
||||
onmessage = function({ data }) {
|
||||
postMessage(getPrettyCode(data));
|
||||
};
|
||||
@@ -1881,6 +1881,10 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
|
||||
|
||||
deep-diff@^0.3.8:
|
||||
version "0.3.8"
|
||||
resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
|
||||
|
||||
deep-extend@~0.4.0:
|
||||
version "0.4.2"
|
||||
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
|
||||
|
||||
Reference in new issue
Block a user