Consolidate built files into Libraries folder

vnext/.eslintignore

@@ -1,4 +1,8 @@
 /lib
+/Libraries
 /local-cli/generator-windows/templates/App.windows.js
 /node_modules
-/packages
+/packages
+/RNTester
+/index.*
+/RNTester.*

vnext/.gitignore

@@ -43,6 +43,10 @@ node_modules
 /bots/node_modules/
 
 /lib
+/Libraries
+/RNTester
+/RNTester.*
+/index.*
 
 # Visual Studio
 .vs/

vnext/.npmignore

@@ -1,33 +1,33 @@
 .vs
 .vscode
+**/*.inc
+**/*.windesktop.*
 build
+CMakeLists.txt
 Desktop
 Desktop.Dll
 Desktop.IntegrationTests
 Desktop.UnitTests
 FollyWin32
 IntegrationTests
 IntegrationTestScripts
+NuGet.Config
+package-deps.json
 packages
+react-native-windows.build.log
+ReactUwp.nuspec
+ReactWin32.nuspec
 ReactWin32SandboxSample
+ReactWindows-CopyToStaging.bat
+ReactWindows-TestNuspec.bat
+ReactWindows-UWP.sln
+ReactWindows.sln
+RNTester.*
+RNTester/
 src/
 target
 Universal.IntegrationTests
 Universal.SampleApp
 Universal.UnitTests
 win32
 WindowsSampleCSharpApp
-NuGet.Config
-package-deps.json
-react-native-windows.build.log
-ReactWin32.nuspec
-ReactWindows-CopyToStaging.bat
-ReactWindows-TestNuspec.bat
-ReactUwp.nuspec
-ReactWindows.sln
-ReactWindows-UWP.sln
-**/*.inc
-CMakeLists.txt
-**/sources
-**/dirs
-**/*.windesktop.js

vnext/just-task.js

@@ -8,6 +8,7 @@
 const path = require('path');
 const {
   task,
+  copyTask,
   series,
   condition,
   option,
@@ -25,6 +26,9 @@ option('clean');
 task('eslint', () => {
   return eslintTask();
 });
+task('copyFlowFiles', () => {
+  return copyTask(['src/**/*.js'], '.');
+});
 task('ts', () => {
   return tscTask({
     pretty: true,
@@ -33,14 +37,21 @@ task('ts', () => {
       sourceRoot: path.relative(libPath, srcPath),
     }),
     target: 'es5',
-    outDir: 'lib',
     module: 'commonjs',
   });
 });
 task('clean', () => {
   return cleanTask(
-    ['lib', 'temp', 'dist', 'coverage'].map(p => path.join(process.cwd(), p)),
+    ['Libraries', 'RNTester', 'lib'].map(p => path.join(process.cwd(), p)),
   );
 });
 
-task('build', series(condition('clean', () => argv().clean), 'eslint', 'ts'));
+task(
+  'build',
+  series(
+    condition('clean', () => argv().clean),
+    'eslint',
+    'copyFlowFiles',
+    'ts',
+  ),
+);

vnext/package.json

@@ -8,7 +8,7 @@
     "directory": "vnext"
   },
   "description": "ReactNative Windows implementation using react-native's c++ ReactCommon bridge",
-  "types": "lib/index.d.ts",
+  "types": "index.d.ts",
   "scripts": {
     "preinstall": "node Scripts/preInstall.js",
     "postinstall": "node Scripts/postInstall.js",
@@ -77,4 +77,4 @@
     "react": "16.8.3",
     "react-native": "^0.59.0 || 0.59.0-microsoft.11 || https://github.com/microsoft/react-native/archive/v0.59.0-microsoft.11.tar.gz"
   }
-}
+}

vnext/rn-cli.config.js

@@ -82,7 +82,7 @@ if (
   !fs.existsSync(
     path.resolve(
       __dirname,
-      'lib/Libraries/Components/AccessibilityInfo/AccessibilityInfo.uwp.js',
+      'Libraries/Components/AccessibilityInfo/AccessibilityInfo.uwp.js',
     ),
   )
 ) {

vnext/src/RNTester/RNTesterApp.uwp.tsx

@@ -18,8 +18,8 @@ const RNTesterActions = require('react-native/RNTester/js/RNTesterActions');
 const RNTesterExampleContainer = require('react-native/RNTester/js/RNTesterExampleContainer');
 const RNTesterExampleList = require('react-native/RNTester/js/RNTesterExampleList');
 import RNTesterList from './RNTesterList.uwp';
-import RNTesterNavigationReducer from './RNTesterNavigationReducer';
-import {RNTesterAction} from './RNTesterActions';
+import RNTesterNavigationReducer from './RNTesterNavigationReducer.uwp';
+import {RNTesterAction} from './RNTesterActions.uwp';
 
 const styles = StyleSheet.create({
   headerContainer: {

vnext/src/RNTester/RNTesterNavigationReducer.ts → vnext/src/RNTester/RNTesterNavigationReducer.uwp.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import RNTesterList from './RNTesterList.uwp';
-import {RNTesterAction} from './RNTesterActions';
+import {RNTesterAction} from './RNTesterActions.uwp';
 
 interface IRNTesterNavigationState {
   openExample?: string;

vnext/tsconfig.json

@@ -4,15 +4,17 @@
     "target": "es6",
     "module": "commonjs",
     "jsx": "react",
-    "outDir": "lib",
+    "outDir": ".",
     "declaration": true,
     "sourceMap": true,
     "experimentalDecorators": true,
     "noEmitOnError": true,
     "skipLibCheck": true,
     "moduleResolution": "node",
     "noUnusedLocals": true,
-    "strict": true
+    "strict": true,
+    "rootDir": "src"
   },
+  "include": ["src"],
   "exclude": ["node_modules", "dist", "lib"]
-}
+}