Skip to content

Commit b9536e9

Browse files
authored
Merge pull request #11 from Automattic/add/bundle-tool
Tools to bundle with rollup
2 parents 7150cf0 + 51cab11 commit b9536e9

7 files changed

+1134
-14
lines changed

.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
},
1515
"extends": [
1616
"eslint:recommended"
17-
]
17+
],
18+
"ignorePatterns": [ "dist/**" ]
1819
}
1920

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/node_modules
2+
/dist
23
.DS_Store

index.d.ts

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ export interface CssFilters {
2727
export declare class CriticalCssError {
2828
hasUrl(): boolean;
2929
toJSON(): any;
30+
get( key: string ): any;
31+
getType(): string;
3032
static fromJSON: ( data: any ) => CriticalCssError;
3133
}
3234

lib/errors.js

+18-13
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
*/
1212
class CriticalCssError extends Error {
1313
constructor( type, data ) {
14-
super( type.getMessage( data ) );
14+
if ( ! CriticalCssErrorTypes[ type ] ) {
15+
type = 'UnknownError';
16+
data = { message: JSON.stringify( data ) };
17+
}
18+
19+
super( CriticalCssErrorTypes[ type ].getMessage( data ) );
1520

1621
this.type = type;
1722
this.data = data;
@@ -21,7 +26,7 @@ class CriticalCssError extends Error {
2126
* Returns the type of error as a string.
2227
*/
2328
getType() {
24-
return this.type.name;
29+
return this.type;
2530
}
2631

2732
/**
@@ -44,9 +49,9 @@ class CriticalCssError extends Error {
4449
*/
4550
toJSON() {
4651
return {
47-
type: this.type.name,
52+
type: this.type,
4853
data: this.data,
49-
message: this.type.getMessage( this.data ),
54+
message: CriticalCssErrorTypes[ this.type ].getMessage( this.data ),
5055
};
5156
}
5257

@@ -73,7 +78,7 @@ class CriticalCssError extends Error {
7378
*/
7479
class UnknownError extends CriticalCssError {
7580
constructor( { message } ) {
76-
super( UnknownError, { message } );
81+
super( 'UnknownError', { message } );
7782
}
7883

7984
static getMessage( data ) {
@@ -86,7 +91,7 @@ class UnknownError extends CriticalCssError {
8691
*/
8792
class HttpError extends CriticalCssError {
8893
constructor( { url, code } ) {
89-
super( HttpError, { url, code } );
94+
super( 'HttpError', { url, code } );
9095
}
9196

9297
static getMessage( data ) {
@@ -100,7 +105,7 @@ class HttpError extends CriticalCssError {
100105
*/
101106
class GenericUrlError extends CriticalCssError {
102107
constructor( { url, message } ) {
103-
super( GenericUrlError, { url, message } );
108+
super( 'GenericUrlError', { url, message } );
104109
}
105110

106111
static getMessage( data ) {
@@ -114,7 +119,7 @@ class GenericUrlError extends CriticalCssError {
114119
*/
115120
class CrossDomainError extends CriticalCssError {
116121
constructor( { url } ) {
117-
super( CrossDomainError, { url } );
122+
super( 'CrossDomainError', { url } );
118123
}
119124

120125
static getMessage( data ) {
@@ -127,7 +132,7 @@ class CrossDomainError extends CriticalCssError {
127132
*/
128133
class LoadTimeoutError extends CriticalCssError {
129134
constructor( { url } ) {
130-
super( LoadTimeoutError, { url } );
135+
super( 'LoadTimeoutError', { url } );
131136
}
132137

133138
static getMessage( data ) {
@@ -140,7 +145,7 @@ class LoadTimeoutError extends CriticalCssError {
140145
*/
141146
class RedirectError extends CriticalCssError {
142147
constructor( { url, redirectUrl } ) {
143-
super( RedirectError, { url, redirectUrl } );
148+
super( 'RedirectError', { url, redirectUrl } );
144149
}
145150

146151
static getMessage( data ) {
@@ -154,7 +159,7 @@ class RedirectError extends CriticalCssError {
154159
*/
155160
class UrlVerifyError extends CriticalCssError {
156161
constructor( { url } ) {
157-
super( UrlVerifyError, { url } );
162+
super( 'UrlVerifyError', { url } );
158163
}
159164

160165
static getMessage( data ) {
@@ -168,7 +173,7 @@ class UrlVerifyError extends CriticalCssError {
168173
*/
169174
class ConfigurationError extends CriticalCssError {
170175
constructor( { message } ) {
171-
super( ConfigurationError, { message } );
176+
super( 'ConfigurationError', { message } );
172177
}
173178

174179
static getMessage( data ) {
@@ -182,7 +187,7 @@ class ConfigurationError extends CriticalCssError {
182187
*/
183188
class InternalError extends CriticalCssError {
184189
constructor( { message } ) {
185-
super( InternalError, { message } );
190+
super( 'InternalError', { message } );
186191
}
187192

188193
static getMessage( data ) {

0 commit comments

Comments
 (0)