Restructure repo source files (#520)

Author: itoys

.github/CONTRIBUTING.md

@@ -25,7 +25,7 @@ There are currently 3 components to our extension: The extension running in the
 
 * To debug the code running in the same process as the react-native code, open up an instance of VS code running the extension on a react-native project. From this instance, open up the typescript file in the extension codebase that you wish to debug and add breakpoints. Now when you launch the react-native project, you should hit breakpoints in the extension code wrapper.
 
-* Currently the codebase is not configured for easy debugging of the debug adapter, and we plan significant changes in the near future. However, if you ensure that `out/debugger/nodeDebugLocation.json` contains a `nodeDebugPath` entry which points to the location of the node debug adapter extension (Run the extension normally and open up a react-native project to generate this file), then you can run `node --harmony --server=4712 out/debugger/nodeDebugWrapper.js` to start a standalone instance of the debug adapter (optionally with a debugger attached to it) and then inside a react-native project add `"debugServer": 4712` to the top-level launch.json to get it to use the standalone instance.
+* Currently the codebase is not configured for easy debugging of the debug adapter, and we plan significant changes in the near future. However, if you ensure that `debugger/nodeDebugLocation.json` contains a `nodeDebugPath` entry which points to the location of the node debug adapter extension (Run the extension normally and open up a react-native project to generate this file), then you can run `node --harmony --server=4712 debugger/nodeDebugWrapper.js` to start a standalone instance of the debug adapter (optionally with a debugger attached to it) and then inside a react-native project add `"debugServer": 4712` to the top-level launch.json to get it to use the standalone instance.
 
 
 ## Testing

.gitignore

@@ -1,9 +1,15 @@
 .DS_Store
 node_modules/
-out/
 .vscode-test/
 coverage/
 .idea
+out
+src/**/nodeDebugLocation.json
+
+# Compiled files
+src/**/*.js
+test/**/*.js
+**/*.js.map
 
 # Sample Application auto-generated files
 SampleApplication/.vscode/.react/debuggerWorker.js

.npmignore

@@ -1,8 +1,9 @@
 .DS_Store
 
 node_modules/
-src/
-test/
+src/**/*.ts
+src/**/*.js.map
+test
 .vscode-test/
 
 tools/

.vscode/launch.json

@@ -10,7 +10,9 @@
                 "--extensionDevelopmentPath=${workspaceRoot}"
             ],
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out",
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ],
             "preLaunchTask": "build"
         },
         {
@@ -22,7 +24,9 @@
                 "--extensionDevelopmentPath=${workspaceRoot}"
             ],
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out",
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ],
             "preLaunchTask": "quick-build"
         },
         {
@@ -38,7 +42,9 @@
                 "--server=4712"
             ], // Use "debugServer": "4712", on launch.json of the instance to debug
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out",
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ],
             "preLaunchTask": "quick-build"
         },
         {
@@ -54,7 +60,9 @@
                 "--server=4712"
             ], // Use "debugServer": "4712", on launch.json of the instance to debug
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out",
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ],
             "preLaunchTask": "build"
         },
         {
@@ -69,7 +77,9 @@
                 "--nolazy"
             ],
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/SampleApplication/.vscode/.react/"
+            "outFiles": [
+                "${workspaceRoot}/SampleApplication/.vscode/.react/**/*.js"
+            ]
         },
         {
             "name": "Sample - iOS App",
@@ -83,7 +93,9 @@
                 "--nolazy"
             ],
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/SampleApplication/.vscode/.react/"
+            "outFiles": [
+                "${workspaceRoot}/SampleApplication/.vscode/.react/**/*.js"
+            ]
         },
         {
             "name": "Sample - Android Extension",
@@ -97,7 +109,9 @@
                 "--nolazy"
             ],
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out/"
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ]
         },
         {
             "name": "Sample - iOS Extension",
@@ -111,7 +125,9 @@
                 "--nolazy"
             ],
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out/"
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ]
         },
         {
             "name": "Launch Tests",
@@ -120,33 +136,38 @@
             "runtimeExecutable": "${execPath}",
             "args": [
                 "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test"
+                "--extensionTestsPath=${workspaceRoot}/test"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out",
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ],
             "preLaunchTask": "build"
         },
         {
             "name": "Run mocha",
-            "type": "node2",
+            "type": "node",
+            "protocol": "inspector",
             "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
             "stopOnEntry": false,
             // Command line arguments passed to the program.
             "args": [
                 "--ui",
                 "tdd",
                 // "--grep", "patternToFilterTestsBy",
-                "out/test/debugger/**/*.test.js",
-                "out/test/common/**/*.test.js"
+                "test/debugger/**/*.test.js",
+                "test/common/**/*.test.js"
             ],
             "cwd": "${workspaceRoot}",
             "runtimeExecutable": null,
             "env": {
                 "NODE_ENV": "development"
             },
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out"
+            "outFiles": [
+                "${workspaceRoot}/src/**/*.js"
+            ],
+            "sourceMaps": true
         }
     ],
     "compounds": [

.vscode/settings.json

@@ -7,8 +7,12 @@
     "editor.tabSize": 4,
     "files.exclude": {
         "**/node_modules": true,
-        "**/out": true
+        "**/*.js": {
+            "when": "$(basename).ts"
+        },
+        "**/out": true,
+        "**/*.js.map": true
     }
 ,
 "typescript.tsdk": "./node_modules/typescript/lib"
-}
+}

.vscodeignore

@@ -3,9 +3,10 @@
 .vscode/**/*
 .vscode-test/**
 .gitignore
-src/**
 test/**
-out/test/**
+out/**
+src/**
+!src/**/*.js
 **/*.js.map
 SampleApplication/**
 tools/**

gulpfile.js

@@ -24,7 +24,6 @@ var executeCommand = GulpExtras.executeCommand;
 
 var srcPath = "src";
 var testPath = "test";
-var outPath = "out";
 
 var sources = [
     srcPath,
@@ -63,7 +62,9 @@ function build(callback) {
             includeContent: false,
             sourceRoot: "."
         }))
-        .pipe(gulp.dest(outPath));
+        .pipe(gulp.dest(function (file) {
+            return file.cwd;
+        }));
 }
 
 gulp.task("watch", ["build"], function (cb) {
@@ -104,7 +105,7 @@ function test() {
         console.log("\nTesting cases that don't match pattern: extensionContext");
     }
 
-    return gulp.src(["out/test/**/*.test.js", "!out/test/extension/**"])
+    return gulp.src(["test/**/*.test.js", "!test/extension/**"])
         .pipe(mocha({
             ui: "tdd",
             useColors: true,
@@ -116,7 +117,7 @@ function test() {
 gulp.task("test", ["build", "tslint"], test);
 
 gulp.task('coverage:instrument', function () {
-    return gulp.src(["out/**/*.js", "!out/test/**"])
+    return gulp.src(["src/**/*.js", "!test/**"])
         .pipe(istanbul({
             // Use the isparta instrumenter (code coverage for ES6)
             instrumenter: isparta.Instrumenter,
@@ -128,7 +129,7 @@ gulp.task('coverage:instrument', function () {
 
 gulp.task('coverage:report', function (done) {
     return gulp.src(
-        ["out/**/*.js", "!out/test/**"],
+        ["src/**/*.js", "!test/**"],
         { read: false }
     )
         .pipe(istanbul.writeReports({
@@ -167,7 +168,7 @@ gulp.task("check-copyright", function (cb) {
         "!**/*.d.ts",
         "!coverage/**",
         "!node_modules/**",
-        "!out/test/**/*.js",
+        "!test/**/*.js",
         "!SampleApplication/**",
         "!test/resources/sampleReactNative022Project/**/*.js",
     ])
@@ -181,11 +182,14 @@ gulp.task("watch-build-test", ["build", "build-test"], function () {
 gulp.task("clean", function () {
     var del = require("del");
     var pathsToDelete = [
-        outPath,
-        ".vscode-test"
-    ].map(function (folder) {
-        return folder + "/**";
-    });
+        "src/**/*.js",
+        "src/**/*.js.map",
+        "test/**/*.js",
+        "test/**/*.js.map",
+        "out/",
+        "!test/resources/sampleReactNative022Project/**/*.js",
+        ".vscode-test/",
+    ]
     return del(pathsToDelete, { force: true });
 });
 

package.json

@@ -26,7 +26,7 @@
   "activationEvents": [
     "*"
   ],
-  "main": "./out/extension/rn-extension",
+  "main": "./src/extension/rn-extension",
   "contributes": {
     "commands": [
       {
@@ -70,7 +70,7 @@
       {
         "type": "reactnative",
         "label": "React Native",
-        "program": "./out/debugger/reactNativeDebugEntryPoint.js",
+        "program": "./src/debugger/reactNativeDebugEntryPoint.js",
         "runtime": "node",
         "enableBreakpointsFor": {
           "languageIds": [

scripts/atom

@@ -19,4 +19,4 @@ if (process.argv.length < 3) {
     process.exit(1);
 }
 
-require("../out/extension/openFileAtLocation");
+require("../src/extension/openFileAtLocation");

test/debugger/sourceMapsCombinator.test.ts

@@ -26,7 +26,7 @@ suite("sourceMapsCombinator", function () {
             const pathToTS = "d:/hello.ts";
             const sourcemapPath = "d:/hello.js.map";
             const codeJS = fs.readFileSync(path.resolve(__dirname, "assets/hello.js"));
-            const codeTS = fs.readFileSync(path.resolve(__dirname, "../../../test/debugger/assets/hello.ts"));
+            const codeTS = fs.readFileSync(path.resolve(__dirname, "assets/hello.ts"));
             const sourcemap: RawSourceMap = {
                 "version": 3,
                 "sources": [

test/resources/reactNative022.ts

@@ -16,9 +16,8 @@ import {Recording, Simulator} from "./processExecution/simulator";
 import {AdbSimulator} from "./simulators/adbSimulator";
 import {APKSerializer} from "./simulators/apkSerializer";
 
-const resourcesPath = path.join(__dirname, "../../../test/resources/");
-const sampleRNProjectPath = path.join(resourcesPath, "sampleReactNative022Project");
-const processExecutionsRecordingsPath = path.join(resourcesPath, "processExecutionsRecordings");
+const sampleRNProjectPath = path.join(__dirname, "sampleReactNative022Project");
+const processExecutionsRecordingsPath = path.join(__dirname, "processExecutionsRecordings");
 
 export type IReactNative = reactNative.IReactNative;
 

test/resources/recordingsHelper.ts

@@ -4,7 +4,7 @@
 import * as fs from "fs";
 import * as path from "path";
 
-const RECORDINGS_ROOT = path.resolve(__dirname, "../../../test/resources/", "processExecutionsRecordings");
+const RECORDINGS_ROOT = path.resolve(__dirname, "processExecutionsRecordings");
 
 interface TestUsingRecording {
     (expectation: string, recordingNames: string[], assertion?: () => void): Mocha.ITest;

tsconfig.json

@@ -6,7 +6,6 @@
         "lib": [
             "es2015"
         ],
-        "outDir": "out",
         "rootDir": "./",
         "sourceMap": true,
         "removeComments": false,