Defer to rollup TS plugin to build types (#3564)

* Defer to rollup TS plugin to build types * index.ts -> redux.js, redux.d.ts * Only output one copy of the types. This also puts them back into the types path. However, I don't know how to have them output as a single file bundle to match our other outputs. * Remove the move Co-authored-by: Tim Dorr <git@timdorr.com>
reduxjs · Sep 6, 2019 · d8417e8 · d8417e8
1 parent 9e71b4c
commit d8417e8
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
-.DS_Store
-*.log
 node_modules
+
+coverage
+
 dist
 lib
 es
-coverage
 types
 
 website/translated_docs

diff --git a/package.json b/package.json
@@ -39,14 +39,13 @@
     "format": "prettier --write \"{src,test}/**/*.{js,ts}\" index.d.ts \"**/*.md\"",
     "format:check": "prettier --list-different \"{src,test}/**/*.{js,ts}\" index.d.ts \"**/*.md\"",
     "lint": "eslint --ext js,ts src test",
+    "check-types": "tsc --noEmit",
     "pretest": "npm run build",
     "test": "jest",
     "test:watch": "npm test -- --watch",
     "test:cov": "npm test -- --coverage",
-    "build": "npm run build-types && rollup -c",
+    "build": "rollup -c",
     "prepare": "npm run clean && npm run check-types && npm run format:check && npm run lint && npm test",
-    "build-types": "tsc --emitDeclarationOnly",
-    "check-types": "tsc --noEmit",
     "examples:lint": "eslint --ext js,ts examples",
     "examples:test": "cross-env CI=true babel-node examples/testAll.js"
   },

diff --git a/rollup.config.js b/rollup.config.js
@@ -6,6 +6,8 @@ import { terser } from 'rollup-plugin-terser'
 
 import pkg from './package.json'
 
+const noDeclarationFiles = { compilerOptions: { declaration: false } };
+
 export default [
   // CommonJS
   {
@@ -19,7 +21,7 @@ export default [
       nodeResolve({
         extensions: ['.ts']
       }),
-      typescript(),
+      typescript({ useTsconfigDeclarationDir: true }),
       babel()
     ]
   },
@@ -36,7 +38,7 @@ export default [
       nodeResolve({
         extensions: ['.ts']
       }),
-      typescript(),
+      typescript({ tsconfigOverride: noDeclarationFiles }),
       babel()
     ]
   },
@@ -52,7 +54,7 @@ export default [
       replace({
         'process.env.NODE_ENV': JSON.stringify('production')
       }),
-      typescript(),
+      typescript({ tsconfigOverride: noDeclarationFiles }),
       babel({
         exclude: 'node_modules/**'
       }),
@@ -80,7 +82,7 @@ export default [
       nodeResolve({
         extensions: ['.ts']
       }),
-      typescript(),
+      typescript({ tsconfigOverride: noDeclarationFiles }),
       babel({
         exclude: 'node_modules/**'
       }),
@@ -103,7 +105,7 @@ export default [
       nodeResolve({
         extensions: ['.ts']
       }),
-      typescript(),
+      typescript({ tsconfigOverride: noDeclarationFiles }),
       babel({
         exclude: 'node_modules/**'
       }),

diff --git a/test/typescript/actionCreators.ts b/test/typescript/actionCreators.ts
@@ -4,7 +4,7 @@ import {
   Dispatch,
   bindActionCreators,
   ActionCreatorsMapObject
-} from 'redux'
+} from '../..'
 
 interface AddTodoAction extends Action {
   text: string

diff --git a/test/typescript/actions.ts b/test/typescript/actions.ts
@@ -1,4 +1,4 @@
-import { Action as ReduxAction } from 'redux'
+import { Action as ReduxAction } from '../..'
 
 namespace FSA {
   interface Action<P> extends ReduxAction {

diff --git a/test/typescript/compose.ts b/test/typescript/compose.ts
@@ -1,4 +1,4 @@
-import { compose } from 'redux'
+import { compose } from '../..'
 
 // adapted from DefinitelyTyped/compose-function
 

diff --git a/test/typescript/dispatch.ts b/test/typescript/dispatch.ts
@@ -1,4 +1,4 @@
-import { Dispatch, AnyAction } from 'redux'
+import { Dispatch } from '../..'
 
 /**
  * Default Dispatch type accepts any object with `type` property.

diff --git a/test/typescript/enhancers.ts b/test/typescript/enhancers.ts
@@ -1,11 +1,4 @@
-import {
-  StoreEnhancer,
-  Action,
-  AnyAction,
-  Reducer,
-  createStore,
-  PreloadedState
-} from 'redux'
+import { StoreEnhancer, Action, AnyAction, Reducer, createStore } from '../..'
 
 interface State {
   someField: 'string'

diff --git a/test/typescript/injectedDispatch.ts b/test/typescript/injectedDispatch.ts
@@ -1,4 +1,4 @@
-import { Dispatch, Action } from 'redux'
+import { Dispatch, Action } from '../..'
 
 interface Component<P> {
   props: P

diff --git a/test/typescript/middleware.ts b/test/typescript/middleware.ts
@@ -2,13 +2,12 @@ import {
   Middleware,
   MiddlewareAPI,
   applyMiddleware,
-  StoreEnhancer,
   createStore,
   Dispatch,
   Reducer,
   Action,
   AnyAction
-} from 'redux'
+} from '../..'
 
 /**
  * Logger middleware doesn't add any extra types to dispatch, just logs actions

diff --git a/test/typescript/reducers.ts b/test/typescript/reducers.ts
@@ -1,4 +1,4 @@
-import { Reducer, Action, combineReducers, ReducersMapObject } from 'redux'
+import { Reducer, Action, combineReducers, ReducersMapObject } from '../..'
 
 /**
  * Simple reducer definition with no action shape checks.

diff --git a/test/typescript/replaceReducer.ts b/test/typescript/replaceReducer.ts
@@ -1,4 +1,4 @@
-import { combineReducers, createStore } from 'redux'
+import { combineReducers, createStore } from '../..'
 
 /**
  * verify that replaceReducer maintains strict typing if the new types change

diff --git a/test/typescript/store.ts b/test/typescript/store.ts
@@ -4,12 +4,10 @@ import {
   Reducer,
   Action,
   StoreEnhancer,
-  StoreCreator,
-  StoreEnhancerStoreCreator,
   Unsubscribe,
   Observer,
   ExtendState
-} from 'redux'
+} from '../..'
 import 'symbol-observable'
 
 type State = {

diff --git a/test/typescript/tsconfig.json b/test/typescript/tsconfig.json
@@ -2,9 +2,6 @@
   "compilerOptions": {
     "lib": ["es2017", "dom"],
     "strict": true,
-    "baseUrl": "../..",
-    "paths": {
-      "redux": ["types/index.d.ts"]
-    }
+    "baseUrl": "../.."
   }
 }