Skip to content

Commit 95f97c1

Browse files
committed
chore: lock playwright version [swc-829]
1 parent 1c12bc0 commit 95f97c1

File tree

95 files changed

+455
-832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+455
-832
lines changed

.circleci/config.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
executors:
44
node:
55
docker:
6-
- image: mcr.microsoft.com/playwright:v1.44.0
6+
- image: mcr.microsoft.com/playwright:v1.52.0
77
resource_class: xlarge
88
environment:
99
NODE_ENV: development
@@ -22,12 +22,12 @@ commands:
2222
downstream:
2323
steps:
2424
- checkout
25-
# - restore_cache:
26-
# keys:
27-
# - v4c-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}
28-
# - restore_cache:
29-
# keys:
30-
# - v4b-<< pipeline.parameters.wireit_cache_name >>-{{ arch }}-{{ checksum "package.json" }}-
25+
- restore_cache:
26+
keys:
27+
- v4c-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}
28+
- restore_cache:
29+
keys:
30+
- v4b-<< pipeline.parameters.wireit_cache_name >>-{{ arch }}-{{ checksum "package.json" }}-
3131
- run:
3232
name: Installing Dependencies
3333
command: |
@@ -128,7 +128,7 @@ commands:
128128
- run:
129129
when: always
130130
command: |
131-
rm -rf test/visual/screenshots-baseline
131+
[[ -f test/visual/screenshots-baseline ]] && rm -rf test/visual/screenshots-baseline
132132
cp -R test/visual/screenshots-actual/updates test/visual/screenshots-baseline
133133
- save_cache:
134134
when: always
@@ -338,7 +338,7 @@ jobs:
338338
- run:
339339
when: always
340340
command: |
341-
rm -rf test/visual/screenshots-baseline
341+
[[ -f test/visual/screenshots-baseline ]] && rm -rf test/visual/screenshots-baseline
342342
cp -R test/visual/screenshots-actual/updates test/visual/screenshots-baseline
343343
- save_cache:
344344
when: always

.eslintrc.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
}
3535
],
3636
"import/prefer-default-export": "off",
37+
"import/no-extraneous-dependencies": "off",
3738
"@spectrum-web-components/prevent-argument-names": [
3839
"error",
3940
["e", "ev", "evt", "err"]
@@ -83,6 +84,21 @@
8384
"rules": {
8485
"no-console": ["off"]
8586
}
87+
},
88+
{
89+
"files": [
90+
"packages/*/src/*.ts",
91+
"tools/*/src/*.ts",
92+
"projects/*/src/*.ts"
93+
],
94+
"rules": {
95+
"import/no-extraneous-dependencies": [
96+
"error",
97+
{
98+
"devDependencies": true
99+
}
100+
]
101+
}
86102
}
87103
]
88104
}

lint-staged.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ governing permissions and limitations under the License.
1212

1313
export default {
1414
'*.css': [
15-
'stylelint --fix --cache --allow-empty-input',
1615
'prettier --cache --no-error-on-unmatched-pattern --ignore-unknown --log-level silent --write',
16+
'stylelint --fix --cache --allow-empty-input',
1717
],
1818
'*.ts': [
19-
'eslint --fix --format pretty --cache --no-error-on-unmatched-pattern --quiet',
2019
'prettier --cache --no-error-on-unmatched-pattern --ignore-unknown --log-level silent --write',
20+
'eslint --fix --format pretty --config .eslintrc.json --cache --no-error-on-unmatched-pattern --quiet',
2121
],
2222
'{packages,tools}/*/src/**/!(*.css).ts': ['yarn lit-analyzer'],
2323
'package.json': () => [

package.json

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,18 @@
22
"name": "@adobe/spectrum-web-components",
33
"version": "0.0.9",
44
"private": true,
5-
"description": "",
5+
"description": "A web-component implementation of the Adobe Spectrum design system.",
66
"type": "module",
7+
"license": "Apache-2.0",
8+
"author": "Adobe",
9+
"repository": {
10+
"type": "git",
11+
"url": "https://github.com/adobe/spectrum-web-components.git"
12+
},
13+
"homepage": "https://opensource.adobe.com/spectrum-web-components/",
14+
"bugs": {
15+
"url": "https://github.com/adobe/spectrum-web-components/issues"
16+
},
717
"engines": {
818
"node": ">=20",
919
"yarn": ">=4.6.0"
@@ -101,7 +111,7 @@
101111
"@netlify/build": "^29.17.3",
102112
"@open-wc/dev-server-hmr": "^0.2.0",
103113
"@open-wc/testing": "^4.0.0",
104-
"@playwright/test": "^1.44.0",
114+
"@playwright/test": "^1.52.0",
105115
"@rollup/plugin-commonjs": "^25.0.7",
106116
"@rollup/plugin-json": "^6.0.1",
107117
"@rollup/plugin-node-resolve": "^15.2.3",
@@ -199,6 +209,27 @@
199209
"wireit": "^0.14.3",
200210
"yargs": "^17.2.1"
201211
},
212+
"resolutions": {
213+
"playwright": "^1.52.0"
214+
},
215+
"workspaces": [
216+
"linters/*",
217+
"packages/*",
218+
"projects/*",
219+
"tools/*",
220+
"react/*"
221+
],
222+
"packageManager": "[email protected]",
223+
"keywords": [
224+
"design-system",
225+
"spectrum",
226+
"adobe",
227+
"adobe-spectrum",
228+
"web components",
229+
"web-components",
230+
"lit-element",
231+
"lit-html"
232+
],
202233
"wireit": {
203234
"build:css:watch": {
204235
"command": "node ./tasks/watch-css.js",
@@ -426,33 +457,5 @@
426457
],
427458
"clean": "if-file-deleted"
428459
}
429-
},
430-
"workspaces": [
431-
"linters/*",
432-
"packages/*",
433-
"projects/*",
434-
"tools/*",
435-
"react/*"
436-
],
437-
"packageManager": "[email protected]",
438-
"license": "Apache-2.0",
439-
"author": "Adobe",
440-
"repository": {
441-
"type": "git",
442-
"url": "https://github.com/adobe/spectrum-web-components.git"
443-
},
444-
"bugs": {
445-
"url": "https://github.com/adobe/spectrum-web-components/issues"
446-
},
447-
"keywords": [
448-
"design-system",
449-
"spectrum",
450-
"adobe",
451-
"adobe-spectrum",
452-
"web components",
453-
"web-components",
454-
"lit-element",
455-
"lit-html"
456-
],
457-
"homepage": "https://opensource.adobe.com/spectrum-web-components/"
460+
}
458461
}

packages/icons-workflow/bin/build.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import prettier from 'prettier';
1919
import Case from 'case';
2020
import { fileURLToPath } from 'url';
2121

22-
import systemsIconMapping from './icons-mapping.json' assert { type: 'json' };
22+
import systemsIconMapping from './icons-mapping.json' with { type: 'json' };
2323

2424
const __dirname = path.dirname(fileURLToPath(import.meta.url));
2525

@@ -169,9 +169,9 @@ async function buildIcons(icons, tag, iconsNameList) {
169169

170170
const iconLiteral = `
171171
${disclaimer}
172-
172+
173173
import {tag as html, TemplateResult} from '../custom-tag.js';
174-
174+
175175
export {setCustomTemplateLiteralTag} from '../custom-tag.js';
176176
export const ${ComponentName}Icon = ({
177177
width = 24,
@@ -241,7 +241,7 @@ async function buildIcons(icons, tag, iconsNameList) {
241241

242242
const iconElement = `
243243
${disclaimer}
244-
244+
245245
import {
246246
html,
247247
TemplateResult
@@ -252,22 +252,22 @@ async function buildIcons(icons, tag, iconsNameList) {
252252
import {
253253
setCustomTemplateLiteralTag
254254
} from '../custom-tag.js';
255-
255+
256256
${currenVersionIconImport}
257257
${otherVersionIconImport}
258-
258+
259259
/**
260260
* @element ${iconElementName}
261261
*/
262262
export class Icon${ComponentName} extends IconBase {
263263
protected override render(): TemplateResult {
264264
setCustomTemplateLiteralTag(html);
265-
265+
266266
if(this.spectrumVersion === ${spectrumVersion}){
267267
return CurrentIcon({ hidden: !this.label, title: this.label }) as TemplateResult;
268268
}
269269
return AlternateIcon({ hidden: !this.label, title: this.label }) as TemplateResult;
270-
270+
271271
}
272272
}
273273
`;
@@ -302,12 +302,12 @@ async function buildIcons(icons, tag, iconsNameList) {
302302

303303
const iconRegistration = `
304304
${disclaimer}
305-
305+
306306
import { Icon${ComponentName} } from '../src/elements/Icon${id}.js';
307307
import { defineElement } from '@spectrum-web-components/base/src/define-element.js';
308-
308+
309309
defineElement('${iconElementName}', Icon${ComponentName});
310-
310+
311311
declare global {
312312
interface HTMLElementTagNameMap {
313313
'${iconElementName}': Icon${ComponentName};

packages/iconset/stories/icons-demo.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import bodyStyles from '@spectrum-web-components/styles/body.js';
3131
import '@spectrum-web-components/icon/sp-icon.js';
3232
import '@spectrum-web-components/help-text/sp-help-text.js';
3333

34-
import iconsList from './iconsList.json' assert { type: 'json' };
34+
import iconsList from './iconsList.json' with { type: 'json' };
3535

3636
import {
3737
SystemResolutionController,
@@ -209,7 +209,8 @@ export class IconsDemo extends SpectrumElement {
209209
var(
210210
--spectrum-alias-focus-ring-gap,
211211
var(--spectrum-spacing-50)
212-
) * 2
212+
) *
213+
2
213214
);
214215
}
215216
`,
@@ -225,7 +226,9 @@ export class IconsDemo extends SpectrumElement {
225226
}
226227

227228
private shouldCopy(tag: string): void {
228-
if (!this.package) return;
229+
if (!this.package) {
230+
return;
231+
}
229232
const conditionedTag = tag.slice(1, tag.length - 1);
230233
const importURL = `import '@spectrum-web-components/${this.package}/icons/${conditionedTag}.js';`;
231234
this.dispatchEvent(

packages/number-field/test/inputs.test.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { html } from '@spectrum-web-components/base';
1414
import { elementUpdated, expect, nextFrame } from '@open-wc/testing';
1515
import { getElFrom } from './helpers.js';
1616
import { createLanguageContext } from '../../../tools/reactive-controllers/test/helpers.js';
17-
import { shouldPolyfill } from '@formatjs/intl-numberformat/should-polyfill.js';
1817

1918
import '@spectrum-web-components/number-field/sp-number-field.js';
2019
import { remapMultiByteCharacters } from '@spectrum-web-components/number-field';
@@ -28,23 +27,6 @@ import {
2827
import { sendKeys } from '@web/test-runner-commands';
2928

3029
describe('NumberField - inputs', () => {
31-
before(async () => {
32-
const shouldPolyfillEn = shouldPolyfill('en');
33-
const shouldPolyfillEs = shouldPolyfill('es');
34-
const shouldPolyfillFr = shouldPolyfill('fr');
35-
if (shouldPolyfillEn || shouldPolyfillEs || shouldPolyfillFr) {
36-
await import('@formatjs/intl-numberformat/polyfill-force.js');
37-
}
38-
if (shouldPolyfillEn) {
39-
await import('@formatjs/intl-numberformat/locale-data/en.js');
40-
}
41-
if (shouldPolyfillEs) {
42-
await import('@formatjs/intl-numberformat/locale-data/es.js');
43-
}
44-
if (shouldPolyfillFr) {
45-
await import('@formatjs/intl-numberformat/locale-data/fr.js');
46-
}
47-
});
4830
describe('keystroke prevention', () => {
4931
it('converts 2 byte characters, default', async () => {
5032
const el = await getElFrom(html`

0 commit comments

Comments
 (0)