WIP update to holochain 0.4-rc

zippy · zippy · commit 6309e4b802cf · 2024-11-13T12:03:33.000-05:00
diff --git a/scripts/download-happs.sh b/scripts/download-happs.sh
@@ -3,5 +3,5 @@
 mkdir -p electron/binaries
 # bump this in tandem with bumping the INTEGRITY_VERSION_NUMBER
 # -q is just "quiet" without the logs
-wget -q https://github.com/lightningrodlabs/acorn-happ/releases/download/v14.0.0/acorn.happ -O electron/binaries/acorn.happ
-wget -q https://github.com/lightningrodlabs/acorn-happ/releases/download/v14.0.0/projects.happ -O electron/binaries/projects.happ
+wget -q https://github.com/lightningrodlabs/acorn-happ/releases/download/v14.0.1/acorn.happ -O electron/binaries/acorn.happ
+wget -q https://github.com/lightningrodlabs/acorn-happ/releases/download/v14.0.1/projects.happ -O electron/binaries/projects.happ
diff --git a/we-applet/package.json b/we-applet/package.json
@@ -4,10 +4,10 @@
   "main": "index.js",
   "license": "MIT",
   "scripts": {
-    "dev-we": "we-dev-cli --agent-idx 1 --dev-config we.dev.config.ts",
-    "dev-we2": "we-dev-cli --agent-idx 2 --dev-config we.dev.config.ts"
+    "dev-we": "weave --agent-idx 1 --dev-config we.dev.config.ts",
+    "dev-we2": "weave --agent-idx 2 --dev-config we.dev.config.ts"
   },
   "dependencies": {
-    "@lightningrodlabs/we-dev-cli": "0.13.0-beta.5"
+    "@theweave/cli": "0.13.0-gamma.6"
   }
 }
diff --git a/we-applet/we.dev.config.ts b/we-applet/we.dev.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from '@lightningrodlabs/we-dev-cli'
+import { defineConfig } from '@theweave/cli'
 
 export default defineConfig({
   groups: [
diff --git a/web/package.json b/web/package.json
@@ -15,7 +15,7 @@
     "zip:ui": "zip -r dist.zip dist",
     "build:webhapp": "hc web-app pack --output=./acorn.webhapp ./",
     "package": "npm run build:ui && npm run zip:ui && npm run build:webhapp && cp acorn.webhapp /Users/weswalla/lrl/kando/we_dev",
-    "dev:we": "we-dev-cli --agent-idx 1 --dev-config we.dev.config.ts"
+    "dev:we": "weave --agent-idx 1 --dev-config we.dev.config.ts"
   },
   "devDependencies": {
     "@babel/core": "^7.14.0",
@@ -61,11 +61,11 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.7.4",
-    "@holochain/client": "0.18.0-dev.1",
-    "@lightningrodlabs/we-applet": "0.17.0-dev.1",
-    "@lightningrodlabs/we-dev-cli": "0.12.0-dev.0",
-    "@holochain-open-dev/profiles": "0.400.0-dev.1",
-    "@holochain-open-dev/utils": "0.300.2",
+    "@holochain/client": "0.18.0-rc.0",
+    "@theweave/api": "0.2.1",
+    "@theweave/cli": "0.13.0-gamma.6 ",
+    "@holochain-open-dev/profiles": "0.400.0-dev.4",
+    "@holochain-open-dev/utils": "0.400.0-dev.4",
     "@tweenjs/tween.js": "^18.6.4",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "buffer": "^6.0.3",
diff --git a/web/src/components/IntroScreen/IntroScreen.connector.tsx b/web/src/components/IntroScreen/IntroScreen.connector.tsx
@@ -12,7 +12,7 @@ import IntroScreenInner, {
 import useAppWebsocket from '../../hooks/useAppWebsocket'
 import React from 'react'
 import { getAppWs, getWeaveProfilesClient } from '../../hcWebsockets'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 
 function mapStateToProps(state: RootState): IntroScreenStateProps {
   return {
diff --git a/web/src/components/NetworkInfo/NetworkInfo.tsx b/web/src/components/NetworkInfo/NetworkInfo.tsx
@@ -3,7 +3,7 @@ import './NetworkInfo.scss'
 import { getAdminWs } from '../../hcWebsockets'
 import ReactJsonView from 'react-json-view'
 import { VersionInfo } from '../../hooks/useVersionChecker'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 
 export type NetworkInfoProps = {
   versionInfo: VersionInfo
diff --git a/web/src/hcWebsockets.ts b/web/src/hcWebsockets.ts
@@ -1,6 +1,6 @@
 import { AdminWebsocket, AppWebsocket, AppClient } from '@holochain/client'
 import { MAIN_APP_ID } from './holochainConfig'
-import { isWeContext, WeaveClient } from '@lightningrodlabs/we-applet'
+import { isWeContext, WeaveClient } from '@theweave/api'
 import { ProfilesClient } from '@holochain-open-dev/profiles'
 
 // export for use by holochainMiddleware (redux)
diff --git a/web/src/index.tsx b/web/src/index.tsx
@@ -14,7 +14,7 @@ import {
   WeaveClient,
   initializeHotReload,
   isWeContext,
-} from '@lightningrodlabs/we-applet'
+} from '@theweave/api'
 import createStoreAndRenderToDom, { electronInit } from './indexForElectron'
 import {
   getAdminWs,
diff --git a/web/src/indexForMoss.tsx b/web/src/indexForMoss.tsx
@@ -17,7 +17,7 @@ import { cellIdToString } from './utils'
 // Import styles
 import './variables.scss'
 import './global.scss'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 import { ProfilesClient } from '@holochain-open-dev/profiles'
 
 export async function mossInit(
diff --git a/web/src/migrating/import/zomeApiCreators.ts b/web/src/migrating/import/zomeApiCreators.ts
@@ -1,7 +1,7 @@
 import { AppClient } from '@holochain/client'
 import ProfilesZomeApi from '../../api/profilesApi'
 import ProjectsZomeApi from '../../api/projectsApi'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 import { getWeaveProfilesClient } from '../../hcWebsockets'
 
 export async function createProfilesZomeApi(
diff --git a/web/src/projects/installProject.ts b/web/src/projects/installProject.ts
@@ -10,7 +10,7 @@ import { PROJECT_APP_PREFIX, PROJECTS_ROLE_NAME } from '../holochainConfig'
 import { passphraseToUid } from '../secrets'
 import { CellIdString } from '../types/shared'
 import { cellIdToString } from '../utils'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 
 export async function internalInstallProject(
   passphrase: string,
diff --git a/web/src/routes/App.connector.ts b/web/src/routes/App.connector.ts
@@ -35,7 +35,7 @@ import { updateProjectMeta } from '../redux/persistent/projects/project-meta/act
 import { uninstallProject } from '../projects/uninstallProject'
 import { unselectAll } from '../redux/ephemeral/selection/actions'
 import { CellId } from '@holochain/client'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 
 function mapStateToProps(state: RootState): AppStateProps {
   const {
diff --git a/web/src/routes/CreateProfilePage/CreateProfilePage.connector.ts b/web/src/routes/CreateProfilePage/CreateProfilePage.connector.ts
@@ -13,7 +13,7 @@ import CreateProfilePage, {
 import { Profile } from '../../types'
 import { CellIdString } from '../../types/shared'
 import { AppClient } from '@holochain/client'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 import { getWeaveProfilesClient } from '../../hcWebsockets'
 
 function mapStateToProps(state: RootState): CreateProfilePageStateProps {
diff --git a/web/src/routes/ProjectView/ProjectView.component.tsx b/web/src/routes/ProjectView/ProjectView.component.tsx
@@ -26,7 +26,7 @@ import selectAndComputeOutcomes from '../../selectors/computeOutcomes'
 import selectOutcomeAndAncestors from '../../selectors/outcomeAndAncestors'
 import { getAdminWs } from '../../hcWebsockets'
 import { cellIdFromString } from '../../utils'
-import { isWeContext } from '@lightningrodlabs/we-applet'
+import { isWeContext } from '@theweave/api'
 
 export type ProjectViewInnerOwnProps = {
   projectId: CellIdString
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"scripts": {`
`7`		`- "dev-we": "we-dev-cli --agent-idx 1 --dev-config we.dev.config.ts",`
`8`		`- "dev-we2": "we-dev-cli --agent-idx 2 --dev-config we.dev.config.ts"`
	`7`	`+ "dev-we": "weave --agent-idx 1 --dev-config we.dev.config.ts",`
	`8`	`+ "dev-we2": "weave --agent-idx 2 --dev-config we.dev.config.ts"`
`9`	`9`	`},`
`10`	`10`	`"dependencies": {`
`11`		`- "@lightningrodlabs/we-dev-cli": "0.13.0-beta.5"`
	`11`	`+ "@theweave/cli": "0.13.0-gamma.6"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineConfig } from '@lightningrodlabs/we-dev-cli'`
	`1`	`+import { defineConfig } from '@theweave/cli'`
`2`	`2`
`3`	`3`	`export default defineConfig({`
`4`	`4`	`groups: [`