Skip to content

Commit 6eba587

Browse files
authored
Merge pull request #10 from vaibhavbansal23/ssr-fix
Ssr fix
2 parents 891d8da + 1a0984f commit 6eba587

File tree

6 files changed

+71
-47
lines changed

6 files changed

+71
-47
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "imagekitio-vue",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"scripts": {
55
"build:lib": "./node_modules/.bin/vue-cli-service build --target lib src/index.js",
66
"build": "./node_modules/.bin/vue-cli-service lint --fix; npm run build:lib",
@@ -12,11 +12,9 @@
1212
"build-storybook": "build-storybook"
1313
},
1414
"main": "dist/imagekitio-vue.common.js",
15-
"browser": "src/index.js",
1615
"unpkg": "dist/imagekitio-vue.umd.min.js",
1716
"files": [
18-
"dist/*",
19-
"src/*"
17+
"dist/*"
2018
],
2119
"repository": {
2220
"type": "git",

samples/sample-app/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ npm run build
2525

2626
Now, Go to `sample-app` by,
2727
```bash
28-
cd example/sample-app
28+
cd samples/sample-app
2929
```
3030

3131
then,

src/components/Intersect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default {
99
default: () => [0, 0.2]
1010
},
1111
root: {
12-
type: HTMLElement,
12+
type: Object,
1313
required: false,
1414
default: () => null
1515
},

src/utils/urlParser.js

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,49 @@
11
export function parseURL(url) {
2-
let parser = document.createElement('a'),
3-
searchObject = {},
4-
queries, split, i;
5-
// Let the browser do the work
6-
parser.href = url;
7-
// Convert query string to object
8-
queries = parser.search.replace(/^\?/, '').split('&');
9-
for( i = 0; i < queries.length; i++ ) {
10-
split = queries[i].split('=');
11-
searchObject[split[0]] = split[1];
12-
}
13-
return {
14-
protocol: parser.protocol,
15-
host: parser.host,
16-
hostname: parser.hostname,
17-
port: parser.port,
18-
pathname: parser.pathname,
19-
search: parser.search,
20-
searchObject: searchObject,
21-
hash: parser.hash
22-
};
2+
let parser;
3+
if(typeof document === 'undefined'){
4+
parser = parseUrlInNode(url);
5+
}else{
6+
parser = parseUrlInBrowser(url);
7+
}
8+
9+
return {
10+
protocol: parser.protocol,
11+
host: parser.host,
12+
hostname: parser.hostname,
13+
port: parser.port,
14+
pathname: parser.pathname,
15+
search: parser.search,
16+
searchObject: parser.searchObject,
17+
hash: parser.hash
18+
};
2319
}
20+
21+
function parseUrlInBrowser(urlToParse){
22+
var parser = document.createElement('a'),searchObject = {}, queries, split, i;
23+
// Let the browser do the work
24+
parser.href = urlToParse;
25+
// Convert query string to object
26+
queries = parser.search.replace(/^\?/, '').split('&');
27+
for( i = 0; i < queries.length; i++ ) {
28+
split = queries[i].split('=');
29+
searchObject[split[0]] = split[1];
30+
}
31+
parser.searchObject = searchObject;
32+
return parser;
33+
}
34+
35+
function parseUrlInNode(urlToParse){
36+
var url = require('url');
37+
38+
var parser = new URL(urlToParse);
39+
var searchObject = {}, queries, split, i;
40+
41+
// Convert query string to object
42+
queries = parser.search.replace(/^\?/, '').split('&');
43+
for( i = 0; i < queries.length; i++ ) {
44+
split = queries[i].split('=');
45+
searchObject[split[0]] = split[1];
46+
}
47+
parser.searchObject = searchObject;
48+
return parser;
49+
}

tests/__snapshots__/storyshots.test.js.snap

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,56 @@
33
exports[`Storyshots IKContext Image With Context 1`] = `
44
<img
55
class="ik-image"
6-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
6+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
77
/>
88
`;
99

1010
exports[`Storyshots IKContext Overriding Url Parameter 1`] = `
1111
<img
1212
class="ik-image"
13-
src="https://ik.imagekit.io/utkace/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
13+
src="https://ik.imagekit.io/utkace/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
1414
/>
1515
`;
1616

1717
exports[`Storyshots IKImage Image With LQIP With Nested Path 1`] = `
1818
<img
1919
class="ik-image"
20-
src="https://ik.imagekit.io/your_imagekit_id/tr:q-20,h-300,w-400/sample-folder/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
20+
src="https://ik.imagekit.io/your_imagekit_id/tr:q-20,h-300,w-400/sample-folder/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
2121
/>
2222
`;
2323

2424
exports[`Storyshots IKImage Image With LQIP With Path With No Transformation 1`] = `
2525
<img
2626
class="ik-image"
27-
src="https://ik.imagekit.io/your_imagekit_id/tr:q-20/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
27+
src="https://ik.imagekit.io/your_imagekit_id/tr:q-20/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
2828
/>
2929
`;
3030

3131
exports[`Storyshots IKImage Image With LQIP With Path With Transformation 1`] = `
3232
<img
3333
class="ik-image"
34-
src="https://ik.imagekit.io/your_imagekit_id/tr:q-20,h-300,w-400/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
34+
src="https://ik.imagekit.io/your_imagekit_id/tr:q-20,h-300,w-400/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
3535
/>
3636
`;
3737

3838
exports[`Storyshots IKImage Image With LQIP With Src With No Transformation 1`] = `
3939
<img
4040
class="ik-image"
41-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=q-20"
41+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=q-20"
4242
/>
4343
`;
4444

4545
exports[`Storyshots IKImage Image With LQIP With Src With Transformation 1`] = `
4646
<img
4747
class="ik-image"
48-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=h-300%2Cw-400%2Cq-20"
48+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=h-300%2Cw-400%2Cq-20"
4949
/>
5050
`;
5151

5252
exports[`Storyshots IKImage Image With Leading Slashes In Path 1`] = `
5353
<img
5454
class="ik-image"
55-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
55+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
5656
/>
5757
`;
5858

@@ -63,35 +63,35 @@ exports[`Storyshots IKImage Image With No Url Endpoint 1`] = `<!---->`;
6363
exports[`Storyshots IKImage Image With Path 1`] = `
6464
<img
6565
class="ik-image"
66-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
66+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
6767
/>
6868
`;
6969

7070
exports[`Storyshots IKImage Image With Query Parameters 1`] = `
7171
<img
7272
class="ik-image"
73-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&version=5&name=check"
73+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&version=5&name=check"
7474
/>
7575
`;
7676

7777
exports[`Storyshots IKImage Image With Src 1`] = `
7878
<img
7979
class="ik-image"
80-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
80+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
8181
/>
8282
`;
8383

8484
exports[`Storyshots IKImage Image With Src Query Parameters 1`] = `
8585
<img
8686
class="ik-image"
87-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?foo=bar&ik-sdk-version=vuejs-1.0.4&version=5&name=check"
87+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?foo=bar&ik-sdk-version=vuejs-1.0.5&version=5&name=check"
8888
/>
8989
`;
9090

9191
exports[`Storyshots IKImage Image With Trailing Slashes In Url Endpoint 1`] = `
9292
<img
9393
class="ik-image"
94-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4"
94+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5"
9595
/>
9696
`;
9797

@@ -128,41 +128,41 @@ exports[`Storyshots IKUpload Image Upload With No Tags 1`] = `
128128
exports[`Storyshots Transformations Image With Chained Transformation 1`] = `
129129
<img
130130
class="ik-image"
131-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=h-300%2Cw-400%3Art-90"
131+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=h-300%2Cw-400%3Art-90"
132132
/>
133133
`;
134134

135135
exports[`Storyshots Transformations Image With Non Existing Transformation With Existing Transformation 1`] = `
136136
<img
137137
class="ik-image"
138-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=h-300%2Cfoo-bar"
138+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=h-300%2Cfoo-bar"
139139
/>
140140
`;
141141

142142
exports[`Storyshots Transformations Image With Transformation 1`] = `
143143
<img
144144
class="ik-image"
145-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=h-300%2Cw-400"
145+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=h-300%2Cw-400"
146146
/>
147147
`;
148148

149149
exports[`Storyshots Transformations Image With Transformation Position As Path Passing Src 1`] = `
150150
<img
151151
class="ik-image"
152-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=h-300%2Cw-400"
152+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=h-300%2Cw-400"
153153
/>
154154
`;
155155

156156
exports[`Storyshots Transformations Image With Transformation Position As Query 1`] = `
157157
<img
158158
class="ik-image"
159-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=h-300%2Cw-400"
159+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=h-300%2Cw-400"
160160
/>
161161
`;
162162

163163
exports[`Storyshots Transformations Image Without Existing Transformation 1`] = `
164164
<img
165165
class="ik-image"
166-
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.4&tr=foo-bar"
166+
src="https://ik.imagekit.io/your_imagekit_id/default-image.jpg?ik-sdk-version=vuejs-1.0.5&tr=foo-bar"
167167
/>
168168
`;

0 commit comments

Comments
 (0)