From 95c55953b25b8cbe9d12c5fc9afab5a64001e907 Mon Sep 17 00:00:00 2001 From: Thibault Ruby Date: Wed, 11 Aug 2021 16:13:21 +0200 Subject: [PATCH] fix: imports --- core/package.json | 4 ++-- core/src/fluid-ses.ts | 2 +- core/src/types.ts | 2 +- core/test/send-mail.spec.ts | 2 +- package.json | 8 ++++---- templating/package.json | 2 +- yarn.lock | 38 ++++++++++++++++++------------------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/core/package.json b/core/package.json index f1b5ff8..4892792 100644 --- a/core/package.json +++ b/core/package.json @@ -1,5 +1,5 @@ { - "name": "@fluid-ses/core", + "name": "fluid-ses-core", "version": "0.0.1", "description": "Fluid SES core", "repository": "https://github.com/neoxia/fluid-ses", @@ -19,7 +19,7 @@ }, "dependencies": { "@aws-sdk/client-ses": "^3.14.0", - "@fluid-ses/templating": "0.0.1", + "fluid-ses-templating": "0.0.1", "nodemailer": "^6.6.0" }, "devDependencies": { diff --git a/core/src/fluid-ses.ts b/core/src/fluid-ses.ts index 6d02f49..27d033d 100644 --- a/core/src/fluid-ses.ts +++ b/core/src/fluid-ses.ts @@ -1,7 +1,7 @@ import {SES} from '@aws-sdk/client-ses'; import {createTransport, SentMessageInfo, Transporter} from 'nodemailer'; import {CustomAttachment, IFluidSESConstructorOptions, IFluidSESMailOptions} from './types'; -import {CustomTemplatingOptions, ITemplateEngine, TemplateEngine} from '@fluid-ses/templating'; +import {CustomTemplatingOptions, ITemplateEngine, TemplateEngine} from 'fluid-ses-templating'; import {MailerError, MissingOptionsError, TemplateEngineError} from './core-errors'; import Mail, {Address} from 'nodemailer/lib/mailer'; diff --git a/core/src/types.ts b/core/src/types.ts index 964c98c..f87984d 100644 --- a/core/src/types.ts +++ b/core/src/types.ts @@ -1,5 +1,5 @@ import Mail, {Address, Attachment} from 'nodemailer/lib/mailer'; -import {CustomTemplatingOptions, ITemplateEngine} from '@fluid-ses/templating'; +import {CustomTemplatingOptions, ITemplateEngine} from 'fluid-ses-templating'; export interface IFluidSESConstructorOptions { defaultSourceMail?: string; diff --git a/core/test/send-mail.spec.ts b/core/test/send-mail.spec.ts index 2ce4d7d..f4df489 100644 --- a/core/test/send-mail.spec.ts +++ b/core/test/send-mail.spec.ts @@ -1,7 +1,7 @@ import {FluidSes} from '../src'; import {SinonStub, stub} from 'sinon'; import Mail, {Attachment} from 'nodemailer/lib/mailer'; -import {CustomTemplatingOptions, TemplateEngine} from '@fluid-ses/templating'; +import {CustomTemplatingOptions, TemplateEngine} from 'fluid-ses-templating'; describe('Fluid ses core tests', () => { const region = 'eu-west-1'; diff --git a/package.json b/package.json index 2a7a5c9..7c15c92 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "license": "MIT", "scripts": { "test:all": "yarn workspaces foreach --topological-dev run test", - "test:templating": "yarn workspace @fluid-ses/templating run test", - "test:core": "yarn workspace @fluid-ses/core run test", + "test:templating": "yarn workspace fluid-ses-templating run test", + "test:core": "yarn workspace fluid-ses-core run test", "build:all": "yarn workspaces foreach --topological-dev run build", - "build:templating": "yarn workspace @fluid-ses/templating run build", - "build:core": "yarn workspace @fluid-ses/core run build", + "build:templating": "yarn workspace fluid-ses-templating run build", + "build:core": "yarn workspace fluid-ses-core run build", "lint": "yarn run eslint '{core,templating}/{src,test}/*.ts'", "lint-fix": "yarn run eslint --fix '{core,templating}/{src,test}/*.ts'" }, diff --git a/templating/package.json b/templating/package.json index 1e8434f..7464b8b 100644 --- a/templating/package.json +++ b/templating/package.json @@ -1,5 +1,5 @@ { - "name": "@fluid-ses/templating", + "name": "fluid-ses-templating", "version": "0.0.1", "description": "Templating engine and utils used by Fluid SES", "repository": "https://github.com/neoxia/fluid-ses", diff --git a/yarn.lock b/yarn.lock index 1049f22..e5258a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1110,25 +1110,6 @@ __metadata: languageName: node linkType: hard -"@fluid-ses/core@workspace:core": - version: 0.0.0-use.local - resolution: "@fluid-ses/core@workspace:core" - dependencies: - "@aws-sdk/client-ses": ^3.14.0 - "@fluid-ses/templating": "workspace:*" - "@types/nodemailer": ^6.4.1 - "@types/sinon": ^10.0.2 - nodemailer: ^6.6.0 - sinon: ^10.0.1 - languageName: unknown - linkType: soft - -"@fluid-ses/templating@workspace:*, @fluid-ses/templating@workspace:templating": - version: 0.0.0-use.local - resolution: "@fluid-ses/templating@workspace:templating" - languageName: unknown - linkType: soft - "@istanbuljs/load-nyc-config@npm:^1.0.0": version: 1.1.0 resolution: "@istanbuljs/load-nyc-config@npm:1.1.0" @@ -3358,6 +3339,25 @@ __metadata: languageName: node linkType: hard +"fluid-ses-core@workspace:core": + version: 0.0.0-use.local + resolution: "fluid-ses-core@workspace:core" + dependencies: + "@aws-sdk/client-ses": ^3.14.0 + "@types/nodemailer": ^6.4.1 + "@types/sinon": ^10.0.2 + fluid-ses-templating: 0.0.1 + nodemailer: ^6.6.0 + sinon: ^10.0.1 + languageName: unknown + linkType: soft + +"fluid-ses-templating@0.0.1, fluid-ses-templating@workspace:templating": + version: 0.0.0-use.local + resolution: "fluid-ses-templating@workspace:templating" + languageName: unknown + linkType: soft + "fluid-ses@workspace:.": version: 0.0.0-use.local resolution: "fluid-ses@workspace:."