Skip to content

Commit

Permalink
Merge pull request #391 from atls/sync/yarn-plugin-service
Browse files Browse the repository at this point in the history
fix(yarn-plugin-service): dependencies
  • Loading branch information
Nelfimov authored Aug 21, 2024
2 parents 05c8108 + 8f0a0eb commit 9ac10ce
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 588 deletions.
290 changes: 144 additions & 146 deletions .pnp.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarn/releases/yarn.cjs

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1325,15 +1325,14 @@ __metadata:
"@atls/yarn-test-utils": "workspace:*"
"@jest/globals": "npm:29.7.0"
"@monstrs/logger": "npm:latest"
"@types/react": "npm:^18.3.3"
"@yarnpkg/builder": "npm:4.1.1"
"@yarnpkg/cli": "npm:4.2.2"
"@yarnpkg/core": "npm:4.0.5"
"@types/react": "npm:18.3.3"
"@yarnpkg/builder": "npm:4.1.2"
"@yarnpkg/cli": "npm:4.4.0"
"@yarnpkg/core": "npm:4.1.2"
"@yarnpkg/fslib": "npm:3.1.0"
clipanion: "npm:4.0.0-rc.3"
react: "npm:18.3.1"
rimraf: "npm:5.0.5"
typescript: "npm:5.2.2"
typescript: "npm:5.4.2"
peerDependencies:
"@yarnpkg/cli": "*"
"@yarnpkg/core": "*"
Expand Down
412 changes: 0 additions & 412 deletions yarn/plugin-service/bundles/@yarnpkg/plugin-service.js

This file was deleted.

23 changes: 15 additions & 8 deletions yarn/plugin-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,33 @@
"@atls/yarn-run-utils": "workspace:*",
"@monstrs/logger": "latest",
"clipanion": "4.0.0-rc.3",
"react": "18.3.1",
"rimraf": "5.0.5"
"react": "18.3.1"
},
"devDependencies": {
"@atls/yarn-test-utils": "workspace:*",
"@jest/globals": "29.7.0",
"@types/react": "^18.3.3",
"@yarnpkg/builder": "4.1.1",
"@yarnpkg/cli": "4.2.2",
"@yarnpkg/core": "4.0.5",
"@types/react": "18.3.3",
"@yarnpkg/builder": "4.1.2",
"@yarnpkg/cli": "4.4.0",
"@yarnpkg/core": "4.1.2",
"@yarnpkg/fslib": "3.1.0",
"typescript": "5.2.2"
"typescript": "5.4.2"
},
"peerDependencies": {
"@yarnpkg/cli": "*",
"@yarnpkg/core": "*"
},
"publishConfig": {
"access": "public",
"exports": {
"./package.json": "./package.json",
".": {
"import": "./dist/index.js",
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
}
},
"main": "dist/index.js",
"typings": "dist/index.d.ts"
"types": "dist/index.d.ts"
}
}
9 changes: 2 additions & 7 deletions yarn/plugin-service/sources/service-build.command.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import { BaseCommand } from '@yarnpkg/cli'
import { Configuration } from '@yarnpkg/core'
import { StreamReport } from '@yarnpkg/core'
import { MessageName } from '@yarnpkg/core'
import { Project } from '@yarnpkg/core'
import { Option } from 'clipanion'
import React from 'react'

import { ErrorInfo } from '@atls/cli-ui-error-info-component'
import { LogRecord } from '@atls/cli-ui-log-record-component'
import { ServiceWorker } from '@atls/code-service-worker'
import { SpinnerProgress } from '@atls/yarn-run-utils'
import { renderStatic } from '@atls/cli-ui-renderer'

import { AbstractServiceCommand } from './abstract-service.command.jsx'

Expand All @@ -19,7 +14,7 @@ class ServiceBuildCommand extends AbstractServiceCommand {

showWarnings = Option.Boolean('-w,--show-warnings', false)

async execute() {
async execute(): Promise<number> {
const configuration = await Configuration.find(this.context.cwd, this.context.plugins)
const { project } = await Project.find(configuration, this.context.cwd)

Expand All @@ -46,7 +41,7 @@ class ServiceBuildCommand extends AbstractServiceCommand {
} catch (error) {
progress.end()

this.renderLogRecord(error, report)
this.renderLogRecord(error as Error, report)
}
})
}
Expand Down
9 changes: 2 additions & 7 deletions yarn/plugin-service/sources/service-dev.command.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import { BaseCommand } from '@yarnpkg/cli'
import { Configuration } from '@yarnpkg/core'
import { StreamReport } from '@yarnpkg/core'
import { MessageName } from '@yarnpkg/core'
import { Project } from '@yarnpkg/core'
import { Option } from 'clipanion'
import React from 'react'

import { ErrorInfo } from '@atls/cli-ui-error-info-component'
import { LogRecord } from '@atls/cli-ui-log-record-component'
import { ServiceWorker } from '@atls/code-service-worker'
import { SpinnerProgress } from '@atls/yarn-run-utils'
import { renderStatic } from '@atls/cli-ui-renderer'

import { AbstractServiceCommand } from './abstract-service.command.jsx'

Expand All @@ -19,7 +14,7 @@ class ServiceDevCommand extends AbstractServiceCommand {

showWarnings = Option.Boolean('-w,--show-warnings', false)

async execute() {
async execute(): Promise<number> {
const configuration = await Configuration.find(this.context.cwd, this.context.plugins)
const { project } = await Project.find(configuration, this.context.cwd)

Expand All @@ -43,7 +38,7 @@ class ServiceDevCommand extends AbstractServiceCommand {
} catch (error) {
progress.end()

this.renderLogRecord(error, report)
this.renderLogRecord(error as Error, report)
}
})
}
Expand Down

0 comments on commit 9ac10ce

Please sign in to comment.