Merge pull request #1 from surol/es6-main

es6 main module

Author: surol

package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-values",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "IoC context values provider",
   "keywords": [
     "ioc"
@@ -15,35 +15,36 @@
   "bugs": {
     "url": "https://github.com/surol/context-values/issues"
   },
-  "main": "dist/context-values.umd.js",
-  "module": "dist/context-values.esm5.js",
-  "es2015": "dist/context-values.esm2015.js",
+  "main": "dist/context-values.js",
+  "browser": "dist/context-values.umd.js",
+  "module": "dist/context-values.mjs",
+  "esm5": "dist/context-values.esm5.js",
   "typings": "index.d.ts",
   "dependencies": {
     "tslib": "^1.9.0"
   },
   "peerDependencies": {
-    "a-iterable": "^2.0.0",
-    "call-thru": "^2.0.0"
+    "a-iterable": "^2.1.0",
+    "call-thru": "^2.1.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^5.0.4",
     "@types/jest": "^23.3.10",
-    "a-iterable": "^2.0.1",
-    "call-thru": "^2.0.0",
+    "a-iterable": "^2.1.0",
+    "call-thru": "^2.1.0",
     "codecov": "^3.1.0",
     "fs-extra": "^7.0.1",
     "jest": "^23.6.0",
     "jest-junit": "^5.2.0",
-    "rollup": "^0.67.4",
+    "rollup": "^0.68.1",
     "rollup-plugin-commonjs": "^9.2.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rollup-plugin-terser": "^3.0.0",
-    "rollup-plugin-typescript2": "^0.18.0",
+    "rollup-plugin-typescript2": "^0.18.1",
     "rollup-plugin-uglify": "^6.0.0",
     "ts-jest": "^23.10.5",
-    "tslint": "^5.11.0",
+    "tslint": "^5.12.0",
     "typescript": "^3.2.2"
   },
   "scripts": {

rollup.config.js

@@ -1,9 +1,10 @@
-import nodeResolve from "rollup-plugin-node-resolve";
-import commonjs from "rollup-plugin-commonjs";
-import sourcemaps from "rollup-plugin-sourcemaps";
-import { terser } from "rollup-plugin-terser";
-import typescript from "rollup-plugin-typescript2";
-import { uglify } from "rollup-plugin-uglify";
+import nodeResolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import sourcemaps from 'rollup-plugin-sourcemaps';
+import { terser } from 'rollup-plugin-terser';
+import typescript from 'rollup-plugin-typescript2';
+import { uglify } from 'rollup-plugin-uglify';
+import pkg from './package.json';
 
 function makeConfig(baseConfig, ...configs) {
   return configs.reduce(
@@ -74,37 +75,47 @@ function baseConfig(tsconfig) {
   };
 }
 
+const mainConfig = makeConfig(
+    baseConfig('tsconfig.main.json'),
+    {
+      output: {
+        file: pkg.main,
+      },
+    },
+    terserConfig);
+
 const umdConfig = makeConfig(
-    baseConfig("tsconfig.umd.json"),
+    baseConfig('tsconfig.umd.json'),
     {
       output: {
-        file: './dist/context-values.umd.js',
+        file: pkg.browser,
       },
     },
     uglifyConfig);
 
-const esm5Config = makeConfig(
-    baseConfig("tsconfig.esm5.json"),
+const esmConfig = makeConfig(
+    baseConfig('tsconfig.esm.json'),
     {
       output: {
-        format: "esm",
-        file: "./dist/context-values.esm5.js",
+        format: 'esm',
+        file: pkg.module,
       },
     },
     terserConfig);
 
-const esm2015Config = makeConfig(
-    baseConfig("tsconfig.esm2015.json"),
+const esm5Config = makeConfig(
+    baseConfig('tsconfig.umd.json'),
     {
       output: {
-        format: "esm",
-        file: "./dist/context-values.esm2015.js",
+        format: 'esm',
+        file: pkg.esm5,
       },
     },
     terserConfig);
 
 export default [
+  mainConfig,
   umdConfig,
+  esmConfig,
   esm5Config,
-  esm2015Config,
 ]

tsconfig.esm2015.json renamed to tsconfig.esm.json

@@ -1,12 +1,8 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.main.json",
   "compilerOptions": {
     "declaration": true,
     "declarationDir": "d.ts",
     "stripInternal": true
-  },
-  "exclude": [
-    "src/**/*.spec.ts",
-    "src/spec/**/*"
-  ]
+  }
 }

tsconfig.esm5.json renamed to tsconfig.main.json

@@ -1,9 +1,5 @@
 {
   "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "target": "es5",
-    "downlevelIteration": true
-  },
   "exclude": [
     "src/**/*.spec.ts",
     "src/spec/**/*"

tsconfig.umd.json

@@ -1,11 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.main.json",
   "compilerOptions": {
     "target": "es5",
     "downlevelIteration": true
-  },
-  "exclude": [
-    "src/**/*.spec.ts",
-    "src/spec/**/*"
-  ]
+  }
 }