[legacy-framework] Extract out display package

packages/cli/package.json

@@ -31,6 +31,7 @@
     "/lib"
   ],
   "dependencies": {
+    "@blitzjs/display": "0.12.0",
     "@blitzjs/repl": "0.12.0",
     "@oclif/command": "1.5.20",
     "@oclif/config": "1.15.1",

packages/cli/src/commands/console.ts

@@ -3,7 +3,7 @@ import {Command} from '@oclif/command'
 import path from 'path'
 import fs from 'fs'
 import pkgDir from 'pkg-dir'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import chalk from 'chalk'
 
 import {setupTsnode} from '../utils/setup-ts-node'

packages/cli/src/commands/db.ts

@@ -1,4 +1,5 @@
-import {resolveBinAsync, log} from '@blitzjs/server'
+import {resolveBinAsync} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {Command, flags} from '@oclif/command'
 import chalk from 'chalk'
 import {spawn} from 'cross-spawn'

packages/cli/src/commands/generate.ts

@@ -11,7 +11,7 @@ import {
   FormGenerator /* ModelGenerator */,
 } from '@blitzjs/generator'
 import {PromptAbortedError} from '../errors/prompt-aborted'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import camelCase from 'camelcase'
 import pkgDir from 'pkg-dir'
 const debug = require('debug')('blitz:generate')

packages/cli/src/commands/install.ts

@@ -2,7 +2,7 @@ import {Command} from '../command'
 import * as path from 'path'
 import {Installer} from '@blitzjs/installer'
 import _got from 'got'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {dedent} from '../utils/dedent'
 import {Stream} from 'stream'
 import {promisify} from 'util'

packages/cli/src/commands/new.ts

@@ -4,7 +4,7 @@ import {Command} from '../command'
 import {AppGenerator} from '@blitzjs/generator'
 import chalk from 'chalk'
 import hasbin from 'hasbin'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 const debug = require('debug')('blitz:new')
 
 import {PromptAbortedError} from '../errors/prompt-aborted'

packages/display/.gitignore

@@ -0,0 +1,4 @@
+*.log
+.DS_Store
+node_modules
+dist

packages/display/README.md

@@ -0,0 +1,3 @@
+# `display`
+
+This package houses all files related to Blitz commandline output.

packages/display/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "@blitzjs/display",
+  "version": "0.12.0",
+  "description": "Display package for the Blitz CLI",
+  "homepage": "https://github.com/blitz-js/blitz#readme",
+  "license": "MIT",
+  "scripts": {
+    "dev": "tsdx watch --verbose",
+    "build": "tsdx build",
+    "test": "tsdx test",
+    "test:watch": "tsdx test --watch",
+    "lint": "tsdx lint"
+  },
+  "author": {
+    "name": "Brandon Bayer",
+    "email": "b@bayer.ws",
+    "url": "https://twitter.com/flybayer"
+  },
+  "main": "dist/index.js",
+  "module": "dist/installer.esm.js",
+  "types": "dist/packages/display/src/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "tsdx lint"
+    }
+  },
+  "keywords": [
+    "blitz",
+    "display"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/blitz-js/blitz.git"
+  },
+  "dependencies": {
+    "chalk": "4.0.0",
+    "ora": "4.0.4",
+    "readline": "1.3.0"
+  },
+  "devDependencies": {}
+}

packages/display/src/index.test.ts

@@ -0,0 +1,3 @@
+it('should do nothing', () => {
+  expect(true).toBe(true)
+})

packages/display/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": ["src", "types", "test"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "baseUrl": "./",
+    "declarationDir": "./dist",
+    "downlevelIteration": true,
+    "paths": {
+      "*": ["src/*", "node_modules/*"]
+    }
+  }
+}

packages/generator/package.json

@@ -42,6 +42,7 @@
   "dependencies": {
     "@babel/core": "7.9.0",
     "@babel/plugin-transform-typescript": "7.9.4",
+    "@blitzjs/display": "0.12.0",
     "ast-types": "0.13.3",
     "chalk": "4.0.0",
     "cross-spawn": "7.0.2",
@@ -56,8 +57,6 @@
     "username": "5.1.0",
     "vinyl": "2.2.0"
   },
-  "devDependencies": {
-    "@blitzjs/server": "0.12.0"
-  },
+  "devDependencies": {},
   "gitHead": "d3b9fce0bdd251c2b1890793b0aa1cd77c1c0922"
 }

packages/generator/src/generator.ts

@@ -4,7 +4,7 @@ import {EventEmitter} from 'events'
 import {create as createStore, Store} from 'mem-fs'
 import {create as createEditor, Editor} from 'mem-fs-editor'
 import Enquirer from 'enquirer'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import readDirRecursive from 'fs-readdir-recursive'
 import * as babel from '@babel/core'
 // @ts-ignore TS wants types for this module but none exist

packages/generator/src/generators/app-generator.ts

@@ -5,7 +5,7 @@ import username from 'username'
 import {readJSONSync, writeJson} from 'fs-extra'
 import {resolve, join} from 'path'
 import {fetchLatestVersionsFor} from '../utils/fetch-latest-version-for'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {getBlitzDependencyVersion} from '../utils/get-blitz-dependency-version'
 
 export interface AppGeneratorOptions extends GeneratorOptions {

packages/generator/src/utils/get-latest-version.ts

@@ -1,5 +1,5 @@
 import {fetchAllVersions, fetchLatestDistVersion} from './npm-fetch'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {Fallbackable} from './fallbackable'
 import chalk from 'chalk'
 

packages/generator/test/generators/app-generator.test.ts

@@ -1,5 +1,5 @@
 import spawn from 'cross-spawn'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 
 import {AppGenerator} from '../../src/generators/app-generator'
 
@@ -8,7 +8,7 @@ jest.spyOn(process, 'chdir').mockImplementation(() => true)
 jest.spyOn(global.console, 'log').mockImplementation()
 // Mocks the log output
 jest.mock(
-  '@blitzjs/server',
+  '@blitzjs/display',
   jest.fn(() => {
     return {
       log: {

packages/installer/package.json

@@ -39,8 +39,8 @@
   "dependencies": {
     "@babel/core": "7.9.0",
     "@babel/plugin-transform-typescript": "7.9.4",
+    "@blitzjs/display": "0.12.0",
     "@blitzjs/generator": "0.12.0",
-    "@blitzjs/server": "0.12.0",
     "ast-types": "0.13.3",
     "chokidar": "3.3.1",
     "cross-spawn": "7.0.2",

packages/installer/src/executors/add-dependency-executor.ts

@@ -2,7 +2,7 @@ import {BaseExecutor, executorArgument, getExecutorArgument} from './executor'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 import spawn from 'cross-spawn'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 
 interface NpmPackage {
   name: string

packages/installer/src/executors/executor.ts

@@ -1,4 +1,4 @@
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 
 export interface BaseExecutor {
   stepId: string | number

packages/installer/src/executors/file-transform-executor.ts

@@ -1,7 +1,7 @@
 import {BaseExecutor, executorArgument, getExecutorArgument} from './executor'
 import {filePrompt} from './file-prompt'
 import {transform, Transformer} from '../utils/transform'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {waitForConfirmation} from '../utils/wait-for-confirmation'
 import {createPatch} from 'diff'
 import chokidar from 'chokidar'

packages/installer/src/executors/new-file-executor.ts

@@ -1,6 +1,6 @@
 import {BaseExecutor, executorArgument, getExecutorArgument} from './executor'
 import {Generator, GeneratorOptions} from '@blitzjs/generator'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {waitForConfirmation} from '../utils/wait-for-confirmation'
 
 export interface NewFileExecutor extends BaseExecutor {

packages/installer/src/installer.ts

@@ -9,7 +9,7 @@ import {
   isFileTransformExecutor,
   fileTransformExecutor,
 } from './executors/file-transform-executor'
-import {log} from '@blitzjs/server'
+import {log} from '@blitzjs/display'
 import {logExecutorFrontmatter} from './executors/executor'
 import {waitForConfirmation} from './utils/wait-for-confirmation'
 

packages/server/package.json

@@ -32,6 +32,7 @@
   "module": "dist/webpack.esm.js",
   "types": "dist/packages/server/src/index.d.ts",
   "dependencies": {
+    "@blitzjs/display": "0.12.0",
     "cross-spawn": "7.0.2",
     "detect-port": "1.3.0",
     "fast-glob": "3.2.2",

packages/server/src/index.ts

@@ -6,5 +6,4 @@ export {Manifest} from './synchronizer/pipeline/rules/manifest'
 export {ManifestLoader} from './synchronizer/manifest-loader'
 export {enhance} from './config'
 export {resolveBinAsync} from './resolve-bin-async'
-export {log} from './log'
 export * from './rpc'

packages/server/src/rpc.ts

@@ -1,5 +1,5 @@
 import {BlitzApiRequest, BlitzApiResponse} from '@blitzjs/core'
-import {log} from './log'
+import {log} from '@blitzjs/display'
 import {serializeError} from 'serialize-error'
 
 export function rpcHandler(

packages/server/src/synchronizer/display.ts

@@ -1,6 +1,6 @@
 import {through} from './streams'
 import File from 'vinyl'
-import {log} from '../log'
+import {log} from '@blitzjs/display'
 import chalk from 'chalk'
 import {Event, FILE_WRITTEN, INIT, ERROR_THROWN, READY} from './events'
 

packages/server/src/synchronizer/errors.ts

@@ -1,4 +1,4 @@
-import {log} from '../log'
+import {log} from '@blitzjs/display'
 import {through} from './streams'
 import {Writable} from 'stream'
 import {ERROR_THROWN} from './events'

yarn.lock

@@ -13632,6 +13632,11 @@ readdirp@~3.4.0:
   dependencies:
     picomatch "^2.2.1"
 
+readline@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
+  integrity sha1-xYDXfvLPyHUrEySYBg3JeTp6wBw=
+
 realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"