From d6cd24f4d6299c5f66ac223d14b664a467c546e9 Mon Sep 17 00:00:00 2001 From: Nandor Kraszlan <95nandi95@gmail.com> Date: Fri, 22 Jan 2021 14:26:51 +0000 Subject: [PATCH 1/2] #4 - Added alias --- jest.config.js | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- rollup.config.js | 4 ++++ tests/unit/ACL.test.ts | 2 +- tests/vue/ACL.test.ts | 4 ++-- tests/vue/Directives.test.ts | 4 ++-- tsconfig.json | 5 ++++- 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/jest.config.js b/jest.config.js index 419e555..b0482a5 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,3 +1,8 @@ +const { pathsToModuleNameMapper } = require('ts-jest/utils'); +const { compilerOptions } = require('./tsconfig.json'); + +/** @typedef {import('ts-jest/dist/types')} */ +/** @type {import('@jest/types').Config.InitialOptions} */ module.exports = { preset: 'ts-jest', testEnvironment: 'jsdom', @@ -5,6 +10,7 @@ module.exports = { transform: { '^.+\\.[t]sx?$': 'ts-jest' }, + moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '/' }), collectCoverageFrom: [ '/src/**/*.ts', '!/src/index.ts' diff --git a/package-lock.json b/package-lock.json index f3359ac..c0d3424 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "vacl", - "version": "0.1.1", + "version": "0.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.1.1", + "version": "0.1.3", "license": "MIT", "devDependencies": { "@olavoparno/jest-badges-readme": "^1.5.1", diff --git a/package.json b/package.json index 8571fd3..1bdba95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vacl", - "version": "0.1.3", + "version": "0.1.4", "description": "A Lightweight Typescript ACL directives library for Vue 3", "files": [ "dist" diff --git a/rollup.config.js b/rollup.config.js index bd312c3..d6afbda 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -2,6 +2,7 @@ import typescript from 'rollup-plugin-typescript2'; import pkg from './package.json'; import { terser } from 'rollup-plugin-terser'; import bundleSize from 'rollup-plugin-bundle-size'; +import path from "path"; export default { input: 'src/index.ts', @@ -20,6 +21,9 @@ export default { external: [ ...Object.keys(pkg.dependencies || {}) ], + alias: { + '@/': path.resolve(__dirname, '/src/') + }, plugins: [ typescript({ typescript: require('typescript'), diff --git a/tests/unit/ACL.test.ts b/tests/unit/ACL.test.ts index 0d722df..26dd56b 100644 --- a/tests/unit/ACL.test.ts +++ b/tests/unit/ACL.test.ts @@ -1,4 +1,4 @@ -import ACL from '../../src/lib/ACL'; +import ACL from '@/lib/ACL'; describe('aCL', () => { it('can_be_instantiated', () => { diff --git a/tests/vue/ACL.test.ts b/tests/vue/ACL.test.ts index 4c4afd2..172b935 100644 --- a/tests/vue/ACL.test.ts +++ b/tests/vue/ACL.test.ts @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import { createApp, h } from 'vue'; -import ACL from '../../src/lib/ACL'; -import Vacl from '../../src/index'; +import ACL from '@/lib/ACL'; +import Vacl from '@/index'; describe('reactivity', () => { it('can be installed correctly', () => { diff --git a/tests/vue/Directives.test.ts b/tests/vue/Directives.test.ts index 98e84a6..e346fc2 100644 --- a/tests/vue/Directives.test.ts +++ b/tests/vue/Directives.test.ts @@ -1,7 +1,7 @@ import type { VueWrapper } from '@vue/test-utils'; import { mount } from '@vue/test-utils'; -import ACL from '../../src/lib/ACL'; -import { can, cannot, has, hasnt } from '../../src/lib/Directives'; +import ACL from '@/lib/ACL'; +import { can, cannot, has, hasnt } from '@/lib/Directives'; /****************************************************************************** * PERMISSIONS diff --git a/tsconfig.json b/tsconfig.json index 77227ec..8c54909 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,10 @@ "declaration": true, "declarationDir": "types", "declarationMap": true, - + "baseUrl": "./", + "paths": { + "@/*": ["src/*"] + }, "module": "ES2015", "rootDir": "src", "preserveConstEnums": false, From e8c831c46687b1ae9495c7119dcf08cb7622be2d Mon Sep 17 00:00:00 2001 From: Nandor Kraszlan <95nandi95@gmail.com> Date: Fri, 22 Jan 2021 14:28:58 +0000 Subject: [PATCH 2/2] #4 - updated lock version --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0d3424..95b93f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "vacl", - "version": "0.1.3", + "version": "0.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.1.3", + "version": "0.1.4", "license": "MIT", "devDependencies": { "@olavoparno/jest-badges-readme": "^1.5.1",