From 59b55794a7ffa387aa649337e4e83c7e4487f69e Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Fri, 8 Jan 2016 15:44:43 -0800 Subject: [PATCH] docs(style-guide): repair missing JSON examples --- .../docs/_examples/styleguide/package.1.json | 25 +++++++++++++++++++ .../_includes/styleguide/_code-examples.jade | 16 ++++++------ 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 public/docs/_examples/styleguide/package.1.json diff --git a/public/docs/_examples/styleguide/package.1.json b/public/docs/_examples/styleguide/package.1.json new file mode 100644 index 0000000000..a40459f717 --- /dev/null +++ b/public/docs/_examples/styleguide/package.1.json @@ -0,0 +1,25 @@ +{ + "name": "angular2-quickstart", + "version": "1.0.0", + "scripts": { + "tsc": "tsc", + "tsc:w": "tsc -w", + "lite": "lite-server", + "start": "concurrent \"npm run tsc:w\" \"npm run lite\" " + }, + "license": "ISC", + "dependencies": { + "angular2": "2.0.0-beta.0", + "systemjs": "0.19.6", + "es6-promise": "^3.0.2", + "es6-shim": "^0.33.3", + "reflect-metadata": "0.1.2", + "rxjs": "5.0.0-beta.0", + "zone.js": "0.5.10" + }, + "devDependencies": { + "concurrently": "^1.0.0", + "lite-server": "^1.3.1", + "typescript": "^1.7.3" + } +} diff --git a/public/docs/_includes/styleguide/_code-examples.jade b/public/docs/_includes/styleguide/_code-examples.jade index d84651cb4c..ab2f5d250d 100644 --- a/public/docs/_includes/styleguide/_code-examples.jade +++ b/public/docs/_includes/styleguide/_code-examples.jade @@ -270,36 +270,36 @@ include ../../../_includes/_util-fns #### Example: - code-example(format="linenums" language="js"). + code-example(format="" language="js"). +makeJson('styleguide/package.json', null, "Entire package.json file") - +makeJson('styleguide/package.json', null, "Entire package.json file") + +makeJson('styleguide/package.1.json', null, "Entire package.json file") :marked A subset of the '.json' file can also be selected. - code-example(format="linenums" language="js"). + code-example(format="" language="js"). +makeJson('styleguide/package.json', { paths: 'version, scripts.tsc, scripts.start '}, "Selected parts of the package.json file" ) - +makeJson('styleguide/package.json', { paths: 'version, scripts.tsc, scripts.start '}, "Selected parts of the package.json file" ) + +makeJson('styleguide/package.1.json', { paths: 'version, scripts.tsc, scripts.start '}, "Selected parts of the package.json file" ) :marked Styling selected portions of the json is also supported. - code-example(format="linenums" language="js"). + code-example(format="" language="js"). +makeJson('styleguide/package.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]}) - +makeJson('styleguide/package.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]}) + +makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]}) :marked As well as styling across multiple lines. - code-example(format="linenums" language="js"). + code-example(format="" language="js"). - var styles = { pnk: /(^.*dependencies[\s\S]* \})/gm }; +makeJson('styleguide/package.json', {paths: 'name, version, dependencies '}, "Foo", styles ) - var styles = { pnk: /(^.*dependencies[\s\S]* \})/gm }; - +makeJson('styleguide/package.json', {paths: 'name, version, dependencies '}, "Foo", styles ) + +makeJson('styleguide/package.1.json', {paths: 'name, version, dependencies '}, "Foo", styles ) :marked ### Inline code and code examples provided directly i.e. not from an example file.