[chore] Cleanup config files

mediaclip · Apr 13, 2019 · 5618625 · 5618625
1 parent 21184d2
commit 5618625
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/.npmignore b/.npmignore
@@ -12,8 +12,9 @@ jest.setup.ts
 # Configs
 .travis.yml
 tsconfig.json
-tsconfig.*.json
-tslint.json
+typescript/
+.eslintrc.yml
+.prettierrc.yml
 .huskyrc.json
 
 # Lock files

diff --git a/.prettierrc.yaml → .prettierrc.yml b/.prettierrc.yaml → .prettierrc.yml
diff --git a/package.json b/package.json
@@ -7,7 +7,12 @@
   "es2015": "./dist/esm2015/index.js",
   "typings": "./dist/typings/index.d.ts",
   "scripts": {
-    "build": "rimraf ./dist && tsc && tsc -p tsconfig.esm5.json && tsc -p tsconfig.esm2015.json && tsc -p tsconfig.types.json",
+    "build": "npm run clean && npm run build:cjs && npm run build:es5 && npm run build:es2015 && npm run build:types",
+    "build:cjs": "tsc",
+    "build:es5": "tsc -p ./typescript/tsconfig.esm5.json",
+    "build:es2015": "tsc -p ./typescript/tsconfig.esm2015.json",
+    "build:types": "tsc -p ./typescript/tsconfig.types.json",
+    "clean": "rimraf ./dist",
     "test": "npm run lint && jest",
     "test:coverage": "jest --coverage",
     "lint": "prettier --check \"src/**/*.ts\" && eslint **/*.ts"

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./typescript/tsconfig.base.json",
   "compilerOptions": {
     "target": "es2015",
     "module": "commonjs",

diff --git a/src/es5Types.d.ts → typescript/es5Types.d.ts b/src/es5Types.d.ts → typescript/es5Types.d.ts
diff --git a/tsconfig.base.json → typescript/tsconfig.base.json b/tsconfig.base.json → typescript/tsconfig.base.json
@@ -15,9 +15,7 @@
     "outDir": "dist",
     "stripInternal": true,
     "moduleResolution": "node",
-    "importHelpers": true,
+    "importHelpers": true
   },
-  "include": [
-    "src/"
-  ]
+  "include": ["../src/"]
 }
diff --git a/tsconfig.esm2015.json → typescript/tsconfig.esm2015.json b/tsconfig.esm2015.json → typescript/tsconfig.esm2015.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "target": "es2015",
     "module": "es2015",
-    "outDir": "./dist/esm2015"
+    "outDir": "../dist/esm2015"
   }
-}
+}
diff --git a/tsconfig.esm5.json → typescript/tsconfig.esm5.json b/tsconfig.esm5.json → typescript/tsconfig.esm5.json
@@ -3,8 +3,8 @@
   "compilerOptions": {
     "target": "es5",
     "module": "es2015",
-    "outDir": "./dist/esm5",
+    "outDir": "../dist/esm5",
     "lib": ["es5", "es2015.iterable", "es2015.collection", "es2015.symbol"]
   },
-  "files": ["src/es5Types.d.ts"]
+  "files": ["./es5Types.d.ts"]
 }
diff --git a/tsconfig.types.json → typescript/tsconfig.types.json b/tsconfig.types.json → typescript/tsconfig.types.json
@@ -5,10 +5,8 @@
     "target": "esnext",
     "removeComments": false,
     "declaration": true,
-    "declarationDir": "./dist/typings",
+    "declarationDir": "../dist/typings",
     "emitDeclarationOnly": true
   },
-  "exclude": [
-    "src/__tests__"
-  ]
-}
+  "exclude": ["../src/__tests__"]
+}