Skip to content

Commit a03c3bb

Browse files
sghowerisghoweri
authored
Merge pull request #1236 from pattern-lab/fix-too-much-recursion
Fix too much recursion and update node-sass
2 parents c3fa917 + 487f2c9 commit a03c3bb

9 files changed

Lines changed: 67 additions & 86 deletions

File tree

‎packages/uikit-workshop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"mini-css-extract-plugin": "^0.8.0",
100100
"mousetrap": "^1.6.3",
101101
"no-emit-webpack-plugin": "^1.0.0",
102-
"node-sass": "^4.13.0",
102+
"node-sass": "^4.14.1",
103103
"node-sass-selector-importer": "^5.2.0",
104104
"penthouse": "^2.2.2",
105105
"postcss-loader": "^3.0.0",

‎packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ import { NavItem } from './src/NavItem';
2020
class Nav extends BaseComponent {
2121
static is = 'pl-nav';
2222

23-
constructor(self) {
24-
self = super(self);
25-
self.toggleNavPanel = self.toggleNavPanel.bind(self);
26-
self.toggleSpecialNavPanel = self.toggleSpecialNavPanel.bind(self);
27-
self.handleClick = self.handleClick.bind(self);
28-
self.handleURLChange = self.handleURLChange.bind(self);
29-
self.handlePageClick = self.handlePageClick.bind(self);
30-
self._hasInitiallyRendered = false;
31-
self.receiveIframeMessage = self.receiveIframeMessage.bind(self);
32-
self.useShadow = false;
33-
return self;
23+
constructor() {
24+
super();
25+
this.toggleNavPanel = this.toggleNavPanel.bind(this);
26+
this.toggleSpecialNavPanel = this.toggleSpecialNavPanel.bind(this);
27+
this.handleClick = this.handleClick.bind(this);
28+
this.handleURLChange = this.handleURLChange.bind(this);
29+
this.handlePageClick = this.handlePageClick.bind(this);
30+
this._hasInitiallyRendered = false;
31+
this.receiveIframeMessage = this.receiveIframeMessage.bind(this);
32+
this.useShadow = false;
3433
}
3534

3635
handlePageClick(e) {

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,28 @@ import { BaseComponent } from '../base-component';
1717
class Search extends BaseComponent {
1818
static is = 'pl-search';
1919

20-
constructor(self) {
21-
self = super(self);
22-
self.useShadow = false;
23-
self.defaultMaxResults = 10;
20+
constructor() {
21+
super();
22+
this.useShadow = false;
23+
this.defaultMaxResults = 10;
2424

2525
// Autosuggest is a controlled component.
2626
// This means that you need to provide an input value
2727
// and an onChange handler that updates this value (see below).
2828
// Suggestions also need to be provided to the Autosuggest,
2929
// and they are initially empty because the Autosuggest is closed.
30-
self.state = {
30+
this.state = {
3131
value: '',
3232
suggestions: [],
3333
isFocused: false,
3434
};
3535

36-
self.receiveIframeMessage = self.receiveIframeMessage.bind(self);
37-
self.onChange = self.onChange.bind(self);
38-
self.toggleSearch = self.toggleSearch.bind(self);
39-
self.closeSearch = self.closeSearch.bind(self);
40-
self.renderInputComponent = self.renderInputComponent.bind(self);
41-
self.openSearch = self.openSearch.bind(self);
42-
return self;
36+
this.receiveIframeMessage = this.receiveIframeMessage.bind(this);
37+
this.onChange = this.onChange.bind(this);
38+
this.toggleSearch = this.toggleSearch.bind(this);
39+
this.closeSearch = this.closeSearch.bind(this);
40+
this.renderInputComponent = this.renderInputComponent.bind(this);
41+
this.openSearch = this.openSearch.bind(this);
4342
}
4443

4544
connecting() {
@@ -61,10 +60,9 @@ class Search extends BaseComponent {
6160
}
6261

6362
connected() {
64-
const self = this;
6563
Mousetrap.bind('command+shift+f', function(e) {
6664
e.preventDefault();
67-
self.toggleSearch();
65+
this.toggleSearch();
6866
});
6967
window.addEventListener('message', this.receiveIframeMessage, false);
7068
}

‎packages/uikit-workshop/src/scripts/lit-components/pl-drawer/pl-drawer.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ import styles from './pl-drawer.scss?external';
1111

1212
@customElement('pl-drawer')
1313
class Drawer extends LitElement {
14-
constructor(self) {
15-
self = super(self);
16-
self.onMouseDown = self.onMouseDown.bind(self); // fix bindings so "self" works properly
17-
self.onMouseUp = self.onMouseUp.bind(self); // fix bindings so "self" works properly
18-
self.onMouseMove = self.onMouseMove.bind(self); // fix bindings so "this" works properly
19-
return self;
14+
constructor() {
15+
super();
16+
this.onMouseDown = this.onMouseDown.bind(this); // fix bindings so "this" works properly
17+
this.onMouseUp = this.onMouseUp.bind(this); // fix bindings so "this" works properly
18+
this.onMouseMove = this.onMouseMove.bind(this); // fix bindings so "this" works properly
2019
}
2120

2221
connectedCallback() {

‎packages/uikit-workshop/src/scripts/lit-components/pl-toggle-info/pl-toggle-info.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import styles from './pl-toggle-info.scss?external';
55

66
@customElement('pl-toggle-info')
77
class InfoToggle extends LitElement {
8-
constructor(self) {
9-
self = super(self);
10-
self.handleClick = self.handleClick.bind(self);
11-
return self;
8+
constructor() {
9+
super();
10+
this.handleClick = this.handleClick.bind(this);
1211
}
1312

1413
createRenderRoot() {

‎packages/uikit-workshop/src/scripts/lit-components/pl-toggle-layout/pl-toggle-layout.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import styles from './pl-toggle-layout.scss?external';
55

66
@customElement('pl-toggle-layout')
77
class LayoutToggle extends LitElement {
8-
constructor(self) {
9-
self = super(self);
10-
self.handleClick = self.handleClick.bind(self);
11-
return self;
8+
constructor() {
9+
super();
10+
this.handleClick = this.handleClick.bind(this);
1211
}
1312

1413
createRenderRoot() {

‎packages/uikit-workshop/src/scripts/lit-components/pl-toggle-theme/pl-toggle-theme.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ import styles from './pl-toggle-theme.scss?external';
66

77
@customElement('pl-toggle-theme')
88
class ThemeToggle extends LitElement {
9-
constructor(self) {
10-
self = super(self);
11-
self.targetOrigin =
9+
constructor() {
10+
super();
11+
this.targetOrigin =
1212
window.location.protocol === 'file:'
1313
? '*'
1414
: window.location.protocol + '//' + window.location.host;
15-
return self;
1615
}
1716

1817
static get properties() {

‎packages/uikit-workshop/src/scripts/lit-components/pl-viewport-size-list/pl-viewport-size-list.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ class ViewportSizes extends BaseComponent {
4343
this.triggerUpdate();
4444
}
4545

46-
constructor(self) {
47-
self = super(self);
48-
self.resizeViewport = self.resizeViewport.bind(self);
49-
self.useShadow = false;
50-
return self;
46+
constructor() {
47+
super();
48+
this.resizeViewport = this.resizeViewport.bind(this);
49+
this.useShadow = false;
5150
}
5251

5352
connectedCallback() {

‎yarn.lock‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1988,6 +1988,14 @@
19881988
dependencies:
19891989
"@types/node" ">= 8"
19901990

1991+
"@pattern-lab/starterkit-handlebars-vanilla@1.4.0":
1992+
version "1.4.0"
1993+
resolved "https://registry.yarnpkg.com/@pattern-lab/starterkit-handlebars-vanilla/-/starterkit-handlebars-vanilla-1.4.0.tgz#aac144d0c21d40226f90ac5ce1b5d8505dddf330"
1994+
integrity sha512-inkcRhpYfm0q58zEQ9Gx2S+iVu+prAtRgqLw5Opd0MYC74NMcqN9XrcbJva4NfLn1tgx9dkA3Xmtg0IxiTHnAw==
1995+
dependencies:
1996+
node-sass "^4.12.0"
1997+
node-sass-glob-importer "^5.3.2"
1998+
19911999
"@pattern-lab/starterkit-mustache-base@3.0.3":
19922000
version "3.0.3"
19932001
resolved "https://registry.yarnpkg.com/@pattern-lab/starterkit-mustache-base/-/starterkit-mustache-base-3.0.3.tgz#8ce9bc8e0d2254ee970a09c4bdc76d4f6131c91d"
@@ -12430,6 +12438,13 @@ node-releases@^1.1.38:
1243012438
dependencies:
1243112439
semver "^6.3.0"
1243212440

12441+
node-sass-glob-importer@^5.3.2:
12442+
version "5.3.2"
12443+
resolved "https://registry.yarnpkg.com/node-sass-glob-importer/-/node-sass-glob-importer-5.3.2.tgz#465581e46027c0e9520e6d87f7e6eda858a14acb"
12444+
integrity sha512-QTX7KPsISgp55REV6pMH703nzHfWCOEYEQC0cDyTRo7XO6WDvyC0OAzekuQ4gs505IZcxv9KxZ3uPJ5s5H9D3g==
12445+
dependencies:
12446+
node-sass-magic-importer "^5.3.2"
12447+
1243312448
node-sass-magic-importer@^5.3.2:
1243412449
version "5.3.2"
1243512450
resolved "https://registry.yarnpkg.com/node-sass-magic-importer/-/node-sass-magic-importer-5.3.2.tgz#2f2248bb2e5cdb275ba34102ebf995edadf99175"
@@ -12452,10 +12467,10 @@ node-sass-selector-importer@^5.2.0:
1245212467
node-sass-magic-importer "^5.3.2"
1245312468
postcss-scss "^2.0.0"
1245412469

12455-
node-sass@^4.13.0:
12456-
version "4.13.0"
12457-
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066"
12458-
integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==
12470+
node-sass@^4.12.0, node-sass@^4.14.1:
12471+
version "4.14.1"
12472+
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
12473+
integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
1245912474
dependencies:
1246012475
async-foreach "^0.1.3"
1246112476
chalk "^1.1.1"
@@ -12471,7 +12486,7 @@ node-sass@^4.13.0:
1247112486
node-gyp "^3.8.0"
1247212487
npmlog "^4.0.0"
1247312488
request "^2.88.0"
12474-
sass-graph "^2.2.4"
12489+
sass-graph "2.2.5"
1247512490
stdout-stream "^1.4.0"
1247612491
"true-case-path" "^1.0.2"
1247712492

@@ -15580,15 +15595,15 @@ sanitize-filename@1.6.1:
1558015595
dependencies:
1558115596
truncate-utf8-bytes "^1.0.0"
1558215597

15583-
sass-graph@^2.2.4:
15584-
version "2.2.4"
15585-
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
15586-
integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
15598+
sass-graph@2.2.5:
15599+
version "2.2.5"
15600+
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
15601+
integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
1558715602
dependencies:
1558815603
glob "^7.0.0"
1558915604
lodash "^4.0.0"
1559015605
scss-tokenizer "^0.2.3"
15591-
yargs "^7.0.0"
15606+
yargs "^13.3.2"
1559215607

1559315608
sass-loader@^8.0.0:
1559415609
version "8.0.0"
@@ -18952,13 +18967,6 @@ yargs-parser@^4.1.0, yargs-parser@^4.2.0:
1895218967
dependencies:
1895318968
camelcase "^3.0.0"
1895418969

18955-
yargs-parser@^5.0.0:
18956-
version "5.0.0"
18957-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
18958-
integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
18959-
dependencies:
18960-
camelcase "^3.0.0"
18961-
1896218970
yargs-parser@^7.0.0:
1896318971
version "7.0.0"
1896418972
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -19056,7 +19064,7 @@ yargs@^13.2.2:
1905619064
y18n "^4.0.0"
1905719065
yargs-parser "^13.1.1"
1905819066

19059-
yargs@^13.3.0:
19067+
yargs@^13.3.0, yargs@^13.3.2:
1906019068
version "13.3.2"
1906119069
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
1906219070
integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -19102,25 +19110,6 @@ yargs@^3.32.0:
1910219110
window-size "^0.1.4"
1910319111
y18n "^3.2.0"
1910419112

19105-
yargs@^7.0.0:
19106-
version "7.1.0"
19107-
resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
19108-
integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
19109-
dependencies:
19110-
camelcase "^3.0.0"
19111-
cliui "^3.2.0"
19112-
decamelize "^1.1.1"
19113-
get-caller-file "^1.0.1"
19114-
os-locale "^1.4.0"
19115-
read-pkg-up "^1.0.1"
19116-
require-directory "^2.1.1"
19117-
require-main-filename "^1.0.1"
19118-
set-blocking "^2.0.0"
19119-
string-width "^1.0.2"
19120-
which-module "^1.0.0"
19121-
y18n "^3.2.1"
19122-
yargs-parser "^5.0.0"
19123-
1912419113
yargs@^8.0.1:
1912519114
version "8.0.2"
1912619115
resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"

0 commit comments

Comments
 (0)