diff --git a/package.json b/package.json index 170aa34..2580431 100644 --- a/package.json +++ b/package.json @@ -34,9 +34,7 @@ }, "type": "module", "imports": { - "#app": "./src/app/index.ts", - "#index": "./src/index.ts", - "#shared": "./src/shared/index.ts" + "#validators": "./src/validators/index.ts" }, "exports": { ".": "./index.js", diff --git a/rollup.config.ts b/rollup.config.ts index 3b7a105..3b84e46 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -6,8 +6,7 @@ import alias from '@rollup/plugin-alias'; import typescript from '@rollup/plugin-typescript'; const sourceFolder = 'src'; -const appFolder = `${sourceFolder}/app`; -const sharedFolder = `${sourceFolder}/shared`; +const validatorsFolder = `${sourceFolder}/validators`; const fileFormat = 'es'; const fileName = 'index'; const declarationFile = `${fileName}.d.ts`; @@ -28,12 +27,8 @@ export default defineConfig([ alias({ entries: [ { - find: '#app', - replacement: resolve(`${appFolder}/${entryFile}`), - }, - { - find: '#shared', - replacement: resolve(`${sharedFolder}/${entryFile}`), + find: '#validators', + replacement: resolve(`${validatorsFolder}/${entryFile}`), }, ], }), diff --git a/src/index.ts b/src/index.ts index 8d29954..f0c8dfc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1 +1 @@ -export { FONT_FILE_NAME_REGEX, selectors } from '#app'; +export { FONT_FILE_NAME_REGEX, selectors } from '#validators'; diff --git a/src/shared/index.ts b/src/shared/index.ts deleted file mode 100644 index f110e91..0000000 --- a/src/shared/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { ITALIC_REGEX } from './italic.ts'; -export { VARIABLE_REGEX } from './variable.ts'; diff --git a/src/app/font-file-name.ts b/src/validators/font-file-name.ts similarity index 89% rename from src/app/font-file-name.ts rename to src/validators/font-file-name.ts index b081859..7d76272 100644 --- a/src/app/font-file-name.ts +++ b/src/validators/font-file-name.ts @@ -1,4 +1,5 @@ -import { ITALIC_REGEX, VARIABLE_REGEX } from '#shared'; +import { ITALIC_REGEX } from './italic.ts'; +import { VARIABLE_REGEX } from './variable.ts'; const LETTERS_REGEX = '[A-Z][a-z]'; const FONT_FAMILY_REGEX = `^${LETTERS_REGEX}+(${LETTERS_REGEX}+)?`; diff --git a/src/app/index.ts b/src/validators/index.ts similarity index 53% rename from src/app/index.ts rename to src/validators/index.ts index 53ba6ec..ff9cd11 100644 --- a/src/app/index.ts +++ b/src/validators/index.ts @@ -1,2 +1,4 @@ export { FONT_FILE_NAME_REGEX } from './font-file-name.ts'; +export { ITALIC_REGEX } from './italic.ts'; export { selectors } from './selectors.ts'; +export { VARIABLE_REGEX } from './variable.ts'; diff --git a/src/shared/italic.ts b/src/validators/italic.ts similarity index 100% rename from src/shared/italic.ts rename to src/validators/italic.ts diff --git a/src/app/selectors.ts b/src/validators/selectors.ts similarity index 100% rename from src/app/selectors.ts rename to src/validators/selectors.ts diff --git a/src/shared/variable.ts b/src/validators/variable.ts similarity index 100% rename from src/shared/variable.ts rename to src/validators/variable.ts diff --git a/tsconfig.node.json b/tsconfig.node.json index 4361f2c..738c2af 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -14,8 +14,7 @@ "module": "NodeNext", "moduleResolution": "NodeNext", "paths": { - "#app": ["./src/app/index.ts"], - "#shared": ["./src/shared/index.ts"] + "#validators": ["./src/validators/index.ts"] }, "rootDir": "src", "types": ["vitest"],