From e86f419a204138b00e61212fbb904ada943f5f74 Mon Sep 17 00:00:00 2001 From: Konnor Rogers Date: Wed, 26 Jan 2022 22:21:05 -0500 Subject: [PATCH] fix: rework internal plugin structure (#178) * rework internal plugin structure * update workflow * fix tests --- .github/workflows/tests.yml | 9 ++---- package.json | 19 +++++------- plugins/package.json | 23 -------------- plugins/yarn.lock | 13 -------- rollup.config.js | 30 +++++++++---------- src/addedNodesObserver.ts | 2 +- src/clickHandler.ts | 2 +- src/confirm.ts | 2 +- src/csrf.ts | 2 +- src/disabledElementChecker.ts | 2 +- src/elementDisabler.ts | 2 +- src/elementEnabler.ts | 2 +- src/formSubmission.ts | 2 +- src/formSubmitDispatcher.ts | 2 +- src/http/fetchRequest.ts | 2 +- src/http/fetchResponse.ts | 2 +- src/index.ts | 2 +- src/method.ts | 2 +- src/methodSubmission.ts | 2 +- src/mrujs.ts | 2 +- src/navigationAdapter.ts | 2 +- {plugins/src => src/plugins}/cableCar.ts | 0 {plugins/src => src/plugins}/cable_ready.d.ts | 0 {plugins/src => src/plugins}/index.ts | 2 +- {plugins/src => src/plugins}/jsErb.ts | 0 {plugins/src => src/plugins}/mrujs.ts | 2 +- {plugins/src => src/plugins}/mrujsTurbo.ts | 2 +- {plugins/src => src/plugins}/shoelace.ts | 2 +- src/remoteWatcher.ts | 2 +- src/submitFinder.ts | 2 +- types.ts => src/types.ts | 1 - src/utils/dom.ts | 2 +- src/utils/events.ts | 2 +- src/utils/form.ts | 2 +- src/utils/headers.ts | 2 +- src/utils/url.ts | 2 +- test/js/plugin.test.ts | 2 +- test/js/plugins/cableCar.ts | 2 +- test/js/plugins/cableCarMimeType.ts | 2 +- tsconfig-lint.json | 2 +- tsconfig-plugins.json | 8 ----- tsconfig.json | 2 +- 42 files changed, 56 insertions(+), 111 deletions(-) delete mode 100644 plugins/package.json delete mode 100644 plugins/yarn.lock rename {plugins/src => src/plugins}/cableCar.ts (100%) rename {plugins/src => src/plugins}/cable_ready.d.ts (100%) rename {plugins/src => src/plugins}/index.ts (82%) rename {plugins/src => src/plugins}/jsErb.ts (100%) rename {plugins/src => src/plugins}/mrujs.ts (78%) rename {plugins/src => src/plugins}/mrujsTurbo.ts (96%) rename {plugins/src => src/plugins}/shoelace.ts (93%) rename types.ts => src/types.ts (99%) delete mode 100644 tsconfig-plugins.json diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 582312c5..cdcae37b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,10 +31,9 @@ jobs: pnpm-lock.yaml plugins/pnpm-lock.yaml - - name: Install via yarn + - name: Install via pnpm run: | pnpm install - cd plugins && pnpm install - name: lint, and test run: | pnpm lint @@ -72,13 +71,9 @@ jobs: pnpm-lock.yaml plugins/pnpm-lock.yaml - - name: Install via yarn - run: | - - - name: Install via yarn + - name: Install via pnpm run: | pnpm install - cd plugins && pnpm install && cd - pnpm build cd test/rails/dummy pnpm install diff --git a/package.json b/package.json index 0af5d39e..622844cc 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "require": "./dist/mrujs.js" }, "./plugins": { - "browser": "./plugins/dist/mrujs.module.js", - "umd": "./plugins/dist/mrujs.umd.js", - "import": "./plugins/dist/mrujs.module.js", - "require": "./plugins/dist/mrujs.js" + "browser": "./dist/plugins.module.js", + "umd": "./dist/plugins.umd.js", + "import": "./dist/plugins.module.js", + "require": "./dist/plugins.js" } }, "types": "dist/types/src/index.d.ts", @@ -35,10 +35,7 @@ }, "files": [ "src", - "dist", - "plugins/src", - "plugins/dist", - "plugins/package.json" + "dist" ], "sideEffects": [ "./src/index.ts", @@ -48,9 +45,9 @@ "url": "https://github.com/paramagicdev/mrujs/issues" }, "scripts": { - "clean": "rm -rf dist plugins/dist", - "lint": "ts-standard plugins/ src/ test/js", - "fix": "ts-standard plugins/ src/ test/js --fix", + "clean": "rm -rf dist", + "lint": "ts-standard src/ test/js", + "fix": "ts-standard src/ test/js --fix", "test": "web-test-runner", "test:ci": "pnpm lint && pnpm build && web-test-runner", "test:watch": "web-test-runner --watch", diff --git a/plugins/package.json b/plugins/package.json deleted file mode 100644 index 1eafbdf5..00000000 --- a/plugins/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "mrujs-plugins", - "amdName": "mrujsPlugins", - "version": "1.0.0", - "private": true, - "description": "A collection of first part mrujs plugins", - "source": "./src/index.ts", - "main": "./dist/mrujs.js", - "module": "./dist/mrujs.module.js", - "umd:main": "./dist/mrujs.umd.js", - "license": "MIT", - "types": "dist/plugins/dist/types/plugins/src/index.d.ts", - "typings": "dist/plugins/dist/types/plugins/src/index.d.ts", - "peerDependencies": { - "mrujs": ">= 0.4.6" - }, - "dependencies": { - "spark-md5": "^3.0.2" - }, - "devDependencies": { - "@types/spark-md5": "^3.0.2" - } -} diff --git a/plugins/yarn.lock b/plugins/yarn.lock deleted file mode 100644 index d8c9fbe0..00000000 --- a/plugins/yarn.lock +++ /dev/null @@ -1,13 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@types/spark-md5@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/spark-md5/-/spark-md5-3.0.2.tgz#da2e8a778a20335fc4f40b6471c4b0d86b70da55" - integrity sha512-82E/lVRaqelV9qmRzzJ1PKTpyrpnT7mwdneKNJB9hUtypZDMggloDfFUCIqRRx3lYRxteCwXSq9c+W71Vf0QnQ== - -spark-md5@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" - integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== diff --git a/rollup.config.js b/rollup.config.js index a4ad163a..0ce4284b 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -57,25 +57,24 @@ export default [ // Plugins { - external: ["SparkMD5"], - input: "plugins/src/index.ts", + input: "src/plugins/index.ts", output: [{ - file: "plugins/dist/mrujs.module.js", + file: "dist/plugins.module.js", format: "es", sourcemap: true, }], - plugins: basePlugins("./tsconfig-plugins.json") + plugins: basePlugins() }, { - input: "plugins/src/index.ts", + input: "src/plugins/index.ts", output: [{ - name: "mrujs", - file: "plugins/dist/mrujs.umd.js", + name: "mrujsPlugins", + file: "dist/plugins.umd.js", format: "umd", sourcemap: true, exports: "named", }], - plugins: basePlugins("./tsconfig-plugins.json") + plugins: basePlugins() }, // Compressed @@ -103,24 +102,23 @@ export default [ // Plugins { - external: ["SparkMD5"], - input: "plugins/src/index.ts", + input: "src/plugins/index.ts", output: [{ - file: "plugins/dist/mrujs.module.min.js", + file: "dist/plugins.module.min.js", format: "es", sourcemap: true, }], - plugins: compressionPlugins("./tsconfig-plugins.json") + plugins: compressionPlugins() }, { - input: "plugins/src/index.ts", + input: "src/plugins/index.ts", output: [{ - name: "mrujs", - file: "plugins/dist/mrujs.umd.min.js", + name: "mrujsPlugins", + file: "dist/plugins.umd.min.js", format: "umd", sourcemap: true, exports: "named", }], - plugins: compressionPlugins("./tsconfig-plugins.json") + plugins: compressionPlugins() }, ] diff --git a/src/addedNodesObserver.ts b/src/addedNodesObserver.ts index 0ba1bd06..d585b6e4 100644 --- a/src/addedNodesObserver.ts +++ b/src/addedNodesObserver.ts @@ -1,4 +1,4 @@ -import { MrujsPluginInterface } from '../types' +import { MrujsPluginInterface } from './types' /** * Mutation observer for added nodes. diff --git a/src/clickHandler.ts b/src/clickHandler.ts index 83727da2..39ecb221 100644 --- a/src/clickHandler.ts +++ b/src/clickHandler.ts @@ -1,6 +1,6 @@ import { addListeners, attachObserverCallback, removeListeners } from './utils/dom' import { preventInsignificantClick } from './utils/misc' -import { EventQueryInterface, MrujsPluginInterface } from '../types' +import { EventQueryInterface, MrujsPluginInterface } from './types' export function ClickHandler (): MrujsPluginInterface { const callbacks = [preventInsignificantClick] as EventListener[] diff --git a/src/confirm.ts b/src/confirm.ts index 89e85aa8..adbdf263 100644 --- a/src/confirm.ts +++ b/src/confirm.ts @@ -1,6 +1,6 @@ import { dispatch, stopEverything } from './utils/events' import { addListeners, removeListeners, attachObserverCallback } from './utils/dom' -import { EventQueryInterface, MrujsPluginInterface } from '../types' +import { EventQueryInterface, MrujsPluginInterface } from './types' export function Confirm (): MrujsPluginInterface { const callbacks = [handleConfirm] as EventListener[] diff --git a/src/csrf.ts b/src/csrf.ts index aacd07ef..1d1c05da 100644 --- a/src/csrf.ts +++ b/src/csrf.ts @@ -1,6 +1,6 @@ // https://github.com/rails/rails/blob/main/actionview/app/assets/javascripts/rails-ujs/utils/csrf.coffee import { getCookieValue, getMetaContent } from './utils/misc' -import { MrujsPluginInterface } from '../types' +import { MrujsPluginInterface } from './types' import { $ } from './utils/dom' export function Csrf (): MrujsPluginInterface { diff --git a/src/disabledElementChecker.ts b/src/disabledElementChecker.ts index 1d5301b5..9757dae4 100644 --- a/src/disabledElementChecker.ts +++ b/src/disabledElementChecker.ts @@ -1,4 +1,4 @@ -import { MrujsPluginInterface, EventQueryInterface } from '../types' +import { MrujsPluginInterface, EventQueryInterface } from './types' import { addListeners, removeListeners, attachObserverCallback } from './utils/dom' import { stopEverything } from './utils/events' diff --git a/src/elementDisabler.ts b/src/elementDisabler.ts index c3d4bf6a..55c849de 100644 --- a/src/elementDisabler.ts +++ b/src/elementDisabler.ts @@ -1,4 +1,4 @@ -import { MrujsPluginInterface, EventQueryInterface, Submitter } from '../types' +import { MrujsPluginInterface, EventQueryInterface, Submitter } from './types' import { attachObserverCallback, addListeners, removeListeners, formElements, matches } from './utils/dom' import { stopEverything } from './utils/events' diff --git a/src/elementEnabler.ts b/src/elementEnabler.ts index ec81892a..4271328b 100644 --- a/src/elementEnabler.ts +++ b/src/elementEnabler.ts @@ -1,6 +1,6 @@ import { attachObserverCallback, matches, addListeners, removeListeners, formElements } from './utils/dom' import { stopEverything, AJAX_EVENTS } from './utils/events' -import { SelectorType, EventQueryInterface, MrujsPluginInterface } from '../types' +import { SelectorType, EventQueryInterface, MrujsPluginInterface } from './types' export function ElementEnabler (): MrujsPluginInterface { const callbacks = [enableElement] as EventListener[] diff --git a/src/formSubmission.ts b/src/formSubmission.ts index c34027f6..56a4506d 100644 --- a/src/formSubmission.ts +++ b/src/formSubmission.ts @@ -1,6 +1,6 @@ import { buildFormElementFormData, formEnctypeFromString, FormEncType, FormEncTypes, urlEncodeFormData } from './utils/form' import { findResponseTypeHeader } from './utils/headers' -import { FetchRequestInterface, Submitter } from '../types' +import { FetchRequestInterface, Submitter } from './types' import { FetchRequest } from './http/fetchRequest' import { isGetRequest, expandUrl } from './utils/url' diff --git a/src/formSubmitDispatcher.ts b/src/formSubmitDispatcher.ts index dee68c6f..8197a010 100644 --- a/src/formSubmitDispatcher.ts +++ b/src/formSubmitDispatcher.ts @@ -1,7 +1,7 @@ import { AJAX_EVENTS, dispatch } from './utils/events' import { findSubmitter } from './submitFinder' import { FetchResponse } from './http/fetchResponse' -import { MrujsPluginInterface, AddOrRemoveListeners, AjaxEventDetail, ExtendedSubmitEvent } from '../types' +import { MrujsPluginInterface, AddOrRemoveListeners, AjaxEventDetail, ExtendedSubmitEvent } from './types' import { FormSubmission } from './formSubmission' import { disableElement } from './elementDisabler' diff --git a/src/http/fetchRequest.ts b/src/http/fetchRequest.ts index 7255a224..66857042 100644 --- a/src/http/fetchRequest.ts +++ b/src/http/fetchRequest.ts @@ -1,7 +1,7 @@ import { AJAX_EVENTS, dispatch, stopEverything } from '../utils/events' import { isGetRequest, mergeHeaders, expandUrl } from '../utils/url' import { CSRFProtection } from '../csrf' -import { RequestInfo, FetchRequestBody, FetchRequestInterface, Locateable } from '../../types' +import { RequestInfo, FetchRequestBody, FetchRequestInterface, Locateable } from '../types' /** * Fetch Request is essentially an "proxy" class meant to wrap a standard Request diff --git a/src/http/fetchResponse.ts b/src/http/fetchResponse.ts index c433ce6c..c66929d2 100644 --- a/src/http/fetchResponse.ts +++ b/src/http/fetchResponse.ts @@ -1,5 +1,5 @@ import { expandUrl } from '../utils/url' -import { FetchResponseInterface } from '../../types' +import { FetchResponseInterface } from '../types' // Shamelessly stolen from Turbo. // https://github.com/hotwired/turbo/blob/main/src/http/fetch_response.ts diff --git a/src/index.ts b/src/index.ts index 85adc4cf..8d82e412 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ import './polyfills' import { Mrujs } from './mrujs' -import { Adapter, MrujsInterface } from '../types' +import { Adapter, MrujsInterface } from './types' // This is required for typescript checking in tests declare global { diff --git a/src/method.ts b/src/method.ts index 5e4151a9..ff7df880 100644 --- a/src/method.ts +++ b/src/method.ts @@ -1,5 +1,5 @@ import { AJAX_EVENTS, dispatch } from './utils/events' -import { EventQueryInterface, MrujsPluginInterface } from '../types' +import { EventQueryInterface, MrujsPluginInterface } from './types' import { addListeners, removeListeners, attachObserverCallback } from './utils/dom' import { MethodSubmission } from './methodSubmission' diff --git a/src/methodSubmission.ts b/src/methodSubmission.ts index d4f1e985..df7a4555 100644 --- a/src/methodSubmission.ts +++ b/src/methodSubmission.ts @@ -1,7 +1,7 @@ import { urlEncodeFormData } from './utils/form' import { findResponseTypeHeader } from './utils/headers' import { FetchRequest } from './http/fetchRequest' -import { FetchRequestInterface } from '../types' +import { FetchRequestInterface } from './types' import { expandUrl, isGetRequest } from './utils/url' export interface MethodSubmissionInterface { diff --git a/src/mrujs.ts b/src/mrujs.ts index 3cccf775..83eda0e6 100644 --- a/src/mrujs.ts +++ b/src/mrujs.ts @@ -25,7 +25,7 @@ import { Locateable, ExtendedRequestInit, MrujsInterface -} from '../types' +} from './types' export function Mrujs (obj: Partial = {}): MrujsInterface { obj.connected = false diff --git a/src/navigationAdapter.ts b/src/navigationAdapter.ts index 99fdc585..fd80641d 100644 --- a/src/navigationAdapter.ts +++ b/src/navigationAdapter.ts @@ -6,7 +6,7 @@ import { Adapter, MrujsPluginInterface, SnapshotCacheInterface, Locateable, FetchRequestInterface, FetchResponseInterface, VisitAction -} from '../types' +} from './types' const ALLOWABLE_ACTIONS = [ 'advance', diff --git a/plugins/src/cableCar.ts b/src/plugins/cableCar.ts similarity index 100% rename from plugins/src/cableCar.ts rename to src/plugins/cableCar.ts diff --git a/plugins/src/cable_ready.d.ts b/src/plugins/cable_ready.d.ts similarity index 100% rename from plugins/src/cable_ready.d.ts rename to src/plugins/cable_ready.d.ts diff --git a/plugins/src/index.ts b/src/plugins/index.ts similarity index 82% rename from plugins/src/index.ts rename to src/plugins/index.ts index 2a4d56db..099431c1 100644 --- a/plugins/src/index.ts +++ b/src/plugins/index.ts @@ -1,4 +1,4 @@ -import { Adapter, MrujsInterface } from '../../types' +import { Adapter, MrujsInterface } from '../types' declare global { interface Window { diff --git a/plugins/src/jsErb.ts b/src/plugins/jsErb.ts similarity index 100% rename from plugins/src/jsErb.ts rename to src/plugins/jsErb.ts diff --git a/plugins/src/mrujs.ts b/src/plugins/mrujs.ts similarity index 78% rename from plugins/src/mrujs.ts rename to src/plugins/mrujs.ts index db200f37..e7555954 100644 --- a/plugins/src/mrujs.ts +++ b/src/plugins/mrujs.ts @@ -1,4 +1,4 @@ -import { Adapter, MrujsInterface } from '../../types' +import { Adapter, MrujsInterface } from '../types' declare global { interface Window { diff --git a/plugins/src/mrujsTurbo.ts b/src/plugins/mrujsTurbo.ts similarity index 96% rename from plugins/src/mrujsTurbo.ts rename to src/plugins/mrujsTurbo.ts index a061be4e..3632921e 100644 --- a/plugins/src/mrujsTurbo.ts +++ b/src/plugins/mrujsTurbo.ts @@ -1,4 +1,4 @@ -import { MrujsPluginInterface } from '../../types' +import { MrujsPluginInterface } from '../types' export function MrujsTurbo (): MrujsPluginInterface { return { diff --git a/plugins/src/shoelace.ts b/src/plugins/shoelace.ts similarity index 93% rename from plugins/src/shoelace.ts rename to src/plugins/shoelace.ts index 2916a19e..a9b01468 100644 --- a/plugins/src/shoelace.ts +++ b/src/plugins/shoelace.ts @@ -1,4 +1,4 @@ -import { MrujsPluginInterface, MrujsInterface } from '../../types' +import { MrujsPluginInterface, MrujsInterface } from '../types' export function Shoelace (): MrujsPluginInterface { return { diff --git a/src/remoteWatcher.ts b/src/remoteWatcher.ts index d3f20386..a1f23290 100644 --- a/src/remoteWatcher.ts +++ b/src/remoteWatcher.ts @@ -1,4 +1,4 @@ -import { SelectorType, MrujsPluginInterface } from '../types' +import { SelectorType, MrujsPluginInterface } from './types' import { $, matches } from './utils/dom' export function RemoteWatcher (): MrujsPluginInterface { diff --git a/src/submitFinder.ts b/src/submitFinder.ts index ddc04c43..0a2172ff 100644 --- a/src/submitFinder.ts +++ b/src/submitFinder.ts @@ -1,4 +1,4 @@ -import { ExtendedSubmitEvent, Submitter } from '../types' +import { ExtendedSubmitEvent, Submitter } from './types' export function findSubmitter (event: ExtendedSubmitEvent): Submitter { // Not supported by webkit diff --git a/types.ts b/src/types.ts similarity index 99% rename from types.ts rename to src/types.ts index aa8443a0..d29e11c5 100644 --- a/types.ts +++ b/src/types.ts @@ -209,4 +209,3 @@ export interface ExtendedSubmitEvent extends CustomEvent { submitter?: Submitter } } - diff --git a/src/utils/dom.ts b/src/utils/dom.ts index 71946d20..b562f595 100644 --- a/src/utils/dom.ts +++ b/src/utils/dom.ts @@ -1,6 +1,6 @@ // This file is copied from: // https://github.com/rails/rails/blob/main/actionview/app/assets/javascripts/rails-ujs/utils/dom.coffee -import { EventQueryInterface, QuerySelectorInterface, SelectorType } from '../../types' +import { EventQueryInterface, QuerySelectorInterface, SelectorType } from '../types' export function toArray (value: any): T[] { if (Array.isArray(value)) { diff --git a/src/utils/events.ts b/src/utils/events.ts index b49f737b..94165621 100644 --- a/src/utils/events.ts +++ b/src/utils/events.ts @@ -1,5 +1,5 @@ import { matches } from './dom' -import { SelectorType } from '../../types' +import { SelectorType } from '../types' export const EVENT_DEFAULTS = { bubbles: true, diff --git a/src/utils/form.ts b/src/utils/form.ts index a0e10f08..8ea9ce92 100644 --- a/src/utils/form.ts +++ b/src/utils/form.ts @@ -1,4 +1,4 @@ -import { Submitter } from '../../types' +import { Submitter } from '../types' export function buildFormElementFormData (element: HTMLFormElement, submitter?: Submitter): FormData { const formData = new FormData(element) diff --git a/src/utils/headers.ts b/src/utils/headers.ts index 12e27f6b..dd334a76 100644 --- a/src/utils/headers.ts +++ b/src/utils/headers.ts @@ -1,4 +1,4 @@ -import { MimeTypeInterface } from '../../types' +import { MimeTypeInterface } from '../types' export const BASE_ACCEPT_HEADERS: MimeTypeInterface = { '*': '*/*', diff --git a/src/utils/url.ts b/src/utils/url.ts index f2a398af..20365cbe 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -1,4 +1,4 @@ -import { Locateable } from '../../types' +import { Locateable } from '../types' export function expandUrl (locateable: Locateable): URL { return new URL(locateable.toString(), document.baseURI) diff --git a/test/js/plugin.test.ts b/test/js/plugin.test.ts index 69582d7d..07488233 100644 --- a/test/js/plugin.test.ts +++ b/test/js/plugin.test.ts @@ -1,5 +1,5 @@ // This is a base test for the plugin interface. -import { MrujsPluginInterface } from '../../types' +import { MrujsPluginInterface } from '../../src/types' import { assert } from '@esm-bundle/chai' import { spy } from 'sinon' diff --git a/test/js/plugins/cableCar.ts b/test/js/plugins/cableCar.ts index 45560d0e..4bb7329b 100644 --- a/test/js/plugins/cableCar.ts +++ b/test/js/plugins/cableCar.ts @@ -3,7 +3,7 @@ import { assert } from '@esm-bundle/chai' import CableReady from 'cable_ready' import mrujs from '../../../src' -import { CableCar } from '../../../plugins' +import { CableCar } from '../../../src/plugins' const cableCar = new CableCar(CableReady) diff --git a/test/js/plugins/cableCarMimeType.ts b/test/js/plugins/cableCarMimeType.ts index fb63f093..b7ab6fd6 100644 --- a/test/js/plugins/cableCarMimeType.ts +++ b/test/js/plugins/cableCarMimeType.ts @@ -1,7 +1,7 @@ import { assert } from '@esm-bundle/chai' import CableReady from 'cable_ready' import mrujs from '../../../src' -import { CableCar } from '../../../plugins' +import { CableCar } from '../../../src/plugins' describe('CableCar with custom config', () => { it('should allow custom mimetypes', () => { diff --git a/tsconfig-lint.json b/tsconfig-lint.json index d8382fd5..14081d99 100644 --- a/tsconfig-lint.json +++ b/tsconfig-lint.json @@ -1,4 +1,4 @@ { "extends": "./tsconfig.json", - "include": ["./src", "./plugins", "./test/js"] + "include": ["./src", "./test/js"] } diff --git a/tsconfig-plugins.json b/tsconfig-plugins.json deleted file mode 100644 index 4e3c53d3..00000000 --- a/tsconfig-plugins.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": ["./plugins", "./types.ts"], - "exclude": ["./plugins/dist"], - "compilerOptions": { - "outDir": "./plugins/dist" - } -} diff --git a/tsconfig.json b/tsconfig.json index 11c5a798..3921a896 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "include": ["./types.ts", "./src"], + "include": ["./src"], "exclude": ["./dist"], "compilerOptions": { "baseUrl": ".",