Skip to content
This repository has been archived by the owner on Jul 23, 2019. It is now read-only.

Commit

Permalink
Fix broken rename (hopefully)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Sobo committed Sep 26, 2018
1 parent be225d4 commit 8915be7
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 424 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Icon*
.tags*
xray_wasm/dist
xray_browser/dist
memo_wasm/dist
memo_js/dist
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace]
members = [
"memo_core",
"memo_wasm",
"memo_js",
"xray_core",
"xray_server",
"xray_cli",
Expand Down
27 changes: 0 additions & 27 deletions memo_js/dist/0.index.js

This file was deleted.

Binary file removed memo_js/dist/04b973392e9496048e48.module.wasm
Binary file not shown.
233 changes: 0 additions & 233 deletions memo_js/dist/index.js

This file was deleted.

8 changes: 0 additions & 8 deletions memo_js/dist/memo_wasm.d.ts

This file was deleted.

149 changes: 0 additions & 149 deletions memo_js/dist/memo_wasm.js

This file was deleted.

Binary file removed memo_js/dist/memo_wasm_bg.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion memo_js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion memo_js/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "memo_wasm",
"name": "memo_js",
"version": "0.1.0",
"main": "dist/index.js",
"browser": "src/index.js",
Expand Down
2 changes: 1 addition & 1 deletion memo_js/script/build
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ setup_wasm_bindgen
rm -rf dist
mkdir -p dist
CARGO_INCREMENTAL=0 RUSTFLAGS="-C debuginfo=0 -C opt-level=s -C lto -C panic=abort" cargo build --release --target wasm32-unknown-unknown
wasm-bindgen ../target/wasm32-unknown-unknown/release/memo_wasm.wasm --out-dir dist
wasm-bindgen ../target/wasm32-unknown-unknown/release/memo_js.wasm --out-dir dist
node_modules/.bin/webpack --mode=development
2 changes: 1 addition & 1 deletion memo_js/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let server: any;

export async function init() {
const memo = await import("../dist/memo_wasm");
const memo = await import("../dist/memo_js");
if (!server) {
server = memo.Server.new();
}
Expand Down
35 changes: 35 additions & 0 deletions xray_electron/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"

autosize@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.2.tgz#073cfd07c8bf45da4b9fd153437f5bafbba1e4c9"

aws-sign2@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
Expand Down Expand Up @@ -113,6 +117,10 @@ [email protected], combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"

computed-style@~0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/computed-style/-/computed-style-0.1.4.tgz#7f344fd8584b2e425bedca4a1afc0e300bb05d74"

[email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
Expand Down Expand Up @@ -512,6 +520,12 @@ klaw@^1.0.0:
optionalDependencies:
graceful-fs "^4.1.9"

line-height@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/line-height/-/line-height-0.3.1.tgz#4b1205edde182872a5efa3c8f620b3187a9c54c9"
dependencies:
computed-style "~0.1.3"

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"
Expand Down Expand Up @@ -708,6 +722,13 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@^15.5.6:
version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
dependencies:
loose-envify "^1.3.1"
object-assign "^4.1.1"

prop-types@^15.6.0:
version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
Expand All @@ -733,6 +754,18 @@ rc@^1.1.2:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-autosize-textarea@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/react-autosize-textarea/-/react-autosize-textarea-3.0.3.tgz#30e8e081f35eb73b3667dc01cf4e8927c278466b"
dependencies:
autosize "^4.0.0"
line-height "^0.3.1"
prop-types "^15.5.6"

react-component-octicons@^1.6.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/react-component-octicons/-/react-component-octicons-1.8.0.tgz#60bc7491a8529d98060ff85db8b69ed3417698dc"

react-dom@^16.3.0:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
Expand Down Expand Up @@ -1059,6 +1092,8 @@ xray_ui@../xray_ui:
dependencies:
prop-types "^15.6.0"
react "^16.3.0"
react-autosize-textarea "^3.0.3"
react-component-octicons "^1.6.0"
react-dom "^16.3.0"
styletron-engine-atomic "1.0.4"
styletron-react "4.0.3"
Expand Down

0 comments on commit 8915be7

Please sign in to comment.