Skip to content

Commit 3a996af

Browse files
mfranzkemfranzke
authored
Merge branch 'dev' into 1180-deprecate-pattern-parameters
2 parents a36d700 + 535c5f0 commit 3a996af

File tree

105 files changed

+1779
-1797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1779
-1797
lines changed

‎.prettierignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ packages/core/scripts/api.handlebars
99
packages/core/scripts/events.handlebars
1010
packages/core/test/files/annotations.js
1111
packages/**/annotations.js
12-
**/uikit-workshop/src/js/**/*
1312
*.json
1413
*.md
15-
*.scss
14+
**/reset.scss
1615
**/_meta/_head.*
16+
**/_meta/_foot.*
17+
**/development-edition*/source/_patterns/**

‎packages/docs/.eleventy.js‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -16,84 +16,84 @@ const parseTransform = require('./src/transforms/parse-transform.js');
1616
const site = require('./src/_data/site.json');
1717

1818
module.exports = function (config) {
19-
// Filters
20-
config.addFilter('dateFilter', dateFilter);
21-
config.addFilter('markdownFilter', markdownFilter);
22-
config.addFilter('w3DateFilter', w3DateFilter);
23-
24-
// Layout aliases
25-
config.addLayoutAlias('home', 'layouts/home.njk');
26-
27-
// Transforms
28-
config.addTransform('htmlmin', htmlMinTransform);
29-
config.addTransform('parse', parseTransform);
30-
31-
// Passthrough copy
32-
config.addPassthroughCopy('src/images');
33-
config.addPassthroughCopy('src/js');
34-
config.addPassthroughCopy('src/admin/config.yml');
35-
config.addPassthroughCopy('src/admin/previews.js');
36-
config.addPassthroughCopy({
37-
'../../node_modules/nunjucks/browser/nunjucks-slim.js':
38-
'node_modules/nunjucks/browser/nunjucks-slim.js',
39-
});
40-
41-
const now = new Date();
42-
43-
// Custom collections
44-
const livePosts = (post) => post.date <= now && !post.data.draft;
45-
config.addCollection('posts', (collection) => {
46-
return [
47-
...collection.getFilteredByGlob('./src/posts/*.md').filter(livePosts),
48-
].reverse();
49-
});
50-
51-
config.addCollection('demos', (collection) => {
52-
return [...collection.getFilteredByGlob('./src/demos/*.md')].reverse();
53-
});
54-
55-
config.addCollection('postFeed', (collection) => {
56-
return [...collection.getFilteredByGlob('./src/posts/*.md').filter(livePosts)]
57-
.reverse()
58-
.slice(0, site.maxPostsPerPage);
59-
});
60-
61-
config.addCollection('docs', (collection) => {
62-
return [...collection.getFilteredByGlob('./src/docs/*.md')].reverse();
63-
});
64-
65-
config.addCollection('docsOrdered', (collection) => {
66-
const docs = collection.getFilteredByGlob('src/docs/*.md').sort((a, b) => {
67-
return Number(a.data.order) - Number(b.data.order);
68-
});
69-
return docs;
70-
});
71-
72-
// Plugins
73-
config.addPlugin(rssPlugin);
74-
config.addPlugin(syntaxHighlight);
75-
config.addPlugin(eleventyNavigationPlugin);
76-
77-
// 404
78-
config.setBrowserSyncConfig({
79-
callbacks: {
80-
ready: function (err, browserSync) {
81-
const content_404 = fs.readFileSync('dist/404.html');
82-
83-
browserSync.addMiddleware('*', (req, res) => {
84-
// Provides the 404 content without redirect.
85-
res.write(content_404);
86-
res.end();
87-
});
88-
},
89-
},
90-
});
91-
92-
return {
93-
dir: {
94-
input: 'src',
95-
output: 'dist',
96-
},
97-
passthroughFileCopy: true,
98-
};
19+
// Filters
20+
config.addFilter('dateFilter', dateFilter);
21+
config.addFilter('markdownFilter', markdownFilter);
22+
config.addFilter('w3DateFilter', w3DateFilter);
23+
24+
// Layout aliases
25+
config.addLayoutAlias('home', 'layouts/home.njk');
26+
27+
// Transforms
28+
config.addTransform('htmlmin', htmlMinTransform);
29+
config.addTransform('parse', parseTransform);
30+
31+
// Passthrough copy
32+
config.addPassthroughCopy('src/images');
33+
config.addPassthroughCopy('src/js');
34+
config.addPassthroughCopy('src/admin/config.yml');
35+
config.addPassthroughCopy('src/admin/previews.js');
36+
config.addPassthroughCopy({
37+
'../../node_modules/nunjucks/browser/nunjucks-slim.js':
38+
'node_modules/nunjucks/browser/nunjucks-slim.js',
39+
});
40+
41+
const now = new Date();
42+
43+
// Custom collections
44+
const livePosts = (post) => post.date <= now && !post.data.draft;
45+
config.addCollection('posts', (collection) => {
46+
return [
47+
...collection.getFilteredByGlob('./src/posts/*.md').filter(livePosts),
48+
].reverse();
49+
});
50+
51+
config.addCollection('demos', (collection) => {
52+
return [...collection.getFilteredByGlob('./src/demos/*.md')].reverse();
53+
});
54+
55+
config.addCollection('postFeed', (collection) => {
56+
return [...collection.getFilteredByGlob('./src/posts/*.md').filter(livePosts)]
57+
.reverse()
58+
.slice(0, site.maxPostsPerPage);
59+
});
60+
61+
config.addCollection('docs', (collection) => {
62+
return [...collection.getFilteredByGlob('./src/docs/*.md')].reverse();
63+
});
64+
65+
config.addCollection('docsOrdered', (collection) => {
66+
const docs = collection.getFilteredByGlob('src/docs/*.md').sort((a, b) => {
67+
return Number(a.data.order) - Number(b.data.order);
68+
});
69+
return docs;
70+
});
71+
72+
// Plugins
73+
config.addPlugin(rssPlugin);
74+
config.addPlugin(syntaxHighlight);
75+
config.addPlugin(eleventyNavigationPlugin);
76+
77+
// 404
78+
config.setBrowserSyncConfig({
79+
callbacks: {
80+
ready: function (err, browserSync) {
81+
const content_404 = fs.readFileSync('dist/404.html');
82+
83+
browserSync.addMiddleware('*', (req, res) => {
84+
// Provides the 404 content without redirect.
85+
res.write(content_404);
86+
res.end();
87+
});
88+
},
89+
},
90+
});
91+
92+
return {
93+
dir: {
94+
input: 'src',
95+
output: 'dist',
96+
},
97+
passthroughFileCopy: true,
98+
};
9999
};

‎packages/docs/.prettierrc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"printWidth": 90,
3-
"useTabs": true,
4-
"tabWidth": 2,
5-
"singleQuote": true,
6-
"bracketSpacing": false
2+
"printWidth": 90,
3+
"useTabs": false,
4+
"tabWidth": 3,
5+
"singleQuote": true,
6+
"bracketSpacing": false
77
}

‎packages/docs/php-docs/pattern-states.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The three default states included with Pattern Lab might not be enough for every
3737
You can use the following as your CSS template for new pattern states:
3838

3939
```css
40-
{% raw %}.newpatternstate:before {
40+
{% raw %}.newpatternstate::before {
4141
color: #B10DC9 !important;
4242
}{% endraw %}
4343
```

‎packages/docs/rollup.config.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ const nodeResolve = require('rollup-plugin-node-resolve');
44
const json = require('rollup-plugin-json');
55

66
export default {
7-
input: 'src/admin/util',
8-
output: {
9-
file: 'dist/admin/util.js',
10-
format: 'iife',
11-
name: 'previewUtil',
12-
},
13-
plugins: [builtins(), nodeResolve(), commonjs(), json()],
7+
input: 'src/admin/util',
8+
output: {
9+
file: 'dist/admin/util.js',
10+
format: 'iife',
11+
name: 'previewUtil',
12+
},
13+
plugins: [builtins(), nodeResolve(), commonjs(), json()],
1414
};

‎packages/docs/src/_data/global.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module.exports = {
2-
random() {
3-
const segment = () => {
4-
// eslint-disable-next-line no-bitwise
5-
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
6-
};
7-
return `${segment()}-${segment()}-${segment()}`;
8-
},
9-
now: Date.now(),
2+
random() {
3+
const segment = () => {
4+
// eslint-disable-next-line no-bitwise
5+
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
6+
};
7+
return `${segment()}-${segment()}-${segment()}`;
8+
},
9+
now: Date.now(),
1010
};

‎packages/docs/src/_data/helpers.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module.exports = {
2-
getNextHeadingLevel(currentLevel) {
3-
return parseInt(currentLevel, 10) + 1;
4-
},
5-
getReadingTime(text) {
6-
const wordsPerMinute = 200;
7-
const numberOfWords = text.split(/\s/g).length;
8-
return Math.ceil(numberOfWords / wordsPerMinute);
9-
},
2+
getNextHeadingLevel(currentLevel) {
3+
return parseInt(currentLevel, 10) + 1;
4+
},
5+
getReadingTime(text) {
6+
const wordsPerMinute = 200;
7+
const numberOfWords = text.split(/\s/g).length;
8+
return Math.ceil(numberOfWords / wordsPerMinute);
9+
},
1010
};

‎packages/docs/src/_data/styleguide.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
const tokens = require('./tokens.json');
22

33
module.exports = {
4-
colors() {
5-
let response = [];
4+
colors() {
5+
let response = [];
66

7-
Object.keys(tokens.colors).forEach((key) => {
8-
response.push({
9-
value: tokens.colors[key],
10-
key,
11-
});
12-
});
7+
Object.keys(tokens.colors).forEach((key) => {
8+
response.push({
9+
value: tokens.colors[key],
10+
key,
11+
});
12+
});
1313

14-
return response;
15-
},
16-
sizes() {
17-
let response = [];
14+
return response;
15+
},
16+
sizes() {
17+
let response = [];
1818

19-
Object.keys(tokens['size-scale']).forEach((key) => {
20-
response.push({
21-
value: tokens['size-scale'][key],
22-
key,
23-
});
24-
});
19+
Object.keys(tokens['size-scale']).forEach((key) => {
20+
response.push({
21+
value: tokens['size-scale'][key],
22+
key,
23+
});
24+
});
2525

26-
return response;
27-
},
26+
return response;
27+
},
2828
};

0 commit comments

Comments
 (0)