Skip to content

Commit 2cc2ed6

Browse files
committed
update patternlab to v5.14.0
in addition update packages for vue, switch from node-sass to sass and a lot more
1 parent b386d9e commit 2cc2ed6

File tree

16 files changed

+8691
-8179
lines changed

16 files changed

+8691
-8179
lines changed

package-lock.json

Lines changed: 8622 additions & 8118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@
1212
"version": "patternlab --version"
1313
},
1414
"dependencies": {
15-
"core-js": "^3.6.4",
16-
"vue": "^2.6.11",
17-
"vue-router": "^3.1.6"
15+
"core-js": "^3.8.3",
16+
"vue": "^2.6.12",
17+
"vue-router": "^3.5.1"
1818
},
1919
"devDependencies": {
20-
"@pattern-lab/cli": "^5.7.0",
21-
"@pattern-lab/core": "^5.7.0",
22-
"@pattern-lab/engine-twig-php": "^5.7.1",
23-
"@pattern-lab/starterkit-twig-demo": "^5.8.0",
24-
"@pattern-lab/uikit-workshop": "^5.7.2",
25-
"@vue/cli-plugin-babel": "~4.3.0",
26-
"@vue/cli-plugin-eslint": "~4.3.0",
27-
"@vue/cli-plugin-router": "~4.3.0",
28-
"@vue/cli-service": "~4.3.0",
29-
"@vue/cli-shared-utils": "latest",
30-
"@vue/eslint-config-airbnb": "^5.0.2",
20+
"@pattern-lab/cli": "^5.14.0",
21+
"@pattern-lab/core": "^5.14.0",
22+
"@pattern-lab/engine-twig-php": "^5.14.0",
23+
"@pattern-lab/starterkit-twig-demo": "^5.14.0",
24+
"@pattern-lab/uikit-workshop": "^5.14.0",
25+
"@vue/cli-plugin-babel": "^4.5.11",
26+
"@vue/cli-plugin-eslint": "^4.5.11",
27+
"@vue/cli-plugin-router": "^4.5.11",
28+
"@vue/cli-service": "^4.5.11",
29+
"@vue/cli-shared-utils": "^4.5.11",
30+
"@vue/eslint-config-airbnb": "^5.3.0",
3131
"babel-eslint": "^10.1.0",
32-
"eslint": "^6.7.2",
33-
"eslint-plugin-import": "^2.20.2",
34-
"eslint-plugin-vue": "^6.2.2",
35-
"event-hooks-webpack-plugin": "^2.1.6",
32+
"eslint": "^7.19.0",
33+
"eslint-plugin-import": "^2.22.1",
34+
"eslint-plugin-vue": "^7.5.0",
35+
"event-hooks-webpack-plugin": "^2.2.0",
3636
"fs-extra": "latest",
3737
"globby": "latest",
38-
"html-webpack-plugin": "latest",
39-
"minimatch": "latest",
40-
"node-sass": "^4.12.0",
41-
"sass-loader": "^8.0.2",
42-
"stylelint": "^13.3.2",
38+
"html-webpack-plugin": "^5.0.0",
39+
"minimatch": "^3.0.4",
40+
"sass": "^1.32.6",
41+
"sass-loader": "^10.1.1",
42+
"stylelint": "^13.9.0",
4343
"stylelint-config-standard": "^20.0.0",
44-
"stylelint-scss": "^3.17.0",
45-
"stylelint-webpack-plugin": "^1.2.3",
46-
"vue-template-compiler": "^2.6.11",
44+
"stylelint-scss": "^3.18.0",
45+
"stylelint-webpack-plugin": "^2.1.1",
46+
"vue-template-compiler": "^2.6.12",
4747
"webpack-config-utils": "^2.3.1"
4848
}
4949
}

patternlab-config.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"general-header": "views/partials/general-header.mustache",
5353
"general-footer": "views/partials/general-footer.mustache",
5454
"patternSection": "views/partials/patternSection.mustache",
55-
"patternSectionSubtype": "views/partials/patternSectionSubtype.mustache",
55+
"patternSectionSubgroup": "views/partials/patternSectionSubgroup.mustache",
5656
"viewall": "views/viewall.mustache"
5757
}
5858
},
@@ -79,6 +79,8 @@
7979
"patternExportPatternPartials": [],
8080
"patternExportPreserveDirectoryStructure": true,
8181
"patternExportRaw": false,
82+
"patternMergeVariantArrays": true,
83+
"renderFlatPatternsOnViewAllPages": false,
8284
"serverOptions": {
8385
"wait": 1000
8486
},
@@ -93,6 +95,7 @@
9395
"uikits": [
9496
{
9597
"name": "uikit-workshop",
98+
"package": "@pattern-lab/uikit-workshop",
9699
"outputDir": "",
97100
"enabled": true,
98101
"excludedPatternStates": [],
@@ -106,35 +109,35 @@
106109
"id": "atoms",
107110
"recursive": true,
108111
"paths": [
109-
"source/_patterns/00-atoms"
112+
"source/_patterns/atoms"
110113
]
111114
},
112115
{
113116
"id": "molecules",
114117
"recursive": true,
115118
"paths": [
116-
"source/_patterns/01-molecules"
119+
"source/_patterns/molecules"
117120
]
118121
},
119122
{
120123
"id": "organisms",
121124
"recursive": true,
122125
"paths": [
123-
"source/_patterns/02-organisms"
126+
"source/_patterns/organisms"
124127
]
125128
},
126129
{
127130
"id": "templates",
128131
"recursive": true,
129132
"paths": [
130-
"source/_patterns/03-templates"
133+
"source/_patterns/templates"
131134
]
132135
},
133136
{
134137
"id": "pages",
135138
"recursive": true,
136139
"paths": [
137-
"source/_patterns/04-pages"
140+
"source/_patterns/pages"
138141
]
139142
},
140143
{

source/_meta/_00-head.twig

Lines changed: 0 additions & 17 deletions
This file was deleted.

source/_meta/_01-foot.twig

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.

source/_meta/_foot.twig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
<!--DO NOT REMOVE-->
3+
{{ patternLabFoot | raw }}
4+
5+
{# webpack dev serv js files must include to make HMR work inside patternlab iframe #}
6+
<script type="text/javascript" src="/js/chunk-vendors.js"></script>
7+
<script type="text/javascript" src="/js/app.js"></script>
8+
</body>
9+
</html>
File renamed without changes.

source/_meta/_head.twig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!DOCTYPE html>
2+
<html class="{{ htmlClass }}">
3+
<head>
4+
<title>{{ title }}</title>
5+
<meta charset="UTF-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width,initial-scale=1.0">
8+
9+
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?{{ cacheBuster }}" media="all" />
10+
{# webpack dev-server css file #}
11+
<link rel="stylesheet" href="/css/app.css">
12+
13+
<!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
14+
{{ patternLabHead | raw }}
15+
<!-- End Pattern Lab -->
16+
</head>
17+
<body class="{{ bodyClass }}">

src/components/HelloWorld.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,17 @@ export default {
4545
h3 {
4646
margin: 40px 0 0;
4747
}
48+
4849
ul {
4950
list-style-type: none;
5051
padding: 0;
5152
}
53+
5254
li {
5355
display: inline-block;
5456
margin: 0 10px;
5557
}
58+
5659
a {
5760
color: #42b983;
5861
}

vue.config.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ module.exports = {
88
css: {
99
loaderOptions: {
1010
sass: {
11-
prependData: `
12-
@import "@/scss/_variables.scss";
11+
additionalData: `
12+
@import "~@/scss/_variables.scss";
1313
`,
1414
},
1515
},
1616
},
1717

1818
chainWebpack: (config) => {
1919
patternlabVuePluginConfig(config);
20-
config.plugin('stylelint-webpack-plugin').use(StyleLintPlugin);
20+
config.plugin('stylelint-webpack-plugin').use(new StyleLintPlugin({
21+
files: ['**/*.{vue,scss}'],
22+
}));
2123
},
2224
};

0 commit comments

Comments
 (0)