From cbdf846497f8fd590d96e2caadc2f49fb14421db Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Thu, 6 Jun 2024 11:26:38 +0200 Subject: [PATCH] Fixed workflow --- .github/workflows/update-flake-inputs.yml | 3 +- flake.nix | 3 +- package.json | 47 +++++------ packages/core-types/package.json | 66 ++++++++-------- packages/elements/package.json | 96 ++++++++++++----------- packages/signals/package.json | 81 ++++++++++--------- packages/stores/package.json | 90 ++++++++++----------- packages/utils/package.json | 90 ++++++++++----------- 8 files changed, 245 insertions(+), 231 deletions(-) diff --git a/.github/workflows/update-flake-inputs.yml b/.github/workflows/update-flake-inputs.yml index ebd287a..9e340f2 100644 --- a/.github/workflows/update-flake-inputs.yml +++ b/.github/workflows/update-flake-inputs.yml @@ -33,9 +33,10 @@ jobs: - name: Update example repository run: | - cd nix/fixture/module-repo + cd nix/fixtures/module-repo nix flake update nix develop --command bash -c "cargo update" + nix develop --command bash -c "cd nix/reference-happ && cargo update" - uses: dorny/paths-filter@v3 id: changes diff --git a/flake.nix b/flake.nix index a7049fe..207cd8d 100644 --- a/flake.nix +++ b/flake.nix @@ -343,6 +343,7 @@ packages.pnpm = pkgs.writeShellScriptBin "pnpm" '' #!${pkgs.bash}/bin/bash exec ${pkgs.nodejs_20}/bin/node ${pkgs.nodejs_20}/bin/corepack pnpm@9.2.0 "$@" - ''; }; + ''; + }; }; } diff --git a/package.json b/package.json index 4b274aa..c16a20f 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,26 @@ { - "name": "@holochain-open-dev/common-dev", - "private": true, - "type": "module", - "workspaces": [ - "packages/utils", - "packages/core-types", - "packages/elements", - "packages/stores", - "packages/signals", - "sites/*" - ], - "engines": { - "npm": ">=7.0.0" - }, - "devDependencies": { - "@trivago/prettier-plugin-sort-imports": "^4.3.0", - "@eslint/js": "^8.0.0", - "eslint": "^8.0.0", - "eslint-config-prettier": "^9.1.0", - "prettier": "^3.2.5", - "typescript-eslint": "^7.7.0", - "typescript": "^5.4.5" - } + "name": "@holochain-open-dev/common-dev", + "private": true, + "type": "module", + "workspaces": [ + "packages/utils", + "packages/core-types", + "packages/elements", + "packages/stores", + "packages/signals", + "sites/*" + ], + "engines": { + "npm": ">=7.0.0" + }, + "devDependencies": { + "@trivago/prettier-plugin-sort-imports": "^4.3.0", + "@eslint/js": "^8.0.0", + "eslint": "^8.0.0", + "eslint-config-prettier": "^9.1.0", + "prettier": "^3.2.5", + "typescript-eslint": "^7.7.0", + "typescript": "^5.4.5" + }, + "packageManager": "pnpm@9.2.0+sha256.94fab213df221c55b6956b14a2264c21c6203cca9f0b3b95ff2fe9b84b120390" } diff --git a/packages/core-types/package.json b/packages/core-types/package.json index c4bf4d6..b3e3f7e 100644 --- a/packages/core-types/package.json +++ b/packages/core-types/package.json @@ -1,33 +1,35 @@ { - "name": "@holochain-open-dev/core-types", - "version": "0.300.0-rc.0", - "description": "Typescript types for holochain core", - "main": "dist/index.js", - "module": "dist/index.js", - "type": "module", - "files": ["dist/**/*"], - "scripts": { - "lint": "eslint src", - "build": "npm run lint && tsc", - "publish": "npm run build && npm publish --tag dev" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/holochain-open-dev/core-types.git" - }, - "author": "", - "license": "ISC", - "dependencies": { - "@holochain/client": "^0.17.0-rc" - }, - "devDependencies": { - "@types/libsodium-wrappers": "^0.7.10", - "@types/node": "^16.11.10", - "@types/ws": "^8.2.0", - "typescript": "^5.4.0" - }, - "bugs": { - "url": "https://github.com/holochain-open-dev/core-types/issues" - }, - "homepage": "https://github.com/holochain-open-dev/core-types#readme" -} + "name": "@holochain-open-dev/core-types", + "version": "0.300.0-rc.0", + "description": "Typescript types for holochain core", + "main": "dist/index.js", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist/**/*" + ], + "scripts": { + "lint": "eslint src", + "build": "npm run lint && tsc", + "publish": "npm run build && npm publish --tag dev" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/holochain-open-dev/core-types.git" + }, + "author": "", + "license": "ISC", + "dependencies": { + "@holochain/client": "^0.17.0-rc" + }, + "devDependencies": { + "@types/libsodium-wrappers": "^0.7.10", + "@types/node": "^16.11.10", + "@types/ws": "^8.2.0", + "typescript": "^5.4.0" + }, + "bugs": { + "url": "https://github.com/holochain-open-dev/core-types/issues" + }, + "homepage": "https://github.com/holochain-open-dev/core-types#readme" +} \ No newline at end of file diff --git a/packages/elements/package.json b/packages/elements/package.json index f6b0486..baf3496 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -1,48 +1,50 @@ { - "name": "@holochain-open-dev/elements", - "version": "0.300.0-rc.0", - "description": "Common utilities and elements to build Holochain web applications", - "author": "guillem.cordoba@gmail.com", - "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/index.d.ts", - "files": ["dist"], - "repository": { - "type": "git", - "url": "git+https://github.com/holochain-open-dev/common.git" - }, - "exports": { - ".": "./dist/index.js", - "./dist/*": "./dist/*" - }, - "scripts": { - "start": "vite --open", - "build": "npm run lint && tsc && npm run analyze -- --exclude dist", - "lint": "eslint src", - "analyze": "cem analyze --litelement" - }, - "dependencies": { - "@holo-host/identicon": "^0.1.0", - "@holochain/client": "^0.17.0-rc", - "@lit/localize": "^0.12.0", - "@mdi/js": "^7.1.96", - "@shoelace-style/shoelace": "^2.11.0", - "lit": "^3.0.2", - "prosemirror-commands": "^1.5.2", - "prosemirror-keymap": "^1.2.2", - "prosemirror-state": "^1.4.3", - "prosemirror-view": "^1.31.3" - }, - "devDependencies": { - "@custom-elements-manifest/analyzer": "^0.4.17", - "concurrently": "^7.0.0", - "typescript": "^4.9.0", - "vite": "^4.2.0", - "vite-plugin-checker": "^0.5.5" - }, - "publishConfig": { - "access": "public" - }, - "type": "module", - "customElements": "custom-elements.json" -} + "name": "@holochain-open-dev/elements", + "version": "0.300.0-rc.0", + "description": "Common utilities and elements to build Holochain web applications", + "author": "guillem.cordoba@gmail.com", + "main": "dist/index.js", + "module": "dist/index.js", + "types": "dist/index.d.ts", + "files": [ + "dist" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/holochain-open-dev/common.git" + }, + "exports": { + ".": "./dist/index.js", + "./dist/*": "./dist/*" + }, + "scripts": { + "start": "vite --open", + "build": "npm run lint && tsc && npm run analyze -- --exclude dist", + "lint": "eslint src", + "analyze": "cem analyze --litelement" + }, + "dependencies": { + "@holo-host/identicon": "^0.1.0", + "@holochain/client": "^0.17.0-rc", + "@lit/localize": "^0.12.0", + "@mdi/js": "^7.1.96", + "@shoelace-style/shoelace": "^2.11.0", + "lit": "^3.0.2", + "prosemirror-commands": "^1.5.2", + "prosemirror-keymap": "^1.2.2", + "prosemirror-state": "^1.4.3", + "prosemirror-view": "^1.31.3" + }, + "devDependencies": { + "@custom-elements-manifest/analyzer": "^0.4.17", + "concurrently": "^7.0.0", + "typescript": "^4.9.0", + "vite": "^4.2.0", + "vite-plugin-checker": "^0.5.5" + }, + "publishConfig": { + "access": "public" + }, + "type": "module", + "customElements": "custom-elements.json" +} \ No newline at end of file diff --git a/packages/signals/package.json b/packages/signals/package.json index 51da6c4..c09bf0d 100644 --- a/packages/signals/package.json +++ b/packages/signals/package.json @@ -1,40 +1,43 @@ { - "name": "@holochain-open-dev/signals", - "version": "0.300.0-rc.3", - "description": "Holochain async-signals to build reusable holochain-open-dev modules", - "author": "guillem.cordoba@gmail.com", - "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/index.d.ts", - "files": ["dist", "src"], - "exports": { - ".": "./dist/index.js", - "./dist/*": "./dist/*" - }, - "scripts": { - "start": "vite --open", - "build": "npm run lint && tsc", - "lint": "eslint src", - "test": "vitest run", - "prepublish": "npm run build" - }, - "dependencies": { - "@holochain-open-dev/utils": "^0.300.0-rc.0", - "@holochain/client": "^0.17.0-rc", - "@shoelace-style/shoelace": "^2.11.2", - "async-signals": "^0.1.10", - "lit-signal-watcher": "^0.1.1", - "signal-polyfill": "^0.1.1" - }, - "devDependencies": { - "@types/lodash-es": "^4.17.6", - "js-base64": "^3.7.7", - "typescript": "^5.4.0", - "vite": "^4.1.1", - "vitest": "^1.5.0" - }, - "publishConfig": { - "access": "public" - }, - "type": "module" -} + "name": "@holochain-open-dev/signals", + "version": "0.300.0-rc.3", + "description": "Holochain async-signals to build reusable holochain-open-dev modules", + "author": "guillem.cordoba@gmail.com", + "main": "dist/index.js", + "module": "dist/index.js", + "types": "dist/index.d.ts", + "files": [ + "dist", + "src" + ], + "exports": { + ".": "./dist/index.js", + "./dist/*": "./dist/*" + }, + "scripts": { + "start": "vite --open", + "build": "npm run lint && tsc", + "lint": "eslint src", + "test": "vitest run", + "prepublish": "npm run build" + }, + "dependencies": { + "@holochain-open-dev/utils": "^0.300.0-rc.0", + "@holochain/client": "^0.17.0-rc", + "@shoelace-style/shoelace": "^2.11.2", + "async-signals": "^0.1.10", + "lit-signal-watcher": "^0.1.1", + "signal-polyfill": "^0.1.1" + }, + "devDependencies": { + "@types/lodash-es": "^4.17.6", + "js-base64": "^3.7.7", + "typescript": "^5.4.0", + "vite": "^4.1.1", + "vitest": "^1.5.0" + }, + "publishConfig": { + "access": "public" + }, + "type": "module" +} \ No newline at end of file diff --git a/packages/stores/package.json b/packages/stores/package.json index 1c75ede..bba2be2 100644 --- a/packages/stores/package.json +++ b/packages/stores/package.json @@ -1,45 +1,47 @@ { - "name": "@holochain-open-dev/stores", - "version": "0.300.0-rc.0", - "description": "Re-export of svelte/store, with additional utilities to build reusable holochain-open-dev modules", - "author": "guillem.cordoba@gmail.com", - "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/index.d.ts", - "files": ["dist"], - "exports": { - ".": "./dist/index.js", - "./dist/*": "./dist/*" - }, - "scripts": { - "start": "vite --open", - "build": "npm run lint && tsc", - "lint": "eslint src", - "test": "vitest run", - "prepublish": "npm run build" - }, - "dependencies": { - "@alenaksu/json-viewer": "^2.0.1", - "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain/client": "^0.17.0-rc", - "@scoped-elements/cytoscape": "^0.2.0", - "@shoelace-style/shoelace": "^2.11.2", - "lit": "^3.0.2", - "lit-svelte-stores": "^0.3.0", - "svelte": "^3.53.1" - }, - "devDependencies": { - "@esm-bundle/chai": "^4.3.4-fix.0", - "@types/console-log-tree": "^1.2.2", - "@types/lodash-es": "^4.17.6", - "concurrently": "^7.0.0", - "rimraf": "^3.0.2", - "typescript": "^4.4.3", - "vite": "^4.1.1", - "vitest": "^0.28.5" - }, - "publishConfig": { - "access": "public" - }, - "type": "module" -} + "name": "@holochain-open-dev/stores", + "version": "0.300.0-rc.0", + "description": "Re-export of svelte/store, with additional utilities to build reusable holochain-open-dev modules", + "author": "guillem.cordoba@gmail.com", + "main": "dist/index.js", + "module": "dist/index.js", + "types": "dist/index.d.ts", + "files": [ + "dist" + ], + "exports": { + ".": "./dist/index.js", + "./dist/*": "./dist/*" + }, + "scripts": { + "start": "vite --open", + "build": "npm run lint && tsc", + "lint": "eslint src", + "test": "vitest run", + "prepublish": "npm run build" + }, + "dependencies": { + "@alenaksu/json-viewer": "^2.0.1", + "@holochain-open-dev/utils": "^0.300.0-dev.0", + "@holochain/client": "^0.17.0-rc", + "@scoped-elements/cytoscape": "^0.2.0", + "@shoelace-style/shoelace": "^2.11.2", + "lit": "^3.0.2", + "lit-svelte-stores": "^0.3.0", + "svelte": "^3.53.1" + }, + "devDependencies": { + "@esm-bundle/chai": "^4.3.4-fix.0", + "@types/console-log-tree": "^1.2.2", + "@types/lodash-es": "^4.17.6", + "concurrently": "^7.0.0", + "rimraf": "^3.0.2", + "typescript": "^4.4.3", + "vite": "^4.1.1", + "vitest": "^0.28.5" + }, + "publishConfig": { + "access": "public" + }, + "type": "module" +} \ No newline at end of file diff --git a/packages/utils/package.json b/packages/utils/package.json index 949183d..bd96eaf 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,45 +1,47 @@ { - "name": "@holochain-open-dev/utils", - "version": "0.300.0-rc.0", - "description": "Common utilities to build Holochain web applications", - "author": "guillem.cordoba@gmail.com", - "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/index.d.ts", - "files": ["dist"], - "repository": { - "type": "git", - "url": "git+https://github.com/holochain-open-dev/common.git" - }, - "exports": { - ".": "./dist/index.js", - "./dist/*": "./dist/*" - }, - "scripts": { - "build": "npm run lint && tsc --incremental", - "build:watch": "tsc --watch --preserveWatchOutput", - "lint": "eslint src", - "test": "vitest run" - }, - "dependencies": { - "@holochain/client": "^0.17.0-rc", - "@msgpack/msgpack": "^2.8.0", - "blakejs": "^1.2.1", - "emittery": "^1.0.1", - "lodash-es": "^4.17.21", - "sort-keys": "^5.0.0" - }, - "devDependencies": { - "@types/lodash-es": "^4.17.6", - "concurrently": "^7.0.0", - "rimraf": "^3.0.2", - "typescript": "^4.4.3", - "vite": "^4.1.1", - "vitest": "^1.4.0" - }, - "publishConfig": { - "access": "public" - }, - "type": "module", - "customElements": "custom-elements.json" -} + "name": "@holochain-open-dev/utils", + "version": "0.300.0-rc.0", + "description": "Common utilities to build Holochain web applications", + "author": "guillem.cordoba@gmail.com", + "main": "dist/index.js", + "module": "dist/index.js", + "types": "dist/index.d.ts", + "files": [ + "dist" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/holochain-open-dev/common.git" + }, + "exports": { + ".": "./dist/index.js", + "./dist/*": "./dist/*" + }, + "scripts": { + "build": "npm run lint && tsc --incremental", + "build:watch": "tsc --watch --preserveWatchOutput", + "lint": "eslint src", + "test": "vitest run" + }, + "dependencies": { + "@holochain/client": "^0.17.0-rc", + "@msgpack/msgpack": "^2.8.0", + "blakejs": "^1.2.1", + "emittery": "^1.0.1", + "lodash-es": "^4.17.21", + "sort-keys": "^5.0.0" + }, + "devDependencies": { + "@types/lodash-es": "^4.17.6", + "concurrently": "^7.0.0", + "rimraf": "^3.0.2", + "typescript": "^4.4.3", + "vite": "^4.1.1", + "vitest": "^1.4.0" + }, + "publishConfig": { + "access": "public" + }, + "type": "module", + "customElements": "custom-elements.json" +} \ No newline at end of file