diff --git a/packages/cli/bin/inquiries/starterkit.js b/packages/cli/bin/inquiries/starterkit.js index 523eb64bc..945649973 100644 --- a/packages/cli/bin/inquiries/starterkit.js +++ b/packages/cli/bin/inquiries/starterkit.js @@ -10,8 +10,7 @@ const starterkitSetup = [ message: 'What initial patterns do you want included in your project?', choices: [ { - name: - 'Handlebars base patterns (some basic patterns to get started with)', + name: 'Handlebars base patterns (some basic patterns to get started with)', value: '@pattern-lab/starterkit-handlebars-vanilla', }, { diff --git a/packages/core/test/buildListItems_tests.js b/packages/core/test/buildListItems_tests.js index 10e5ee22f..720e4a604 100644 --- a/packages/core/test/buildListItems_tests.js +++ b/packages/core/test/buildListItems_tests.js @@ -21,7 +21,7 @@ tap.test( 'buildlistItems transforms container of listItems with one value', (test) => { // do this to avoid the shuffling for now - const container = Object.assign({}, { listitems: { '1': listItems['1'] } }); + const container = Object.assign({}, { listitems: { 1: listItems['1'] } }); buildlistItems(container); test.same(container.listitems, { 'listItems-one': [ diff --git a/packages/core/test/files/_handlebars-test-patterns/atoms/global/helloworld-withdata.hbs b/packages/core/test/files/_handlebars-test-patterns/atoms/global/helloworld-withdata.hbs index 3cfaf83c0..30c6ff45a 100644 --- a/packages/core/test/files/_handlebars-test-patterns/atoms/global/helloworld-withdata.hbs +++ b/packages/core/test/files/_handlebars-test-patterns/atoms/global/helloworld-withdata.hbs @@ -1,2 +1,2 @@ Hello world! -{{ subtitle }} +{{subtitle}} diff --git a/packages/core/test/lineage_hunter_tests.js b/packages/core/test/lineage_hunter_tests.js index 3ac79646a..8ede3683b 100644 --- a/packages/core/test/lineage_hunter_tests.js +++ b/packages/core/test/lineage_hunter_tests.js @@ -413,9 +413,8 @@ tap.test( 'molecules-error' ); - var currentPatternLineageIndex = patternlab.graph.lineageIndex( - currentPattern - ); + var currentPatternLineageIndex = + patternlab.graph.lineageIndex(currentPattern); test.equal(currentPatternLineageIndex.length, 1); test.equal(currentPatternLineageIndex[0], 'atoms-error'); diff --git a/packages/core/test/pattern_engines_tests.js b/packages/core/test/pattern_engines_tests.js index 9036984b2..3a1e78f1f 100644 --- a/packages/core/test/pattern_engines_tests.js +++ b/packages/core/test/pattern_engines_tests.js @@ -28,9 +28,8 @@ var engineNames = Object.keys(patternEngines); tap.test( 'getEngineNameForPattern returns "mustache" from test pattern', function (test) { - var engineName = patternEngines.getEngineNameForPattern( - mustacheTestPattern - ); + var engineName = + patternEngines.getEngineNameForPattern(mustacheTestPattern); test.equal(engineName, 'mustache'); test.end(); } diff --git a/packages/core/test/pseudopattern_hunter_tests.js b/packages/core/test/pseudopattern_hunter_tests.js index f37b60363..9c5bf40c1 100644 --- a/packages/core/test/pseudopattern_hunter_tests.js +++ b/packages/core/test/pseudopattern_hunter_tests.js @@ -96,12 +96,10 @@ tap.test( 'utf8' ); atomPattern.extendedTemplate = atomPattern.template; - atomPattern.stylePartials = atomPattern.findPartialsWithStyleModifiers( - atomPattern - ); - atomPattern.parameteredPartials = atomPattern.findPartialsWithPatternParameters( - atomPattern - ); + atomPattern.stylePartials = + atomPattern.findPartialsWithStyleModifiers(atomPattern); + atomPattern.parameteredPartials = + atomPattern.findPartialsWithPatternParameters(atomPattern); var pseudoPattern = new Pattern('test/pseudomodifier.mustache'); pseudoPattern.template = fs.readFileSync( @@ -109,12 +107,10 @@ tap.test( 'utf8' ); pseudoPattern.extendedTemplate = atomPattern.template; - pseudoPattern.stylePartials = pseudoPattern.findPartialsWithStyleModifiers( - pseudoPattern - ); - pseudoPattern.parameteredPartials = pseudoPattern.findPartialsWithPatternParameters( - pseudoPattern - ); + pseudoPattern.stylePartials = + pseudoPattern.findPartialsWithStyleModifiers(pseudoPattern); + pseudoPattern.parameteredPartials = + pseudoPattern.findPartialsWithPatternParameters(pseudoPattern); addPattern(atomPattern, pl); addPattern(pseudoPattern, pl); diff --git a/packages/development-edition-engine-react/source/_meta/_head.hbs b/packages/development-edition-engine-react/source/_meta/_head.hbs index b1f5c1ce0..578f7cb71 100644 --- a/packages/development-edition-engine-react/source/_meta/_head.hbs +++ b/packages/development-edition-engine-react/source/_meta/_head.hbs @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/development-edition-engine-react/source/_meta/_head.html b/packages/development-edition-engine-react/source/_meta/_head.html index 56d9a2432..9e3094352 100644 --- a/packages/development-edition-engine-react/source/_meta/_head.html +++ b/packages/development-edition-engine-react/source/_meta/_head.html @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/development-edition-engine-react/source/_meta/_head.mustache b/packages/development-edition-engine-react/source/_meta/_head.mustache index 069727248..56dd6bf55 100644 --- a/packages/development-edition-engine-react/source/_meta/_head.mustache +++ b/packages/development-edition-engine-react/source/_meta/_head.mustache @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/docs/src/docs/advanced-config-options.md b/packages/docs/src/docs/advanced-config-options.md index 505028b22..2572fe84b 100644 --- a/packages/docs/src/docs/advanced-config-options.md +++ b/packages/docs/src/docs/advanced-config-options.md @@ -326,8 +326,6 @@ Prevent specific filetypes being copied from your `source` to your `public` fold ] ``` -These template and page patterns would still be accessible via navigation. - **default**: `[]` ## uikits diff --git a/packages/edition-node-gulp/source/_meta/_head.mustache b/packages/edition-node-gulp/source/_meta/_head.mustache index 0001e7628..8cc7b5018 100644 --- a/packages/edition-node-gulp/source/_meta/_head.mustache +++ b/packages/edition-node-gulp/source/_meta/_head.mustache @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/edition-node/source/_meta/_head.mustache b/packages/edition-node/source/_meta/_head.mustache index 45ce3bb7d..13007d105 100644 --- a/packages/edition-node/source/_meta/_head.mustache +++ b/packages/edition-node/source/_meta/_head.mustache @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/edition-twig/source/_meta/_head.mustache b/packages/edition-twig/source/_meta/_head.mustache index 45ce3bb7d..13007d105 100644 --- a/packages/edition-twig/source/_meta/_head.mustache +++ b/packages/edition-twig/source/_meta/_head.mustache @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/edition-twig/source/_meta/_head.twig b/packages/edition-twig/source/_meta/_head.twig index 3891e1793..d60cbdc12 100644 --- a/packages/edition-twig/source/_meta/_head.twig +++ b/packages/edition-twig/source/_meta/_head.twig @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-handlebars/_meta/_head.hbs b/packages/engine-handlebars/_meta/_head.hbs index b1f5c1ce0..578f7cb71 100644 --- a/packages/engine-handlebars/_meta/_head.hbs +++ b/packages/engine-handlebars/_meta/_head.hbs @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-handlebars/lib/engine_handlebars.js b/packages/engine-handlebars/lib/engine_handlebars.js index f3a3461c8..fdd6dbd14 100644 --- a/packages/engine-handlebars/lib/engine_handlebars.js +++ b/packages/engine-handlebars/lib/engine_handlebars.js @@ -29,7 +29,8 @@ const glob = require('glob'); // regexes, stored here so they're only compiled once const findPartialsRE = /{{#?>\s*([\w-\/.]+)(?:.|\s+)*?}}/g; -const findListItemsRE = /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g; +const findListItemsRE = + /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g; const findAtPartialBlockRE = /{{#?>\s*@partial-block\s*}}/g; function escapeAtPartialBlock(partialString) { diff --git a/packages/engine-liquid/_meta/_head.liquid b/packages/engine-liquid/_meta/_head.liquid index b1f5c1ce0..578f7cb71 100644 --- a/packages/engine-liquid/_meta/_head.liquid +++ b/packages/engine-liquid/_meta/_head.liquid @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-mustache/_meta/_head.mustache b/packages/engine-mustache/_meta/_head.mustache index 45ce3bb7d..13007d105 100644 --- a/packages/engine-mustache/_meta/_head.mustache +++ b/packages/engine-mustache/_meta/_head.mustache @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-nunjucks/_meta/_head.njk b/packages/engine-nunjucks/_meta/_head.njk index b69898755..0de971fd3 100644 --- a/packages/engine-nunjucks/_meta/_head.njk +++ b/packages/engine-nunjucks/_meta/_head.njk @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-nunjucks/lib/engine_nunjucks.js b/packages/engine-nunjucks/lib/engine_nunjucks.js index c4dffb0d8..5e3a909fb 100644 --- a/packages/engine-nunjucks/lib/engine_nunjucks.js +++ b/packages/engine-nunjucks/lib/engine_nunjucks.js @@ -37,9 +37,11 @@ const engine_nunjucks = { expandPartials: false, // regexes, stored here so they're only compiled once - findPartialsRE: /{%\s*(?:extends|include|import|from)\s+(?:'[^']+'|"[^"]+").*%}/g, + findPartialsRE: + /{%\s*(?:extends|include|import|from)\s+(?:'[^']+'|"[^"]+").*%}/g, findPartialKeyRE: /{%\s*(?:extends|include|import|from)\s+('[^']+'|"[^"]+")/, - findListItemsRE: /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // still requires mustache style syntax because of how PL implements lists + findListItemsRE: + /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // still requires mustache style syntax because of how PL implements lists // render it renderPattern: function renderPattern(pattern, data) { diff --git a/packages/engine-twig-php/_meta/_head.twig b/packages/engine-twig-php/_meta/_head.twig index 4b49c63b7..a8fae4379 100644 --- a/packages/engine-twig-php/_meta/_head.twig +++ b/packages/engine-twig-php/_meta/_head.twig @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-twig-php/lib/engine_twig_php.js b/packages/engine-twig-php/lib/engine_twig_php.js index 73dc9c560..c4ab2af72 100644 --- a/packages/engine-twig-php/lib/engine_twig_php.js +++ b/packages/engine-twig-php/lib/engine_twig_php.js @@ -27,7 +27,8 @@ const engine_twig_php = { engineName: 'twig-php', engineFileExtension: '.twig', expandPartials: false, - findPartialsRE: /{%\s*(?:extends|include|embed)\s+('[^']+'|"[^"]+").*?(with|%}|\s*%})/g, + findPartialsRE: + /{%\s*(?:extends|include|embed)\s+('[^']+'|"[^"]+").*?(with|%}|\s*%})/g, findPartialKeyRE: /"((?:\\.|[^"\\])*)"|'((?:\\.|[^"\\])*)'/, namespaces: [], @@ -45,12 +46,8 @@ const engine_twig_php = { process.exit(1); } - const { - namespaces, - alterTwigEnv, - relativeFrom, - ...rest - } = config.engines.twig; + const { namespaces, alterTwigEnv, relativeFrom, ...rest } = + config.engines.twig; // Schema on config object being passed in: // https://github.com/basaltinc/twig-renderer/blob/master/config.schema.json diff --git a/packages/engine-twig/_meta/_head.twig b/packages/engine-twig/_meta/_head.twig index 4b49c63b7..a8fae4379 100644 --- a/packages/engine-twig/_meta/_head.twig +++ b/packages/engine-twig/_meta/_head.twig @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-twig/lib/engine_twig.js b/packages/engine-twig/lib/engine_twig.js index 31a0c9f27..2b66cf482 100644 --- a/packages/engine-twig/lib/engine_twig.js +++ b/packages/engine-twig/lib/engine_twig.js @@ -126,7 +126,8 @@ var engine_twig = { // regexes, stored here so they're only compiled once findPartialsRE: /{%\s*(?:extends|include|embed)\s+('[^']+'|"[^"]+").*?%}/g, findPartialKeyRE: /"((?:\\.|[^"\\])*)"/, - findListItemsRE: /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // TODO + findListItemsRE: + /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // TODO // render it renderPattern: function renderPattern(pattern, data, partials) { diff --git a/packages/engine-underscore/_meta/_head.html b/packages/engine-underscore/_meta/_head.html index 56d9a2432..9e3094352 100644 --- a/packages/engine-underscore/_meta/_head.html +++ b/packages/engine-underscore/_meta/_head.html @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/engine-underscore/lib/engine_underscore.js b/packages/engine-underscore/lib/engine_underscore.js index a562a02a9..d08b3a63f 100644 --- a/packages/engine-underscore/lib/engine_underscore.js +++ b/packages/engine-underscore/lib/engine_underscore.js @@ -97,8 +97,10 @@ const engine_underscore = { expandPartials: false, // regexes, stored here so they're only compiled once - findPartialsRE: /<%=\s*_\.renderNamedPartial[ \t]*\(\s*("(?:[^"].*?)"|'(?:[^'].*?)').*?%>/g, // TODO - findListItemsRE: /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, + findPartialsRE: + /<%=\s*_\.renderNamedPartial[ \t]*\(\s*("(?:[^"].*?)"|'(?:[^'].*?)').*?%>/g, // TODO + findListItemsRE: + /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // render it renderPattern: function renderPattern(pattern, data, partials) { diff --git a/packages/live-server/injected.html b/packages/live-server/injected.html index 493bee19b..1242d8e93 100644 --- a/packages/live-server/injected.html +++ b/packages/live-server/injected.html @@ -1,29 +1,38 @@ diff --git a/packages/starterkit-handlebars-demo/dist/_meta/_head.hbs b/packages/starterkit-handlebars-demo/dist/_meta/_head.hbs index cf2ddff33..102279659 100644 --- a/packages/starterkit-handlebars-demo/dist/_meta/_head.hbs +++ b/packages/starterkit-handlebars-demo/dist/_meta/_head.hbs @@ -1,5 +1,5 @@ - + {{ title }} diff --git a/packages/starterkit-twig-demo/dist/_meta/_head.twig b/packages/starterkit-twig-demo/dist/_meta/_head.twig index 123ccf8a8..9cf77c136 100644 --- a/packages/starterkit-twig-demo/dist/_meta/_head.twig +++ b/packages/starterkit-twig-demo/dist/_meta/_head.twig @@ -1,10 +1,10 @@ - + {{ title }} - + diff --git a/packages/uikit-workshop/src/html/partials/base-template.html b/packages/uikit-workshop/src/html/partials/base-template.html index 1bd7a332d..5f47c91a7 100755 --- a/packages/uikit-workshop/src/html/partials/base-template.html +++ b/packages/uikit-workshop/src/html/partials/base-template.html @@ -2,7 +2,10 @@ {{# descBlockExists }}
{{# isPatternView }} @@ -83,9 +86,7 @@

Annotations

  • {{ title }}

    -
    - {{{ comment }}} -
    +
    {{{ comment }}}
    • diff --git a/packages/uikit-workshop/src/scripts/actions/app.js b/packages/uikit-workshop/src/scripts/actions/app.js index 16ed551bb..c3e335a22 100644 --- a/packages/uikit-workshop/src/scripts/actions/app.js +++ b/packages/uikit-workshop/src/scripts/actions/app.js @@ -9,17 +9,15 @@ export const UPDATE_CURRENT_URL = 'UPDATE_CURRENT_URL'; export const UPDATE_CURRENT_PATTERN = 'UPDATE_CURRENT_PATTERN'; export const IS_VIEWALL_PAGE = 'IS_VIEWALL_PAGE'; -export const updateCurrentPattern = (currentPattern) => ( - dispatch, - getState -) => { - if (getState().app.currentPattern !== currentPattern) { - dispatch({ - type: UPDATE_CURRENT_PATTERN, - currentPattern, - }); - } -}; +export const updateCurrentPattern = + (currentPattern) => (dispatch, getState) => { + if (getState().app.currentPattern !== currentPattern) { + dispatch({ + type: UPDATE_CURRENT_PATTERN, + currentPattern, + }); + } + }; export const updateCurrentUrl = (currentUrl) => (dispatch, getState) => { if (getState().app.currentUrl !== currentUrl) { @@ -75,17 +73,15 @@ export const updateDrawerState = (opened) => (dispatch, getState) => { } }; -export const updateDrawerAnimationState = (drawerIsAnimating) => ( - dispatch, - getState -) => { - if (getState().app.drawerIsAnimating !== drawerIsAnimating) { - dispatch({ - type: UPDATE_DRAWER_ANIMATION_STATE, - drawerIsAnimating, - }); - } -}; +export const updateDrawerAnimationState = + (drawerIsAnimating) => (dispatch, getState) => { + if (getState().app.drawerIsAnimating !== drawerIsAnimating) { + dispatch({ + type: UPDATE_DRAWER_ANIMATION_STATE, + drawerIsAnimating, + }); + } + }; export const updateDrawerHeight = (height) => (dispatch, getState) => { if (getState().app.drawerHeight !== height) { diff --git a/packages/uikit-workshop/src/scripts/components/panels-viewer.js b/packages/uikit-workshop/src/scripts/components/panels-viewer.js index 289102f5f..08d0f27db 100644 --- a/packages/uikit-workshop/src/scripts/components/panels-viewer.js +++ b/packages/uikit-workshop/src/scripts/components/panels-viewer.js @@ -177,9 +177,8 @@ export const panelsViewer = { template = document.getElementById(panel.templateID); templateCompiled = Hogan.compile(template.innerHTML); templateRendered = templateCompiled.render(patternData); - const normalizedCode = normalizeWhitespace.normalize( - templateRendered - ); + const normalizedCode = + normalizeWhitespace.normalize(templateRendered); normalizedCode.replace(/[\r\n]+/g, '\n\n'); const highlightedCode = Prism.highlight( normalizedCode, diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js b/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js index 0c364a4be..80cb246ca 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js +++ b/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js @@ -3,12 +3,13 @@ import { NavToggle } from './NavToggle'; import { NavLink } from './NavLink'; import { NavItem } from './NavItem'; import { NavButton } from './NavButton'; +import { getRandom } from '../../../utils'; export const NavList = (props) => { const { children, category, categoryName, elem } = props; const reorderedChildren = []; - const random = Math.random().toString().substr(2); + const random = getRandom(10000000, 99999999); const nonViewAllItems = elem.noViewAll ? children.filter((item) => !item.isDocPattern) diff --git a/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js b/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js index 46d049a4f..a00a1f8be 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js +++ b/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js @@ -242,7 +242,8 @@ class Search extends BaseComponent { return (
    diff --git a/packages/uikit-workshop/src/scripts/lit-components/pl-viewport/pl-viewport.js b/packages/uikit-workshop/src/scripts/lit-components/pl-viewport/pl-viewport.js index 342f31035..79f6a9cf1 100644 --- a/packages/uikit-workshop/src/scripts/lit-components/pl-viewport/pl-viewport.js +++ b/packages/uikit-workshop/src/scripts/lit-components/pl-viewport/pl-viewport.js @@ -387,7 +387,8 @@ class IFrame extends BaseLitComponent { * Workaround to avoiding an infinite loop (if using srcdoc) which breaks the ability to * hit the back button if you hit a 404 */ - this.iframe.contentWindow.document.body.innerHTML = this.iframe404Fallback; + this.iframe.contentWindow.document.body.innerHTML = + this.iframe404Fallback; } }, 100); }