Proper declarations

.gitignore

@@ -6,4 +6,5 @@ lib
 node_modules
 npm-debug*
 out
-types
+types
+lerna-debug.log

.travis.yml

@@ -19,7 +19,7 @@ deploy:
 #    branch: master
 #    repo: kirill-konshin/next-redux-wrapper
 - provider: script
-  script: npm run publish:fromgit -- --yes
+  script: npm run publish:release -- --yes
   skip_cleanup: true
   on:
     tags: true

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.0.0-alpha.2"
+  "version": "3.0.0-alpha.3"
 }

package.json

@@ -3,9 +3,6 @@
   "private": true,
   "version": "3.0.0",
   "description": "Redux wrapper for Next.js",
-  "main": "lib/index.js",
-  "module": "es6/index.js",
-  "types": "types/index.d.ts",
   "scripts": {
     "postinstall": "lerna bootstrap --hoist --no-ci",
     "clean": "lerna run clean && lerna clean --yes && rimraf node_modules",
@@ -15,9 +12,9 @@
     "test:quick": "lerna run test:quick --concurrency=1 --stream",
     "test:coverage": "cat packages/*/coverage/lcov.info | coveralls",
     "publish:canary": "lerna publish --canary --force-publish=*",
-    "publish:fromgit": "lerna publish from-git --tag-version-prefix=''",
+    "publish:release": "lerna publish from-package --tag-version-prefix=''",
     "prepare:release": "lerna version --tag-version-prefix='' --force-publish=*",
-    "prepare:prerelease": "npm run prepare:release -- prerelease --preid alpha",
+    "prepare:prerelease": "npm run prepare:release prerelease -- --preid alpha",
     "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint --fix",
     "lint:all": "npm run lint -- 'packages/*/**/*.ts?' 'packages/*/*.js'",
     "lint:staged": "lint-staged --debug"
@@ -26,12 +23,12 @@
     "coveralls": "3.0.3",
     "eslint": "5.16.0",
     "eslint-config-ringcentral-typescript": "1.0.0",
-    "husky": "2.2.0",
-    "lerna": "3.13.4",
-    "lint-staged": "8.1.6",
-    "prettier": "1.17.0",
+    "husky": "2.4.0",
+    "lerna": "3.14.1",
+    "lint-staged": "8.1.7",
+    "prettier": "1.17.1",
     "rimraf": "2.6.3",
-    "typescript": "3.4.5"
+    "typescript": "3.5.1"
   },
   "author": "Kirill Konshin",
   "repository": {

packages/configs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "next-redux-wrapper-configs",
   "private": true,
-  "version": "3.0.0-alpha.2"
+  "version": "3.0.0-alpha.3"
 }

packages/configs/tsconfig.es6.json

@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "es6",
-    "outDir": "es6"
+    "module": "es6"
   }
 }

packages/demo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "next-redux-wrapper-demo",
   "private": true,
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "Demo of redux wrapper for Next.js",
   "scripts": {
     "clean": "rimraf .next coverage",
@@ -11,30 +11,30 @@
     "serve": "next start"
   },
   "dependencies": {
-    "next-redux-wrapper": "^3.0.0-alpha.2",
+    "next-redux-wrapper": "^3.0.0-alpha.3",
     "react": "16.8.6",
     "react-dom": "16.8.6",
     "react-redux": "7.0.3",
     "redux": "4.0.1"
   },
   "devDependencies": {
     "@types/expect-puppeteer": "3.3.1",
-    "@types/jest": "24.0.12",
+    "@types/jest": "24.0.13",
     "@types/jest-environment-puppeteer": "4.0.0",
     "@types/next": "8.0.5",
     "@types/puppeteer": "1.12.4",
-    "@types/react": "16.8.15",
-    "@types/react-redux": "7.0.8",
+    "@types/react": "16.8.19",
+    "@types/react-redux": "7.0.9",
     "@types/redux-promise-middleware": "0.0.11",
     "@types/webpack-env": "1.13.9",
     "@zeit/next-typescript": "1.1.1",
-    "jest-puppeteer": "4.1.1",
+    "jest-puppeteer": "4.2.0",
     "next": "8.1.0",
-    "next-redux-wrapper-configs": "^3.0.0-alpha.2",
-    "puppeteer": "1.15.0",
+    "next-redux-wrapper-configs": "^3.0.0-alpha.3",
+    "puppeteer": "1.17.0",
     "rimraf": "2.6.3",
     "ts-jest": "24.0.2",
-    "typescript": "3.4.5"
+    "typescript": "3.5.1"
   },
   "author": "Kirill Konshin",
   "repository": {

packages/wrapper/package.json

@@ -1,10 +1,10 @@
 {
   "name": "next-redux-wrapper",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "Redux wrapper for Next.js",
   "main": "lib/index.js",
   "module": "es6/index.js",
-  "types": "src/index.ts",
+  "types": "es6/index.d.ts",
   "source": "lib/index.ts",
   "scripts": {
     "test": "jest",
@@ -18,14 +18,14 @@
     "start:tsc:es6": "npm run build:tsc:es6 -- --watch --preserveWatchOutput"
   },
   "devDependencies": {
-    "@types/jest": "24.0.12",
+    "@types/jest": "24.0.13",
     "@types/next": "8.0.5",
-    "@types/react": "16.8.15",
-    "@types/react-redux": "7.0.8",
+    "@types/react": "16.8.19",
+    "@types/react-redux": "7.0.9",
     "@types/redux-promise-middleware": "0.0.11",
     "@zeit/next-typescript": "1.1.1",
-    "jest": "24.7.1",
-    "next-redux-wrapper-configs": "^3.0.0-alpha.2",
+    "jest": "24.8.0",
+    "next-redux-wrapper-configs": "^3.0.0-alpha.3",
     "npm-run-all": "4.1.5",
     "react": "16.8.6",
     "react-dom": "16.8.6",
@@ -35,7 +35,7 @@
     "redux-promise-middleware": "6.1.0",
     "rimraf": "2.6.3",
     "ts-jest": "24.0.2",
-    "typescript": "3.4.5"
+    "typescript": "3.5.1"
   },
   "peerDependencies": {
     "next": ">=6.0.0",

packages/wrapper/tsconfig.es6.json

@@ -1,7 +1,9 @@
 {
   "extends": "next-redux-wrapper-configs/tsconfig.es6.json",
   "compilerOptions": {
-    "outDir": "es6"
+    "declaration": true,
+    "outDir": "es6",
+    "declarationDir": "es6"
   },
   "include": [
     "src"

packages/wrapper/tsconfig.json

@@ -1,7 +1,9 @@
 {
   "extends": "next-redux-wrapper-configs/tsconfig.json",
   "compilerOptions": {
-    "outDir": "lib"
+    "declaration": true,
+    "outDir": "lib",
+    "declarationDir": "lib"
   },
   "include": [
     "src"