From 29982b26784845db275313cbae428223aeccaf17 Mon Sep 17 00:00:00 2001 From: WincentyKorobaczHoA Date: Mon, 15 Jan 2024 15:25:40 +0100 Subject: [PATCH] feat: make imports compatible with new bundler --- projects/validation-messages/package.json | 2 +- projects/validation-messages/project.json | 4 ++-- projects/validation-messages/src/index.ts | 10 +++++----- .../validation-messages.component.spec.ts | 4 ++-- .../validation-messages.component.ts | 4 ++-- .../validation-messages.examples.spec.ts | 4 ++-- .../src/lib/resources/const/index.ts | 4 ++-- .../src/lib/resources/enums/index.ts | 8 ++++---- .../validation-messages/src/lib/resources/index.ts | 6 +++--- .../src/lib/resources/interfaces/index.ts | 8 ++++---- .../resources/interfaces/validation-messages-config.ts | 2 +- projects/validation-messages/src/lib/services/index.ts | 2 +- .../src/lib/services/validation-messages.service.ts | 2 +- projects/validation-messages/src/lib/utils/index.ts | 6 +++--- .../utils/merge-validation-messages-configs.util.ts | 2 +- .../src/lib/validation-messages.module.ts | 4 ++-- projects/validation-messages/tsconfig.json | 2 +- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/projects/validation-messages/package.json b/projects/validation-messages/package.json index a8bc036..818f8e8 100644 --- a/projects/validation-messages/package.json +++ b/projects/validation-messages/package.json @@ -1,6 +1,6 @@ { "name": "@house-of-angular/validation-messages", - "version": "17.0.2", + "version": "17.0.3", "peerDependencies": { "@angular/common": "^17.0.6", "@angular/core": "^17.0.6" diff --git a/projects/validation-messages/project.json b/projects/validation-messages/project.json index 1fbfa3b..3853e44 100644 --- a/projects/validation-messages/project.json +++ b/projects/validation-messages/project.json @@ -23,7 +23,7 @@ "defaultConfiguration": "production" }, "test": { - "executor": "@nrwl/jest:jest", + "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { "jestConfig": "projects/validation-messages/jest.config.ts", @@ -37,7 +37,7 @@ } }, "lint": { - "executor": "@nrwl/linter:eslint", + "executor": "@nx/linter:eslint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": [ diff --git a/projects/validation-messages/src/index.ts b/projects/validation-messages/src/index.ts index 849cc32..71d7607 100644 --- a/projects/validation-messages/src/index.ts +++ b/projects/validation-messages/src/index.ts @@ -1,5 +1,5 @@ -export * from './lib/services'; -export * from './lib/components/validation-messages/validation-messages.component'; -export * from './lib/validation-messages.module'; -export * from './lib/resources'; -export * from './lib/utils'; +export * from './lib/services/index.js'; +export * from './lib/components/validation-messages/validation-messages.component.js'; +export * from './lib/validation-messages.module.js'; +export * from './lib/resources/index.js'; +export * from './lib/utils/index.js'; diff --git a/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.spec.ts b/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.spec.ts index b0000df..aae88b7 100644 --- a/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.spec.ts +++ b/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.spec.ts @@ -1,5 +1,5 @@ import { ControlContainer, FormControl, Validators } from '@angular/forms'; -import { ValidationMessagesComponent } from './validation-messages.component'; +import { ValidationMessagesComponent } from './validation-messages.component.js'; import { MatFormField } from '@angular/material/form-field'; import { createHostFactory } from '@ngneat/spectator/jest'; // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries @@ -8,7 +8,7 @@ import { ValidationMessagesConfig, ValidationMessagesService, } from 'validation-messages'; -import { selectors } from '../../resources/const/test-selectors'; +import { selectors } from '../../resources/const/test-selectors.js'; interface TestConfig { control?: FormControl; diff --git a/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.ts b/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.ts index a609a75..349fcdb 100644 --- a/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.ts +++ b/projects/validation-messages/src/lib/components/validation-messages/validation-messages.component.ts @@ -24,8 +24,8 @@ import { ApiErrorMessage, ApiErrorMessages, ValidationMessagesConfig, -} from '../../resources'; -import { ValidationMessagesService } from '../../services'; +} from '../../resources/index.js'; +import { ValidationMessagesService } from '../../services/index.js'; import { MatFormField, MatFormFieldControl, diff --git a/projects/validation-messages/src/lib/components/validation-messages/validation-messages.examples.spec.ts b/projects/validation-messages/src/lib/components/validation-messages/validation-messages.examples.spec.ts index 1c94c97..cf83c8b 100644 --- a/projects/validation-messages/src/lib/components/validation-messages/validation-messages.examples.spec.ts +++ b/projects/validation-messages/src/lib/components/validation-messages/validation-messages.examples.spec.ts @@ -4,14 +4,14 @@ import { ReactiveFormsModule, Validators, } from '@angular/forms'; -import { ValidationMessagesModule } from '../../validation-messages.module'; +import { ValidationMessagesModule } from '../../validation-messages.module.js'; import { createHostFactory } from '@ngneat/spectator/jest'; import { MatInputModule } from '@angular/material/input'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatDatepickerInputHarness } from '@angular/material/datepicker/testing'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatNativeDateModule } from '@angular/material/core'; -import { ValidationMessagesService } from '../../services/validation-messages.service'; +import { ValidationMessagesService } from '../../services/validation-messages.service.js'; const selectors = { textInput: '[data-cy="text-input"]', diff --git a/projects/validation-messages/src/lib/resources/const/index.ts b/projects/validation-messages/src/lib/resources/const/index.ts index b63d867..5f221c0 100644 --- a/projects/validation-messages/src/lib/resources/const/index.ts +++ b/projects/validation-messages/src/lib/resources/const/index.ts @@ -1,2 +1,2 @@ -export * from './angular-validators-with-value-map.const'; -export * from './validators-with-value.const'; +export * from './angular-validators-with-value-map.const.js'; +export * from './validators-with-value.const.js'; diff --git a/projects/validation-messages/src/lib/resources/enums/index.ts b/projects/validation-messages/src/lib/resources/enums/index.ts index f70a3cc..612da62 100644 --- a/projects/validation-messages/src/lib/resources/enums/index.ts +++ b/projects/validation-messages/src/lib/resources/enums/index.ts @@ -1,4 +1,4 @@ -export * from './angular-validator-value.enum'; -export * from './angular-validators-with-value.enum'; -export * from './validator-value.enum'; -export * from './validator-with-value.enum'; +export * from './angular-validator-value.enum.js'; +export * from './angular-validators-with-value.enum.js'; +export * from './validator-value.enum.js'; +export * from './validator-with-value.enum.js'; diff --git a/projects/validation-messages/src/lib/resources/index.ts b/projects/validation-messages/src/lib/resources/index.ts index 73204c4..ba428b9 100644 --- a/projects/validation-messages/src/lib/resources/index.ts +++ b/projects/validation-messages/src/lib/resources/index.ts @@ -1,3 +1,3 @@ -export * from './interfaces'; -export * from './const'; -export * from './enums'; +export * from './interfaces/index.js'; +export * from './const/index.js'; +export * from './enums/index.js'; diff --git a/projects/validation-messages/src/lib/resources/interfaces/index.ts b/projects/validation-messages/src/lib/resources/interfaces/index.ts index df56bd7..36b5a1a 100644 --- a/projects/validation-messages/src/lib/resources/interfaces/index.ts +++ b/projects/validation-messages/src/lib/resources/interfaces/index.ts @@ -1,4 +1,4 @@ -export * from './validation-message'; -export * from './validation-messages-config'; -export * from './api-error-message'; -export * from './parser'; +export * from './validation-message.js'; +export * from './validation-messages-config.js'; +export * from './api-error-message.js'; +export * from './parser.js'; diff --git a/projects/validation-messages/src/lib/resources/interfaces/validation-messages-config.ts b/projects/validation-messages/src/lib/resources/interfaces/validation-messages-config.ts index 49768ba..d966740 100644 --- a/projects/validation-messages/src/lib/resources/interfaces/validation-messages-config.ts +++ b/projects/validation-messages/src/lib/resources/interfaces/validation-messages-config.ts @@ -1,4 +1,4 @@ -import { ValidationMessage } from './validation-message'; +import { ValidationMessage } from './validation-message.js'; export interface ValidationMessagesConfig { [key: string]: string | ValidationMessage; diff --git a/projects/validation-messages/src/lib/services/index.ts b/projects/validation-messages/src/lib/services/index.ts index 6e57a77..2db4b79 100644 --- a/projects/validation-messages/src/lib/services/index.ts +++ b/projects/validation-messages/src/lib/services/index.ts @@ -1 +1 @@ -export * from './validation-messages.service'; +export * from './validation-messages.service.js'; diff --git a/projects/validation-messages/src/lib/services/validation-messages.service.ts b/projects/validation-messages/src/lib/services/validation-messages.service.ts index b229c81..25f155c 100644 --- a/projects/validation-messages/src/lib/services/validation-messages.service.ts +++ b/projects/validation-messages/src/lib/services/validation-messages.service.ts @@ -4,7 +4,7 @@ import { Parser, ValidationMessagesConfig, ValidationMessagesEnhancedConfig, -} from '../resources'; +} from '../resources/index.js'; import { KeyValue } from '@angular/common'; import { getInterpolableParams, diff --git a/projects/validation-messages/src/lib/utils/index.ts b/projects/validation-messages/src/lib/utils/index.ts index 612b8ef..cff0173 100644 --- a/projects/validation-messages/src/lib/utils/index.ts +++ b/projects/validation-messages/src/lib/utils/index.ts @@ -1,3 +1,3 @@ -export * from './get-prop-by-path.util'; -export * from './get-interpolable-params.util'; -export * from './merge-validation-messages-configs.util'; +export * from './get-prop-by-path.util.js'; +export * from './get-interpolable-params.util.js'; +export * from './merge-validation-messages-configs.util.js'; diff --git a/projects/validation-messages/src/lib/utils/merge-validation-messages-configs.util.ts b/projects/validation-messages/src/lib/utils/merge-validation-messages-configs.util.ts index 09f51ae..c137ce8 100644 --- a/projects/validation-messages/src/lib/utils/merge-validation-messages-configs.util.ts +++ b/projects/validation-messages/src/lib/utils/merge-validation-messages-configs.util.ts @@ -2,7 +2,7 @@ import { angularValidatorsWithValueMap, ValidationMessagesConfig, ValidationMessagesEnhancedConfig, -} from '../resources'; +} from '../resources/index.js'; export function mergeValidationMessagesConfigs( config: ValidationMessagesEnhancedConfig, diff --git a/projects/validation-messages/src/lib/validation-messages.module.ts b/projects/validation-messages/src/lib/validation-messages.module.ts index dbd8c46..972eead 100644 --- a/projects/validation-messages/src/lib/validation-messages.module.ts +++ b/projects/validation-messages/src/lib/validation-messages.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ValidationMessagesComponent } from './components/validation-messages/validation-messages.component'; +import { ValidationMessagesComponent } from './components/validation-messages/validation-messages.component.js'; @NgModule({ imports: [CommonModule], declarations: [ValidationMessagesComponent], - exports: [ValidationMessagesComponent] + exports: [ValidationMessagesComponent], }) export class ValidationMessagesModule {} diff --git a/projects/validation-messages/tsconfig.json b/projects/validation-messages/tsconfig.json index 98e26ab..55ac17d 100644 --- a/projects/validation-messages/tsconfig.json +++ b/projects/validation-messages/tsconfig.json @@ -7,7 +7,7 @@ "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true + "noFallthroughCasesInSwitch": true, }, "files": [], "include": [],