Merge pull request #12972 from ficristo/npm-src

zaggino · web-flow · commit f7d4e354a122 · 2016-12-13T09:40:50.000+11:00
Move npm dependencies inside src and add CodeMirror to them
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,9 @@ Thumbs.db
 /node_modules
 /npm-debug.log
 
+# ignore node_modules inside src
+/src/node_modules
+
 # ignore compiled files
 /dist
 /src/.index.html
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/thirdparty/CodeMirror"]
-	path = src/thirdparty/CodeMirror
-	url = https://github.com/adobe/CodeMirror2.git
 [submodule "src/thirdparty/path-utils"]
 	path = src/thirdparty/path-utils
 	url = https://github.com/jblas/path-utils.git
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -65,6 +65,8 @@ module.exports = function (grunt) {
                         cwd: 'src/',
                         src: [
                             'nls/{,*/}*.js',
+                            'package.json',
+                            'npm-shrinkwrap.json',
                             'xorigin.js',
                             'dependencies.js',
                             'thirdparty/requirejs/require.js',
@@ -278,11 +280,6 @@ module.exports = function (grunt) {
                 vendor : [
                     'test/polyfills.js', /* For reference to why this polyfill is needed see Issue #7951. The need for this should go away once the version of phantomjs gets upgraded to 2.0 */
                     'src/thirdparty/jquery-2.1.3.min.js',
-                    'src/thirdparty/CodeMirror/lib/codemirror.js',
-                    'src/thirdparty/CodeMirror/lib/util/dialog.js',
-                    'src/thirdparty/CodeMirror/lib/util/searchcursor.js',
-                    'src/thirdparty/CodeMirror/addon/edit/closetag.js',
-                    'src/thirdparty/CodeMirror/addon/selection/active-line.js',
                     'src/thirdparty/less-2.5.1.min.js'
                 ],
                 helpers : [
@@ -298,7 +295,19 @@ module.exports = function (grunt) {
                             'spec' : '../test/spec',
                             'text' : 'thirdparty/text/text',
                             'i18n' : 'thirdparty/i18n/i18n'
-                        }
+                        },
+                        map: {
+                            "*": {
+                                "thirdparty/CodeMirror2": "thirdparty/CodeMirror"
+                            }
+                        },
+                        packages: [
+                            {
+                                name: "thirdparty/CodeMirror",
+                                location: "node_modules/codemirror",
+                                main: "lib/codemirror"
+                            }
+                        ]
                     }
                 }
             }
@@ -323,7 +332,7 @@ module.exports = function (grunt) {
     });
 
     // task: install
-    grunt.registerTask('install', ['write-config', 'less', 'npm-install-extensions']);
+    grunt.registerTask('install', ['write-config', 'less', 'npm-install-source']);
 
     // task: test
     grunt.registerTask('test', ['eslint', 'jasmine', 'nls-check']);
diff --git a/package.json b/package.json
@@ -12,11 +12,6 @@
         "branch": "",
         "SHA": ""
     },
-    "dependencies": {
-        "anymatch": "1.3.0",
-        "chokidar": "1.6.0",
-        "lodash": "4.15.0"
-    },
     "devDependencies": {
         "glob": "7.0.6",
         "grunt": "0.4.5",
diff --git a/src/config.json b/src/config.json
@@ -35,11 +35,6 @@
         "branch": "",
         "SHA": ""
     },
-    "dependencies": {
-        "anymatch": "1.3.0",
-        "chokidar": "1.6.0",
-        "lodash": "4.15.0"
-    },
     "devDependencies": {
         "glob": "7.0.6",
         "grunt": "0.4.5",
diff --git a/src/index.html b/src/index.html
@@ -34,7 +34,7 @@
     <!-- Warn about failed cross origin requests in Chrome -->
     <script type="application/javascript" src="xorigin.js"></script>
 
-    <link rel="stylesheet" type="text/css" href="thirdparty/CodeMirror/lib/codemirror.css">
+    <link rel="stylesheet" type="text/css" href="node_modules/codemirror/lib/codemirror.css">
     <!--(if target dev)><!-->
     <link rel="stylesheet/less" type="text/css" href="styles/brackets.less">
     <!--<!(endif)-->
diff --git a/src/main.js b/src/main.js
@@ -38,9 +38,16 @@ require.config({
     map: {
         "*": {
             "thirdparty/CodeMirror2": "thirdparty/CodeMirror",
-            "thirdparty/react":	"react"
+            "thirdparty/react":       "react"
         }
-    }
+    },
+    packages: [
+        {
+            name: "thirdparty/CodeMirror",
+            location: "node_modules/codemirror",
+            main: "lib/codemirror"
+        }
+    ]
 });
 
 if (window.location.search.indexOf("testEnvironment") > -1) {
diff --git a/src/npm-shrinkwrap.json b/src/npm-shrinkwrap.json
diff --git a/src/package.json b/src/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "brackets-src",
+  "dependencies": {
+    "anymatch": "1.3.0",
+    "chokidar": "1.6.0",
+    "codemirror": "5.21.0",
+    "lodash": "4.15.0"
+  }
+}
diff --git a/src/thirdparty/CodeMirror b/src/thirdparty/CodeMirror
diff --git a/tasks/npm-install.js b/tasks/npm-install.js
@@ -47,19 +47,18 @@ module.exports = function (grunt) {
     }
 
     grunt.registerTask("npm-install", "Install node_modules to the dist folder so it gets bundled with release", function () {
-        var npmShrinkwrapJSON = grunt.file.readJSON("npm-shrinkwrap.json");
-        common.writeJSON(grunt, "dist/npm-shrinkwrap.json", npmShrinkwrapJSON);
-
-        var packageJSON = grunt.file.readJSON("package.json");
-        delete packageJSON.devDependencies;
-        delete packageJSON.scripts; // we don't want to run post-install scripts in dist folder
-        common.writeJSON(grunt, "dist/package.json", packageJSON);
-
         var done = this.async();
         runNpmInstall("dist", function (err) {
             return err ? done(false) : done();
         });
     });
+
+    grunt.registerTask("npm-install-src", "Install node_modules to the src folder", function () {
+        var done = this.async();
+        runNpmInstall("src", function (err) {
+            return err ? done(false) : done();
+        });
+    });
     
     grunt.registerTask("npm-install-extensions", "Install node_modules for default extensions which have package.json defined", function () {
         var _done = this.async();
@@ -80,4 +79,10 @@ module.exports = function (grunt) {
         });
     });
 
+    grunt.registerTask(
+        "npm-install-source",
+        "Install node_modules for src folder and default extensions which have package.json defined",
+        ["npm-install-src", "npm-install-extensions"]
+    );
+
 };
diff --git a/test/SpecRunner.js b/test/SpecRunner.js
@@ -38,9 +38,17 @@ require.config({
     },
     map: {
         "*": {
-            "thirdparty/react":	"react"
+            "thirdparty/CodeMirror2": "thirdparty/CodeMirror",
+            "thirdparty/react":       "react"
         }
-    }
+    },
+    packages: [
+        {
+            name: "thirdparty/CodeMirror",
+            location: "node_modules/codemirror",
+            main: "lib/codemirror"
+        }
+    ]
 });
 
 define(function (require, exports, module) {
