Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: deprecated packages #552

Merged
merged 2 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/internal/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"@apptension/saas-boilerplate-telemetry": "^1.0.3",
"@oclif/color": "^1.0.13",
"@oclif/core": "^3.26.4",
"@oclif/errors": "^1.3.6",
"@oclif/plugin-autocomplete": "^3.0.16",
"@oclif/plugin-help": "^6.0.21",
"@oclif/plugin-plugins": "^5.0.14",
Expand Down
4 changes: 3 additions & 1 deletion packages/internal/cli/src/lib/awsVault.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { CLIError } from '@oclif/errors';
import { Errors } from '@oclif/core';
import { lookpath } from 'lookpath';

const { CLIError } = Errors;

export const isAwsVaultInstalled = async () => {
return await lookpath('aws-vault');
};
Expand Down
13 changes: 7 additions & 6 deletions packages/internal/cli/src/lib/chamber.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { CLIError } from '@oclif/errors';
import * as childProcess from 'child_process';
import { promisify } from 'util';
import { lookpath } from 'lookpath';
import { Command } from '@oclif/core';
import { Command, Errors } from '@oclif/core';
import * as dotenv from 'dotenv';

const { CLIError } = Errors;

const exec = promisify(childProcess.exec);

export const isChamberInstalled = async () => {
Expand All @@ -24,27 +25,27 @@ type LoadChamberEnvOptions = {
};
export async function loadChamberEnv(
context: Command,
{ serviceName }: LoadChamberEnvOptions
{ serviceName }: LoadChamberEnvOptions,
) {
await assertChamberInstalled();

let chamberOutput;
try {
const { stdout } = await exec(
`chamber export ${serviceName} --format dotenv`
`chamber export ${serviceName} --format dotenv`,
);
chamberOutput = stdout;
} catch (err) {
context.error(
`Failed to load environmental variables from SSM Parameter Store using chamber: ${err}`
`Failed to load environmental variables from SSM Parameter Store using chamber: ${err}`,
);
}

const parsed = dotenv.parse(Buffer.from(chamberOutput));
context.log(
`Loaded environmental variables from SSM Parameter Store using chamber:
service (prefix): ${serviceName}
count: ${Object.keys(parsed).length}\n`
count: ${Object.keys(parsed).length}\n`,
);

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
Expand Down
4 changes: 3 additions & 1 deletion packages/internal/cli/src/lib/docker.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { CLIError } from '@oclif/errors';
import { Errors } from '@oclif/core';
import * as childProcess from 'child_process';
import { promisify } from 'util';
import { trace } from '@opentelemetry/api';

const { CLIError } = Errors;

const tracer = trace.getTracer('docker');
const exec = promisify(childProcess.exec);

Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { StorybookConfig } from '@storybook/react-vite';
const { mergeConfig } = require('vite');
const config: StorybookConfig = {
stories: ['../src/**/*.stories.tsx', '../../webapp-libs/**/src/**/*.stories.tsx'],
addons: ['@storybook/addon-essentials', '@storybook/addon-styling', 'storybook-dark-mode'],
addons: ['@storybook/addon-essentials', '@storybook/addon-themes', 'storybook-dark-mode'],
staticDirs: ['../public'],
core: {},
async viteFinal(config, options) {
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { withThemeByClassName } from '@storybook/addon-styling';
import { withThemeByClassName } from '@storybook/addon-themes';
import { Preview } from '@storybook/react';
import * as jest from 'jest-mock';

Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@sb/webapp-notifications": "workspace:*",
"@storybook/addon-essentials": "^8.0.9",
"@storybook/addon-measure": "^8.0.9",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addon-themes": "^8.0.10",
"@storybook/cli": "^8.0.9",
"@storybook/client-api": "^7.6.17",
"@storybook/client-logger": "^8.0.9",
Expand Down
Loading
Loading