Merge pull request #2278 from feiming/conflict_dist

Change tsc output dir to dist-types

.eslintignore

@@ -1,5 +1,6 @@
 **/node_modules/**
 **/dist/**
+**/dist-types/**
 **/storybook-static/**
 **/coverage/**
 **/build/**

.gitignore

@@ -89,6 +89,7 @@ typings/
 # Nuxt.js build / generate output
 .nuxt
 dist
+dist-types
 
 # Gatsby files
 .cache/

packages/cli/config/eslint.backend.js

@@ -35,7 +35,7 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
   },
-  ignorePatterns: ['.eslintrc.js', '**/dist/**'],
+  ignorePatterns: ['.eslintrc.js', '**/dist/**', '**/dist-types/**'],
   rules: {
     'no-console': 0, // Permitted in console programs
     'new-cap': ['error', { capIsNew: false }], // Because Express constructs things e.g. like 'const r = express.Router()'

packages/cli/config/eslint.js

@@ -39,7 +39,7 @@ module.exports = {
       version: 'detect',
     },
   },
-  ignorePatterns: ['.eslintrc.js', '**/dist/**'],
+  ignorePatterns: ['.eslintrc.js', '**/dist/**', '**/dist-types/**'],
   rules: {
     'import/newline-after-import': 'error',
     'import/no-duplicates': 'warn',

packages/cli/src/commands/clean/clean.ts

@@ -19,5 +19,6 @@ import { paths } from '../../lib/paths';
 
 export default async function clean() {
   await fs.remove(paths.resolveTarget('dist'));
+  await fs.remove(paths.resolveTarget('dist-types'));
   await fs.remove(paths.resolveTarget('coverage'));
 }

packages/cli/src/lib/builder/config.ts

@@ -37,7 +37,7 @@ export const makeConfigs = async (
   options: BuildOptions,
 ): Promise<RollupOptions[]> => {
   const typesInput = paths.resolveTargetRoot(
-    'dist',
+    'dist-types',
     relativePath(paths.targetRoot, paths.targetDir),
     'src/index.d.ts',
   );

packages/create-app/templates/default-app/.gitignore

@@ -22,6 +22,7 @@ node_modules/
 
 # Build output
 dist
+dist-types
 
 # Temporary change files created by Vim
 *.swp

packages/create-app/templates/default-app/tsconfig.json

@@ -8,7 +8,7 @@
   ],
   "exclude": ["node_modules"],
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "dist-types",
     "rootDir": ".",
     "skipLibCheck": true
   }

tsconfig.json

@@ -7,7 +7,7 @@
     "plugins/*/migrations"
   ],
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "dist-types",
     "rootDir": "."
   }
 }