Skip to content

Commit

Permalink
refactor(sage)!: use new robo.js package name
Browse files Browse the repository at this point in the history
  • Loading branch information
Pkmmte committed Apr 10, 2024
1 parent 7f73414 commit 3940de7
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 43 deletions.
5 changes: 5 additions & 0 deletions .changeset/wet-bananas-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@roboplay/sage': minor
---

refactor!: use new `robo.js` package name
2 changes: 1 addition & 1 deletion packages/sage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"sage": "dist/index.js"
},
"dependencies": {
"@roboplay/robo.js": "0.9.5",
"commander": "10.0.0",
"depcheck": "^1.4.7",
"inquirer": "^9.2.0",
"robo.js": "workspace:*",
"tar": "^6.1.13"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/sage/src/commands/doctor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { color, composeColors } from '../core/color.js'
import { logger } from '../core/logger.js'
import { checkSageUpdates, getPackageManager } from '../core/utils.js'

import { loadEnv } from '@roboplay/robo.js/dist/core/dotenv.js'
import { loadConfig } from '@roboplay/robo.js/dist/core/config.js'
import { loadEnv } from 'robo.js/dist/core/dotenv.js'
import { loadConfig } from 'robo.js/dist/core/config.js'

const command = new Command('doctor')
.description('Checks if your Robo is healthy')
Expand Down
2 changes: 1 addition & 1 deletion packages/sage/src/commands/export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async function exportAction(modules: string[], options: ExportOptions) {
hasPrettier: !!packageJson.devDependencies['prettier'],
hasTypescript: !!packageJson.devDependencies['typescript'],
hasWorkspaces: !!packageJson.workspaces,
roboversion: packageJson.dependencies['@roboplay/robo.js']
roboversion: packageJson.dependencies['robo.js']
}

const results: unknown[] = []
Expand Down
4 changes: 2 additions & 2 deletions packages/sage/src/commands/generate.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Command } from 'commander'
import { writeFile } from 'node:fs/promises'
import { logger } from '../core/logger.js'
import type { Manifest, CommandEntry, ContextEntry, EventConfig, CommandOption } from '@roboplay/robo.js'
import type { Manifest, CommandEntry, ContextEntry, EventConfig, CommandOption } from 'robo.js'
import path from 'node:path'
// @ts-expect-error - Internal module
import { loadManifest } from '@roboplay/robo.js/dist/cli/utils/manifest.js'
import { loadManifest } from 'robo.js/dist/cli/utils/manifest.js'

const command = new Command('generate')
command.command('docs').description('generates a basic doc file for the project').action(generateDocAction)
Expand Down
5 changes: 2 additions & 3 deletions packages/sage/src/commands/import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import { checkSageUpdates, cmd, downloadFile, exec, getPackageManager, isRoboPro
import path from 'node:path'
import { mkdirSync } from 'node:fs'
import { access, cp, readFile, writeFile } from 'node:fs/promises'
// @ts-expect-error - TODO: Move from /cli to /core and expose as @roboplay/robo.js/utils
import { cleanTempDir } from '@roboplay/robo.js/dist/cli/utils/utils.js'
import { cleanTempDir } from 'robo.js/utils.js'
import type { PackageJson } from '../core/types.js'

const command = new Command('import')
Expand Down Expand Up @@ -171,7 +170,7 @@ async function importPlugin(plugin: string, packageJson: PackageJson) {
logger.debug(prefix, `Plugin ${pluginHasTs ? 'contains' : 'does not contain'} TypeScript.`)

// It's safe to assume core is necessary for all plugins' development
delete pluginDevDeps['@roboplay/robo.js']
delete pluginDevDeps['robo.js']
delete projectDevDeps['discord.js']

// Install dependencies
Expand Down
7 changes: 3 additions & 4 deletions packages/sage/src/commands/upgrade.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// @ts-expect-error - no types
import { packageJson } from '@roboplay/robo.js/dist/cli/utils/utils.js'
import { packageJson } from 'robo.js/dist/cli/utils/utils.js'
import { Command } from 'commander'
import { logger } from '../core/logger.js'
import { checkSageUpdates, checkUpdates, cmd, exec, getPackageManager } from '../core/utils.js'
import { loadConfig } from '@roboplay/robo.js/dist/core/config.js'
import { prepareFlashcore } from '@roboplay/robo.js/dist/core/flashcore.js'
import { loadConfig } from 'robo.js/dist/core/config.js'
import { prepareFlashcore } from 'robo.js/dist/core/flashcore.js'
import { color, composeColors } from '../core/color.js'
import fs from 'node:fs'
import path from 'node:path'
Expand Down
4 changes: 2 additions & 2 deletions packages/sage/src/commands/why.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { color } from '@roboplay/robo.js'
import { color } from 'robo.js'
// @ts-expect-error - Internal module
import { loadManifest } from '@roboplay/robo.js/dist/cli/utils/manifest.js'
import { loadManifest } from 'robo.js/dist/cli/utils/manifest.js'
import { Command } from 'commander'
import { logger } from '../core/logger.js'
import { checkSageUpdates } from '../core/utils.js'
Expand Down
8 changes: 4 additions & 4 deletions packages/sage/src/core/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { promisify } from 'node:util'
import { readFile } from 'node:fs/promises'
import { logger } from './logger.js'
import { color } from './color.js'
import { FLASHCORE_KEYS } from '@roboplay/robo.js/dist/core/constants.js'
import { FLASHCORE_KEYS } from 'robo.js/dist/core/constants.js'
import { spawn } from 'node:child_process'
import { Config, Flashcore } from '@roboplay/robo.js'
import { Config, Flashcore } from 'robo.js'
import { packageJson } from '../index.js'
import inquirer from 'inquirer'
import type { SpawnOptions } from 'node:child_process'
Expand Down Expand Up @@ -206,14 +206,14 @@ export function getPackageExecutor(): string {
}

/**
* Make sure that the working directory is a Robo project by checking for @roboplay/robo.js in package.json
* Make sure that the working directory is a Robo project by checking for robo.js in package.json
*/
export async function isRoboProject(project = process.cwd()): Promise<boolean> {
try {
const packageJsonPath = path.join(project, 'package.json')
const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf-8'))

return packageJson.dependencies['@roboplay/robo.js'] || packageJson.devDependencies['@roboplay/robo.js']
return packageJson.dependencies['robo.js'] || packageJson.devDependencies['robo.js']
} catch (e) {
logger.debug(`Not a Robo project:`, e)
return false
Expand Down
51 changes: 27 additions & 24 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3940de7

Please sign in to comment.