Guess who didn't check whether zapp name is available on npm

j-piasecki · Sep 28, 2022 · 6d3fd5b · 6d3fd5b
1 parent 91f9437
commit 6d3fd5b
Show file tree

Hide file tree

Showing 122 changed files with 94 additions and 73 deletions.
diff --git a/.github/workflows/run-core-tests.yml b/.github/workflows/run-core-tests.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/run-core-tests.yml'
-      - '@zapp/core/**'
+      - '@zapp-framework/core/**'
   push:
     branches:
       - main
@@ -33,5 +33,5 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Run tests
-        working-directory: ./@zapp/core
+        working-directory: ./@zapp-framework/core
         run: yarn test
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 node_modules
 .yarn
 build
-**/dist/bundle.js
+**/dist/bundle.js
+.DS_Store
diff --git a/@zapp/core/README.md → @zapp-framework/core/README.md b/@zapp/core/README.md → @zapp-framework/core/README.md
diff --git a/@zapp/core/jest.config.json → @zapp-framework/core/jest.config.json b/@zapp/core/jest.config.json → @zapp-framework/core/jest.config.json
diff --git a/@zapp/core/package.json → @zapp-framework/core/package.json b/@zapp/core/package.json → @zapp-framework/core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@zapp/core",
+  "name": "@zapp-framework/core",
   "version": "0.1.0",
   "description": "",
   "license": "MIT",

diff --git a/@zapp/core/src/Application.ts → @zapp-framework/core/src/Application.ts b/@zapp/core/src/Application.ts → @zapp-framework/core/src/Application.ts
diff --git a/@zapp/core/src/Color.ts → @zapp-framework/core/src/Color.ts b/@zapp/core/src/Color.ts → @zapp-framework/core/src/Color.ts
diff --git a/@zapp/core/src/Navigator.ts → @zapp-framework/core/src/Navigator.ts b/@zapp/core/src/Navigator.ts → @zapp-framework/core/src/Navigator.ts
diff --git a/@zapp/core/src/NodeType.ts → @zapp-framework/core/src/NodeType.ts b/@zapp/core/src/NodeType.ts → @zapp-framework/core/src/NodeType.ts
diff --git a/@zapp/core/src/PrefixTree.ts → @zapp-framework/core/src/PrefixTree.ts b/@zapp/core/src/PrefixTree.ts → @zapp-framework/core/src/PrefixTree.ts
diff --git a/@zapp/core/src/ZappInterface.ts → @zapp-framework/core/src/ZappInterface.ts b/@zapp/core/src/ZappInterface.ts → @zapp-framework/core/src/ZappInterface.ts
diff --git a/...p/core/src/__tests__/ColumnLayout.test.ts → ...k/core/src/__tests__/ColumnLayout.test.ts b/...p/core/src/__tests__/ColumnLayout.test.ts → ...k/core/src/__tests__/ColumnLayout.test.ts
diff --git a/@zapp/core/src/__tests__/PrefixTree.test.ts → ...ork/core/src/__tests__/PrefixTree.test.ts b/@zapp/core/src/__tests__/PrefixTree.test.ts → ...ork/core/src/__tests__/PrefixTree.test.ts
diff --git a/@zapp/core/src/__tests__/RowLayout.test.ts → ...work/core/src/__tests__/RowLayout.test.ts b/@zapp/core/src/__tests__/RowLayout.test.ts → ...work/core/src/__tests__/RowLayout.test.ts
diff --git a/@zapp/core/src/__tests__/StackLayout.test.ts → ...rk/core/src/__tests__/StackLayout.test.ts b/@zapp/core/src/__tests__/StackLayout.test.ts → ...rk/core/src/__tests__/StackLayout.test.ts
diff --git a/@zapp/core/src/__tests__/WorkingTree.test.ts → ...rk/core/src/__tests__/WorkingTree.test.ts b/@zapp/core/src/__tests__/WorkingTree.test.ts → ...rk/core/src/__tests__/WorkingTree.test.ts
diff --git a/..._/__snapshots__/ColumnLayout.test.ts.snap → ..._/__snapshots__/ColumnLayout.test.ts.snap b/..._/__snapshots__/ColumnLayout.test.ts.snap → ..._/__snapshots__/ColumnLayout.test.ts.snap
diff --git a/...ts__/__snapshots__/RowLayout.test.ts.snap → ...ts__/__snapshots__/RowLayout.test.ts.snap b/...ts__/__snapshots__/RowLayout.test.ts.snap → ...ts__/__snapshots__/RowLayout.test.ts.snap
diff --git a/...__/__snapshots__/StackLayout.test.ts.snap → ...__/__snapshots__/StackLayout.test.ts.snap b/...__/__snapshots__/StackLayout.test.ts.snap → ...__/__snapshots__/StackLayout.test.ts.snap
diff --git a/...__/__snapshots__/WorkingTree.test.ts.snap → ...__/__snapshots__/WorkingTree.test.ts.snap b/...__/__snapshots__/WorkingTree.test.ts.snap → ...__/__snapshots__/WorkingTree.test.ts.snap
diff --git a/@zapp/core/src/index.ts → @zapp-framework/core/src/index.ts b/@zapp/core/src/index.ts → @zapp-framework/core/src/index.ts
diff --git a/@zapp/core/src/renderer/DummyViewManager.ts → ...ork/core/src/renderer/DummyViewManager.ts b/@zapp/core/src/renderer/DummyViewManager.ts → ...ork/core/src/renderer/DummyViewManager.ts
diff --git a/...p/core/src/renderer/GlobalEventManager.ts → ...k/core/src/renderer/GlobalEventManager.ts b/...p/core/src/renderer/GlobalEventManager.ts → ...k/core/src/renderer/GlobalEventManager.ts
diff --git a/@zapp/core/src/renderer/LayoutManager.ts → ...mework/core/src/renderer/LayoutManager.ts b/@zapp/core/src/renderer/LayoutManager.ts → ...mework/core/src/renderer/LayoutManager.ts
diff --git a/.../core/src/renderer/PointerEventManager.ts → .../core/src/renderer/PointerEventManager.ts b/.../core/src/renderer/PointerEventManager.ts → .../core/src/renderer/PointerEventManager.ts
diff --git a/@zapp/core/src/renderer/RenderedTree.ts → ...amework/core/src/renderer/RenderedTree.ts b/@zapp/core/src/renderer/RenderedTree.ts → ...amework/core/src/renderer/RenderedTree.ts
diff --git a/@zapp/core/src/renderer/Renderer.ts → ...p-framework/core/src/renderer/Renderer.ts b/@zapp/core/src/renderer/Renderer.ts → ...p-framework/core/src/renderer/Renderer.ts
diff --git a/@zapp/core/src/renderer/ViewManager.ts → ...ramework/core/src/renderer/ViewManager.ts b/@zapp/core/src/renderer/ViewManager.ts → ...ramework/core/src/renderer/ViewManager.ts
diff --git a/@zapp/core/src/utils.ts → @zapp-framework/core/src/utils.ts b/@zapp/core/src/utils.ts → @zapp-framework/core/src/utils.ts
diff --git a/@zapp/core/src/working_tree/EffectNode.ts → ...ework/core/src/working_tree/EffectNode.ts b/@zapp/core/src/working_tree/EffectNode.ts → ...ework/core/src/working_tree/EffectNode.ts
diff --git a/@zapp/core/src/working_tree/EventNode.ts → ...mework/core/src/working_tree/EventNode.ts b/@zapp/core/src/working_tree/EventNode.ts → ...mework/core/src/working_tree/EventNode.ts
diff --git a/@zapp/core/src/working_tree/RememberNode.ts → ...ork/core/src/working_tree/RememberNode.ts b/@zapp/core/src/working_tree/RememberNode.ts → ...ork/core/src/working_tree/RememberNode.ts
diff --git a/...p/core/src/working_tree/SavedTreeState.ts → ...k/core/src/working_tree/SavedTreeState.ts b/...p/core/src/working_tree/SavedTreeState.ts → ...k/core/src/working_tree/SavedTreeState.ts
diff --git a/@zapp/core/src/working_tree/ViewNode.ts → ...amework/core/src/working_tree/ViewNode.ts b/@zapp/core/src/working_tree/ViewNode.ts → ...amework/core/src/working_tree/ViewNode.ts
diff --git a/@zapp/core/src/working_tree/WorkingNode.ts → ...work/core/src/working_tree/WorkingNode.ts b/@zapp/core/src/working_tree/WorkingNode.ts → ...work/core/src/working_tree/WorkingNode.ts
diff --git a/@zapp/core/src/working_tree/WorkingTree.ts → ...work/core/src/working_tree/WorkingTree.ts b/@zapp/core/src/working_tree/WorkingTree.ts → ...work/core/src/working_tree/WorkingTree.ts
diff --git a/...src/working_tree/effects/ButtonActions.ts → ...src/working_tree/effects/ButtonActions.ts b/...src/working_tree/effects/ButtonActions.ts → ...src/working_tree/effects/ButtonActions.ts
diff --git a/...ng_tree/effects/RememberedMutableValue.ts → ...ng_tree/effects/RememberedMutableValue.ts b/...ng_tree/effects/RememberedMutableValue.ts → ...ng_tree/effects/RememberedMutableValue.ts
diff --git a/...c/working_tree/effects/RememberedValue.ts → ...c/working_tree/effects/RememberedValue.ts b/...c/working_tree/effects/RememberedValue.ts → ...c/working_tree/effects/RememberedValue.ts
diff --git a/...rking_tree/effects/animation/Animation.ts → ...rking_tree/effects/animation/Animation.ts b/...rking_tree/effects/animation/Animation.ts → ...rking_tree/effects/animation/Animation.ts
diff --git a/.../working_tree/effects/animation/Easing.ts → .../working_tree/effects/animation/Easing.ts b/.../working_tree/effects/animation/Easing.ts → .../working_tree/effects/animation/Easing.ts
diff --git a/...tree/effects/animation/RepeatAnimation.ts → ...tree/effects/animation/RepeatAnimation.ts b/...tree/effects/animation/RepeatAnimation.ts → ...tree/effects/animation/RepeatAnimation.ts
diff --git a/...tree/effects/animation/TimingAnimation.ts → ...tree/effects/animation/TimingAnimation.ts b/...tree/effects/animation/TimingAnimation.ts → ...tree/effects/animation/TimingAnimation.ts
diff --git a/...tree/effects/registerCrownEventHandler.ts → ...tree/effects/registerCrownEventHandler.ts b/...tree/effects/registerCrownEventHandler.ts → ...tree/effects/registerCrownEventHandler.ts
diff --git a/...ee/effects/registerGestureEventHandler.ts → ...ee/effects/registerGestureEventHandler.ts b/...ee/effects/registerGestureEventHandler.ts → ...ee/effects/registerGestureEventHandler.ts
diff --git a/...effects/registerHomeButtonEventHandler.ts → ...effects/registerHomeButtonEventHandler.ts b/...effects/registerHomeButtonEventHandler.ts → ...effects/registerHomeButtonEventHandler.ts
diff --git a/...cts/registerShortcutButtonEventHandler.ts → ...cts/registerShortcutButtonEventHandler.ts b/...cts/registerShortcutButtonEventHandler.ts → ...cts/registerShortcutButtonEventHandler.ts
diff --git a/...core/src/working_tree/effects/remember.ts → ...core/src/working_tree/effects/remember.ts b/...core/src/working_tree/effects/remember.ts → ...core/src/working_tree/effects/remember.ts
diff --git a/...working_tree/effects/rememberImmutable.ts → ...working_tree/effects/rememberImmutable.ts b/...working_tree/effects/rememberImmutable.ts → ...working_tree/effects/rememberImmutable.ts
diff --git a/...tree/effects/rememberLauncherForResult.ts → ...tree/effects/rememberLauncherForResult.ts b/...tree/effects/rememberLauncherForResult.ts → ...tree/effects/rememberLauncherForResult.ts
diff --git a/...orking_tree/effects/rememberObservable.ts → ...orking_tree/effects/rememberObservable.ts b/...orking_tree/effects/rememberObservable.ts → ...orking_tree/effects/rememberObservable.ts
diff --git a/...re/src/working_tree/effects/sideEffect.ts → ...re/src/working_tree/effects/sideEffect.ts b/...re/src/working_tree/effects/sideEffect.ts → ...re/src/working_tree/effects/sideEffect.ts
diff --git a/.../core/src/working_tree/props/ArcConfig.ts → .../core/src/working_tree/props/ArcConfig.ts b/.../core/src/working_tree/props/ArcConfig.ts → .../core/src/working_tree/props/ArcConfig.ts
diff --git a/...re/src/working_tree/props/ColumnConfig.ts → ...re/src/working_tree/props/ColumnConfig.ts b/...re/src/working_tree/props/ColumnConfig.ts → ...re/src/working_tree/props/ColumnConfig.ts
diff --git a/@zapp/core/src/working_tree/props/Config.ts → ...ork/core/src/working_tree/props/Config.ts b/@zapp/core/src/working_tree/props/Config.ts → ...ork/core/src/working_tree/props/Config.ts
diff --git a/...ore/src/working_tree/props/ImageConfig.ts → ...ore/src/working_tree/props/ImageConfig.ts b/...ore/src/working_tree/props/ImageConfig.ts → ...ore/src/working_tree/props/ImageConfig.ts
diff --git a/...re/src/working_tree/props/LayoutConfig.ts → ...re/src/working_tree/props/LayoutConfig.ts b/...re/src/working_tree/props/LayoutConfig.ts → ...re/src/working_tree/props/LayoutConfig.ts
diff --git a/.../core/src/working_tree/props/RowConfig.ts → .../core/src/working_tree/props/RowConfig.ts b/.../core/src/working_tree/props/RowConfig.ts → .../core/src/working_tree/props/RowConfig.ts
diff --git a/...ore/src/working_tree/props/StackConfig.ts → ...ore/src/working_tree/props/StackConfig.ts b/...ore/src/working_tree/props/StackConfig.ts → ...ore/src/working_tree/props/StackConfig.ts
diff --git a/...core/src/working_tree/props/TextConfig.ts → ...core/src/working_tree/props/TextConfig.ts b/...core/src/working_tree/props/TextConfig.ts → ...core/src/working_tree/props/TextConfig.ts
diff --git a/@zapp/core/src/working_tree/props/types.ts → ...work/core/src/working_tree/props/types.ts b/@zapp/core/src/working_tree/props/types.ts → ...work/core/src/working_tree/props/types.ts
diff --git a/@zapp/core/src/working_tree/views/Arc.ts → ...mework/core/src/working_tree/views/Arc.ts b/@zapp/core/src/working_tree/views/Arc.ts → ...mework/core/src/working_tree/views/Arc.ts
diff --git a/...p/core/src/working_tree/views/BareText.ts → ...k/core/src/working_tree/views/BareText.ts b/...p/core/src/working_tree/views/BareText.ts → ...k/core/src/working_tree/views/BareText.ts
diff --git a/@zapp/core/src/working_tree/views/Column.ts → ...ork/core/src/working_tree/views/Column.ts b/@zapp/core/src/working_tree/views/Column.ts → ...ork/core/src/working_tree/views/Column.ts
diff --git a/@zapp/core/src/working_tree/views/Custom.ts → ...ork/core/src/working_tree/views/Custom.ts b/@zapp/core/src/working_tree/views/Custom.ts → ...ork/core/src/working_tree/views/Custom.ts
diff --git a/@zapp/core/src/working_tree/views/Image.ts → ...work/core/src/working_tree/views/Image.ts b/@zapp/core/src/working_tree/views/Image.ts → ...work/core/src/working_tree/views/Image.ts
diff --git a/@zapp/core/src/working_tree/views/Row.ts → ...mework/core/src/working_tree/views/Row.ts b/@zapp/core/src/working_tree/views/Row.ts → ...mework/core/src/working_tree/views/Row.ts
diff --git a/@zapp/core/src/working_tree/views/Screen.ts → ...ork/core/src/working_tree/views/Screen.ts b/@zapp/core/src/working_tree/views/Screen.ts → ...ork/core/src/working_tree/views/Screen.ts
diff --git a/@zapp/core/src/working_tree/views/Stack.ts → ...work/core/src/working_tree/views/Stack.ts b/@zapp/core/src/working_tree/views/Stack.ts → ...work/core/src/working_tree/views/Stack.ts
diff --git a/@zapp/core/tsconfig.json → @zapp-framework/core/tsconfig.json b/@zapp/core/tsconfig.json → @zapp-framework/core/tsconfig.json
diff --git a/@zapp/ui/README.md → @zapp-framework/ui/README.md b/@zapp/ui/README.md → @zapp-framework/ui/README.md
diff --git a/@zapp/ui/package.json → @zapp-framework/ui/package.json b/@zapp/ui/package.json → @zapp-framework/ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@zapp/ui",
+  "name": "@zapp-framework/ui",
   "version": "0.1.0",
   "description": "",
   "license": "MIT",
@@ -20,13 +20,13 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.34.0",
     "@typescript-eslint/parser": "^5.34.0",
-    "@zapp/core": "*",
+    "@zapp-framework/core": "*",
     "eslint": "^8.22.0",
     "prettier": "^2.7.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
   "peerDependencies": {
-    "@zapp/core": "*"
+    "@zapp-framework/core": "*"
   }
 }
diff --git a/@zapp/ui/src/ActivityIndicator.ts → @zapp-framework/ui/src/ActivityIndicator.ts b/@zapp/ui/src/ActivityIndicator.ts → @zapp-framework/ui/src/ActivityIndicator.ts
@@ -9,7 +9,7 @@ import {
   Stack,
   withRepeat,
   withTiming,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 interface ActivityIndicatorConfigType extends ConfigType {

diff --git a/@zapp/ui/src/Button.ts → @zapp-framework/ui/src/Button.ts b/@zapp/ui/src/Button.ts → @zapp-framework/ui/src/Button.ts
@@ -10,7 +10,7 @@ import {
   withTiming,
   Easing,
   Color,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { popTextColor, popTextSize, pushTextColor, pushTextSize } from './Text.js'
 import { Theme } from './Theme.js'
 

diff --git a/@zapp/ui/src/CheckBox.ts → @zapp-framework/ui/src/CheckBox.ts b/@zapp/ui/src/CheckBox.ts → @zapp-framework/ui/src/CheckBox.ts
@@ -12,7 +12,7 @@ import {
   StackAlignment,
   StackConfig,
   withTiming,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 interface CheckBoxConfigType extends ConfigType {

diff --git a/@zapp/ui/src/Divider.ts → @zapp-framework/ui/src/Divider.ts b/@zapp/ui/src/Divider.ts → @zapp-framework/ui/src/Divider.ts
@@ -1,4 +1,4 @@
-import { ConfigBuilder, Stack } from '@zapp/core'
+import { ConfigBuilder, Stack } from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 export class DividerConfigBuilder extends ConfigBuilder {

diff --git a/@zapp/ui/src/PageIndicator.ts → @zapp-framework/ui/src/PageIndicator.ts b/@zapp/ui/src/PageIndicator.ts → @zapp-framework/ui/src/PageIndicator.ts
@@ -12,7 +12,7 @@ import {
   StackAlignment,
   StackConfig,
   Zapp,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 const DOT_SIZE = px(16)

diff --git a/@zapp/ui/src/RadioGroup.ts → @zapp-framework/ui/src/RadioGroup.ts b/@zapp/ui/src/RadioGroup.ts → @zapp-framework/ui/src/RadioGroup.ts
@@ -12,7 +12,7 @@ import {
   StackAlignment,
   StackConfig,
   withTiming,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 interface RadioGroupConfigType extends ConfigType {

diff --git a/@zapp/ui/src/Switch.ts → @zapp-framework/ui/src/Switch.ts b/@zapp/ui/src/Switch.ts → @zapp-framework/ui/src/Switch.ts
@@ -8,7 +8,7 @@ import {
   withTiming,
   Easing,
   Color,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 interface SwitchConfigType extends ConfigType {

diff --git a/@zapp/ui/src/Text.ts → @zapp-framework/ui/src/Text.ts b/@zapp/ui/src/Text.ts → @zapp-framework/ui/src/Text.ts
@@ -1,4 +1,4 @@
-import { TextConfig, BareText } from '@zapp/core'
+import { TextConfig, BareText } from '@zapp-framework/core'
 import { Theme } from './Theme.js'
 
 const nextColors: number[] = []

diff --git a/@zapp/ui/src/Theme.ts → @zapp-framework/ui/src/Theme.ts b/@zapp/ui/src/Theme.ts → @zapp-framework/ui/src/Theme.ts
@@ -1,4 +1,4 @@
-import { Zapp } from '@zapp/core'
+import { Zapp } from '@zapp-framework/core'
 
 const SAVED_THEME_KEY = 'zapp#theme'
 

diff --git a/@zapp/ui/src/global.d.ts → @zapp-framework/ui/src/global.d.ts b/@zapp/ui/src/global.d.ts → @zapp-framework/ui/src/global.d.ts
diff --git a/@zapp/ui/src/index.ts → @zapp-framework/ui/src/index.ts b/@zapp/ui/src/index.ts → @zapp-framework/ui/src/index.ts
diff --git a/@zapp/ui/tsconfig.json → @zapp-framework/ui/tsconfig.json b/@zapp/ui/tsconfig.json → @zapp-framework/ui/tsconfig.json
diff --git a/@zapp/watch/README.md → @zapp-framework/watch/README.md b/@zapp/watch/README.md → @zapp-framework/watch/README.md
diff --git a/@zapp/web/package.json → @zapp-framework/watch/package.json b/@zapp/web/package.json → @zapp-framework/watch/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@zapp/web",
+  "name": "@zapp-framework/watch",
   "version": "0.1.0",
   "description": "",
   "license": "MIT",
@@ -20,13 +20,13 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.34.0",
     "@typescript-eslint/parser": "^5.34.0",
-    "@zapp/core": "*",
+    "@zapp-framework/core": "*",
     "eslint": "^8.22.0",
     "prettier": "^2.7.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
   "peerDependencies": {
-    "@zapp/core": "*"
+    "@zapp-framework/core": "*"
   }
 }
diff --git a/@zapp/watch/src/Application.ts → @zapp-framework/watch/src/Application.ts b/@zapp/watch/src/Application.ts → @zapp-framework/watch/src/Application.ts
@@ -1,4 +1,4 @@
-import { ApplicationConfig } from '@zapp/core'
+import { ApplicationConfig } from '@zapp-framework/core'
 import { NavigatorData } from './Navigator.js'
 import { KeyValueStorage } from './KeyValueStorage.js'
 

diff --git a/@zapp/watch/src/KeyValueStorage.ts → @zapp-framework/watch/src/KeyValueStorage.ts b/@zapp/watch/src/KeyValueStorage.ts → @zapp-framework/watch/src/KeyValueStorage.ts
@@ -1,4 +1,4 @@
-import { RememberedMutableValue, rememberObservable } from '@zapp/core'
+import { RememberedMutableValue, rememberObservable } from '@zapp-framework/core'
 
 function stringToArrayBuffer(str: string) {
   const buf = new ArrayBuffer(str.length * 2) // 2 bytes for each char

diff --git a/@zapp/watch/src/Navigator.ts → @zapp-framework/watch/src/Navigator.ts b/@zapp/watch/src/Navigator.ts → @zapp-framework/watch/src/Navigator.ts
@@ -1,4 +1,4 @@
-import { NavigatorInterface, RegisteredCallback, WorkingTree, SavedTreeState } from '@zapp/core'
+import { NavigatorInterface, RegisteredCallback, WorkingTree, SavedTreeState } from '@zapp-framework/core'
 
 interface SavedState {
   treeState: SavedTreeState

diff --git a/@zapp/watch/src/WatchViewManager.ts → ...p-framework/watch/src/WatchViewManager.ts b/@zapp/watch/src/WatchViewManager.ts → ...p-framework/watch/src/WatchViewManager.ts
@@ -6,7 +6,7 @@ import {
   PointerEventType,
   PointerEventManager,
   Alignment,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { Direction } from './types.js'
 
 const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()

diff --git a/@zapp/watch/src/ZappWatch.ts → @zapp-framework/watch/src/ZappWatch.ts b/@zapp/watch/src/ZappWatch.ts → @zapp-framework/watch/src/ZappWatch.ts
@@ -7,7 +7,7 @@ import {
   Renderer,
   Animation,
   GlobalEventManager,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { tryUpdatingRememberedPagePositions } from './screens/ScreenPager.js'
 import { tryUpdatingRememberedScrollPositions } from './screens/ScrollableScreen.js'
 import { viewManagerInstance } from './WatchViewManager.js'

diff --git a/@zapp/watch/src/global.d.ts → @zapp-framework/watch/src/global.d.ts b/@zapp/watch/src/global.d.ts → @zapp-framework/watch/src/global.d.ts
diff --git a/@zapp/watch/src/index.ts → @zapp-framework/watch/src/index.ts b/@zapp/watch/src/index.ts → @zapp-framework/watch/src/index.ts
@@ -5,7 +5,7 @@ import {
   __setSimpleScreenImplementation,
   __setNavigator,
   __setApplicationImplementation,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { viewManagerInstance } from './WatchViewManager.js'
 import { ZappWatch } from './ZappWatch.js'
 import { SimpleScreen } from './screens/SimpleScreen.js'

diff --git a/@zapp/watch/src/screens/PageWrapper.ts → ...ramework/watch/src/screens/PageWrapper.ts b/@zapp/watch/src/screens/PageWrapper.ts → ...ramework/watch/src/screens/PageWrapper.ts
@@ -7,7 +7,7 @@ import {
   GestureType,
   EventType,
   ButtonAction,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 function mapGesture(gesture: unknown): GestureType {
   switch (gesture) {

diff --git a/@zapp/watch/src/screens/ScreenPager.ts → ...ramework/watch/src/screens/ScreenPager.ts b/@zapp/watch/src/screens/ScreenPager.ts → ...ramework/watch/src/screens/ScreenPager.ts
@@ -8,7 +8,7 @@ import {
   ScreenBody,
   sideEffect,
   PointerEventManager,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 import { PageWrapper } from './PageWrapper.js'
 import { viewManagerInstance } from './../WatchViewManager.js'
 import { Direction } from './../types.js'

diff --git a/@zapp/watch/src/screens/ScrollableScreen.ts → ...ork/watch/src/screens/ScrollableScreen.ts b/@zapp/watch/src/screens/ScrollableScreen.ts → ...ork/watch/src/screens/ScrollableScreen.ts
@@ -1,4 +1,10 @@
-import { ScreenBody, ConfigBuilder, RememberedMutableValue, rememberObservable, PointerEventManager } from '@zapp/core'
+import {
+  ScreenBody,
+  ConfigBuilder,
+  RememberedMutableValue,
+  rememberObservable,
+  PointerEventManager,
+} from '@zapp-framework/core'
 import { PageWrapper } from './PageWrapper.js'
 import { viewManagerInstance } from './../WatchViewManager.js'
 import { navigatorInstance } from '../Navigator.js'

diff --git a/@zapp/watch/src/screens/SimpleScreen.ts → ...amework/watch/src/screens/SimpleScreen.ts b/@zapp/watch/src/screens/SimpleScreen.ts → ...amework/watch/src/screens/SimpleScreen.ts
@@ -1,4 +1,4 @@
-import { ScreenBody, ConfigBuilder } from '@zapp/core'
+import { ScreenBody, ConfigBuilder } from '@zapp-framework/core'
 import { PageWrapper } from './PageWrapper.js'
 import { viewManagerInstance } from './../WatchViewManager.js'
 

diff --git a/@zapp/watch/src/types.ts → @zapp-framework/watch/src/types.ts b/@zapp/watch/src/types.ts → @zapp-framework/watch/src/types.ts
diff --git a/@zapp/watch/tsconfig.json → @zapp-framework/watch/tsconfig.json b/@zapp/watch/tsconfig.json → @zapp-framework/watch/tsconfig.json
diff --git a/@zapp/web/README.md → @zapp-framework/web/README.md b/@zapp/web/README.md → @zapp-framework/web/README.md
diff --git a/@zapp/watch/package.json → @zapp-framework/web/package.json b/@zapp/watch/package.json → @zapp-framework/web/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@zapp/watch",
+  "name": "@zapp-framework/web",
   "version": "0.1.0",
   "description": "",
   "license": "MIT",
@@ -20,13 +20,13 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.34.0",
     "@typescript-eslint/parser": "^5.34.0",
-    "@zapp/core": "*",
+    "@zapp-framework/core": "*",
     "eslint": "^8.22.0",
     "prettier": "^2.7.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
   "peerDependencies": {
-    "@zapp/core": "*"
+    "@zapp-framework/core": "*"
   }
 }
diff --git a/@zapp/web/src/Application.ts → @zapp-framework/web/src/Application.ts b/@zapp/web/src/Application.ts → @zapp-framework/web/src/Application.ts
@@ -1,4 +1,4 @@
-import { ApplicationConfig } from '@zapp/core'
+import { ApplicationConfig } from '@zapp-framework/core'
 
 export function Application(config: ApplicationConfig) {
   config.onInit?.()

diff --git a/@zapp/web/src/HashNavigator.ts → @zapp-framework/web/src/HashNavigator.ts b/@zapp/web/src/HashNavigator.ts → @zapp-framework/web/src/HashNavigator.ts
@@ -1,4 +1,4 @@
-import { SavedTreeState, WorkingTree, NavigatorInterface, RegisteredCallback } from '@zapp/core'
+import { SavedTreeState, WorkingTree, NavigatorInterface, RegisteredCallback } from '@zapp-framework/core'
 
 const historyStack: SavedTreeState[] = []
 const registeredCallbacks: RegisteredCallback[] = []

diff --git a/@zapp/web/src/WebViewManager.ts → @zapp-framework/web/src/WebViewManager.ts b/@zapp/web/src/WebViewManager.ts → @zapp-framework/web/src/WebViewManager.ts
@@ -6,7 +6,7 @@ import {
   PointerEventType,
   PointerEventManager,
   Alignment,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 const SVG_NS = 'http://www.w3.org/2000/svg'
 

diff --git a/@zapp/web/src/ZappWeb.ts → @zapp-framework/web/src/ZappWeb.ts b/@zapp/web/src/ZappWeb.ts → @zapp-framework/web/src/ZappWeb.ts
@@ -10,7 +10,7 @@ import {
   EventType,
   ButtonAction,
   ScreenShape,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 export class ZappWeb extends ZappInterface {
   private running = false

diff --git a/@zapp/web/src/index.ts → @zapp-framework/web/src/index.ts b/@zapp/web/src/index.ts → @zapp-framework/web/src/index.ts
@@ -1,4 +1,9 @@
-import { __setViewManager, __setZappInterface, __setNavigator, __setApplicationImplementation } from '@zapp/core'
+import {
+  __setViewManager,
+  __setZappInterface,
+  __setNavigator,
+  __setApplicationImplementation,
+} from '@zapp-framework/core'
 import { WebViewManager } from './WebViewManager.js'
 import { ZappWeb } from './ZappWeb.js'
 import { HashNavigator } from './HashNavigator.js'

diff --git a/@zapp/web/tsconfig.json → @zapp-framework/web/tsconfig.json b/@zapp/web/tsconfig.json → @zapp-framework/web/tsconfig.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
-  "private":"true",
+  "private": "true",
   "scripts": {
-    "build": "cd @zapp/core && yarn build && cd .. && cd web && yarn build && cd .. && cd watch && yarn build && cd .. && cd ui && yarn build"
+    "build": "cd @zapp-framework/core && yarn build && cd .. && cd web && yarn build && cd .. && cd watch && yarn build && cd .. && cd ui && yarn build"
   },
   "workspaces": [
-    "@zapp/*",
+    "@zapp-framework/*",
     "web-test",
     "watch-test"
   ]

diff --git a/watch-test/app.js b/watch-test/app.js
@@ -1,6 +1,6 @@
-import '@zapp/watch'
-import { setTheme } from '@zapp/ui'
-import { Application } from '@zapp/core'
+import '@zapp-framework/watch'
+import { setTheme } from '@zapp-framework/ui'
+import { Application } from '@zapp-framework/core'
 
 Application({
   onInit() {

diff --git a/watch-test/package.json b/watch-test/package.json
@@ -9,9 +9,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@zapp/core": "*",
-    "@zapp/ui": "*",
-    "@zapp/watch": "*"
+    "@zapp-framework/core": "*",
+    "@zapp-framework/ui": "*",
+    "@zapp-framework/watch": "*"
   },
   "devDependencies": {
     "@zeppos/device-types": "^1.0.0"

diff --git a/watch-test/page/index.js b/watch-test/page/index.js
@@ -1,5 +1,5 @@
-import '@zapp/watch'
-import { ActivityIndicator, ActivityIndicatorConfig, Theme } from '@zapp/ui'
+import '@zapp-framework/watch'
+import { ActivityIndicator, ActivityIndicatorConfig, Theme } from '@zapp-framework/ui'
 import {
   SimpleScreen,
   Stack,
@@ -23,7 +23,7 @@ import {
   registerCrownEventHandler,
   Image,
   ImageConfig,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 let cycle = [
   Arrangement.SpaceEvenly,

diff --git a/watch-test/page/page1.js b/watch-test/page/page1.js
@@ -1,4 +1,4 @@
-import '@zapp/watch'
+import '@zapp-framework/watch'
 import {
   SimpleScreen,
   Stack,
@@ -20,7 +20,7 @@ import {
   ArcConfig,
   Navigator,
   registerGestureEventHandler,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 SimpleScreen(Config('screen'), (params) => {
   Column(

diff --git a/watch-test/page/page2.js b/watch-test/page/page2.js
@@ -1,4 +1,4 @@
-import '@zapp/watch'
+import '@zapp-framework/watch'
 import {
   SimpleScreen,
   Stack,
@@ -21,7 +21,7 @@ import {
   Navigator,
   registerHomeButtonEventHandler,
   registerShortcutButtonEventHandler,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 SimpleScreen(Config('screen'), (params) => {
   Column(

diff --git a/watch-test/page/page3.js b/watch-test/page/page3.js
@@ -1,4 +1,4 @@
-import '@zapp/watch'
+import '@zapp-framework/watch'
 import {
   SimpleScreen,
   Stack,
@@ -21,7 +21,7 @@ import {
   Navigator,
   rememberLauncherForResult,
   registerCrownEventHandler,
-} from '@zapp/core'
+} from '@zapp-framework/core'
 
 SimpleScreen(Config('screen'), (params) => {
   const selectedNumber = remember(-1)