Skip to content

Commit b560e95

Browse files
pawelphilipczyk-cloudinarypawelphilipczyk-cloudinary
committed
Merge remote-tracking branch 'origin/master' into vue-reference-docs
2 parents 2a7ec2c + 2437331 commit b560e95

28 files changed

Lines changed: 255 additions & 70 deletions

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
1.9.1 / 2023-02-06
2+
==================
3+
4+
Html
5+
-------
6+
* Add analytics features to plugins
7+
8+
9+
110
1.9.0 / 2023-01-17
211
==================
312

‎e2e-tests/react-test-app/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,8 @@
55
"dependencies": {
66
"@cloudinary/url-gen": "^1.0.0-beta.5",
77
"@cloudinary/react": "file:cloudinary-react.tgz",
8-
"@testing-library/jest-dom": "^5.11.4",
9-
"@testing-library/react": "^11.1.0",
10-
"@testing-library/user-event": "^12.1.10",
11-
"@types/jest": "^26.0.15",
12-
"@types/node": "^12.0.0",
13-
"@types/react": "^17.0.0",
14-
"@types/react-dom": "^17.0.0",
158
"react": "^17.0.1",
169
"react-dom": "^17.0.1",
17-
"react-scripts": "4.0.3",
18-
"typescript": "^4.1.2",
1910
"web-vitals": "^1.0.1"
2011
},
2112
"scripts": {
@@ -44,6 +35,15 @@
4435
]
4536
},
4637
"devDependencies": {
47-
"del-cli": "^3.0.1"
38+
"@testing-library/jest-dom": "^5.11.4",
39+
"@testing-library/react": "^11.1.0",
40+
"@testing-library/user-event": "^12.1.10",
41+
"@types/jest": "^26.0.15",
42+
"@types/node": "^12.0.0",
43+
"@types/react": "^17.0.0",
44+
"@types/react-dom": "^17.0.0",
45+
"del-cli": "^3.0.1",
46+
"react-scripts": "4.0.3",
47+
"typescript": "^4.1.2"
4848
}
4949
}

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"packages": [
33
"packages/**/!(dist|playground)*"
44
],
5-
"version": "1.9.0"
5+
"version": "1.9.1"
66
}

‎package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,23 @@
1010
"start:docs": "live-server --open=public/docs",
1111
"update:urlgen": "npm install @cloudinary/url-gen@latest --prefix packages/html && npm install @cloudinary/url-gen@latest --prefix packages/react && npm install @cloudinary/url-gen@latest --prefix packages/vue && npm install @cloudinary/url-gen@latest --prefix packages/angular && npm install @cloudinary/url-gen@latest --prefix packages/angular/projects/cloudinary-library"
1212
},
13-
"dependencies": {
13+
"devDependencies": {
1414
"@vue/compiler-sfc": "^3.2.47",
1515
"better-docs": "2.3.2",
1616
"foodoc": "0.0.9",
1717
"jsdoc": "3.6.4",
1818
"jsdoc-plugin-typescript": "2.0.5",
1919
"jsdoc-vuejs": "^4.0.0",
20-
"typedoc": "^0.17.8"
21-
},
22-
"devDependencies": {
2320
"lerna": "^4.0.0",
24-
"replace-in-file": "^6.2.0"
21+
"replace-in-file": "^6.2.0",
22+
"typedoc": "^0.17.8"
2523
},
2624
"overrides": {
2725
"foodoc": {
2826
"handlebars": {
2927
"minimist": "1.2.6"
30-
}
28+
},
29+
"sanitize-html": "2.9.0"
3130
}
3231
}
3332
}

‎packages/angular/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudinary/angular-workspace",
3-
"version": "1.9.0",
3+
"version": "1.9.1",
44
"description": "Cloudinary Angular SDK",
55
"repository": "https://github.com/cloudinary/frontend-frameworks",
66
"sideEffects": false,
@@ -32,7 +32,7 @@
3232
"@angular-devkit/build-angular": "~0.1002.3",
3333
"@angular/cli": "~10.2.3",
3434
"@angular/compiler-cli": "~10.2.4",
35-
"@cloudinary/html": "^1.9.0",
35+
"@cloudinary/html": "^1.9.1",
3636
"@cloudinary/url-gen": "^1.8.7",
3737
"@types/jasmine": "~3.5.0",
3838
"@types/jasminewd2": "~2.0.3",

‎packages/angular/projects/cloudinary-library/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudinary/ng",
3-
"version": "1.9.0",
3+
"version": "1.9.1",
44
"repository": "https://github.com/cloudinary/frontend-frameworks",
55
"peerDependencies": {
66
"@angular/common": ">=10.0.0",
@@ -12,7 +12,7 @@
1212
"@cloudinary/url-gen": "^1.8.7"
1313
},
1414
"dependencies": {
15-
"@cloudinary/html": "^1.9.0"
15+
"@cloudinary/html": "^1.9.1"
1616
},
1717
"publishConfig": {
1818
"access": "public"

‎packages/html/__tests__/HtmlImageLayer.test.ts‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,54 @@
11
import {CloudinaryImage} from "@cloudinary/url-gen";
22
import {HtmlImageLayer} from "../src";
3-
import {AnalyticsOptions} from "../src/types";
3+
import {BaseAnalyticsOptions} from "../src/types";
4+
import {responsive} from "../src/plugins/responsive";
5+
import {placeholder} from "../src/plugins/placeholder";
6+
import {lazyload} from "../src/plugins/lazyload";
7+
import {accessibility} from "../src/plugins/accessibility";
48

5-
const sdkAnalyticsTokens:AnalyticsOptions = {
9+
jest.useFakeTimers();
10+
11+
const sdkAnalyticsTokens: BaseAnalyticsOptions = {
612
sdkSemver: '1.0.0',
713
techVersion: '1.0.0',
814
sdkCode: 'X'
915
}
1016

17+
const flushPromises = async () => {
18+
jest.advanceTimersByTime(100);
19+
await Promise.resolve();
20+
}
21+
1122
describe('HtmlImageLayer tests', function () {
1223
const cldImage = new CloudinaryImage('sample', {cloudName: 'demo'});
1324

14-
it('should set image src', function () {
25+
it('should set image src', async function () {
1526
const img = document.createElement('img');
1627
new HtmlImageLayer(img, cldImage, [], sdkAnalyticsTokens);
17-
process.nextTick(() => {
18-
expect(img.src).toEqual('https://res.cloudinary.com/demo/image/upload/sample?_a=AXAABAB0')
19-
})
28+
await flushPromises();
29+
expect(img.src).toEqualAnalyticsToken('AXAABAB0');
30+
});
31+
32+
it('should use feature flag for responsive plugin', async function () {
33+
const parentElement = document.createElement('div');
34+
const img = document.createElement('img');
35+
parentElement.append(img);
36+
new HtmlImageLayer(img, cldImage, [responsive({steps: [100]})], sdkAnalyticsTokens);
37+
await flushPromises();
38+
expect(img.src).toEqualAnalyticsToken('AXAABABA');
39+
});
40+
41+
it('should use feature flag for placeholder plugin', async function () {
42+
const img = document.createElement('img');
43+
new HtmlImageLayer(img, cldImage, [placeholder()], sdkAnalyticsTokens);
44+
await flushPromises();
45+
expect(img.src).toEqualAnalyticsToken('AXAABABB');
46+
});
47+
48+
it('should use feature flag for accessibility plugin', async function () {
49+
const img = document.createElement('img');
50+
new HtmlImageLayer(img, cldImage, [accessibility()], sdkAnalyticsTokens);
51+
await flushPromises();
52+
expect(img.src).toEqualAnalyticsToken('AXAABABD');
2053
});
2154
});

‎packages/html/jest.config.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,8 @@
3131
},
3232
"transformIgnorePatterns": [
3333
"/node_modules\/(?!@cloudinary/(html|url-gen|transformation-builder-sdk))(.*)"
34+
],
35+
"setupFilesAfterEnv": [
36+
"./src/setupTests.ts"
3437
]
3538
}

‎packages/html/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudinary/html",
3-
"version": "1.9.0",
3+
"version": "1.9.1",
44
"description": "An HTML wrapper for Cloudinary",
55
"main": "./index.js",
66
"umd": "./index.umd.js",
@@ -22,15 +22,15 @@
2222
"@cloudinary/url-gen": "^1.8.7",
2323
"@rollup/plugin-commonjs": "^19.0.0",
2424
"@rollup/plugin-node-resolve": "^13.0.0",
25-
"@types/jest": "^29.2.6",
25+
"@types/jest": "^29.4.0",
2626
"core-js": "^3.23.5",
2727
"jest": "^29.3.1",
2828
"jest-environment-jsdom": "^29.3.1",
2929
"rollup": "^2.52.2",
3030
"rollup-plugin-peer-deps-external": "^2.2.4",
3131
"rollup-plugin-typescript2": "^0.34.1",
32-
"tslib": "^2.0.0",
33-
"ts-jest": "^29.0.5"
32+
"ts-jest": "^29.0.5",
33+
"tslib": "^2.0.0"
3434
},
3535
"dependencies": {
3636
"@types/lodash.clonedeep": "^4.5.6",

‎packages/html/playground/.gitignore‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
9+
10+
node_modules
11+
dist
12+
dist-ssr
13+
*.local
14+
15+
# Editor directories and files
16+
.vscode/*
17+
!.vscode/extensions.json
18+
.idea
19+
.DS_Store
20+
*.suo
21+
*.ntvs*
22+
*.njsproj
23+
*.sln
24+
*.sw?

0 commit comments

Comments
 (0)