Skip to content

Commit 3900150

Browse files
committed
manor minor fixes, resync/update test apps
1 parent 3290dc1 commit 3900150

File tree

223 files changed

+1809
-7375
lines changed

Some content is hidden

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

223 files changed

+1809
-7375
lines changed

packages/e2e-playwright/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ import playwright from 'eslint-plugin-playwright';
2323
export default [
2424
// ...
2525
{
26+
name: 'custom/playwright',
27+
2628
...playwright.configs['flat/recommended'],
2729
files: ['src/components/**/*.spec.ts', 'test/**/*.spec.ts'],
2830
rules: {
2931
...playwright.configs['flat/recommended'].rules,
30-
// you might need to disable this rule if it's turned on to avoid `mount` being reported as unbound
31-
// '@typescript-eslint/unbound-method': 'off',
32+
// Other rules
3233
},
3334
},
3435
];
@@ -45,8 +46,7 @@ For ESLint versions earlier than v9, add this to your `.eslintrc.js` or `.eslint
4546
"files": ["src/components/**/*.spec.{js,ts}", "test/**/*.spec.{js,ts}"],
4647
"extends": "plugin:playwright/recommended",
4748
"rules": {
48-
// you might need to disable this rule if it's turned on to avoid `mount` being reported as unbound
49-
// "@typescript-eslint/unbound-method": "off"
49+
// Other rules
5050
}
5151
}
5252
]

packages/e2e-playwright/build.config.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ export default defineBuildConfig({
88
'./src/ct/main',
99
],
1010

11-
rollup: {
12-
emitCJS: true,
13-
esbuild: {
14-
minify: true,
15-
},
16-
},
17-
1811
// Generate TypeScript declaration files (.d.ts) for all entries.
1912
declaration: true,
2013

@@ -28,6 +21,9 @@ export default defineBuildConfig({
2821
rollup: {
2922
// Explicitly enable generating the CJS bundle.
3023
emitCJS: true,
24+
esbuild: {
25+
minify: true,
26+
},
3127
},
3228

3329
// There is some strange warning about missing package.json. It doesn't affect the build however.

packages/e2e-playwright/package.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,24 @@
2424
},
2525
"exports": {
2626
".": {
27-
"import": "./dist/main.mjs",
28-
"require": "./dist/main.cjs",
29-
"types": "./dist/main.d.ts"
27+
"import": {
28+
"types": "./dist/main.d.mts",
29+
"default": "./dist/main.mjs"
30+
},
31+
"require": {
32+
"types": "./dist/main.d.cts",
33+
"default": "./dist/main.cjs"
34+
}
3035
},
3136
"./ct": {
32-
"import": "./dist/ct/main.mjs",
33-
"require": "./dist/ct/main.cjs",
34-
"types": "./dist/ct/main.d.ts"
37+
"import": {
38+
"types": "./dist/ct/main.d.mts",
39+
"default": "./dist/ct/main.mjs"
40+
},
41+
"require": {
42+
"types": "./dist/ct/main.d.cts",
43+
"default": "./dist/ct/main.cjs"
44+
}
3545
},
3646
"./package.json": "./package.json",
3747
"./src/index": "./src/index.js",
@@ -44,11 +54,11 @@
4454
"type": "git",
4555
"url": "https://github.com/quasarframework/quasar-testing"
4656
},
47-
"main": "dist/cjs/main.js",
48-
"module": "dist/esm/main.js",
57+
"main": "dist/main.cjs",
58+
"module": "dist/main.mjs",
59+
"types": "dist/main.d.cts",
4960
"bugs": "https://github.com/quasarframework/quasar-testing/issues",
5061
"homepage": "https://github.com/quasarframework/quasar-testing/tree/dev/packages/e2e-playwright",
51-
"typings": "dist/types/main.d.ts",
5262
"engines": {
5363
"node": ">= 12.2.0",
5464
"npm": ">= 5.6.0",
@@ -87,4 +97,4 @@
8797
"optional": true
8898
}
8999
}
90-
}
100+
}

packages/e2e-playwright/src/install.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ export default async function (api) {
106106

107107
try {
108108
if (api.prompts.port && api.prompts.port !== enforcedDevServerPort) {
109-
console.log(api.prompts.port, enforcedDevServerPort);
110109
const port = parseInt(api.prompts.port.trim(), 10);
111110
if (!Number.isInteger(port)) {
112111
throw new Error(`Invalid port number: ${api.prompts.port}`);
@@ -136,11 +135,11 @@ export default async function (api) {
136135
api.render(`${configTemplate}/component-test`, {
137136
codeCoverageIsEnabled: shouldEnableCodeCoverage,
138137
});
139-
}
140138

141-
api.render('./templates/base', {
142-
shouldSupportTypeScript: supportsTypescript,
143-
});
139+
api.render('./templates/component-test', {
140+
shouldSupportTypeScript: supportsTypescript,
141+
});
142+
}
144143

145144
let testEnvCommand = 'cross-env NODE_ENV=test';
146145
if (shouldEnableCodeCoverage) {

packages/e2e-playwright/src/templates/base/test/playwright/wrappers/DialogWrapper.vue

Lines changed: 0 additions & 37 deletions
This file was deleted.

packages/e2e-playwright/src/templates/base/test/playwright/wrappers/LayoutContainer.vue

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/e2e-playwright/src/templates/base/src/components/QuasarButton.vue renamed to packages/e2e-playwright/src/templates/component-test/src/components/AppButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import { defineComponent } from 'vue';
77
88
export default defineComponent({
9+
name: 'QuasarButton',
910
props: {
1011
label: {
1112
type: String,
1213
},
1314
},
14-
name: 'QuasarButton',
1515
emits: { test: () => true },
1616
});
1717
</script>

0 commit comments

Comments
 (0)