From e0ebe358301b94a2a7e3046b18729b448f42ea75 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Fri, 4 Aug 2017 13:49:25 +0200 Subject: [PATCH 1/2] Fix #18 Remove 'module' and 'jsnext:main' targets to avoid babel compilation errors --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index 26d9f05..4587353 100644 --- a/package.json +++ b/package.json @@ -3,16 +3,12 @@ "version": "1.2.1", "description": "Snabbdom CSS-Selector", "main": "lib/commonjs/index.js", - "jsnext:main": "lib/es2015/index.js", - "module": "lib/es2015/index.js", "typings": "lib/es2015/index.d.ts", "scripts": { "test:lint": "tslint src/*.ts src/**/*.ts", "test:unit": "cross-env TS_NODE_PROJECT=./test/tsconfig.json mocha -r ts-node/register test/*.ts", "test": "npm run test:lint && npm run test:unit", - "build:commonjs": "tsc -P tsconfig.commonjs.json", - "build:es2015": "tsc -P tsconfig.json", - "build": "npm run build:commonjs && npm run build:es2015" + "build": "tsc -P tsconfig.commonjs.json" }, "repository": { "type": "git", From 69f98e9637a8d7774722271b90cb5131d21221a7 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Fri, 4 Aug 2017 18:36:38 +0200 Subject: [PATCH 2/2] Remove traces of the commonjs/es2015 split targets --- package.json | 6 +++--- tsconfig.commonjs.json | 22 ---------------------- tsconfig.json | 8 ++++---- 3 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 tsconfig.commonjs.json diff --git a/package.json b/package.json index 4587353..5fdccd6 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,13 @@ "name": "snabbdom-selector", "version": "1.2.1", "description": "Snabbdom CSS-Selector", - "main": "lib/commonjs/index.js", - "typings": "lib/es2015/index.d.ts", + "main": "lib/index.js", + "typings": "lib/index.d.ts", "scripts": { "test:lint": "tslint src/*.ts src/**/*.ts", "test:unit": "cross-env TS_NODE_PROJECT=./test/tsconfig.json mocha -r ts-node/register test/*.ts", "test": "npm run test:lint && npm run test:unit", - "build": "tsc -P tsconfig.commonjs.json" + "build": "tsc -P tsconfig.json" }, "repository": { "type": "git", diff --git a/tsconfig.commonjs.json b/tsconfig.commonjs.json deleted file mode 100644 index 52ba14e..0000000 --- a/tsconfig.commonjs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "lib": [ - "dom", - "es2015" - ], - "moduleResolution": "node", - "module": "commonjs", - "target": "es5", - "noImplicitAny": true, - "sourceMap": true, - "noUnusedParameters": true, - "strictNullChecks": true, - "types": [], - "outDir": "lib/commonjs" - }, - "files": [ - "custom-typings/cssauron.d.ts", - "src/index.ts" - ] -} diff --git a/tsconfig.json b/tsconfig.json index af4c8f0..80513d1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,17 +3,17 @@ "declaration": true, "lib": [ "dom", - "es5" + "es2015" ], "moduleResolution": "node", - "module": "es2015", - "target": "es2015", + "module": "commonjs", + "target": "es5", "noImplicitAny": true, "sourceMap": true, "noUnusedParameters": true, "strictNullChecks": true, "types": [], - "outDir": "lib/es2015" + "outDir": "lib" }, "files": [ "custom-typings/cssauron.d.ts",