Skip to content

Commit b6f18e0

Browse files
mfranzkeMaximilian
mfranzke
and
Maximilian
authored
refactor: updated even further dependencies (#1320)
* chore(docs): some typos missed to replace mustache initially and incorrect handlebars two times (both in package name and URL) * Revert "Merge pull request #2 from pattern-lab/dev" This reverts commit 7812878, reversing changes made to 26db979. * Revert "Merge pull request #1 from pattern-lab/dev" This reverts commit 26db979, reversing changes made to fc90750. * Revert "chore(docs): some typos" This reverts commit 271dc8d. * refactor: updated dependency ejs * refactor: updated dependency scroll-js * refactor: updated dependency classnames * refactor: updated dependency gulp * refactor: replaced dependency opn by its new name open * refactor: updated dependency lerna and executed a simple migration script as stated in https://github.com/lerna/lerna/blob/main/CHANGELOG.md#400-2021-02-10 * refactor: updated dependency @auto-it/released * refactor: updated dependency auto * refactor: updated dependency fs-extra * refactor: updated dependency better-opn * refactor: updated dependency cosmiconfig * fix(cosmiconfig-update): corrected the variable name * fix(cosmiconfig-update): added the variable name * refactor: updated dependency fuse.js * refactor: updated dependency deepmerge * refactor: updated dependency execa * refactor: updated dependency js-yaml * refactor: updated dependency jsdoc-to-markdown * refactor: updated dependency archiver * refactor: updated dependency has-yarn * refactor: updated dependency inquirer * refactor: updated dependency ora * refactor: updated dependency http-auth and added necessary new dependency http-auth-connect that provides a method that got extracted from the original one. * refactor(node): aligned all node versions within the packages * refactor: updated dependency node-sass * refactor: updated dependency open * refactor: updated dependency yargs * refactor: updated dependency @11ty/eleventy-plugin-syntaxhighlight * refactor: updated dependency markdown-it * build: regenerated yarn.lock file * refactor: updated dependency node-sass #1320 * refactor: updated dependency recursive-copy * chore: reverted node-sass dependency update * refactor: rebuild yarn.lock file * refactor(node): aligned all node versions within the packages * build: regenerated yarn.lock file * refactor: updated dependency husky * refactor: updated dependency @11ty/eleventy * chore: code optimizations that are mentioned by the github pipeline as well * chore: rebuild yarn.lock file * chore: some reformatting * chore: rebuild yarn.lock file * chore: reformatted * chore: reverted commit a852046 * Revert "chore: reformatted" This reverts commit 1531399. * chore: formatting * chore: formatting * chore: formatting * chore: formatting This reverts commit 271dc8d. * chore: formatting * chore: formatting * build: regenerated package-lock.json * refactor: revert commit 373ea94 and 9b60cf2 * chore: reformatting * fix: corrected those files contents * refactor: updated dependency send * refactor: updated dependency commander * refactor: we need to fix this dependencies version range to minor * build: regenerated yarn.lock file Co-authored-by: Maximilian <[email protected]>
1 parent 515df95 commit b6f18e0

File tree

24 files changed

+1109
-889
lines changed

24 files changed

+1109
-889
lines changed

Diff for: ‎.husky/.gitignore

-1
This file was deleted.

Diff for: ‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
]
1111
},
1212
"dependencies": {
13-
"@auto-it/released": "^9.40.5",
13+
"@auto-it/released": "^10.27.0",
1414
"@babel/plugin-proposal-decorators": "^7.13.5",
1515
"@babel/plugin-syntax-jsx": "^7.12.13",
16-
"auto": "^9.40.5",
16+
"auto": "^10.27.0",
1717
"babel-eslint": "^10.0.2",
1818
"eslint": "^6.1.0",
1919
"eslint-config-prettier": "^6.0.0",
@@ -51,6 +51,6 @@
5151
]
5252
},
5353
"devDependencies": {
54-
"husky": "^6.0.0"
54+
"husky": "^7.0.4"
5555
}
5656
}

Diff for: ‎packages/cli/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
},
1111
"dependencies": {
1212
"@pattern-lab/core": "^5.15.5",
13-
"archiver": "2.1.1",
13+
"archiver": "5.3.0",
1414
"chalk": "4.1.0",
15-
"commander": "2.15.1",
16-
"deepmerge": "^2.1.1",
17-
"execa": "4.0.3",
18-
"fs-extra": "6.0.1",
15+
"commander": "6.2.1",
16+
"deepmerge": "^4.2.2",
17+
"execa": "5.0.0",
18+
"fs-extra": "10.0.0",
1919
"glob": "7.1.6",
20-
"has-yarn": "1.0.0",
21-
"inquirer": "5.1.0",
20+
"has-yarn": "2.1.0",
21+
"inquirer": "8.0.0",
2222
"lodash": "4.17.21",
23-
"ora": "2.1.0"
23+
"ora": "5.4.0"
2424
},
2525
"devDependencies": {
2626
"@pattern-lab/starterkit-mustache-base": "3.0.3",
@@ -47,7 +47,7 @@
4747
],
4848
"scripts": {
4949
"lint": "eslint ./{bin,test}",
50-
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120",
50+
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120",
5151
"prepublish": "npx dos2unix-cli bin/patternlab.js"
5252
},
5353
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",

Diff for: ‎packages/core/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"chalk": "4.1.0",
1010
"chokidar": "3.5.1",
1111
"dive": "0.5.0",
12-
"fs-extra": "5.0.0",
12+
"fs-extra": "10.0.0",
1313
"glob": "7.1.6",
1414
"graphlib": "2.1.8",
1515
"js-beautify": "1.13.5",
16-
"js-yaml": "3.13.1",
16+
"js-yaml": "4.1.0",
1717
"lodash": "4.17.21",
18-
"markdown-it": "6.0.1",
18+
"markdown-it": "12.0.6",
1919
"node-fetch": "2.6.1",
2020
"recursive-copy": "2.0.13",
2121
"update-notifier": "5.1.0"
@@ -28,7 +28,7 @@
2828
"eslint": "^6.1.0",
2929
"eslint-config-prettier": "^6.0.0",
3030
"eslint-plugin-prettier": "^3.1.0",
31-
"jsdoc-to-markdown": "5.0.1",
31+
"jsdoc-to-markdown": "6.0.1",
3232
"prettier": "^2.2.1",
3333
"rewire": "2.5.2",
3434
"standard-version": "9.1.1",

Diff for: ‎packages/core/src/lib/data_loader.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ function loadFile(dataFilePath, fsDep) {
2121

2222
if (dataFile && fsDep.existsSync(path.resolve(dataFile))) {
2323
try {
24-
return yaml.safeLoad(
25-
fsDep.readFileSync(path.resolve(dataFile), 'utf8')
26-
);
24+
return yaml.load(fsDep.readFileSync(path.resolve(dataFile), 'utf8'));
2725
} catch (err) {
2826
throw new Error(`Error loading file: ${dataFile} - ${err.message}`);
2927
}
@@ -55,7 +53,7 @@ function loadDataFromFolder(dataFilesPath, excludeFileNames, fsDep) {
5553

5654
dataFiles.forEach(function (filePath) {
5755
try {
58-
const jsonData = yaml.safeLoad(
56+
const jsonData = yaml.load(
5957
fsDep.readFileSync(path.resolve(filePath), 'utf8')
6058
);
6159
mergeObject = _.merge(mergeObject, jsonData);

Diff for: ‎packages/core/src/lib/markdown_parser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const markdown_parser = function () {
2323
if (chunks && chunks[1]) {
2424
//parse the yaml if we got it
2525
const frontmatter = chunks[1];
26-
returnObject = yaml.safeLoad(frontmatter);
26+
returnObject = yaml.load(frontmatter);
2727
}
2828

2929
if (chunks[2]) {

Diff for: ‎packages/core/src/lib/pseudopattern_hunter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function (
5050
paths.source.patterns,
5151
pseudoPatterns[i]
5252
);
53-
variantFileData = yaml.safeLoad(
53+
variantFileData = yaml.load(
5454
fs.readFileSync(variantFileFullPath, 'utf8')
5555
);
5656
} catch (err) {

Diff for: ‎packages/development-edition-engine-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@pattern-lab/engine-mustache": "^5.15.1",
1010
"@pattern-lab/engine-react": "^5.15.1",
1111
"@pattern-lab/uikit-workshop": "^5.15.7",
12-
"gulp": "3.9.1",
12+
"gulp": "4.0.2",
1313
"minimist": "^1.2.5",
1414
"react": "16.2.0"
1515
},

Diff for: ‎packages/edition-node-gulp/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@pattern-lab/core": "^5.15.5",
99
"@pattern-lab/engine-mustache": "^5.15.1",
1010
"@pattern-lab/uikit-workshop": "^5.15.7",
11-
"gulp": "3.9.1",
11+
"gulp": "4.0.2",
1212
"minimist": "1.2.5"
1313
},
1414
"keywords": [

Diff for: ‎packages/engine-handlebars/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "5.15.1",
55
"main": "lib/engine_handlebars.js",
66
"dependencies": {
7-
"fs-extra": "^8.1.0",
7+
"fs-extra": "^10.0.0",
88
"glob": "^7.1.6",
99
"handlebars": "^4.7.7"
1010
},

Diff for: ‎packages/engine-liquid/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "5.15.1",
55
"main": "lib/engine_liquid.js",
66
"dependencies": {
7-
"fs-extra": "5.0.0",
7+
"fs-extra": "10.0.0",
88
"liquidjs": "2.2.0"
99
},
1010
"keywords": [

Diff for: ‎packages/engine-mustache/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "5.15.1",
55
"main": "lib/engine_mustache.js",
66
"dependencies": {
7-
"fs-extra": "0.30.0",
7+
"fs-extra": "10.0.0",
88
"mustache": "3.1.0"
99
},
1010
"keywords": [

Diff for: ‎packages/engine-nunjucks/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"deprecated": false,
88
"description": "The nunjucks PatternEngine for Pattern Lab / Node",
99
"dependencies": {
10-
"fs-extra": "7.0.0",
10+
"fs-extra": "10.0.0",
1111
"nunjucks": "^3.2.3"
1212
},
1313
"engines": {

Diff for: ‎packages/engine-twig-php/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@basalt/twig-renderer": "^2.0.0",
88
"@pattern-lab/core": "^5.15.5",
99
"chalk": "^4.1.0",
10-
"fs-extra": "0.30.0"
10+
"fs-extra": "10.0.0"
1111
},
1212
"keywords": [
1313
"Pattern Lab",

Diff for: ‎packages/engine-twig/lib/engine_twig.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ var engine_twig = {
124124
engineFileExtension: '.twig',
125125

126126
// regexes, stored here so they're only compiled once
127-
findPartialsRE: /{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
127+
findPartialsRE:
128+
/{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
128129
findPartialKeyRE: /"((?:\\.|[^"\\])*)"/,
129130
findListItemsRE:
130131
/({{#( )?)(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

Diff for: ‎packages/engine-twig/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "5.15.3",
55
"main": "lib/engine_twig.js",
66
"dependencies": {
7-
"fs-extra": "0.30.0",
7+
"fs-extra": "10.0.0",
88
"twing": "^5.0.2"
99
},
1010
"keywords": [

Diff for: ‎packages/live-server/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const path = require('path');
88
const url = require('url');
99
const http = require('http');
1010
const send = require('send');
11-
const open = require('opn');
11+
const open = require('open');
1212
const es = require('event-stream');
1313
const os = require('os');
1414
const chokidar = require('chokidar');
@@ -370,14 +370,14 @@ LiveServer.start = function (options) {
370370
if (openPath !== null)
371371
if (typeof openPath === 'object') {
372372
openPath.forEach((p) =>
373-
open(openURL + p, { app: browser }).catch(() =>
373+
open(openURL + p, { app: { name: browser } }).catch(() =>
374374
console.log(
375375
'Warning: Could not open pattern lab in default browser.'
376376
)
377377
)
378378
);
379379
} else {
380-
open(openURL + openPath, { app: browser }).catch(() =>
380+
open(openURL + openPath, { app: { name: browser } }).catch(() =>
381381
console.log('Warning: Could not open pattern lab in default browser.')
382382
);
383383
}

Diff for: ‎packages/live-server/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"http-auth-connect": "^1.0.5",
2323
"morgan": "1.10.0",
2424
"object-assign": "4.1.1",
25-
"opn": "5.3.0",
25+
"open": "8.0.9",
2626
"proxy-middleware": "0.15.0",
27-
"send": "0.16.2",
27+
"send": "0.17.2",
2828
"serve-index": "1.9.1"
2929
},
3030
"devDependencies": {

Diff for: ‎packages/plugin-tab/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "",
55
"main": "index.js",
66
"dependencies": {
7-
"fs-extra": "0.30.0",
7+
"fs-extra": "10.0.0",
88
"glob": "7.1.6",
99
"lodash": "4.17.21"
1010
},

Diff for: ‎packages/uikit-workshop/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@
5050
"@webcomponents/custom-elements": "^1.4.3",
5151
"autoprefixer": "^9.6.5",
5252
"babel-loader": "^8.0.6",
53-
"better-opn": "^1.0.0",
53+
"better-opn": "^3.0.0",
5454
"browser-sync": "^2.26.7",
55-
"classnames": "^2.2.6",
55+
"classnames": "^2.3.1",
5656
"clean-css-loader": "^1.0.1",
5757
"clean-webpack-plugin": "0.1.19",
5858
"clipboard": "^2.0.8",
5959
"copy-webpack-plugin": "^5.0.2",
60-
"cosmiconfig": "^5.0.6",
60+
"cosmiconfig": "^7.0.0",
6161
"css-loader": "^3.2.0",
62-
"ejs": "^2.7.2",
62+
"ejs": "^3.1.6",
6363
"express": "^4.17.1",
6464
"fg-loadjs": "^1.1.0",
65-
"fuse.js": "^3.4.5",
65+
"fuse.js": "^6.4.6",
6666
"hard-source-webpack-plugin-patch": "^0.13.3",
6767
"hasha": "^5.2.2",
6868
"hogan.js": "^3.0.2",
@@ -90,7 +90,7 @@
9090
"sass": "1.43.4",
9191
"sass-loader": "^10.1.1",
9292
"scriptjs": "^2.5.9",
93-
"scroll-js": "^2.2.0",
93+
"scroll-js": "3.4.x",
9494
"skatejs": "^5.2.4",
9595
"style-loader": "^1.0.0",
9696
"svg-sprite-loader": "^4.1.6",
@@ -104,7 +104,7 @@
104104
"webpack-merge": "^4.2.2",
105105
"webpackbar": "^4.0.0",
106106
"wolfy87-eventemitter": "^5.2.9",
107-
"yargs": "^16.2.0"
107+
"yargs": "^17.0.1"
108108
},
109109
"browserslist": [
110110
"last 2 version",

Diff for: ‎packages/uikit-workshop/src/html/partials/base-template.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
{{# descBlockExists }}
33

44
<div
5-
class="
6-
pl-c-pattern-info__panel pl-c-pattern-info__panel--info
7-
pl-js-pattern-info
8-
"
5+
class="pl-c-pattern-info__panel pl-c-pattern-info__panel--info pl-js-pattern-info"
96
>
107
{{# isPatternView }}
118
<!-- extra info for modal view -->

Diff for: ‎packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js

-2
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,9 @@ class Search extends BaseComponent {
145145
const fuseOptions = {
146146
shouldSort: true,
147147
threshold: 0.3,
148-
tokenize: true,
149148
includeMatches: true,
150149
location: 0,
151150
distance: 100,
152-
maxPatternLength: 32,
153151
minMatchCharLength: 1,
154152
keys: ['label'],
155153
};

Diff for: ‎packages/uikit-workshop/webpack.config.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const argv = require('yargs').argv;
1212
const merge = require('webpack-merge');
1313
const WebpackBar = require('webpackbar');
1414

15-
const cosmiconfig = require('cosmiconfig');
16-
const explorer = cosmiconfig('patternlab');
15+
const cosmiconfigSync = require('cosmiconfig').cosmiconfigSync;
16+
const explorerSync = cosmiconfigSync('patternlab');
1717

1818
// @todo: wire these two ocnfigs up to use cosmicconfig!
1919
const defaultConfig = {
@@ -33,9 +33,9 @@ module.exports = function (apiConfig) {
3333
let configToSearchFor;
3434

3535
if (argv.patternlabrc) {
36-
configToSearchFor = await explorer.loadSync(argv.patternlabrc);
36+
configToSearchFor = await explorerSync.load(argv.patternlabrc);
3737
} else {
38-
configToSearchFor = await explorer.searchSync();
38+
configToSearchFor = await explorerSync.search();
3939
}
4040

4141
if (configToSearchFor) {

0 commit comments

Comments
 (0)