Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: updated even further dependencies #1320

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
26db979
Merge pull request #1 from pattern-lab/dev
mfranzke Apr 24, 2020
7812878
Merge pull request #2 from pattern-lab/dev
mfranzke Apr 25, 2020
271dc8d
chore(docs): some typos
Apr 25, 2020
ccdf238
Revert "Merge pull request #2 from pattern-lab/dev"
Apr 25, 2020
4c2070f
Revert "Merge pull request #1 from pattern-lab/dev"
Apr 25, 2020
117ca22
Revert "chore(docs): some typos"
Apr 25, 2020
4f5bff6
Merge remote-tracking branch 'upstream/dev' into dev
Apr 28, 2020
73df9d3
Merge remote-tracking branch 'upstream/dev' into dev
Apr 30, 2020
9115c17
Merge remote-tracking branch 'upstream/dev' into dev
May 2, 2020
e86272f
Merge remote-tracking branch 'upstream/dev' into dev
May 8, 2020
a243f5d
Merge remote-tracking branch 'upstream/dev' into dev
May 11, 2020
3238ac7
Merge remote-tracking branch 'upstream/dev' into dev
May 23, 2020
7f4ba39
Merge remote-tracking branch 'upstream/dev' into dev
Jun 11, 2020
f7b514b
Merge remote-tracking branch 'upstream/dev' into dev
Jun 13, 2020
37f9749
Merge remote-tracking branch 'upstream/dev' into dev
Jun 28, 2020
572afec
Merge branch 'dev' of https://github.com/mfranzke/patternlab-node int…
Jun 28, 2020
e4a5245
Merge remote-tracking branch 'upstream/dev' into dev
Sep 6, 2020
4aa9366
Merge remote-tracking branch 'upstream/dev' into dev
Sep 11, 2020
155c253
Merge remote-tracking branch 'upstream/dev' into dev
Oct 11, 2020
3b95604
Merge remote-tracking branch 'upstream/dev' into dev
Jan 12, 2021
6b4a6fb
Merge remote-tracking branch 'upstream/dev' into dev
Feb 5, 2021
6431987
Merge remote-tracking branch 'upstream/dev' into dev
Feb 20, 2021
d486051
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 23, 2021
be17657
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 24, 2021
6c18bdc
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 26, 2021
46eb7dc
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 29, 2021
ce0dedd
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Apr 18, 2021
f1082d9
refactor: updated dependency ejs
mfranzke Apr 25, 2021
53b7ce2
refactor: updated dependency scroll-js
mfranzke Apr 25, 2021
1ab4f81
refactor: updated dependency classnames
mfranzke Apr 25, 2021
95f8a29
refactor: updated dependency gulp
mfranzke Apr 25, 2021
fea3670
refactor: replaced dependency opn by its new name open
mfranzke Apr 25, 2021
b8de73d
refactor: updated dependency lerna
mfranzke Apr 25, 2021
bea9c32
refactor: updated dependency @auto-it/released
mfranzke May 11, 2021
64aec69
refactor: updated dependency auto
mfranzke May 11, 2021
deb70ea
refactor: updated dependency fs-extra
mfranzke May 11, 2021
e92a31c
refactor: updated dependency better-opn
mfranzke May 12, 2021
6acd7fd
refactor: updated dependency cosmiconfig
mfranzke May 12, 2021
f70cf70
fix(cosmiconfig-update): corrected the variable name
mfranzke May 12, 2021
7b53b9e
fix(cosmiconfig-update): added the variable name
mfranzke May 12, 2021
51ff7c5
refactor: updated dependency fuse.js
mfranzke May 13, 2021
32ab105
refactor: updated dependency deepmerge
mfranzke May 14, 2021
f341914
refactor: updated dependency execa
mfranzke May 15, 2021
4be1ce1
refactor: updated dependency js-yaml
mfranzke May 15, 2021
6a4c221
refactor: updated dependency jsdoc-to-markdown
mfranzke May 16, 2021
866f69a
refactor: updated dependency archiver
mfranzke May 16, 2021
3850bda
refactor: updated dependency has-yarn
mfranzke May 16, 2021
ccddcb4
refactor: updated dependency inquirer
mfranzke May 16, 2021
f152137
refactor: updated dependency ora
mfranzke May 16, 2021
e536cb2
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke May 17, 2021
7012913
Merge remote-tracking branch 'upstream/dev' into refactor-updated-eve…
mfranzke May 17, 2021
340e62f
refactor: updated dependency http-auth
mfranzke May 17, 2021
b953c0a
refactor(node): aligned all node versions within the packages
mfranzke May 19, 2021
d5096e1
refactor: updated dependency node-sass
mfranzke May 19, 2021
ca5e35d
refactor: updated dependency open
mfranzke May 19, 2021
70e943c
refactor: updated dependency yargs
mfranzke May 19, 2021
7007718
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke May 19, 2021
7fa4ab4
refactor: updated dependency @11ty/eleventy-plugin-syntaxhighlight
mfranzke May 24, 2021
b579d0c
refactor: updated dependency markdown-it
mfranzke May 27, 2021
929c0d8
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jun 9, 2021
e16c3e7
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jun 12, 2021
ace56ab
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jun 21, 2021
39dac8c
build: regenerated yarn.lock file
mfranzke Jun 21, 2021
90dec8e
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jun 21, 2021
efeaf06
refactor: updated dependency node-sass #1320
mfranzke Jun 24, 2021
af39775
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jun 24, 2021
cb69bed
refactor: updated dependency recursive-copy
mfranzke Jul 20, 2021
9b60cf2
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Aug 30, 2021
51c1d00
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 3, 2021
4617540
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 5, 2021
373ea94
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Oct 5, 2021
4c8ed6b
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Oct 5, 2021
37ef900
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Oct 5, 2021
e3524db
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 6, 2021
43fabb9
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Oct 6, 2021
20d3573
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 16, 2021
47d0fad
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 3, 2021
fbf5f46
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 10, 2021
397bf6f
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Nov 13, 2021
dd6c783
chore: reverted node-sass dependency update
mfranzke Nov 14, 2021
da469b9
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 21, 2021
82a52f0
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 21, 2021
3e587b0
refactor: rebuild yarn.lock file
mfranzke Nov 21, 2021
44153fc
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Nov 21, 2021
853b80a
refactor(node): aligned all node versions within the packages
mfranzke Nov 21, 2021
334ecd3
build: regenerated yarn.lock file
mfranzke Nov 21, 2021
8249a87
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 22, 2021
6e09f99
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Nov 22, 2021
a601a87
refactor: updated dependency husky
mfranzke Nov 22, 2021
a852046
refactor: updated dependency @11ty/eleventy
mfranzke Nov 22, 2021
2f0c9c2
chore: code optimizations
mfranzke Nov 23, 2021
e852842
Merge branch 'refactor-updated-even-further-dependencies' of https://…
mfranzke Nov 23, 2021
1b665bb
chore: rebuild yarn.lock file
mfranzke Nov 24, 2021
d6debbc
chore: some reformatting
mfranzke Nov 28, 2021
3caa194
chore: rebuild yarn.lock file
mfranzke Nov 28, 2021
1531399
chore: reformatted
mfranzke Nov 28, 2021
c29a411
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Nov 28, 2021
aff4fef
chore: reverted commit a852046a
mfranzke Nov 29, 2021
b6195b5
Revert "chore: reformatted"
mfranzke Nov 29, 2021
bdfc4b9
chore: formatting
mfranzke Nov 30, 2021
fe92f4b
chore: formatting
mfranzke Nov 30, 2021
ffaa223
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Nov 30, 2021
da708a1
chore: formatting
mfranzke Dec 1, 2021
3d91936
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 3, 2021
d7b18ac
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 3, 2021
ecf076b
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 4, 2021
5d65b24
chore: formatting
mfranzke Dec 4, 2021
4400ed0
Merge branch 'dev' of https://github.com/mfranzke/patternlab-node int…
mfranzke Dec 4, 2021
16d9089
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 5, 2021
480162d
chore: formatting
mfranzke Dec 6, 2021
1779eba
Merge branch 'dev' of https://github.com/mfranzke/patternlab-node int…
mfranzke Dec 6, 2021
9b9ab9a
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 6, 2021
7cb6c97
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 7, 2021
0de4737
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Dec 8, 2021
226490e
chore: formatting
mfranzke Dec 12, 2021
44e7ee8
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Dec 12, 2021
849fccd
build: regenerated package-lock.json
mfranzke Dec 12, 2021
792944c
Merge branch 'refactor-updated-even-further-dependencies' of https://…
mfranzke Dec 29, 2021
df875e1
refactor: revert commit 373ea941c14d0aa0afbe5b0e2d1f453a2f5df244 and …
mfranzke Dec 29, 2021
c5b16ed
chore: reformatting
mfranzke Dec 29, 2021
8f91837
fix: corrected those files contents
mfranzke Dec 29, 2021
35b850e
refactor: updated dependency send
mfranzke Dec 29, 2021
9177800
refactor: updated dependency commander
mfranzke Dec 30, 2021
34cb497
Merge remote-tracking branch 'upstream/dev' into refactor-updated-eve…
mfranzke Dec 31, 2021
dd6ff6f
refactor: we need to fix this dependencies version range to minor
mfranzke Dec 31, 2021
155b9c1
Merge remote-tracking branch 'upstream/dev' into refactor-updated-eve…
mfranzke Jan 1, 2022
258f312
build: regenerated yarn.lock file
mfranzke Jan 2, 2022
a867aab
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jan 7, 2022
96f0c38
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jan 23, 2022
8e44bc3
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jan 29, 2022
6651a7c
Merge branch 'dev' into refactor-updated-even-further-dependencies
mfranzke Jan 29, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
]
},
"dependencies": {
"@auto-it/released": "^9.40.5",
"@auto-it/released": "^10.27.0",
"@babel/plugin-proposal-decorators": "^7.13.5",
"@babel/plugin-syntax-jsx": "^7.12.13",
"auto": "^9.40.5",
"auto": "^10.27.0",
"babel-eslint": "^10.0.2",
"eslint": "^6.1.0",
"eslint-config-prettier": "^6.0.0",
Expand Down Expand Up @@ -51,6 +51,6 @@
]
},
"devDependencies": {
"husky": "^6.0.0"
"husky": "^7.0.4"
}
}
18 changes: 9 additions & 9 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
},
"dependencies": {
"@pattern-lab/core": "^5.15.5",
"archiver": "2.1.1",
"archiver": "5.3.0",
"chalk": "4.1.0",
"commander": "2.15.1",
"deepmerge": "^2.1.1",
"execa": "4.0.3",
"fs-extra": "6.0.1",
"commander": "6.2.1",
"deepmerge": "^4.2.2",
"execa": "5.0.0",
"fs-extra": "10.0.0",
"glob": "7.1.6",
"has-yarn": "1.0.0",
"inquirer": "5.1.0",
"has-yarn": "2.1.0",
"inquirer": "8.0.0",
"lodash": "4.17.21",
"ora": "2.1.0"
"ora": "5.4.0"
},
"devDependencies": {
"@pattern-lab/starterkit-mustache-base": "3.0.3",
Expand All @@ -47,7 +47,7 @@
],
"scripts": {
"lint": "eslint ./{bin,test}",
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120",
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120",
"prepublish": "npx dos2unix-cli bin/patternlab.js"
},
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"chalk": "4.1.0",
"chokidar": "3.5.1",
"dive": "0.5.0",
"fs-extra": "5.0.0",
"fs-extra": "10.0.0",
"glob": "7.1.6",
"graphlib": "2.1.8",
"js-beautify": "1.13.5",
"js-yaml": "3.13.1",
"js-yaml": "4.1.0",
"lodash": "4.17.21",
"markdown-it": "6.0.1",
"markdown-it": "12.0.6",
"node-fetch": "2.6.1",
"recursive-copy": "2.0.13",
"update-notifier": "5.1.0"
Expand All @@ -28,7 +28,7 @@
"eslint": "^6.1.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-prettier": "^3.1.0",
"jsdoc-to-markdown": "5.0.1",
"jsdoc-to-markdown": "6.0.1",
"prettier": "^2.2.1",
"rewire": "2.5.2",
"standard-version": "9.1.1",
Expand Down
6 changes: 2 additions & 4 deletions packages/core/src/lib/data_loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ function loadFile(dataFilePath, fsDep) {

if (dataFile && fsDep.existsSync(path.resolve(dataFile))) {
try {
return yaml.safeLoad(
fsDep.readFileSync(path.resolve(dataFile), 'utf8')
);
return yaml.load(fsDep.readFileSync(path.resolve(dataFile), 'utf8'));
} catch (err) {
throw new Error(`Error loading file: ${dataFile} - ${err.message}`);
}
Expand Down Expand Up @@ -55,7 +53,7 @@ function loadDataFromFolder(dataFilesPath, excludeFileNames, fsDep) {

dataFiles.forEach(function (filePath) {
try {
const jsonData = yaml.safeLoad(
const jsonData = yaml.load(
fsDep.readFileSync(path.resolve(filePath), 'utf8')
);
mergeObject = _.merge(mergeObject, jsonData);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/lib/markdown_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const markdown_parser = function () {
if (chunks && chunks[1]) {
//parse the yaml if we got it
const frontmatter = chunks[1];
returnObject = yaml.safeLoad(frontmatter);
returnObject = yaml.load(frontmatter);
}

if (chunks[2]) {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/lib/pseudopattern_hunter.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function (
paths.source.patterns,
pseudoPatterns[i]
);
variantFileData = yaml.safeLoad(
variantFileData = yaml.load(
fs.readFileSync(variantFileFullPath, 'utf8')
);
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion packages/development-edition-engine-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@pattern-lab/engine-mustache": "^5.15.1",
"@pattern-lab/engine-react": "^5.15.1",
"@pattern-lab/uikit-workshop": "^5.15.7",
"gulp": "3.9.1",
"gulp": "4.0.2",
"minimist": "^1.2.5",
"react": "16.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/edition-node-gulp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@pattern-lab/core": "^5.15.5",
"@pattern-lab/engine-mustache": "^5.15.1",
"@pattern-lab/uikit-workshop": "^5.15.7",
"gulp": "3.9.1",
"gulp": "4.0.2",
"minimist": "1.2.5"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-handlebars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "5.15.1",
"main": "lib/engine_handlebars.js",
"dependencies": {
"fs-extra": "^8.1.0",
"fs-extra": "^10.0.0",
"glob": "^7.1.6",
"handlebars": "^4.7.7"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-liquid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "5.15.1",
"main": "lib/engine_liquid.js",
"dependencies": {
"fs-extra": "5.0.0",
"fs-extra": "10.0.0",
"liquidjs": "2.2.0"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-mustache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "5.15.1",
"main": "lib/engine_mustache.js",
"dependencies": {
"fs-extra": "0.30.0",
"fs-extra": "10.0.0",
JosefBredereck marked this conversation as resolved.
Show resolved Hide resolved
"mustache": "3.1.0"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-nunjucks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"deprecated": false,
"description": "The nunjucks PatternEngine for Pattern Lab / Node",
"dependencies": {
"fs-extra": "7.0.0",
"fs-extra": "10.0.0",
"nunjucks": "^3.2.3"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-twig-php/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@basalt/twig-renderer": "^2.0.0",
"@pattern-lab/core": "^5.15.5",
"chalk": "^4.1.0",
"fs-extra": "0.30.0"
"fs-extra": "10.0.0"
},
"keywords": [
"Pattern Lab",
Expand Down
3 changes: 2 additions & 1 deletion packages/engine-twig/lib/engine_twig.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ var engine_twig = {
engineFileExtension: '.twig',

// regexes, stored here so they're only compiled once
findPartialsRE: /{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
findPartialsRE:
/{%[-]?\s*(?:extends|include|embed|from|import|use)\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
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-twig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "5.15.3",
"main": "lib/engine_twig.js",
"dependencies": {
"fs-extra": "0.30.0",
"fs-extra": "10.0.0",
"twing": "^5.0.2"
},
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions packages/live-server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const path = require('path');
const url = require('url');
const http = require('http');
const send = require('send');
const open = require('opn');
const open = require('open');
const es = require('event-stream');
const os = require('os');
const chokidar = require('chokidar');
Expand Down Expand Up @@ -370,14 +370,14 @@ LiveServer.start = function (options) {
if (openPath !== null)
if (typeof openPath === 'object') {
openPath.forEach((p) =>
open(openURL + p, { app: browser }).catch(() =>
open(openURL + p, { app: { name: browser } }).catch(() =>
console.log(
'Warning: Could not open pattern lab in default browser.'
)
)
);
} else {
open(openURL + openPath, { app: browser }).catch(() =>
open(openURL + openPath, { app: { name: browser } }).catch(() =>
console.log('Warning: Could not open pattern lab in default browser.')
);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/live-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"http-auth-connect": "^1.0.5",
"morgan": "1.10.0",
"object-assign": "4.1.1",
"opn": "5.3.0",
"open": "8.0.9",
"proxy-middleware": "0.15.0",
"send": "0.16.2",
"send": "0.17.2",
"serve-index": "1.9.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-tab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"main": "index.js",
"dependencies": {
"fs-extra": "0.30.0",
"fs-extra": "10.0.0",
"glob": "7.1.6",
"lodash": "4.17.21"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/uikit-workshop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@
"@webcomponents/custom-elements": "^1.4.3",
"autoprefixer": "^9.6.5",
"babel-loader": "^8.0.6",
"better-opn": "^1.0.0",
"better-opn": "^3.0.0",
"browser-sync": "^2.26.7",
"classnames": "^2.2.6",
"classnames": "^2.3.1",
"clean-css-loader": "^1.0.1",
"clean-webpack-plugin": "0.1.19",
"clipboard": "^2.0.8",
"copy-webpack-plugin": "^5.0.2",
"cosmiconfig": "^5.0.6",
"cosmiconfig": "^7.0.0",
"css-loader": "^3.2.0",
"ejs": "^2.7.2",
"ejs": "^3.1.6",
"express": "^4.17.1",
"fg-loadjs": "^1.1.0",
"fuse.js": "^3.4.5",
"fuse.js": "^6.4.6",
"hard-source-webpack-plugin-patch": "^0.13.3",
"hasha": "^5.2.2",
"hogan.js": "^3.0.2",
Expand Down Expand Up @@ -90,7 +90,7 @@
"sass": "1.43.4",
"sass-loader": "^10.1.1",
"scriptjs": "^2.5.9",
"scroll-js": "^2.2.0",
"scroll-js": "3.4.x",
"skatejs": "^5.2.4",
"style-loader": "^1.0.0",
"svg-sprite-loader": "^4.1.6",
Expand All @@ -104,7 +104,7 @@
"webpack-merge": "^4.2.2",
"webpackbar": "^4.0.0",
"wolfy87-eventemitter": "^5.2.9",
"yargs": "^16.2.0"
"yargs": "^17.0.1"
},
"browserslist": [
"last 2 version",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
{{# descBlockExists }}

<div
class="
pl-c-pattern-info__panel pl-c-pattern-info__panel--info
pl-js-pattern-info
"
class="pl-c-pattern-info__panel pl-c-pattern-info__panel--info pl-js-pattern-info"
>
{{# isPatternView }}
<!-- extra info for modal view -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,9 @@ class Search extends BaseComponent {
const fuseOptions = {
shouldSort: true,
threshold: 0.3,
tokenize: true,
includeMatches: true,
location: 0,
distance: 100,
maxPatternLength: 32,
minMatchCharLength: 1,
keys: ['label'],
};
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-workshop/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const argv = require('yargs').argv;
const merge = require('webpack-merge');
const WebpackBar = require('webpackbar');

const cosmiconfig = require('cosmiconfig');
const explorer = cosmiconfig('patternlab');
const cosmiconfigSync = require('cosmiconfig').cosmiconfigSync;
const explorerSync = cosmiconfigSync('patternlab');

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

if (argv.patternlabrc) {
configToSearchFor = await explorer.loadSync(argv.patternlabrc);
configToSearchFor = await explorerSync.load(argv.patternlabrc);
} else {
configToSearchFor = await explorer.searchSync();
configToSearchFor = await explorerSync.search();
}

if (configToSearchFor) {
Expand Down
Loading