diff --git a/Earthfile b/Earthfile index 25d6617..0a8b666 100644 --- a/Earthfile +++ b/Earthfile @@ -29,16 +29,16 @@ base-node: CACHE $HOME/.local/share/pnpm COPY +wasmlib/pkg-web tools/upend_wasm/pkg-web COPY +wasmlib/pkg-node tools/upend_wasm/pkg-node - COPY tools/upend_js/package.json tools/upend_js/pnpm-lock.yaml tools/upend_js/ - RUN cd tools/upend_js && rm -rf node_modules && pnpm install --frozen-lockfile + COPY sdks/js/package.json sdks/js/pnpm-lock.yaml sdks/js/ + RUN cd sdks/js && rm -rf node_modules && pnpm install --frozen-lockfile COPY webui/package.json webui/pnpm-lock.yaml webui/ RUN cd webui && rm -rf node_modules && pnpm install --frozen-lockfile COPY --dir webui webext . - COPY --dir tools/upend_js tools/ + COPY --dir sdks/js sdks/ base-frontend: FROM +base-node - COPY +jslib/jslib tools/upend_js + COPY +jslib/jslib sdks/js WORKDIR webui RUN rm -rf node_modules && pnpm install --frozen-lockfile @@ -72,7 +72,7 @@ wasmlib: jslib: FROM +base-node - WORKDIR tools/upend_js + WORKDIR sdks/js RUN pnpm build SAVE ARTIFACT . jslib @@ -161,7 +161,7 @@ lint-frontend: lint-jslib: FROM +base-node - WORKDIR tools/upend_js + WORKDIR sdks/js RUN pnpm lint audit: @@ -192,7 +192,7 @@ test-backend: test-jslib: FROM +base-node - WORKDIR tools/upend_js + WORKDIR sdks/js RUN pnpm build && pnpm test # Deployment targets @@ -217,7 +217,7 @@ publish-js-all: publish-js-lib: FROM +base-npm-publish - WORKDIR /upend/tools/upend_js + WORKDIR /upend/sdks/js DO +NPM_PUBLISH --pkg_name=@upnd/upend publish-js-wasm: @@ -230,7 +230,7 @@ publish-js-wasm: base-npm-publish: FROM +base-node RUN --secret NPM_TOKEN echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > $HOME/.npmrc - COPY +jslib/jslib tools/upend_js + COPY +jslib/jslib sdks/js NPM_PUBLISH: FUNCTION diff --git a/tools/upend_js/.eslintrc.json b/sdks/js/.eslintrc.json similarity index 100% rename from tools/upend_js/.eslintrc.json rename to sdks/js/.eslintrc.json diff --git a/tools/upend_js/.gitignore b/sdks/js/.gitignore similarity index 100% rename from tools/upend_js/.gitignore rename to sdks/js/.gitignore diff --git a/tools/upend_js/.yarnrc.yml b/sdks/js/.yarnrc.yml similarity index 100% rename from tools/upend_js/.yarnrc.yml rename to sdks/js/.yarnrc.yml diff --git a/tools/upend_js/api.ts b/sdks/js/api.ts similarity index 100% rename from tools/upend_js/api.ts rename to sdks/js/api.ts diff --git a/tools/upend_js/constants.ts b/sdks/js/constants.ts similarity index 100% rename from tools/upend_js/constants.ts rename to sdks/js/constants.ts diff --git a/tools/upend_js/index.ts b/sdks/js/index.ts similarity index 100% rename from tools/upend_js/index.ts rename to sdks/js/index.ts diff --git a/tools/upend_js/package.json b/sdks/js/package.json similarity index 100% rename from tools/upend_js/package.json rename to sdks/js/package.json diff --git a/tools/upend_js/pnpm-lock.yaml b/sdks/js/pnpm-lock.yaml similarity index 100% rename from tools/upend_js/pnpm-lock.yaml rename to sdks/js/pnpm-lock.yaml diff --git a/tools/upend_js/query.ts b/sdks/js/query.ts similarity index 100% rename from tools/upend_js/query.ts rename to sdks/js/query.ts diff --git a/tools/upend_js/test.ts b/sdks/js/test.ts similarity index 100% rename from tools/upend_js/test.ts rename to sdks/js/test.ts diff --git a/tools/upend_js/tsconfig.json b/sdks/js/tsconfig.json similarity index 100% rename from tools/upend_js/tsconfig.json rename to sdks/js/tsconfig.json diff --git a/tools/upend_js/types.ts b/sdks/js/types.ts similarity index 100% rename from tools/upend_js/types.ts rename to sdks/js/types.ts diff --git a/tools/upend_js/util.ts b/sdks/js/util.ts similarity index 100% rename from tools/upend_js/util.ts rename to sdks/js/util.ts diff --git a/tools/upend_js/wasm/index.ts b/sdks/js/wasm/index.ts similarity index 100% rename from tools/upend_js/wasm/index.ts rename to sdks/js/wasm/index.ts diff --git a/tools/upend_js/wasm/node.ts b/sdks/js/wasm/node.ts similarity index 100% rename from tools/upend_js/wasm/node.ts rename to sdks/js/wasm/node.ts diff --git a/tools/upend_js/wasm/web.ts b/sdks/js/wasm/web.ts similarity index 100% rename from tools/upend_js/wasm/web.ts rename to sdks/js/wasm/web.ts diff --git a/tools/upend_py/README.rst b/sdks/py/README.rst similarity index 100% rename from tools/upend_py/README.rst rename to sdks/py/README.rst diff --git a/tools/upend_py/poetry.lock b/sdks/py/poetry.lock similarity index 100% rename from tools/upend_py/poetry.lock rename to sdks/py/poetry.lock diff --git a/tools/upend_py/pyproject.toml b/sdks/py/pyproject.toml similarity index 100% rename from tools/upend_py/pyproject.toml rename to sdks/py/pyproject.toml diff --git a/tools/upend_py/tests/__init__.py b/sdks/py/tests/__init__.py similarity index 100% rename from tools/upend_py/tests/__init__.py rename to sdks/py/tests/__init__.py diff --git a/tools/upend_py/tests/test_upend.py b/sdks/py/tests/test_upend.py similarity index 100% rename from tools/upend_py/tests/test_upend.py rename to sdks/py/tests/test_upend.py diff --git a/tools/upend_py/upend/__init__.py b/sdks/py/upend/__init__.py similarity index 100% rename from tools/upend_py/upend/__init__.py rename to sdks/py/upend/__init__.py diff --git a/tools/upend_py/upend/lib.py b/sdks/py/upend/lib.py similarity index 100% rename from tools/upend_py/upend/lib.py rename to sdks/py/upend/lib.py diff --git a/tools/upend_py/upend/upend.py b/sdks/py/upend/upend.py similarity index 100% rename from tools/upend_py/upend/upend.py rename to sdks/py/upend/upend.py diff --git a/tools/upend_py/upend/util.py b/sdks/py/upend/util.py similarity index 100% rename from tools/upend_py/upend/util.py rename to sdks/py/upend/util.py diff --git a/webext/package.json b/webext/package.json index ce873b4..e17a8d7 100644 --- a/webext/package.json +++ b/webext/package.json @@ -22,7 +22,7 @@ "svelte": "^3.55.0", "svelte-preprocess": "^5.0.3", "typescript": "^4.9.4", - "upend": "file:../tools/upend_js", + "upend": "file:../sdks/js", "vite": "^4.0.3", "vite-plugin-static-copy": "^0.15.0", "web-ext": "^7.6.2" diff --git a/webext/pnpm-lock.yaml b/webext/pnpm-lock.yaml index 4c957c1..326cead 100644 --- a/webext/pnpm-lock.yaml +++ b/webext/pnpm-lock.yaml @@ -27,8 +27,8 @@ dependencies: specifier: ^4.9.4 version: 4.9.5 upend: - specifier: file:../tools/upend_js - version: file:../tools/upend_js + specifier: file:../sdks/js + version: file:../sdks/js vite: specifier: ^4.0.3 version: 4.3.8(sass@1.62.1) @@ -4669,20 +4669,14 @@ packages: jszip: 3.10.1 dev: false - file:../tools/upend_js: - resolution: {directory: ../tools/upend_js, type: directory} + file:../sdks/js: + resolution: {directory: ../sdks/js, type: directory} name: '@upnd/upend' dependencies: '@upnd/wasm-node': 0.1.0 '@upnd/wasm-web': 0.1.0 debug: 4.3.4 lru-cache: 7.18.3 - upend_wasm: file:../tools/upend_wasm/pkg transitivePeerDependencies: - supports-color dev: false - - file:../tools/upend_wasm/pkg: - resolution: {directory: ../tools/upend_wasm/pkg, type: directory} - name: upend_wasm - dev: false diff --git a/webui/package.json b/webui/package.json index 2640aef..c8f9882 100644 --- a/webui/package.json +++ b/webui/package.json @@ -42,8 +42,8 @@ "@types/node": "^18.19.8", "@types/three": "^0.160.0", "@types/wavesurfer.js": "^6.0.12", - "@upnd/upend": "file:../tools/upend_js", - "@upnd/wasm-web": "file:../tools/upend_wasm/pkg-web", + "@upnd/upend": "file:../sdks/js", + "@upnd/wasm-web": "file:../wasm/pkg-web", "boxicons": "^2.1.4", "d3": "^7.8.5", "date-fns": "^2.30.0", diff --git a/webui/pnpm-lock.yaml b/webui/pnpm-lock.yaml index 7f346b4..be66847 100644 --- a/webui/pnpm-lock.yaml +++ b/webui/pnpm-lock.yaml @@ -39,11 +39,11 @@ dependencies: specifier: ^6.0.12 version: 6.0.12 '@upnd/upend': - specifier: file:../tools/upend_js - version: file:../tools/upend_js + specifier: file:../sdks/js + version: file:../sdks/js '@upnd/wasm-web': - specifier: file:../tools/upend_wasm/pkg-web - version: file:../tools/upend_wasm/pkg-web + specifier: file:../wasm/pkg-web + version: file:../wasm/pkg-web boxicons: specifier: ^2.1.4 version: 2.1.4 @@ -1359,7 +1359,6 @@ packages: react-interactive: 0.8.3(react@16.14.0) react-router-dom: 4.3.1(react@16.14.0) dev: false - bundledDependencies: false /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -3128,7 +3127,6 @@ packages: react: 16.14.0 scheduler: 0.19.1 dev: false - bundledDependencies: false /react-draggable@4.4.6(react-dom@16.14.0)(react@16.14.0): resolution: {integrity: sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==} @@ -3236,7 +3234,6 @@ packages: object-assign: 4.1.1 prop-types: 15.8.1 dev: false - bundledDependencies: false /readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} @@ -3977,8 +3974,8 @@ packages: engines: {node: '>=10'} dev: true - file:../tools/upend_js: - resolution: {directory: ../tools/upend_js, type: directory} + file:../sdks/js: + resolution: {directory: ../sdks/js, type: directory} name: '@upnd/upend' dependencies: '@upnd/wasm-node': 0.1.0 @@ -3988,11 +3985,8 @@ packages: transitivePeerDependencies: - supports-color dev: false - bundledDependencies: - - '@upnd/wasm-node' - - '@upnd/wasm-web' - file:../tools/upend_wasm/pkg-web: - resolution: {directory: ../tools/upend_wasm/pkg-web, type: directory} + file:../wasm/pkg-web: + resolution: {directory: ../wasm/pkg-web, type: directory} name: '@upnd/wasm-web' dev: false