From c9f3f6a7dda587809733dd4e096cc03858aa11b3 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 12 Jul 2017 16:24:15 -0700 Subject: [PATCH 1/2] Update examples script to print messages and move docs/blog examples to folder outside of website --- .../2016-03-11-blog-post.md | 0 .../2017-04-10-blog-post-two.md | 0 .../en/doc1.md | 0 .../en/doc2.md | 0 .../en/doc3.md | 0 .../en/exampledoc4.md | 0 .../en/exampledoc5.md | 0 lib/copy-examples.js | 30 +++++++++++++++---- 8 files changed, 25 insertions(+), 5 deletions(-) rename examples/{example-blog => blog-examples}/2016-03-11-blog-post.md (100%) rename examples/{example-blog => blog-examples}/2017-04-10-blog-post-two.md (100%) rename examples/{example-docs => docs-examples}/en/doc1.md (100%) rename examples/{example-docs => docs-examples}/en/doc2.md (100%) rename examples/{example-docs => docs-examples}/en/doc3.md (100%) rename examples/{example-docs => docs-examples}/en/exampledoc4.md (100%) rename examples/{example-docs => docs-examples}/en/exampledoc5.md (100%) diff --git a/examples/example-blog/2016-03-11-blog-post.md b/examples/blog-examples/2016-03-11-blog-post.md similarity index 100% rename from examples/example-blog/2016-03-11-blog-post.md rename to examples/blog-examples/2016-03-11-blog-post.md diff --git a/examples/example-blog/2017-04-10-blog-post-two.md b/examples/blog-examples/2017-04-10-blog-post-two.md similarity index 100% rename from examples/example-blog/2017-04-10-blog-post-two.md rename to examples/blog-examples/2017-04-10-blog-post-two.md diff --git a/examples/example-docs/en/doc1.md b/examples/docs-examples/en/doc1.md similarity index 100% rename from examples/example-docs/en/doc1.md rename to examples/docs-examples/en/doc1.md diff --git a/examples/example-docs/en/doc2.md b/examples/docs-examples/en/doc2.md similarity index 100% rename from examples/example-docs/en/doc2.md rename to examples/docs-examples/en/doc2.md diff --git a/examples/example-docs/en/doc3.md b/examples/docs-examples/en/doc3.md similarity index 100% rename from examples/example-docs/en/doc3.md rename to examples/docs-examples/en/doc3.md diff --git a/examples/example-docs/en/exampledoc4.md b/examples/docs-examples/en/exampledoc4.md similarity index 100% rename from examples/example-docs/en/exampledoc4.md rename to examples/docs-examples/en/exampledoc4.md diff --git a/examples/example-docs/en/exampledoc5.md b/examples/docs-examples/en/exampledoc5.md similarity index 100% rename from examples/example-docs/en/exampledoc5.md rename to examples/docs-examples/en/exampledoc5.md diff --git a/lib/copy-examples.js b/lib/copy-examples.js index d4f7f2fd15..fe8ebcc1b7 100644 --- a/lib/copy-examples.js +++ b/lib/copy-examples.js @@ -11,11 +11,31 @@ const CWD = process.cwd(); const fs = require("fs-extra"); +const path = require("path"); +const glob = require("glob"); +let examplesFolder = "examples"; if (process.argv.indexOf("translations") !== -1) { - fs.copySync(__dirname + "/../examples-translations/", CWD, { - overwrite: false - }); -} else { - fs.copySync(__dirname + "/../examples/", CWD, { overwrite: false }); + examplesFolder = "examples-translations"; } +const files = glob.sync(path.join(__dirname, "..", examplesFolder, "**")); +files.forEach(file => { + if (!fs.lstatSync(file).isDirectory()) { + let target = CWD; + if (file.includes("-examples")) { + target = path.join(CWD, ".."); + } + let fileName = file.substring(file.indexOf(examplesFolder) + examplesFolder.length); + try { + fs.copySync(file, path.join(target, fileName), { + overwrite: false, + errorOnExist: true + }); + console.log(fileName + " created in " + path.basename(target)); + } catch (e) { + console.log( + fileName + " already exists in " + path.basename(target) + ); + } + } +}); From 6dd70c67f658b226c4c05c74976f4c14b7ffaafe Mon Sep 17 00:00:00 2001 From: Frank Li Date: Mon, 17 Jul 2017 16:36:20 -0700 Subject: [PATCH 2/2] Update message when file to copy already exists --- lib/copy-examples.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/copy-examples.js b/lib/copy-examples.js index fe8ebcc1b7..88141ed8fd 100644 --- a/lib/copy-examples.js +++ b/lib/copy-examples.js @@ -25,7 +25,9 @@ files.forEach(file => { if (file.includes("-examples")) { target = path.join(CWD, ".."); } - let fileName = file.substring(file.indexOf(examplesFolder) + examplesFolder.length); + let fileName = file.substring( + file.indexOf(examplesFolder) + examplesFolder.length + ); try { fs.copySync(file, path.join(target, fileName), { overwrite: false, @@ -34,7 +36,10 @@ files.forEach(file => { console.log(fileName + " created in " + path.basename(target)); } catch (e) { console.log( - fileName + " already exists in " + path.basename(target) + fileName + + " already exists in " + + path.basename(target) + + ". Remove or rename the file to regenerate this example file." ); } }