From d09210d7d0ecfe8ca002cf55241459058e892524 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 23 Jun 2020 13:06:22 -0700 Subject: [PATCH] Cleanup TypeScript packages (#851) * Rename all packages/ directories to match package name * Audit all dependencies vs. devDependencies * Fix doc generation for browser and browser-lite --- .gitignore | 2 +- CONTRIBUTING.md | 2 +- Makefile | 4 +-- cmd/cut-release/main.go | 30 +++++++++---------- common/types/types_js.go | 2 +- db/dexie_implementation.go | 2 +- db/dexietypes/dexietypes.go | 2 +- db/types_js.go | 2 +- docs/browser.md | 4 +-- integration-tests/browser_integration_test.go | 2 +- integration-tests/utils.go | 4 +-- keys/fs_js.go | 2 +- orderfilter/filter_js.go | 2 +- orderfilter/validate_js.go | 2 +- .../README.md | 0 .../package.json | 0 .../src/database.ts | 0 .../src/index.ts | 0 .../src/mesh.ts | 0 .../src/schema_validator.ts | 0 .../src/types.ts | 0 .../src/wasm_exec.js | 0 .../src/wrapper_conversion.ts | 0 .../tsconfig.json | 0 .../tslint.json | 0 .../yarn.lock | 0 .../package.json | 12 ++++---- .../src/browser_shim.ts | 0 .../tsconfig.json | 2 +- .../tslint.json | 0 .../webpack.config.js | 0 .../yarn.lock | 0 packages/{browser => mesh-browser}/README.md | 0 .../conversion-tests/conversion_test.ts | 0 .../{browser => mesh-browser}/dist/index.html | 0 .../go/browserutil/browserutil.go | 4 +-- .../go/conversion-test/conversion_test.go | 0 .../go/conversion-test/main.go | 2 +- .../go/jsutil/jsutil.go | 0 .../go/jsutil/jsutil_bench_test.go | 0 .../go/mesh-browser/main.go | 4 +-- .../go/providerwrapper/providerwrapper.go | 2 +- .../{browser => mesh-browser}/package.json | 11 ++++--- .../scripts/generate_wasm_buffer.go | 0 .../{browser => mesh-browser}/src/index.ts | 0 .../{browser => mesh-browser}/tsconfig.json | 2 +- .../tslint.json | 0 .../webpack.config.js | 0 .../webpack.tsconfig.json | 0 packages/{browser => mesh-browser}/yarn.lock | 0 .../dist/index.html | 0 .../package.json | 0 .../src/index.ts | 0 .../tsconfig.json | 2 +- .../tslint.json | 0 .../webpack.config.js | 0 .../yarn.lock | 0 .../.npmignore | 0 .../{rpc-client => mesh-rpc-client}/LICENSE | 0 .../{rpc-client => mesh-rpc-client}/README.md | 0 .../package.json | 18 +++++------ .../src/globals.d.ts | 0 .../src/index.ts | 0 .../src/types.ts | 0 .../src/ws_client.ts | 0 .../test/utils/chai_setup.ts | 0 .../test/utils/mock_ws_server.ts | 0 .../test/utils/ws_server.ts | 0 .../test/ws_client_test.ts | 0 .../tsconfig.json | 0 .../tslint.json | 0 .../{rpc-client => mesh-rpc-client}/yarn.lock | 0 .../README.md | 0 .../dist/index.html | 0 .../package.json | 5 ++-- .../src/index.ts | 0 .../tsconfig.json | 2 +- .../tslint.json | 0 .../webpack.config.js | 0 .../yarn.lock | 0 .../README.md | 0 .../dist/index.html | 0 .../package.json | 3 +- .../src/index.ts | 0 .../tsconfig.json | 2 +- .../tslint.json | 0 .../webpack.config.js | 0 .../yarn.lock | 0 tsconfig.json | 14 ++++----- yarn.lock | 12 ++------ 90 files changed, 76 insertions(+), 83 deletions(-) rename packages/{browser-lite => mesh-browser-lite}/README.md (100%) rename packages/{browser-lite => mesh-browser-lite}/package.json (100%) rename packages/{browser-lite => mesh-browser-lite}/src/database.ts (100%) rename packages/{browser-lite => mesh-browser-lite}/src/index.ts (100%) rename packages/{browser-lite => mesh-browser-lite}/src/mesh.ts (100%) rename packages/{browser-lite => mesh-browser-lite}/src/schema_validator.ts (100%) rename packages/{browser-lite => mesh-browser-lite}/src/types.ts (100%) rename packages/{browser-lite => mesh-browser-lite}/src/wasm_exec.js (100%) rename packages/{browser-lite => mesh-browser-lite}/src/wrapper_conversion.ts (100%) rename packages/{browser-lite => mesh-browser-lite}/tsconfig.json (100%) rename packages/{browser-lite => mesh-browser-lite}/tslint.json (100%) rename packages/{browser-lite => mesh-browser-lite}/yarn.lock (100%) rename packages/{test-wasm => mesh-browser-shim}/package.json (87%) rename packages/{test-wasm => mesh-browser-shim}/src/browser_shim.ts (100%) rename packages/{test-wasm => mesh-browser-shim}/tsconfig.json (82%) rename packages/{browser => mesh-browser-shim}/tslint.json (100%) rename packages/{test-wasm => mesh-browser-shim}/webpack.config.js (100%) rename packages/{test-wasm => mesh-browser-shim}/yarn.lock (100%) rename packages/{browser => mesh-browser}/README.md (100%) rename packages/{browser => mesh-browser}/conversion-tests/conversion_test.ts (100%) rename packages/{browser => mesh-browser}/dist/index.html (100%) rename packages/{browser => mesh-browser}/go/browserutil/browserutil.go (96%) rename packages/{browser => mesh-browser}/go/conversion-test/conversion_test.go (100%) rename packages/{browser => mesh-browser}/go/conversion-test/main.go (99%) rename packages/{browser => mesh-browser}/go/jsutil/jsutil.go (100%) rename packages/{browser => mesh-browser}/go/jsutil/jsutil_bench_test.go (100%) rename packages/{browser => mesh-browser}/go/mesh-browser/main.go (98%) rename packages/{browser => mesh-browser}/go/providerwrapper/providerwrapper.go (98%) rename packages/{browser => mesh-browser}/package.json (98%) rename packages/{browser => mesh-browser}/scripts/generate_wasm_buffer.go (100%) rename packages/{browser => mesh-browser}/src/index.ts (100%) rename packages/{browser => mesh-browser}/tsconfig.json (85%) rename packages/{integration-tests => mesh-browser}/tslint.json (100%) rename packages/{browser => mesh-browser}/webpack.config.js (100%) rename packages/{browser => mesh-browser}/webpack.tsconfig.json (100%) rename packages/{browser => mesh-browser}/yarn.lock (100%) rename packages/{integration-tests => mesh-integration-tests}/dist/index.html (100%) rename packages/{integration-tests => mesh-integration-tests}/package.json (100%) rename packages/{integration-tests => mesh-integration-tests}/src/index.ts (100%) rename packages/{integration-tests => mesh-integration-tests}/tsconfig.json (89%) rename packages/{rpc-client => mesh-integration-tests}/tslint.json (100%) rename packages/{integration-tests => mesh-integration-tests}/webpack.config.js (100%) rename packages/{integration-tests => mesh-integration-tests}/yarn.lock (100%) rename packages/{rpc-client => mesh-rpc-client}/.npmignore (100%) rename packages/{rpc-client => mesh-rpc-client}/LICENSE (100%) rename packages/{rpc-client => mesh-rpc-client}/README.md (100%) rename packages/{rpc-client => mesh-rpc-client}/package.json (100%) rename packages/{rpc-client => mesh-rpc-client}/src/globals.d.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/src/index.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/src/types.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/src/ws_client.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/test/utils/chai_setup.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/test/utils/mock_ws_server.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/test/utils/ws_server.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/test/ws_client_test.ts (100%) rename packages/{rpc-client => mesh-rpc-client}/tsconfig.json (100%) rename packages/{test-wasm => mesh-rpc-client}/tslint.json (100%) rename packages/{rpc-client => mesh-rpc-client}/yarn.lock (100%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/README.md (100%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/dist/index.html (100%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/package.json (81%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/src/index.ts (100%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/tsconfig.json (83%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/tslint.json (100%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/webpack.config.js (100%) rename packages/{webpack-example-lite => mesh-webpack-example-lite}/yarn.lock (100%) rename packages/{webpack-example => mesh-webpack-example}/README.md (100%) rename packages/{webpack-example => mesh-webpack-example}/dist/index.html (100%) rename packages/{webpack-example => mesh-webpack-example}/package.json (84%) rename packages/{webpack-example => mesh-webpack-example}/src/index.ts (100%) rename packages/{webpack-example => mesh-webpack-example}/tsconfig.json (85%) rename packages/{webpack-example => mesh-webpack-example}/tslint.json (100%) rename packages/{webpack-example => mesh-webpack-example}/webpack.config.js (100%) rename packages/{webpack-example => mesh-webpack-example}/yarn.lock (100%) diff --git a/.gitignore b/.gitignore index a93e890b2..51dc989c5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ yarn-error.log */**/yarn-error.log* ganache.log */**/ganache.log* -packages/browser/src/generated +packages/**/generated/** */**/dist/**/* !*/**/dist/index.html !integration-tests/data/standalone-0/keys/privKey diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c3a26e5d..bb5cafd1e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -122,7 +122,7 @@ pipeline will fail if Typescript code is not "prettified," so `prettier` must be to ensure that the code is properly formatted. The prettier tool can be run using the following command from the top-level of the -0x-Mesh repository (outside of a directory inside `packages/`): +0x-Mesh repository (outside of a directory inside **packages/**): ```bash yarn prettier diff --git a/Makefile b/Makefile index cfd251a0d..8479c7e4e 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,12 @@ test-browser-integration: .PHONY: test-browser-conversion test-browser-conversion: - go test ./packages/browser/go/conversion-test -timeout 185s --enable-browser-conversion-tests -run BrowserConversions + go test ./packages/mesh-browser/go/conversion-test -timeout 185s --enable-browser-conversion-tests -run BrowserConversions .PHONY: test-wasm-browser test-wasm-browser: - WASM_INIT_FILE="$$(pwd)/packages/test-wasm/dist/browser_shim.js" GOOS=js GOARCH=wasm go test -tags=browser -exec="$$GOPATH/bin/wasmbrowsertest" ./... + WASM_INIT_FILE="$$(pwd)/packages/mesh-browser-shim/dist/browser_shim.js" GOOS=js GOARCH=wasm go test -tags=browser -exec="$$GOPATH/bin/wasmbrowsertest" ./... .PHONY: test-ts diff --git a/cmd/cut-release/main.go b/cmd/cut-release/main.go index 71a261f78..7cab22673 100644 --- a/cmd/cut-release/main.go +++ b/cmd/cut-release/main.go @@ -13,7 +13,7 @@ import ( "github.com/plaid/go-envvar/envvar" ) -var functionDocsTemplate = "\n# Functions\n\n## loadMeshStreamingForURLAsync\n▸ **loadMeshStreamingWithURLAsync**(`url`: `string`): *Promise‹`void`›*\n\n*Defined in [index.ts:7](https://github.com/0xProject/0x-mesh/blob/%s/packages/browser-lite/src/index.ts#L7)*\n\nLoads the Wasm module that is provided by fetching a url.\n\n**Parameters:**\n\nName | Type | Description |\n------ | ------ | ------ |\n`url` | `string` | The URL to query for the Wasm binary |\n\n
\n\n## loadMeshStreamingAsync\n\n▸ **loadMeshStreamingAsync**(`response`: `Response | Promise`): *Promise‹`void`›*\n\n*Defined in [index.ts:15](https://github.com/0xProject/0x-mesh/blob/%s/packages/browser-lite/src/index.ts#L15)*\n\nLoads the Wasm module that is provided by a response.\n\n**Parameters:**\n\nName | Type | Description |\n------ | ------ | ------ |\n`response` | `Response | Promise` | The Wasm response that supplies the Wasm binary |\n\n
" +var functionDocsTemplate = "\n# Functions\n\n## loadMeshStreamingForURLAsync\n▸ **loadMeshStreamingWithURLAsync**(`url`: `string`): *Promise‹`void`›*\n\n*Defined in [index.ts:7](https://github.com/0xProject/0x-mesh/blob/%s/packages/mesh-browser-lite/src/index.ts#L7)*\n\nLoads the Wasm module that is provided by fetching a url.\n\n**Parameters:**\n\nName | Type | Description |\n------ | ------ | ------ |\n`url` | `string` | The URL to query for the Wasm binary |\n\n
\n\n## loadMeshStreamingAsync\n\n▸ **loadMeshStreamingAsync**(`response`: `Response | Promise`): *Promise‹`void`›*\n\n*Defined in [index.ts:15](https://github.com/0xProject/0x-mesh/blob/%s/packages/mesh-browser-lite/src/index.ts#L15)*\n\nLoads the Wasm module that is provided by a response.\n\n**Parameters:**\n\nName | Type | Description |\n------ | ------ | ------ |\n`response` | `Response | Promise` | The Wasm response that supplies the Wasm binary |\n\n
" type envVars struct { // Version is the new release version to use @@ -98,18 +98,18 @@ func updateHardCodedVersions(version string) { newBrowserLiteDependencyString := fmt.Sprintf(`"@0x/mesh-browser-lite": "^%s"`, version) newBrowserDependencyString := fmt.Sprintf(`"@0x/mesh-browser": "^%s"`, version) - // Update `packages/rpc-client/package.json` - tsClientPackageJSONPath := "packages/rpc-client/package.json" + // Update `packages/mesh-rpc-client/package.json` + tsClientPackageJSONPath := "packages/mesh-rpc-client/package.json" regex := `"version": "(.*)"` updateFileWithRegex(tsClientPackageJSONPath, regex, newVersionString) - // Update `packages/browser-lite/package.json` - browserLitePackageJSONPath := "packages/browser-lite/package.json" + // Update `packages/mesh-browser-lite/package.json` + browserLitePackageJSONPath := "packages/mesh-browser-lite/package.json" regex = `"version": "(.*)"` updateFileWithRegex(browserLitePackageJSONPath, regex, newVersionString) - // Update `packages/browser/package.json` - browserPackageJSONPath := "packages/browser/package.json" + // Update `packages/mesh-browser/package.json` + browserPackageJSONPath := "packages/mesh-browser/package.json" regex = `"version": "(.*)"` updateFileWithRegex(browserPackageJSONPath, regex, newVersionString) // NOTE(jalextowle): `@0x/mesh-browser` uses the local version of `@0x/mesh-browser-lite` @@ -118,23 +118,23 @@ func updateHardCodedVersions(version string) { regex = `"@0x/mesh-browser-lite": "(.*)"` updateFileWithRegex(browserPackageJSONPath, regex, newBrowserLiteDependencyString) - // Update `packages/webpack-example-lite/package.json` - webpackExampleLitePackageJSONPath := "packages/webpack-example-lite/package.json" + // Update `packages/mesh-webpack-example-lite/package.json` + webpackExampleLitePackageJSONPath := "packages/mesh-webpack-example-lite/package.json" regex = `"@0x/mesh-browser-lite": "(.*)"` updateFileWithRegex(webpackExampleLitePackageJSONPath, regex, newBrowserLiteDependencyString) - // Update `packages/webpack-example/package.json` - webpackExamplePackageJSONPath := "packages/webpack-example/package.json" + // Update `packages/mesh-webpack-example/package.json` + webpackExamplePackageJSONPath := "packages/mesh-webpack-example/package.json" regex = `"@0x/mesh-browser": "(.*)"` updateFileWithRegex(webpackExamplePackageJSONPath, regex, newBrowserDependencyString) - // Update `packages/integration-tests/package.json` - integrationTestsPackageJSONPath := "packages/integration-tests/package.json" + // Update `packages/mesh-integration-tests/package.json` + integrationTestsPackageJSONPath := "packages/mesh-integration-tests/package.json" regex = `"@0x/mesh-browser": "(.*)"` updateFileWithRegex(integrationTestsPackageJSONPath, regex, newBrowserDependencyString) - // Update `packages/test-wasm/package.json` - testWasmPackageJSONPath := "packages/test-wasm/package.json" + // Update `packages/mesh-browser-shim/package.json` + testWasmPackageJSONPath := "packages/mesh-browser-shim/package.json" regex = `"@0x/mesh-browser-lite": "(.*)"` updateFileWithRegex(testWasmPackageJSONPath, regex, newBrowserLiteDependencyString) diff --git a/common/types/types_js.go b/common/types/types_js.go index 183af691b..74fa68212 100644 --- a/common/types/types_js.go +++ b/common/types/types_js.go @@ -6,7 +6,7 @@ import ( "encoding/json" "syscall/js" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" ) func (r GetOrdersResponse) JSValue() js.Value { diff --git a/db/dexie_implementation.go b/db/dexie_implementation.go index 58a2a1a74..6118540dc 100644 --- a/db/dexie_implementation.go +++ b/db/dexie_implementation.go @@ -13,7 +13,7 @@ import ( "github.com/0xProject/0x-mesh/common/types" "github.com/0xProject/0x-mesh/db/dexietypes" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" "github.com/ethereum/go-ethereum/common" "github.com/gibson042/canonicaljson-go" "github.com/google/uuid" diff --git a/db/dexietypes/dexietypes.go b/db/dexietypes/dexietypes.go index a9b57a5e0..c504c21c9 100644 --- a/db/dexietypes/dexietypes.go +++ b/db/dexietypes/dexietypes.go @@ -18,7 +18,7 @@ import ( "time" "github.com/0xProject/0x-mesh/common/types" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" "github.com/ethereum/go-ethereum/common" ethmath "github.com/ethereum/go-ethereum/common/math" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/db/types_js.go b/db/types_js.go index 08345e86d..4281c68cd 100644 --- a/db/types_js.go +++ b/db/types_js.go @@ -5,7 +5,7 @@ package db import ( "syscall/js" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" ) func (opts *Options) JSValue() js.Value { diff --git a/docs/browser.md b/docs/browser.md index 58ebf1a4b..017c8970a 100644 --- a/docs/browser.md +++ b/docs/browser.md @@ -84,7 +84,7 @@ yarn add @0x/mesh-browser-lite ### Example usage -[The webpack-example directory](../packages/webpack-example) and -[the webpack-example-lite directory](../packages/webpack-example) include +[The webpack-example directory](../packages/mesh-webpack-example) and +[the webpack-example-lite directory](../packages/mesh-webpack-example-lite) include examples of how to use the `@0x/mesh-browser` and the `@0x/mesh-browser-lite` packages, respectively. diff --git a/integration-tests/browser_integration_test.go b/integration-tests/browser_integration_test.go index ca317ba23..6e83822a3 100644 --- a/integration-tests/browser_integration_test.go +++ b/integration-tests/browser_integration_test.go @@ -107,7 +107,7 @@ func TestBrowserIntegration(t *testing.T) { }() // Start a simple HTTP server to serve the web page for the browser node. - ts := httptest.NewServer(http.FileServer(http.Dir("../packages/integration-tests/dist"))) + ts := httptest.NewServer(http.FileServer(http.Dir("../packages/mesh-integration-tests/dist"))) defer ts.Close() // browserLogMessages is a channel through which log messages from the diff --git a/integration-tests/utils.go b/integration-tests/utils.go index 94912695d..c46e4bcc6 100644 --- a/integration-tests/utils.go +++ b/integration-tests/utils.go @@ -117,13 +117,13 @@ func buildForTests(t *testing.T, ctx context.Context) { // for TypeScript code changes only. fmt.Println("Building mesh-browser package...") cmd := exec.CommandContext(ctx, "yarn", "build") - cmd.Dir = "../packages/browser" + cmd.Dir = "../packages/mesh-browser" output, err := cmd.CombinedOutput() require.NoError(t, err, "could not build mesh-browser package: %s", string(output)) fmt.Println("Building integration-tests package...") cmd = exec.CommandContext(ctx, "yarn", "build") - cmd.Dir = "../packages/integration-tests" + cmd.Dir = "../packages/mesh-integration-tests" output, err = cmd.CombinedOutput() require.NoError(t, err, "could not build integration-tests package: %s", string(output)) fmt.Println("Done building everything") diff --git a/keys/fs_js.go b/keys/fs_js.go index 7488df1c1..f9fea05dc 100644 --- a/keys/fs_js.go +++ b/keys/fs_js.go @@ -9,7 +9,7 @@ import ( "os" "syscall/js" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" ) // keyPrefix is a prefix applied to all entries in localStorage. diff --git a/orderfilter/filter_js.go b/orderfilter/filter_js.go index 7024ce9b0..55b0a8854 100644 --- a/orderfilter/filter_js.go +++ b/orderfilter/filter_js.go @@ -9,7 +9,7 @@ import ( "syscall/js" "github.com/0xProject/0x-mesh/ethereum" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" ) type Filter struct { diff --git a/orderfilter/validate_js.go b/orderfilter/validate_js.go index 3ba32f048..2ef4a4e50 100644 --- a/orderfilter/validate_js.go +++ b/orderfilter/validate_js.go @@ -5,7 +5,7 @@ package orderfilter import ( "errors" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" "github.com/0xProject/0x-mesh/zeroex" ) diff --git a/packages/browser-lite/README.md b/packages/mesh-browser-lite/README.md similarity index 100% rename from packages/browser-lite/README.md rename to packages/mesh-browser-lite/README.md diff --git a/packages/browser-lite/package.json b/packages/mesh-browser-lite/package.json similarity index 100% rename from packages/browser-lite/package.json rename to packages/mesh-browser-lite/package.json diff --git a/packages/browser-lite/src/database.ts b/packages/mesh-browser-lite/src/database.ts similarity index 100% rename from packages/browser-lite/src/database.ts rename to packages/mesh-browser-lite/src/database.ts diff --git a/packages/browser-lite/src/index.ts b/packages/mesh-browser-lite/src/index.ts similarity index 100% rename from packages/browser-lite/src/index.ts rename to packages/mesh-browser-lite/src/index.ts diff --git a/packages/browser-lite/src/mesh.ts b/packages/mesh-browser-lite/src/mesh.ts similarity index 100% rename from packages/browser-lite/src/mesh.ts rename to packages/mesh-browser-lite/src/mesh.ts diff --git a/packages/browser-lite/src/schema_validator.ts b/packages/mesh-browser-lite/src/schema_validator.ts similarity index 100% rename from packages/browser-lite/src/schema_validator.ts rename to packages/mesh-browser-lite/src/schema_validator.ts diff --git a/packages/browser-lite/src/types.ts b/packages/mesh-browser-lite/src/types.ts similarity index 100% rename from packages/browser-lite/src/types.ts rename to packages/mesh-browser-lite/src/types.ts diff --git a/packages/browser-lite/src/wasm_exec.js b/packages/mesh-browser-lite/src/wasm_exec.js similarity index 100% rename from packages/browser-lite/src/wasm_exec.js rename to packages/mesh-browser-lite/src/wasm_exec.js diff --git a/packages/browser-lite/src/wrapper_conversion.ts b/packages/mesh-browser-lite/src/wrapper_conversion.ts similarity index 100% rename from packages/browser-lite/src/wrapper_conversion.ts rename to packages/mesh-browser-lite/src/wrapper_conversion.ts diff --git a/packages/browser-lite/tsconfig.json b/packages/mesh-browser-lite/tsconfig.json similarity index 100% rename from packages/browser-lite/tsconfig.json rename to packages/mesh-browser-lite/tsconfig.json diff --git a/packages/browser-lite/tslint.json b/packages/mesh-browser-lite/tslint.json similarity index 100% rename from packages/browser-lite/tslint.json rename to packages/mesh-browser-lite/tslint.json diff --git a/packages/browser-lite/yarn.lock b/packages/mesh-browser-lite/yarn.lock similarity index 100% rename from packages/browser-lite/yarn.lock rename to packages/mesh-browser-lite/yarn.lock diff --git a/packages/test-wasm/package.json b/packages/mesh-browser-shim/package.json similarity index 87% rename from packages/test-wasm/package.json rename to packages/mesh-browser-shim/package.json index 2ca5f3073..4fd2531b5 100644 --- a/packages/test-wasm/package.json +++ b/packages/mesh-browser-shim/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@0x/browser-shim", + "name": "@0x/mesh-browser-shim", "description": "Bundled Javascript init files to use with `wasmbrowsertest` for testing Go WebAssembly binaries", "version": "1.0.0", "main": "./lib/index.js", @@ -11,15 +11,15 @@ "lint": "tslint --format stylish --project ." }, "devDependencies": { - "@types/dexie": "^1.3.1" - }, - "dependencies": { - "@0x/mesh-browser-lite": "1.0.0", - "dexie": "^3.0.1", + "@types/dexie": "^1.3.1", "shx": "^0.3.2", "ts-loader": "^6.2.1", "typescript": "^3.9.3", "webpack": "^4.43.0", "webpack-cli": "^3.3.10" + }, + "dependencies": { + "@0x/mesh-browser-lite": "1.0.0", + "dexie": "^3.0.1" } } diff --git a/packages/test-wasm/src/browser_shim.ts b/packages/mesh-browser-shim/src/browser_shim.ts similarity index 100% rename from packages/test-wasm/src/browser_shim.ts rename to packages/mesh-browser-shim/src/browser_shim.ts diff --git a/packages/test-wasm/tsconfig.json b/packages/mesh-browser-shim/tsconfig.json similarity index 82% rename from packages/test-wasm/tsconfig.json rename to packages/mesh-browser-shim/tsconfig.json index c9d6044a7..7104f5fc0 100644 --- a/packages/test-wasm/tsconfig.json +++ b/packages/mesh-browser-shim/tsconfig.json @@ -7,7 +7,7 @@ "include": ["./src/**/*"], "references": [ { - "path": "../browser-lite" + "path": "../mesh-browser-lite" } ] } diff --git a/packages/browser/tslint.json b/packages/mesh-browser-shim/tslint.json similarity index 100% rename from packages/browser/tslint.json rename to packages/mesh-browser-shim/tslint.json diff --git a/packages/test-wasm/webpack.config.js b/packages/mesh-browser-shim/webpack.config.js similarity index 100% rename from packages/test-wasm/webpack.config.js rename to packages/mesh-browser-shim/webpack.config.js diff --git a/packages/test-wasm/yarn.lock b/packages/mesh-browser-shim/yarn.lock similarity index 100% rename from packages/test-wasm/yarn.lock rename to packages/mesh-browser-shim/yarn.lock diff --git a/packages/browser/README.md b/packages/mesh-browser/README.md similarity index 100% rename from packages/browser/README.md rename to packages/mesh-browser/README.md diff --git a/packages/browser/conversion-tests/conversion_test.ts b/packages/mesh-browser/conversion-tests/conversion_test.ts similarity index 100% rename from packages/browser/conversion-tests/conversion_test.ts rename to packages/mesh-browser/conversion-tests/conversion_test.ts diff --git a/packages/browser/dist/index.html b/packages/mesh-browser/dist/index.html similarity index 100% rename from packages/browser/dist/index.html rename to packages/mesh-browser/dist/index.html diff --git a/packages/browser/go/browserutil/browserutil.go b/packages/mesh-browser/go/browserutil/browserutil.go similarity index 96% rename from packages/browser/go/browserutil/browserutil.go rename to packages/mesh-browser/go/browserutil/browserutil.go index b65475f9b..84ac0ac29 100644 --- a/packages/browser/go/browserutil/browserutil.go +++ b/packages/mesh-browser/go/browserutil/browserutil.go @@ -12,8 +12,8 @@ import ( "github.com/0xProject/0x-mesh/core" "github.com/0xProject/0x-mesh/orderfilter" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" - "github.com/0xProject/0x-mesh/packages/browser/go/providerwrapper" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/providerwrapper" ) // ConvertConfig converts a JavaScript config object into a core.Config. It also diff --git a/packages/browser/go/conversion-test/conversion_test.go b/packages/mesh-browser/go/conversion-test/conversion_test.go similarity index 100% rename from packages/browser/go/conversion-test/conversion_test.go rename to packages/mesh-browser/go/conversion-test/conversion_test.go diff --git a/packages/browser/go/conversion-test/main.go b/packages/mesh-browser/go/conversion-test/main.go similarity index 99% rename from packages/browser/go/conversion-test/main.go rename to packages/mesh-browser/go/conversion-test/main.go index a64ad5251..2423e956d 100644 --- a/packages/browser/go/conversion-test/main.go +++ b/packages/mesh-browser/go/conversion-test/main.go @@ -13,7 +13,7 @@ import ( "github.com/0xProject/0x-mesh/constants" "github.com/0xProject/0x-mesh/core" "github.com/0xProject/0x-mesh/orderfilter" - "github.com/0xProject/0x-mesh/packages/browser/go/browserutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/browserutil" "github.com/0xProject/0x-mesh/zeroex" "github.com/0xProject/0x-mesh/zeroex/ordervalidator" "github.com/0xProject/0x-mesh/zeroex/orderwatch/decoder" diff --git a/packages/browser/go/jsutil/jsutil.go b/packages/mesh-browser/go/jsutil/jsutil.go similarity index 100% rename from packages/browser/go/jsutil/jsutil.go rename to packages/mesh-browser/go/jsutil/jsutil.go diff --git a/packages/browser/go/jsutil/jsutil_bench_test.go b/packages/mesh-browser/go/jsutil/jsutil_bench_test.go similarity index 100% rename from packages/browser/go/jsutil/jsutil_bench_test.go rename to packages/mesh-browser/go/jsutil/jsutil_bench_test.go diff --git a/packages/browser/go/mesh-browser/main.go b/packages/mesh-browser/go/mesh-browser/main.go similarity index 98% rename from packages/browser/go/mesh-browser/main.go rename to packages/mesh-browser/go/mesh-browser/main.go index 113603d4c..95a23ffd4 100644 --- a/packages/browser/go/mesh-browser/main.go +++ b/packages/mesh-browser/go/mesh-browser/main.go @@ -9,8 +9,8 @@ import ( "time" "github.com/0xProject/0x-mesh/core" - "github.com/0xProject/0x-mesh/packages/browser/go/browserutil" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/browserutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" "github.com/0xProject/0x-mesh/zeroex" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" diff --git a/packages/browser/go/providerwrapper/providerwrapper.go b/packages/mesh-browser/go/providerwrapper/providerwrapper.go similarity index 98% rename from packages/browser/go/providerwrapper/providerwrapper.go rename to packages/mesh-browser/go/providerwrapper/providerwrapper.go index 507b920a1..654dc1b09 100644 --- a/packages/browser/go/providerwrapper/providerwrapper.go +++ b/packages/mesh-browser/go/providerwrapper/providerwrapper.go @@ -12,7 +12,7 @@ import ( "math/rand" "syscall/js" - "github.com/0xProject/0x-mesh/packages/browser/go/jsutil" + "github.com/0xProject/0x-mesh/packages/mesh-browser/go/jsutil" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" log "github.com/sirupsen/logrus" diff --git a/packages/browser/package.json b/packages/mesh-browser/package.json similarity index 98% rename from packages/browser/package.json rename to packages/mesh-browser/package.json index 0b9c08343..0a189915d 100644 --- a/packages/browser/package.json +++ b/packages/mesh-browser/package.json @@ -20,12 +20,6 @@ "config": { "docsPath": "../../docs/browser-bindings/browser" }, - "dependencies": { - "@0x/mesh-browser-lite": "1.0.0", - "base64-arraybuffer": "^0.2.0", - "browserfs": "^1.4.3", - "ethereum-types": "^3.0.0" - }, "devDependencies": { "@0x/subproviders": "^6.0.5", "@0x/ts-doc-gen": "^0.0.16", @@ -40,5 +34,10 @@ "typescript": "^3.9.3", "webpack": "^4.41.5", "webpack-cli": "^3.3.10" + }, + "dependencies": { + "@0x/mesh-browser-lite": "1.0.0", + "base64-arraybuffer": "^0.2.0", + "ethereum-types": "^3.0.0" } } diff --git a/packages/browser/scripts/generate_wasm_buffer.go b/packages/mesh-browser/scripts/generate_wasm_buffer.go similarity index 100% rename from packages/browser/scripts/generate_wasm_buffer.go rename to packages/mesh-browser/scripts/generate_wasm_buffer.go diff --git a/packages/browser/src/index.ts b/packages/mesh-browser/src/index.ts similarity index 100% rename from packages/browser/src/index.ts rename to packages/mesh-browser/src/index.ts diff --git a/packages/browser/tsconfig.json b/packages/mesh-browser/tsconfig.json similarity index 85% rename from packages/browser/tsconfig.json rename to packages/mesh-browser/tsconfig.json index c64e47d2c..99b1f66c0 100644 --- a/packages/browser/tsconfig.json +++ b/packages/mesh-browser/tsconfig.json @@ -8,7 +8,7 @@ "exclude": ["./conversion-tests/**/*"], "references": [ { - "path": "../browser-lite" + "path": "../mesh-browser-lite" } ] } diff --git a/packages/integration-tests/tslint.json b/packages/mesh-browser/tslint.json similarity index 100% rename from packages/integration-tests/tslint.json rename to packages/mesh-browser/tslint.json diff --git a/packages/browser/webpack.config.js b/packages/mesh-browser/webpack.config.js similarity index 100% rename from packages/browser/webpack.config.js rename to packages/mesh-browser/webpack.config.js diff --git a/packages/browser/webpack.tsconfig.json b/packages/mesh-browser/webpack.tsconfig.json similarity index 100% rename from packages/browser/webpack.tsconfig.json rename to packages/mesh-browser/webpack.tsconfig.json diff --git a/packages/browser/yarn.lock b/packages/mesh-browser/yarn.lock similarity index 100% rename from packages/browser/yarn.lock rename to packages/mesh-browser/yarn.lock diff --git a/packages/integration-tests/dist/index.html b/packages/mesh-integration-tests/dist/index.html similarity index 100% rename from packages/integration-tests/dist/index.html rename to packages/mesh-integration-tests/dist/index.html diff --git a/packages/integration-tests/package.json b/packages/mesh-integration-tests/package.json similarity index 100% rename from packages/integration-tests/package.json rename to packages/mesh-integration-tests/package.json diff --git a/packages/integration-tests/src/index.ts b/packages/mesh-integration-tests/src/index.ts similarity index 100% rename from packages/integration-tests/src/index.ts rename to packages/mesh-integration-tests/src/index.ts diff --git a/packages/integration-tests/tsconfig.json b/packages/mesh-integration-tests/tsconfig.json similarity index 89% rename from packages/integration-tests/tsconfig.json rename to packages/mesh-integration-tests/tsconfig.json index 4bbac901f..9d387eaf0 100644 --- a/packages/integration-tests/tsconfig.json +++ b/packages/mesh-integration-tests/tsconfig.json @@ -8,7 +8,7 @@ "include": ["./src/**/*", "./test/**/*"], "references": [ { - "path": "../browser" + "path": "../mesh-browser" } ] } diff --git a/packages/rpc-client/tslint.json b/packages/mesh-integration-tests/tslint.json similarity index 100% rename from packages/rpc-client/tslint.json rename to packages/mesh-integration-tests/tslint.json diff --git a/packages/integration-tests/webpack.config.js b/packages/mesh-integration-tests/webpack.config.js similarity index 100% rename from packages/integration-tests/webpack.config.js rename to packages/mesh-integration-tests/webpack.config.js diff --git a/packages/integration-tests/yarn.lock b/packages/mesh-integration-tests/yarn.lock similarity index 100% rename from packages/integration-tests/yarn.lock rename to packages/mesh-integration-tests/yarn.lock diff --git a/packages/rpc-client/.npmignore b/packages/mesh-rpc-client/.npmignore similarity index 100% rename from packages/rpc-client/.npmignore rename to packages/mesh-rpc-client/.npmignore diff --git a/packages/rpc-client/LICENSE b/packages/mesh-rpc-client/LICENSE similarity index 100% rename from packages/rpc-client/LICENSE rename to packages/mesh-rpc-client/LICENSE diff --git a/packages/rpc-client/README.md b/packages/mesh-rpc-client/README.md similarity index 100% rename from packages/rpc-client/README.md rename to packages/mesh-rpc-client/README.md diff --git a/packages/rpc-client/package.json b/packages/mesh-rpc-client/package.json similarity index 100% rename from packages/rpc-client/package.json rename to packages/mesh-rpc-client/package.json index 3b9578a11..f647d1de0 100644 --- a/packages/rpc-client/package.json +++ b/packages/mesh-rpc-client/package.json @@ -37,15 +37,6 @@ "url": "https://github.com/0xProject/0x-mesh/issues" }, "homepage": "https://github.com/0xProject/0x-mesh/rpc/clients/typescript/README.md", - "dependencies": { - "@0x/assert": "^3.0.6", - "@0x/types": "^3.1.2", - "@0x/typescript-typings": "^5.0.2", - "@0x/utils": "^5.4.0", - "uuid": "^3.3.2", - "web3-providers": "^2.0.0-alpha.1", - "websocket": "^1.0.29" - }, "devDependencies": { "@0x/contract-addresses": "^4.1.0", "@0x/contracts-erc20": "^3.1.0", @@ -76,6 +67,15 @@ "typescript": "3.9.3", "uuid-validate": "^0.0.3" }, + "dependencies": { + "@0x/assert": "^3.0.6", + "@0x/types": "^3.1.2", + "@0x/typescript-typings": "^5.0.2", + "@0x/utils": "^5.4.0", + "uuid": "^3.3.2", + "web3-providers": "^2.0.0-alpha.1", + "websocket": "^1.0.29" + }, "publishConfig": { "access": "public" } diff --git a/packages/rpc-client/src/globals.d.ts b/packages/mesh-rpc-client/src/globals.d.ts similarity index 100% rename from packages/rpc-client/src/globals.d.ts rename to packages/mesh-rpc-client/src/globals.d.ts diff --git a/packages/rpc-client/src/index.ts b/packages/mesh-rpc-client/src/index.ts similarity index 100% rename from packages/rpc-client/src/index.ts rename to packages/mesh-rpc-client/src/index.ts diff --git a/packages/rpc-client/src/types.ts b/packages/mesh-rpc-client/src/types.ts similarity index 100% rename from packages/rpc-client/src/types.ts rename to packages/mesh-rpc-client/src/types.ts diff --git a/packages/rpc-client/src/ws_client.ts b/packages/mesh-rpc-client/src/ws_client.ts similarity index 100% rename from packages/rpc-client/src/ws_client.ts rename to packages/mesh-rpc-client/src/ws_client.ts diff --git a/packages/rpc-client/test/utils/chai_setup.ts b/packages/mesh-rpc-client/test/utils/chai_setup.ts similarity index 100% rename from packages/rpc-client/test/utils/chai_setup.ts rename to packages/mesh-rpc-client/test/utils/chai_setup.ts diff --git a/packages/rpc-client/test/utils/mock_ws_server.ts b/packages/mesh-rpc-client/test/utils/mock_ws_server.ts similarity index 100% rename from packages/rpc-client/test/utils/mock_ws_server.ts rename to packages/mesh-rpc-client/test/utils/mock_ws_server.ts diff --git a/packages/rpc-client/test/utils/ws_server.ts b/packages/mesh-rpc-client/test/utils/ws_server.ts similarity index 100% rename from packages/rpc-client/test/utils/ws_server.ts rename to packages/mesh-rpc-client/test/utils/ws_server.ts diff --git a/packages/rpc-client/test/ws_client_test.ts b/packages/mesh-rpc-client/test/ws_client_test.ts similarity index 100% rename from packages/rpc-client/test/ws_client_test.ts rename to packages/mesh-rpc-client/test/ws_client_test.ts diff --git a/packages/rpc-client/tsconfig.json b/packages/mesh-rpc-client/tsconfig.json similarity index 100% rename from packages/rpc-client/tsconfig.json rename to packages/mesh-rpc-client/tsconfig.json diff --git a/packages/test-wasm/tslint.json b/packages/mesh-rpc-client/tslint.json similarity index 100% rename from packages/test-wasm/tslint.json rename to packages/mesh-rpc-client/tslint.json diff --git a/packages/rpc-client/yarn.lock b/packages/mesh-rpc-client/yarn.lock similarity index 100% rename from packages/rpc-client/yarn.lock rename to packages/mesh-rpc-client/yarn.lock diff --git a/packages/webpack-example-lite/README.md b/packages/mesh-webpack-example-lite/README.md similarity index 100% rename from packages/webpack-example-lite/README.md rename to packages/mesh-webpack-example-lite/README.md diff --git a/packages/webpack-example-lite/dist/index.html b/packages/mesh-webpack-example-lite/dist/index.html similarity index 100% rename from packages/webpack-example-lite/dist/index.html rename to packages/mesh-webpack-example-lite/dist/index.html diff --git a/packages/webpack-example-lite/package.json b/packages/mesh-webpack-example-lite/package.json similarity index 81% rename from packages/webpack-example-lite/package.json rename to packages/mesh-webpack-example-lite/package.json index 396dd354f..ad50699dd 100644 --- a/packages/webpack-example-lite/package.json +++ b/packages/mesh-webpack-example-lite/package.json @@ -1,12 +1,13 @@ { - "name": "mesh-webpack-lite", + "name": "mesh-webpack-example-lite", + "description": "An example of how to run Mesh directly in the browser using Webpack and the @0x/mesh-browser-lite package.", "version": "1.0.0", "main": "index.js", "license": "Apache-2.0", "private": true, "scripts": { "build": "tsc -b && yarn build:webpack && yarn build:wasm", - "build:wasm": "GOOS=js GOARCH=wasm go build -o ./dist/main.wasm ../browser/go/mesh-browser/main.go", + "build:wasm": "GOOS=js GOARCH=wasm go build -o ./dist/main.wasm ../mesh-browser/go/mesh-browser/main.go", "build:webpack": "node --max_old_space_size=3072 ./node_modules/.bin/webpack --mode=development", "clean": "shx rm ./dist/bundle.js || exit 0", "postinstall:comment": "Remove the go and scripts directories of the mesh browser package to reduce the webpack bundle size", diff --git a/packages/webpack-example-lite/src/index.ts b/packages/mesh-webpack-example-lite/src/index.ts similarity index 100% rename from packages/webpack-example-lite/src/index.ts rename to packages/mesh-webpack-example-lite/src/index.ts diff --git a/packages/webpack-example-lite/tsconfig.json b/packages/mesh-webpack-example-lite/tsconfig.json similarity index 83% rename from packages/webpack-example-lite/tsconfig.json rename to packages/mesh-webpack-example-lite/tsconfig.json index 47fde54f4..7695b76f3 100644 --- a/packages/webpack-example-lite/tsconfig.json +++ b/packages/mesh-webpack-example-lite/tsconfig.json @@ -7,7 +7,7 @@ "include": ["./src/**/*", "./test/**/*"], "references": [ { - "path": "../browser-lite" + "path": "../mesh-browser-lite" } ] } diff --git a/packages/webpack-example-lite/tslint.json b/packages/mesh-webpack-example-lite/tslint.json similarity index 100% rename from packages/webpack-example-lite/tslint.json rename to packages/mesh-webpack-example-lite/tslint.json diff --git a/packages/webpack-example-lite/webpack.config.js b/packages/mesh-webpack-example-lite/webpack.config.js similarity index 100% rename from packages/webpack-example-lite/webpack.config.js rename to packages/mesh-webpack-example-lite/webpack.config.js diff --git a/packages/webpack-example-lite/yarn.lock b/packages/mesh-webpack-example-lite/yarn.lock similarity index 100% rename from packages/webpack-example-lite/yarn.lock rename to packages/mesh-webpack-example-lite/yarn.lock diff --git a/packages/webpack-example/README.md b/packages/mesh-webpack-example/README.md similarity index 100% rename from packages/webpack-example/README.md rename to packages/mesh-webpack-example/README.md diff --git a/packages/webpack-example/dist/index.html b/packages/mesh-webpack-example/dist/index.html similarity index 100% rename from packages/webpack-example/dist/index.html rename to packages/mesh-webpack-example/dist/index.html diff --git a/packages/webpack-example/package.json b/packages/mesh-webpack-example/package.json similarity index 84% rename from packages/webpack-example/package.json rename to packages/mesh-webpack-example/package.json index bc02d1ba0..acad4bb3c 100644 --- a/packages/webpack-example/package.json +++ b/packages/mesh-webpack-example/package.json @@ -1,5 +1,6 @@ { - "name": "mesh-webpack", + "name": "mesh-webpack-example", + "description": "An example of how to run Mesh directly in the browser using Webpack and the @0x/mesh-browser package.", "version": "1.0.0", "main": "index.js", "license": "Apache-2.0", diff --git a/packages/webpack-example/src/index.ts b/packages/mesh-webpack-example/src/index.ts similarity index 100% rename from packages/webpack-example/src/index.ts rename to packages/mesh-webpack-example/src/index.ts diff --git a/packages/webpack-example/tsconfig.json b/packages/mesh-webpack-example/tsconfig.json similarity index 85% rename from packages/webpack-example/tsconfig.json rename to packages/mesh-webpack-example/tsconfig.json index 6f064db05..0abd184ed 100644 --- a/packages/webpack-example/tsconfig.json +++ b/packages/mesh-webpack-example/tsconfig.json @@ -7,7 +7,7 @@ "include": ["./src/**/*", "./test/**/*"], "references": [ { - "path": "../browser" + "path": "../mesh-browser" } ] } diff --git a/packages/webpack-example/tslint.json b/packages/mesh-webpack-example/tslint.json similarity index 100% rename from packages/webpack-example/tslint.json rename to packages/mesh-webpack-example/tslint.json diff --git a/packages/webpack-example/webpack.config.js b/packages/mesh-webpack-example/webpack.config.js similarity index 100% rename from packages/webpack-example/webpack.config.js rename to packages/mesh-webpack-example/webpack.config.js diff --git a/packages/webpack-example/yarn.lock b/packages/mesh-webpack-example/yarn.lock similarity index 100% rename from packages/webpack-example/yarn.lock rename to packages/mesh-webpack-example/yarn.lock diff --git a/tsconfig.json b/tsconfig.json index 1159fc8b1..facfe0472 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,12 +4,12 @@ "extends": "./tsconfig-base", "include": [], "references": [ - { "path": "./packages/browser" }, - { "path": "./packages/browser-lite" }, - { "path": "./packages/webpack-example" }, - { "path": "./packages/webpack-example-lite" }, - { "path": "./packages/rpc-client" }, - { "path": "./packages/integration-tests" }, - { "path": "./packages/test-wasm" } + { "path": "./packages/mesh-browser" }, + { "path": "./packages/mesh-browser-lite" }, + { "path": "./packages/mesh-webpack-example" }, + { "path": "./packages/mesh-webpack-example-lite" }, + { "path": "./packages/mesh-rpc-client" }, + { "path": "./packages/mesh-integration-tests" }, + { "path": "./packages/mesh-browser-shim" } ] } diff --git a/yarn.lock b/yarn.lock index 875698c35..65d4d5814 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1252,7 +1252,7 @@ async@2.6.2: dependencies: lodash "^4.17.11" -async@^2.0.1, async@^2.1.2, async@^2.1.4, async@^2.4.0, async@^2.5.0, async@^2.6.1: +async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== @@ -2024,14 +2024,6 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserfs@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/browserfs/-/browserfs-1.4.3.tgz#92ffc6063967612daccdb8566d3fc03f521205fb" - integrity sha512-tz8HClVrzTJshcyIu8frE15cjqjcBIu15Bezxsvl/i+6f59iNCN3kznlWjz0FEb3DlnDx3gW5szxeT6D1x0s0w== - dependencies: - async "^2.1.4" - pako "^1.0.4" - browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -6513,7 +6505,7 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -pako@^1.0.4, pako@~1.0.5: +pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==