From 433bc6d874d684c5184ad286709d733da5b7587d Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 13:33:09 -0700 Subject: [PATCH 1/8] baseline from Paul's changes --- script/lib/include-path-in-packaged-app.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index 71daaa0bd..ab516d0e2 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -47,6 +47,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.join('build', 'Release', 'obj.target')), escapeRegExp(path.join('build', 'Release', 'obj')), escapeRegExp(path.join('build', 'Release', '.deps')), + escapeRegExp(path.join('deps', 'libgit2')), escapeRegExp(path.join('vendor', 'apm')), // These are only required in dev-mode, when pegjs grammars aren't precompiled @@ -54,7 +55,6 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.join('node_modules', 'pegjs')), escapeRegExp(path.join('node_modules', '.bin', 'pegjs')), escapeRegExp(path.join('node_modules', 'spellchecker', 'vendor', 'hunspell') + path.sep) + '.*', - escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.pdb', // Ignore *.cc and *.h files from native modules escapeRegExp(path.sep) + '.+\\.(cc|h)$', @@ -64,11 +64,18 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.sep) + '.+\\.target.mk$', escapeRegExp(path.sep) + 'linker\\.lock$', escapeRegExp(path.join('build', 'Release') + path.sep) + '.+\\.node\\.dSYM', + escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.(pdb|lib|exp|map|ipdb|iobj)', // Ignore test and example folders 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + '_*te?sts?_*' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep) -] + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'spec' + escapeRegExp(path.sep), + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'docs' + escapeRegExp(path.sep), + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep), + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'samples?' + escapeRegExp(path.sep), + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' + ] // Ignore spec directories in all bundled packages for (let packageName in CONFIG.appMetadata.packageDependencies) { From d42326ea09963cd92fb617a101b79ee08360d7da Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 14:00:26 -0700 Subject: [PATCH 2/8] first guess --- script/lib/include-path-in-packaged-app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index ab516d0e2..e98a0fce0 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -64,7 +64,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.sep) + '.+\\.target.mk$', escapeRegExp(path.sep) + 'linker\\.lock$', escapeRegExp(path.join('build', 'Release') + path.sep) + '.+\\.node\\.dSYM', - escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.(pdb|lib|exp|map|ipdb|iobj)', +// escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.(pdb|lib|exp|map|ipdb|iobj)', // Ignore test and example folders 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + '_*te?sts?_*' + escapeRegExp(path.sep), From a0ebc21893f10f6dad2008c18eaf490b568d8d59 Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 14:11:31 -0700 Subject: [PATCH 3/8] indentation fix for linter --- script/lib/include-path-in-packaged-app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index e98a0fce0..48ae5256c 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -75,7 +75,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' - ] +] // Ignore spec directories in all bundled packages for (let packageName in CONFIG.appMetadata.packageDependencies) { From c4d4ef0209a7fe2ef6cfba9274813dab46c4840a Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 14:48:51 -0700 Subject: [PATCH 4/8] next guess --- script/lib/include-path-in-packaged-app.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index 48ae5256c..916186a9c 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -64,7 +64,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.sep) + '.+\\.target.mk$', escapeRegExp(path.sep) + 'linker\\.lock$', escapeRegExp(path.join('build', 'Release') + path.sep) + '.+\\.node\\.dSYM', -// escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.(pdb|lib|exp|map|ipdb|iobj)', + escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.(pdb|lib|exp|map|ipdb|iobj)', // Ignore test and example folders 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + '_*te?sts?_*' + escapeRegExp(path.sep), @@ -72,9 +72,9 @@ const EXCLUDE_REGEXPS_SOURCES = [ 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'docs' + escapeRegExp(path.sep), 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep), 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'samples?' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', - 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', - 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' + // 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', + // 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', + // 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' ] // Ignore spec directories in all bundled packages From c7dcbeb0dacc42899c6e3ec3551ea9669bc445d7 Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 15:03:39 -0700 Subject: [PATCH 5/8] put libgit2 back --- script/lib/include-path-in-packaged-app.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index 916186a9c..801a19855 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -47,7 +47,6 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.join('build', 'Release', 'obj.target')), escapeRegExp(path.join('build', 'Release', 'obj')), escapeRegExp(path.join('build', 'Release', '.deps')), - escapeRegExp(path.join('deps', 'libgit2')), escapeRegExp(path.join('vendor', 'apm')), // These are only required in dev-mode, when pegjs grammars aren't precompiled @@ -72,9 +71,9 @@ const EXCLUDE_REGEXPS_SOURCES = [ 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'docs' + escapeRegExp(path.sep), 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep), 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'samples?' + escapeRegExp(path.sep), - // 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', - // 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', - // 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' ] // Ignore spec directories in all bundled packages From 9eca8ff4aa1f60f5d02a912da0f72b4e083662a8 Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 15:30:51 -0700 Subject: [PATCH 6/8] even more conservative --- script/lib/include-path-in-packaged-app.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index 801a19855..bd82ef196 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -70,10 +70,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'spec' + escapeRegExp(path.sep), 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'docs' + escapeRegExp(path.sep), 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'samples?' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', - 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', - 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'samples?' + escapeRegExp(path.sep) ] // Ignore spec directories in all bundled packages From 09e98fe9448987be643650ba6f35b18b9c781f32 Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 15:52:11 -0700 Subject: [PATCH 7/8] just libs and debugger files --- script/lib/include-path-in-packaged-app.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index bd82ef196..fc9f9241a 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -67,10 +67,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ // Ignore test and example folders 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + '_*te?sts?_*' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'spec' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'docs' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'samples?' + escapeRegExp(path.sep) + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep) ] // Ignore spec directories in all bundled packages From b18ca74e498c4e9e6d6e1eaf9ca9e91152e18620 Mon Sep 17 00:00:00 2001 From: Ian Olsen Date: Tue, 29 Aug 2017 16:29:45 -0700 Subject: [PATCH 8/8] put everything else back --- script/lib/include-path-in-packaged-app.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js index fc9f9241a..1705c3457 100644 --- a/script/lib/include-path-in-packaged-app.js +++ b/script/lib/include-path-in-packaged-app.js @@ -47,6 +47,7 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.join('build', 'Release', 'obj.target')), escapeRegExp(path.join('build', 'Release', 'obj')), escapeRegExp(path.join('build', 'Release', '.deps')), + escapeRegExp(path.join('deps', 'libgit2')), escapeRegExp(path.join('vendor', 'apm')), // These are only required in dev-mode, when pegjs grammars aren't precompiled @@ -65,9 +66,12 @@ const EXCLUDE_REGEXPS_SOURCES = [ escapeRegExp(path.join('build', 'Release') + path.sep) + '.+\\.node\\.dSYM', escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.(pdb|lib|exp|map|ipdb|iobj)', - // Ignore test and example folders + // Ignore node_module files we won't need at runtime 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + '_*te?sts?_*' + escapeRegExp(path.sep), - 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep) + 'node_modules' + escapeRegExp(path.sep) + '.*' + escapeRegExp(path.sep) + 'examples?' + escapeRegExp(path.sep), + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.md$', + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.d\\.ts$', + 'node_modules' + escapeRegExp(path.sep) + '.*' + '\\.js\\.map$' ] // Ignore spec directories in all bundled packages