generator-nitro 6.0.7 → 6.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/generators/app/templates/.node-version +1 -1
- package/generators/app/templates/CUTAWAYpackage.json +5 -5
- package/generators/app/templates/tests/backstop/engine_scripts/cookies.json +1 -1
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/clickAndHoverHelper.js +39 -39
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/ignoreCSP.js +1 -1
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/interceptImages.js +1 -1
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/loadCookies.js +33 -33
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/onBefore.js +3 -3
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/onReady.js +6 -6
- package/generators/app/templates/tests/backstop/engine_scripts/puppet/overrideCSS.js +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
16.
|
|
1
|
+
16.14.0
|
|
@@ -85,7 +85,7 @@
|
|
|
85
85
|
"@gondel/plugin-hot": "1.2.7",
|
|
86
86
|
"@khanacademy/tota11y": "0.2.0",
|
|
87
87
|
"bootstrap": "5.1.3",<% } %>
|
|
88
|
-
"core-js": "3.
|
|
88
|
+
"core-js": "3.21.0"<% if (options.exampleCode) { %>,
|
|
89
89
|
"flatpickr": "4.6.9",
|
|
90
90
|
"handlebars": "4.7.7",
|
|
91
91
|
"jquery": "3.6.0",
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
"commitizen": "4.2.4",
|
|
115
115
|
"config": "3.3.7",
|
|
116
116
|
"cross-env": "7.0.3",
|
|
117
|
-
"cypress": "9.
|
|
117
|
+
"cypress": "9.4.1",
|
|
118
118
|
"cz-conventional-changelog": "3.3.0",
|
|
119
119
|
"env-linter": "0.5.1",
|
|
120
120
|
"eslint": "7.32.0",
|
|
@@ -124,10 +124,10 @@
|
|
|
124
124
|
"gulp": "4.0.2",
|
|
125
125
|
"husky": "7.0.4",
|
|
126
126
|
"license-checker": "25.0.1",
|
|
127
|
-
"lighthouse": "9.
|
|
128
|
-
"lint-staged": "12.3.
|
|
127
|
+
"lighthouse": "9.3.1",
|
|
128
|
+
"lint-staged": "12.3.3",<% if (options.themes) { %>
|
|
129
129
|
"node-sass": "6.0.1",<% } %>
|
|
130
|
-
"npm-check-updates": "12.
|
|
130
|
+
"npm-check-updates": "12.3.0",
|
|
131
131
|
"npm-run-all": "4.1.5",
|
|
132
132
|
"opener": "1.5.2",
|
|
133
133
|
"prettier": "2.5.1",
|
package/generators/app/templates/tests/backstop/engine_scripts/puppet/clickAndHoverHelper.js
CHANGED
|
@@ -1,39 +1,39 @@
|
|
|
1
|
-
module.exports = async (page, scenario) => {
|
|
2
|
-
const hoverSelector = scenario.hoverSelectors || scenario.hoverSelector;
|
|
3
|
-
const clickSelector = scenario.clickSelectors || scenario.clickSelector;
|
|
4
|
-
const keyPressSelector = scenario.keyPressSelectors || scenario.keyPressSelector;
|
|
5
|
-
const scrollToSelector = scenario.scrollToSelector;
|
|
6
|
-
const postInteractionWait = scenario.postInteractionWait; // selector [str] | ms [int]
|
|
7
|
-
|
|
8
|
-
if (keyPressSelector) {
|
|
9
|
-
for (const keyPressSelectorItem of [].concat(keyPressSelector)) {
|
|
10
|
-
await page.waitFor(keyPressSelectorItem.selector);
|
|
11
|
-
await page.type(keyPressSelectorItem.selector, keyPressSelectorItem.keyPress);
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
if (hoverSelector) {
|
|
16
|
-
for (const hoverSelectorIndex of [].concat(hoverSelector)) {
|
|
17
|
-
await page.waitFor(hoverSelectorIndex);
|
|
18
|
-
await page.hover(hoverSelectorIndex);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
if (clickSelector) {
|
|
23
|
-
for (const clickSelectorIndex of [].concat(clickSelector)) {
|
|
24
|
-
await page.waitFor(clickSelectorIndex);
|
|
25
|
-
await page.click(clickSelectorIndex);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
if (postInteractionWait) {
|
|
30
|
-
await page.waitFor(postInteractionWait);
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
if (scrollToSelector) {
|
|
34
|
-
await page.waitFor(scrollToSelector);
|
|
35
|
-
await page.evaluate((scrollToSelector) => {
|
|
36
|
-
document.querySelector(scrollToSelector).scrollIntoView();
|
|
37
|
-
}, scrollToSelector);
|
|
38
|
-
}
|
|
39
|
-
};
|
|
1
|
+
module.exports = async (page, scenario) => {
|
|
2
|
+
const hoverSelector = scenario.hoverSelectors || scenario.hoverSelector;
|
|
3
|
+
const clickSelector = scenario.clickSelectors || scenario.clickSelector;
|
|
4
|
+
const keyPressSelector = scenario.keyPressSelectors || scenario.keyPressSelector;
|
|
5
|
+
const scrollToSelector = scenario.scrollToSelector;
|
|
6
|
+
const postInteractionWait = scenario.postInteractionWait; // selector [str] | ms [int]
|
|
7
|
+
|
|
8
|
+
if (keyPressSelector) {
|
|
9
|
+
for (const keyPressSelectorItem of [].concat(keyPressSelector)) {
|
|
10
|
+
await page.waitFor(keyPressSelectorItem.selector);
|
|
11
|
+
await page.type(keyPressSelectorItem.selector, keyPressSelectorItem.keyPress);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
if (hoverSelector) {
|
|
16
|
+
for (const hoverSelectorIndex of [].concat(hoverSelector)) {
|
|
17
|
+
await page.waitFor(hoverSelectorIndex);
|
|
18
|
+
await page.hover(hoverSelectorIndex);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
if (clickSelector) {
|
|
23
|
+
for (const clickSelectorIndex of [].concat(clickSelector)) {
|
|
24
|
+
await page.waitFor(clickSelectorIndex);
|
|
25
|
+
await page.click(clickSelectorIndex);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
if (postInteractionWait) {
|
|
30
|
+
await page.waitFor(postInteractionWait);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
if (scrollToSelector) {
|
|
34
|
+
await page.waitFor(scrollToSelector);
|
|
35
|
+
await page.evaluate((scrollToSelector) => {
|
|
36
|
+
document.querySelector(scrollToSelector).scrollIntoView();
|
|
37
|
+
}, scrollToSelector);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
@@ -46,7 +46,7 @@ module.exports = async function (page, scenario) {
|
|
|
46
46
|
const result = await fetch(requestUrl, options);
|
|
47
47
|
|
|
48
48
|
const buffer = await result.buffer();
|
|
49
|
-
|
|
49
|
+
const cleanedHeaders = result.headers._headers || {};
|
|
50
50
|
cleanedHeaders['content-security-policy'] = '';
|
|
51
51
|
await request.respond({
|
|
52
52
|
body: buffer,
|
|
@@ -16,7 +16,7 @@ const fs = require('fs');
|
|
|
16
16
|
const path = require('path');
|
|
17
17
|
|
|
18
18
|
const IMAGE_URL_RE = /\.gif|\.jpg|\.png/i;
|
|
19
|
-
const IMAGE_STUB_URL = path.resolve(__dirname, '
|
|
19
|
+
const IMAGE_STUB_URL = path.resolve(__dirname, '../imageStub.jpg');
|
|
20
20
|
const IMAGE_DATA_BUFFER = fs.readFileSync(IMAGE_STUB_URL);
|
|
21
21
|
const HEADERS_STUB = {};
|
|
22
22
|
|
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
const fs = require('fs');
|
|
2
|
-
|
|
3
|
-
module.exports = async (page, scenario) => {
|
|
4
|
-
let cookies = [];
|
|
5
|
-
const cookiePath = scenario.cookiePath;
|
|
6
|
-
|
|
7
|
-
// READ COOKIES FROM FILE IF EXISTS
|
|
8
|
-
if (fs.existsSync(cookiePath)) {
|
|
9
|
-
cookies = JSON.parse(fs.readFileSync(cookiePath));
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
// MUNGE COOKIE DOMAIN
|
|
13
|
-
cookies = cookies.map((cookie) => {
|
|
14
|
-
if (cookie.domain.startsWith('http://') || cookie.domain.startsWith('https://')) {
|
|
15
|
-
cookie.url = cookie.domain;
|
|
16
|
-
} else {
|
|
17
|
-
cookie.url = 'https://' + cookie.domain;
|
|
18
|
-
}
|
|
19
|
-
delete cookie.domain;
|
|
20
|
-
return cookie;
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
// SET COOKIES
|
|
24
|
-
const setCookies = async () => {
|
|
25
|
-
return Promise.all(
|
|
26
|
-
cookies.map(async (cookie) => {
|
|
27
|
-
await page.setCookie(cookie);
|
|
28
|
-
})
|
|
29
|
-
);
|
|
30
|
-
};
|
|
31
|
-
await setCookies();
|
|
32
|
-
console.log('Cookie state restored with:', JSON.stringify(cookies, null, 2));
|
|
33
|
-
};
|
|
1
|
+
const fs = require('fs');
|
|
2
|
+
|
|
3
|
+
module.exports = async (page, scenario) => {
|
|
4
|
+
let cookies = [];
|
|
5
|
+
const cookiePath = scenario.cookiePath;
|
|
6
|
+
|
|
7
|
+
// READ COOKIES FROM FILE IF EXISTS
|
|
8
|
+
if (fs.existsSync(cookiePath)) {
|
|
9
|
+
cookies = JSON.parse(fs.readFileSync(cookiePath));
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
// MUNGE COOKIE DOMAIN
|
|
13
|
+
cookies = cookies.map((cookie) => {
|
|
14
|
+
if (cookie.domain.startsWith('http://') || cookie.domain.startsWith('https://')) {
|
|
15
|
+
cookie.url = cookie.domain;
|
|
16
|
+
} else {
|
|
17
|
+
cookie.url = 'https://' + cookie.domain;
|
|
18
|
+
}
|
|
19
|
+
delete cookie.domain;
|
|
20
|
+
return cookie;
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
// SET COOKIES
|
|
24
|
+
const setCookies = async () => {
|
|
25
|
+
return Promise.all(
|
|
26
|
+
cookies.map(async (cookie) => {
|
|
27
|
+
await page.setCookie(cookie);
|
|
28
|
+
})
|
|
29
|
+
);
|
|
30
|
+
};
|
|
31
|
+
await setCookies();
|
|
32
|
+
console.log('Cookie state restored with:', JSON.stringify(cookies, null, 2));
|
|
33
|
+
};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
module.exports = async (page, scenario, vp) => {
|
|
2
|
-
await require('./loadCookies')(page, scenario);
|
|
3
|
-
};
|
|
1
|
+
module.exports = async (page, scenario, vp) => {
|
|
2
|
+
await require('./loadCookies')(page, scenario);
|
|
3
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
module.exports = async (page, scenario, vp) => {
|
|
2
|
-
console.log('SCENARIO > ' + scenario.label);
|
|
3
|
-
await require('./clickAndHoverHelper')(page, scenario);
|
|
4
|
-
|
|
5
|
-
// add more ready handlers here...
|
|
6
|
-
};
|
|
1
|
+
module.exports = async (page, scenario, vp) => {
|
|
2
|
+
console.log('SCENARIO > ' + scenario.label);
|
|
3
|
+
await require('./clickAndHoverHelper')(page, scenario);
|
|
4
|
+
|
|
5
|
+
// add more ready handlers here...
|
|
6
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "generator-nitro",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.8",
|
|
4
4
|
"description": "Yeoman generator for the nitro frontend framework",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": "merkle-open/generator-nitro",
|
|
@@ -51,6 +51,6 @@
|
|
|
51
51
|
"fs-extra": "10.0.0",
|
|
52
52
|
"jasmine": "3.99.0",
|
|
53
53
|
"yeoman-assert": "3.1.1",
|
|
54
|
-
"yeoman-test": "6.
|
|
54
|
+
"yeoman-test": "6.3.0"
|
|
55
55
|
}
|
|
56
56
|
}
|