feat(block): rename rallie to @rallie/block

ralliejs · Oct 24, 2022 · dd5a967 · dd5a967
1 parent 69ceeff
commit dd5a967
Show file tree

Hide file tree

Showing 54 changed files with 479 additions and 134 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "packages/*"
   ],
   "scripts": {
-    "prepare": "npm run bootstrap && husky install",
+    "prepare": "husky install && npm run bootstrap",
     "bootstrap": "lerna bootstrap --force-local",
     "clean": "lerna clean && rm -rf node_modules",
     "test": "npm run build && jest --coverage",

diff --git a/packages/rallie/CHANGELOG.md → packages/block/CHANGELOG.md b/packages/rallie/CHANGELOG.md → packages/block/CHANGELOG.md
diff --git a/packages/rallie/README.md → packages/block/README.md b/packages/rallie/README.md → packages/block/README.md
diff --git a/packages/rallie/package.json → packages/block/package.json b/packages/rallie/package.json → packages/block/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rallie",
+  "name": "@rallie/block",
   "version": "0.10.0",
   "description": "a  progressive micro front framework",
   "main": "./dist/index.umd.js",

diff --git a/packages/rallie/rollup.config.js → packages/block/rollup.config.js b/packages/rallie/rollup.config.js → packages/block/rollup.config.js
@@ -9,7 +9,7 @@ export default {
     {
       file: pkg.main,
       format: 'umd',
-      name: 'Rallie',
+      name: 'RallieBlock',
       exports: 'named',
     },
     {

diff --git a/packages/rallie/src/block.ts → packages/block/src/block.ts b/packages/rallie/src/block.ts → packages/block/src/block.ts
@@ -2,11 +2,7 @@ import { touchBus } from '@rallie/core'
 import type { CallbackType, Socket } from '@rallie/core'
 import { constant, errors } from './utils'
 
-export class Block<
-  State extends Record<string, any>,
-  Events extends Record<string, CallbackType>,
-  Methods extends Record<string, CallbackType>,
-> {
+export class Block<State extends Record<string, any>, Events extends Record<string, CallbackType>, Methods extends Record<string, CallbackType>> {
   protected socket: Socket
   public name: string
   public state: State

diff --git a/packages/rallie/src/connected-block.ts → packages/block/src/connected-block.ts b/packages/rallie/src/connected-block.ts → packages/block/src/connected-block.ts
diff --git a/packages/rallie/src/created-block.ts → packages/block/src/created-block.ts b/packages/rallie/src/created-block.ts → packages/block/src/created-block.ts
diff --git a/packages/rallie/src/index.ts → packages/block/src/index.ts b/packages/rallie/src/index.ts → packages/block/src/index.ts
diff --git a/packages/rallie/src/utils.ts → packages/block/src/utils.ts b/packages/rallie/src/utils.ts → packages/block/src/utils.ts
diff --git a/...lie/test/blocks/connect-testers/events.ts → ...ock/test/blocks/connect-testers/events.ts b/...lie/test/blocks/connect-testers/events.ts → ...ock/test/blocks/connect-testers/events.ts
diff --git a/...ie/test/blocks/connect-testers/exports.ts → ...ck/test/blocks/connect-testers/exports.ts b/...ie/test/blocks/connect-testers/exports.ts → ...ck/test/blocks/connect-testers/exports.ts
diff --git a/...ie/test/blocks/connect-testers/methods.ts → ...ck/test/blocks/connect-testers/methods.ts b/...ie/test/blocks/connect-testers/methods.ts → ...ck/test/blocks/connect-testers/methods.ts
diff --git a/...llie/test/blocks/connect-testers/state.ts → ...lock/test/blocks/connect-testers/state.ts b/...llie/test/blocks/connect-testers/state.ts → ...lock/test/blocks/connect-testers/state.ts
diff --git a/...allie/test/blocks/dependency-testers/a.ts → ...block/test/blocks/dependency-testers/a.ts b/...allie/test/blocks/dependency-testers/a.ts → ...block/test/blocks/dependency-testers/a.ts
diff --git a/...allie/test/blocks/dependency-testers/b.ts → ...block/test/blocks/dependency-testers/b.ts b/...allie/test/blocks/dependency-testers/b.ts → ...block/test/blocks/dependency-testers/b.ts
diff --git a/...allie/test/blocks/dependency-testers/c.ts → ...block/test/blocks/dependency-testers/c.ts b/...allie/test/blocks/dependency-testers/c.ts → ...block/test/blocks/dependency-testers/c.ts
diff --git a/...ie/test/blocks/dependency-testers/main.ts → ...ck/test/blocks/dependency-testers/main.ts b/...ie/test/blocks/dependency-testers/main.ts → ...ck/test/blocks/dependency-testers/main.ts
diff --git a/...es/rallie/test/blocks/lifecycle-tester.ts → ...ges/block/test/blocks/lifecycle-tester.ts b/...es/rallie/test/blocks/lifecycle-tester.ts → ...ges/block/test/blocks/lifecycle-tester.ts
diff --git a/...es/rallie/test/blocks/relate-testers/a.ts → ...ges/block/test/blocks/relate-testers/a.ts b/...es/rallie/test/blocks/relate-testers/a.ts → ...ges/block/test/blocks/relate-testers/a.ts
diff --git a/...es/rallie/test/blocks/relate-testers/b.ts → ...ges/block/test/blocks/relate-testers/b.ts b/...es/rallie/test/blocks/relate-testers/b.ts → ...ges/block/test/blocks/relate-testers/b.ts
diff --git a/...es/rallie/test/blocks/relate-testers/c.ts → ...ges/block/test/blocks/relate-testers/c.ts b/...es/rallie/test/blocks/relate-testers/c.ts → ...ges/block/test/blocks/relate-testers/c.ts
diff --git a/...rallie/test/blocks/relate-testers/main.ts → .../block/test/blocks/relate-testers/main.ts b/...rallie/test/blocks/relate-testers/main.ts → .../block/test/blocks/relate-testers/main.ts
diff --git a/packages/rallie/test/connect.test.ts → packages/block/test/connect.test.ts b/packages/rallie/test/connect.test.ts → packages/block/test/connect.test.ts
diff --git a/packages/rallie/test/dependencies.test.ts → packages/block/test/dependencies.test.ts b/packages/rallie/test/dependencies.test.ts → packages/block/test/dependencies.test.ts
diff --git a/packages/rallie/test/lifecycle.test.ts → packages/block/test/lifecycle.test.ts b/packages/rallie/test/lifecycle.test.ts → packages/block/test/lifecycle.test.ts
diff --git a/packages/rallie/test/middlewares/logger.ts → packages/block/test/middlewares/logger.ts b/packages/rallie/test/middlewares/logger.ts → packages/block/test/middlewares/logger.ts
diff --git a/.../rallie/test/middlewares/native-loader.ts → ...s/block/test/middlewares/native-loader.ts b/.../rallie/test/middlewares/native-loader.ts → ...s/block/test/middlewares/native-loader.ts
diff --git a/packages/rallie/test/relate.test.ts → packages/block/test/relate.test.ts b/packages/rallie/test/relate.test.ts → packages/block/test/relate.test.ts
diff --git a/packages/rallie/test/utils.test.ts → packages/block/test/utils.test.ts b/packages/rallie/test/utils.test.ts → packages/block/test/utils.test.ts
diff --git a/packages/rallie/tsconfig.json → packages/block/tsconfig.json b/packages/rallie/tsconfig.json → packages/block/tsconfig.json
diff --git a/packages/playground/apps/host-app/block.ts b/packages/playground/apps/host-app/block.ts
@@ -1,4 +1,4 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 
 interface HostApp {
   events: {

diff --git a/packages/playground/apps/host-app/index.tsx b/packages/playground/apps/host-app/index.tsx
@@ -1,4 +1,4 @@
-import { registerBlock } from 'rallie'
+import { registerBlock } from '@rallie/block'
 import { hostApp } from './block'
 
 registerBlock(hostApp)

diff --git a/packages/playground/apps/react-app/blocks/react-app.ts b/packages/playground/apps/react-app/blocks/react-app.ts
@@ -1,3 +1,3 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 
 export const reactApp = createBlock('react-app')
diff --git a/packages/playground/apps/react-app/index.tsx b/packages/playground/apps/react-app/index.tsx
@@ -1,5 +1,5 @@
 import { reactApp } from './blocks/react-app'
-import { registerBlock } from 'rallie'
+import { registerBlock } from '@rallie/block'
 
 registerBlock(reactApp)
   .relyOn(['lib:react', 'lib:react-dom', 'host-app'])

diff --git a/packages/playground/apps/vue-app/blocks/vue-app.ts b/packages/playground/apps/vue-app/blocks/vue-app.ts
@@ -1,4 +1,4 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 
 type State = {
   count: number

diff --git a/packages/playground/apps/vue-app/index.tsx b/packages/playground/apps/vue-app/index.tsx
@@ -1,4 +1,4 @@
-import { registerBlock } from 'rallie'
+import { registerBlock } from '@rallie/block'
 import { vueApp } from './blocks/vue-app'
 
 registerBlock(vueApp)

diff --git a/packages/playground/index.ts b/packages/playground/index.ts
@@ -1,4 +1,4 @@
-import { registerBlock, createBlock } from 'rallie'
+import { registerBlock, createBlock } from '@rallie/block'
 import { jsdelivrLibraryLoader, dynamicImportLoader, htmlLoader } from './middlewares' // eslint-disable-line
 import loadHtml from '@rallie/load-html' // eslint-disable-line
 

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -12,7 +12,7 @@
     "@rallie/react": "0.10.0",
     "@rallie/vue": "0.10.0",
     "naive-ui": "^2.21.1",
-    "rallie": "0.10.0"
+    "@rallie/block": "0.10.0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^1.0.7",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -22,11 +22,11 @@
     "url": "https://github.com/ralliejs/rallie/issues"
   },
   "peerDependencies": {
-    "rallie": "^0.6.0",
+    "@rallie/block": "^0.6.0",
     "react": ">=16.8.0"
   },
   "devDependencies": {
     "@rallie/core": "0.10.0",
-    "rallie": "0.10.0"
+    "@rallie/block": "0.10.0"
   }
 }
diff --git a/packages/react/rollup.config.js b/packages/react/rollup.config.js
@@ -13,7 +13,7 @@ export default {
       exports: 'named',
       globals: {
         react: 'React',
-        rallie: 'Rallie',
+        '@rallie/block': 'RallieBlock',
       },
     },
     {
@@ -23,5 +23,5 @@ export default {
     },
   ],
   plugins: [resolve(), commonJs(), typescript()],
-  external: ['react', 'rallie'],
+  external: ['react', '@rallie/block'],
 }
diff --git a/packages/react/src/hooks.ts b/packages/react/src/hooks.ts
@@ -1,5 +1,5 @@
 import React from 'react'
-import type { Block, CreatedBlock } from 'rallie'
+import type { Block, CreatedBlock } from '@rallie/block'
 
 export function useBlockState<T extends Block<any, any, any>, U>(block: T, getter: (state: T['state']) => U, deps: any[] = []) {
   const [value, setValue] = React.useState<U>(getter(block.state))

diff --git a/packages/react/test/blocks/consumer.tsx b/packages/react/test/blocks/consumer.tsx
@@ -1,4 +1,4 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 import { useBlockState } from '../../src'
 
 interface ConsumerType {

diff --git a/packages/react/test/blocks/producer.tsx b/packages/react/test/blocks/producer.tsx
@@ -1,4 +1,4 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 import { useBlockState, useBlockEvents, useBlockMethods } from '../../src'
 
 interface ProducerType {

diff --git a/packages/react/test/hooks.test.tsx b/packages/react/test/hooks.test.tsx
@@ -1,7 +1,7 @@
 import { producer, Producer } from './blocks/producer'
 import { consumer, Consumer } from './blocks/consumer'
 import { render, fireEvent, act, screen, cleanup } from '@testing-library/react'
-import { registerBlock } from 'rallie'
+import { registerBlock } from '@rallie/block'
 
 registerBlock(producer)
   .onActivate(() => {

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -22,10 +22,10 @@
     "url": "https://github.com/ralliejs/rallie/issues"
   },
   "peerDependencies": {
-    "rallie": "^0.6.0",
+    "@rallie/block": "^0.6.0",
     "vue": ">=2.0.0"
   },
   "devDependencies": {
-    "rallie": "0.10.0"
+    "@rallie/block": "0.10.0"
   }
 }
diff --git a/packages/vue/rollup.config.js b/packages/vue/rollup.config.js
@@ -5,7 +5,7 @@ import pkg from './package.json'
 
 const commonConfigs = {
   plugins: [resolve(), commonJs(), typescript()],
-  external: ['vue', 'rallie'],
+  external: ['vue', '@rallie/block'],
 }
 
 export default [
@@ -19,7 +19,7 @@ export default [
         exports: 'named',
         globals: {
           vue: 'Vue',
-          rallie: 'Rallie',
+          '@rallie/block': 'RallieBlock',
         },
       },
       {
@@ -39,7 +39,7 @@ export default [
         name: 'RallieVueMixin',
         exports: 'named',
         globals: {
-          rallie: 'Rallie',
+          '@rallie/block': 'RallieBlock',
         },
       },
       {

diff --git a/packages/vue/src/hooks.ts b/packages/vue/src/hooks.ts
@@ -1,5 +1,5 @@
 import { onBeforeUnmount, onBeforeMount, ref, UnwrapRef } from 'vue'
-import type { Block, CreatedBlock } from 'rallie'
+import type { Block, CreatedBlock } from '@rallie/block'
 
 export function useBlockState<T extends Block<any, any, any>, U>(block: T, getter: (state: T['state']) => U) {
   const stateRef = ref<U>(getter(block.state))

diff --git a/packages/vue/src/mixins.ts b/packages/vue/src/mixins.ts
@@ -1,4 +1,4 @@
-import type { Block, CreatedBlock } from 'rallie'
+import type { Block, CreatedBlock } from '@rallie/block'
 
 export function mixinBlockState<T extends Block<any, any, any>, U>(block: T, mapStateToComputed: (state: T['state']) => U) {
   let unwatchState = null

diff --git a/packages/vue/test/blocks/consumer/blocks.ts b/packages/vue/test/blocks/consumer/blocks.ts
@@ -1,4 +1,4 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 
 export const consumer = createBlock('consumer')
 export const producer = consumer.connect<{

diff --git a/packages/vue/test/blocks/producer/blocks.ts b/packages/vue/test/blocks/producer/blocks.ts
@@ -1,4 +1,4 @@
-import { createBlock } from 'rallie'
+import { createBlock } from '@rallie/block'
 
 export const producer = createBlock<{
   state: {

diff --git a/packages/vue/test/hooks.test.ts b/packages/vue/test/hooks.test.ts
@@ -2,7 +2,7 @@
 import { render, fireEvent, screen, cleanup } from '@testing-library/vue'
 import { HooksProducer, producer } from './blocks/producer'
 import { HooksConsumer, consumer } from './blocks/consumer'
-import { registerBlock } from 'rallie'
+import { registerBlock } from '@rallie/block'
 
 registerBlock(producer)
   .onActivate(() => {

diff --git a/packages/vue/test/mixins.test.ts b/packages/vue/test/mixins.test.ts
@@ -2,7 +2,7 @@
 import { render, fireEvent, screen, cleanup } from '@testing-library/vue'
 import { MixinsProducer, producer } from './blocks/producer'
 import { MixinsConsumer, consumer } from './blocks/consumer'
-import { registerBlock } from 'rallie'
+import { registerBlock } from '@rallie/block'
 
 registerBlock(producer)
   .onActivate(() => {