diff --git a/jest.config.js b/jest.config.js index 5ce21b1a..ff46a04a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,7 +3,7 @@ module.exports = { testEnvironment: 'node', globals: { 'ts-jest': { - tsConfig: 'src/tsconfig.json' + tsConfig: './tsconfig.base.json' } }, moduleNameMapper: { diff --git a/src/markdown/plugins/__tests__/containers.spec.ts b/src/node/markdown/plugins/__tests__/containers.spec.ts similarity index 100% rename from src/markdown/plugins/__tests__/containers.spec.ts rename to src/node/markdown/plugins/__tests__/containers.spec.ts diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-danger.html b/src/node/markdown/plugins/__tests__/fragments/containers/custom-danger.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-danger.html rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-danger.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-danger.md b/src/node/markdown/plugins/__tests__/fragments/containers/custom-danger.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-danger.md rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-danger.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-info.html b/src/node/markdown/plugins/__tests__/fragments/containers/custom-info.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-info.html rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-info.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-info.md b/src/node/markdown/plugins/__tests__/fragments/containers/custom-info.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-info.md rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-info.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-tip.html b/src/node/markdown/plugins/__tests__/fragments/containers/custom-tip.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-tip.html rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-tip.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-tip.md b/src/node/markdown/plugins/__tests__/fragments/containers/custom-tip.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-tip.md rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-tip.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-warning.html b/src/node/markdown/plugins/__tests__/fragments/containers/custom-warning.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-warning.html rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-warning.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/custom-warning.md b/src/node/markdown/plugins/__tests__/fragments/containers/custom-warning.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/custom-warning.md rename to src/node/markdown/plugins/__tests__/fragments/containers/custom-warning.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/danger.html b/src/node/markdown/plugins/__tests__/fragments/containers/danger.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/danger.html rename to src/node/markdown/plugins/__tests__/fragments/containers/danger.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/danger.md b/src/node/markdown/plugins/__tests__/fragments/containers/danger.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/danger.md rename to src/node/markdown/plugins/__tests__/fragments/containers/danger.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/info.html b/src/node/markdown/plugins/__tests__/fragments/containers/info.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/info.html rename to src/node/markdown/plugins/__tests__/fragments/containers/info.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/info.md b/src/node/markdown/plugins/__tests__/fragments/containers/info.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/info.md rename to src/node/markdown/plugins/__tests__/fragments/containers/info.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/tip.html b/src/node/markdown/plugins/__tests__/fragments/containers/tip.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/tip.html rename to src/node/markdown/plugins/__tests__/fragments/containers/tip.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/tip.md b/src/node/markdown/plugins/__tests__/fragments/containers/tip.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/tip.md rename to src/node/markdown/plugins/__tests__/fragments/containers/tip.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/v-pre.html b/src/node/markdown/plugins/__tests__/fragments/containers/v-pre.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/v-pre.html rename to src/node/markdown/plugins/__tests__/fragments/containers/v-pre.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/v-pre.md b/src/node/markdown/plugins/__tests__/fragments/containers/v-pre.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/v-pre.md rename to src/node/markdown/plugins/__tests__/fragments/containers/v-pre.md diff --git a/src/markdown/plugins/__tests__/fragments/containers/warning.html b/src/node/markdown/plugins/__tests__/fragments/containers/warning.html similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/warning.html rename to src/node/markdown/plugins/__tests__/fragments/containers/warning.html diff --git a/src/markdown/plugins/__tests__/fragments/containers/warning.md b/src/node/markdown/plugins/__tests__/fragments/containers/warning.md similarity index 100% rename from src/markdown/plugins/__tests__/fragments/containers/warning.md rename to src/node/markdown/plugins/__tests__/fragments/containers/warning.md diff --git a/src/tsconfig.json b/src/tsconfig.json deleted file mode 100644 index 7d1cf197..00000000 --- a/src/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": "./", - "outDir": "../dist", - "module": "commonjs", - "lib": ["ESNext", "DOM"], - "sourceMap": false, - "target": "esnext", - "moduleResolution": "node", - "esModuleInterop": true, - "declaration": true, - "allowJs": true, - "checkJs": true, - "allowSyntheticDefaultImports": true, - "noUnusedLocals": true, - "strictNullChecks": true, - "noImplicitAny": true, - "removeComments": false, - "preserveSymlinks": true, - "paths": { - "@/*": ["./*"] - } - }, - "include": ["."] -} diff --git a/tsconfig.base.json b/tsconfig.base.json index dd189b66..24e72917 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,10 +1,14 @@ { "compilerOptions": { + "baseUrl": ".", "target": "esnext", "moduleResolution": "node", "strict": true, "declaration": true, "noUnusedLocals": true, - "esModuleInterop": true + "esModuleInterop": true, + "paths": { + "@/*": ["./src/*"] + } } } diff --git a/yarn.lock b/yarn.lock index c104f19e..c6081e17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -645,16 +645,16 @@ "@types/keygrip" "*" "@types/node" "*" -"@types/estree@*": - version "0.0.45" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884" - integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/estree@0.0.44": + version "0.0.44" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz#980cc5a29a3ef3bea6ff1f7d021047d7ea575e21" + integrity sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g== + "@types/express-serve-static-core@*": version "4.17.5" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c" @@ -2043,7 +2043,7 @@ debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@^3.1.0: +debug@^3.0.0, debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2635,9 +2635,11 @@ find-up@^4.0.0, find-up@^4.1.0: path-exists "^4.0.0" follow-redirects@^1.0.0: - version "1.12.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6" - integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg== + version "1.11.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" + integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA== + dependencies: + debug "^3.0.0" for-in@^1.0.2: version "1.0.2" @@ -3334,11 +3336,11 @@ is-potential-custom-element-name@^1.0.0: integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= is-reference@^1.1.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" - integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.0.tgz#d938b0cf85a0df09849417b274f02fb509293599" + integrity sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ== dependencies: - "@types/estree" "*" + "@types/estree" "0.0.44" is-regex@^1.0.5: version "1.0.5" @@ -5567,9 +5569,9 @@ rimraf@^3.0.0, rimraf@^3.0.2: glob "^7.1.3" rollup-plugin-dynamic-import-variables@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-dynamic-import-variables/-/rollup-plugin-dynamic-import-variables-1.0.2.tgz#13328bd7c78f6dd1672f8eddb200d1b78b555f36" - integrity sha512-bzYC/MwYsHgNGpWMI3G4qTjstJCtFqE25/k1Cq/sjfnzl7MQwwrrA4SAQEMiFgKbsw1H4tijVGY1tRk5Xa4h9g== + version "1.0.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-dynamic-import-variables/-/rollup-plugin-dynamic-import-variables-1.0.1.tgz#1b17449ceba881a11277a4bd156765928e92fb51" + integrity sha512-P2sOswQZmlUiXU9UvU4vfQS8n6Jm/A1FPhbBmomhEnTrnTDkBw+D87ihJVEQEbZ0c528/DOFVg1GWOzQECyN0A== dependencies: "@rollup/pluginutils" "^3.0.9" estree-walker "^2.0.1"