Merge pull request #13020 from ficristo/npm-thirdparty

Add a post install 'cleanup' for thirdparty dependencies

Author: zaggino

.gitignore

@@ -10,6 +10,9 @@ Thumbs.db
 # ignore node_modules inside src
 /src/node_modules
 
+#ignore file copied from node_modules to src/thirdparty
+/src/thirdparty/CodeMirror
+
 # ignore compiled files
 /dist
 /src/.index.html

Gruntfile.js

@@ -65,8 +65,6 @@ module.exports = function (grunt) {
                         cwd: 'src/',
                         src: [
                             'nls/{,*/}*.js',
-                            'package.json',
-                            'npm-shrinkwrap.json',
                             'xorigin.js',
                             'dependencies.js',
                             'thirdparty/requirejs/require.js',
@@ -105,13 +103,7 @@ module.exports = function (grunt) {
                             '!extensions/default/*/thirdparty/**/*.htm{,l}',
                             'extensions/dev/*',
                             'extensions/samples/**/*',
-                            'thirdparty/CodeMirror/addon/{,*/}*',
-                            'thirdparty/CodeMirror/keymap/{,*/}*',
-                            'thirdparty/CodeMirror/lib/{,*/}*',
-                            'thirdparty/CodeMirror/mode/{,*/}*',
-                            '!thirdparty/CodeMirror/mode/**/*.html',
-                            '!thirdparty/CodeMirror/**/*test.js',
-                            'thirdparty/CodeMirror/theme/{,*/}*',
+                            'thirdparty/CodeMirror/**',
                             'thirdparty/i18n/*.js',
                             'thirdparty/text/*.js'
                         ]
@@ -124,6 +116,22 @@ module.exports = function (grunt) {
                         src: ['jsTreeTheme.css', 'fonts/{,*/}*.*', 'images/*', 'brackets.min.css*']
                     }
                 ]
+            },
+            thirdparty: {
+                files: [
+                    {
+                        expand: true,
+                        dest: 'src/thirdparty/CodeMirror',
+                        cwd: 'src/node_modules/codemirror',
+                        src: [
+                            'addon/{,*/}*',
+                            'keymap/{,*/}*',
+                            'lib/{,*/}*',
+                            'mode/{,*/}*',
+                            'theme/{,*/}*',
+                        ]
+                    }
+                ]
             }
         },
         cleanempty: {
@@ -295,19 +303,7 @@ 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"
-                            }
-                        ]
+                        }
                     }
                 }
             }
@@ -355,7 +351,7 @@ module.exports = function (grunt) {
         'concat',
         /*'cssmin',*/
         /*'uglify',*/
-        'copy',
+        'copy:dist',
         'npm-install',
         'cleanempty',
         'usemin',

npm-shrinkwrap.json

@@ -12,6 +12,11 @@
         "branch": "",
         "SHA": ""
     },
+    "dependencies": {
+        "anymatch": "1.3.0",
+        "chokidar": "1.6.0",
+        "lodash": "4.15.0"
+    },
     "devDependencies": {
         "glob": "7.0.6",
         "grunt": "0.4.5",

package.json

@@ -35,6 +35,11 @@
         "branch": "",
         "SHA": ""
     },
+    "dependencies": {
+        "anymatch": "1.3.0",
+        "chokidar": "1.6.0",
+        "lodash": "4.15.0"
+    },
     "devDependencies": {
         "glob": "7.0.6",
         "grunt": "0.4.5",