Skip to content

Commit fdac9d8

Browse files
tgriessertgriesser
committed
Merge branch 'tgriesser/fix/UNIFY-1206-cloud' of github.com:cypress-io/cypress into tgriesser/fix/UNIFY-1206-cloud
* 'tgriesser/fix/UNIFY-1206-cloud' of github.com:cypress-io/cypress: feat: swap the #__cy_root id selector to become data-cy-root for component mounting (#20951) fix: Doc changes around vue2 (#21066) feat: Add vue2 package from npm/vue/v2 branch (#21026) fix: add possible frameworks to object API config (#21056)
2 parents 222c465 + d823544 commit fdac9d8

File tree

181 files changed

+8592
-107030
lines changed

Some content is hidden

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

181 files changed

+8592
-107030
lines changed

‎.eslintignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ cli/types
4141
# cli/react, cli/vue, and cli/mount-utils are all copied from dist'd builds
4242
cli/react
4343
cli/vue
44+
cli/vue2
4445
cli/mount-utils
4546

4647
# packages/example is not linted (think about changing this)
@@ -69,6 +70,9 @@ npm/cypress-schematic/src/**/*.js
6970
/npm/create-cypress-tests/initial-template
7071
/npm/create-cypress-tests/**/*.template.*
7172

73+
# The global eslint configuration is not set up to parse vue@2 files
74+
/npm/vue2/**/*.vue
75+
7276
packages/data-context/test/unit/codegen/files
7377

7478
# community templates we test against, no need to lint

‎.releaserc.base.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ module.exports = {
1515
],
1616
extends: 'semantic-release-monorepo',
1717
branches: [
18+
'master',
1819
],
1920
}

‎circle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ commands:
956956
command: ls -la types
957957
working_directory: cli/build
958958
- run:
959-
command: ls -la vue mount-utils react
959+
command: ls -la vue vue2 mount-utils react
960960
working_directory: cli/build
961961
- unless:
962962
condition:

‎cli/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ build
1616
# ignore packages synced at build-time via
1717
# the sync-exported-npm-with-cli.js script
1818
vue
19+
vue2
1920
react
20-
mount-utils
21+
mount-utils

‎cli/package.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
"types/net-stubbing.ts",
107107
"mount-utils",
108108
"vue",
109-
"react"
109+
"react",
110+
"vue2"
110111
],
111112
"bin": {
112113
"cypress": "bin/cypress"
@@ -124,6 +125,10 @@
124125
"import": "./vue/dist/cypress-vue.esm-bundler.js",
125126
"require": "./vue/dist/cypress-vue.cjs.js"
126127
},
128+
"./vue2": {
129+
"import": "./vue2/dist/cypress-vue2.esm-bundler.js",
130+
"require": "./vue2/dist/cypress-vue2.cjs.js"
131+
},
127132
"./package.json": {
128133
"import": "./package.json",
129134
"require": "./package.json"

‎cli/scripts/post-build.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const npmModulesToCopy = [
1010
'mount-utils',
1111
'react',
1212
'vue',
13+
'vue2',
1314
]
1415

1516
npmModulesToCopy.forEach((folder) => {

‎cli/scripts/post-install.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ shell.set('-e') // any error is fatal
2323
fs.ensureDirSync(join(__dirname, '..', 'types'))
2424

2525
includeTypes.forEach((folder) => {
26-
const source = resolvePkg(`@types/${folder}`, { cwd: join(__dirname, '..', '..') })
26+
const source = resolvePkg(`@types/${folder}`, { cwd: __dirname })
2727

2828
fs.copySync(source, join(__dirname, '..', 'types', folder))
2929
})

‎cli/types/cypress.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2987,11 +2987,11 @@ declare namespace Cypress {
29872987

29882988
type DevServerConfigObject = {
29892989
bundler: 'webpack'
2990-
framework: 'react'
2990+
framework: 'react' | 'vue' | 'vue-cli' | 'nuxt' | 'create-react-app'
29912991
webpackConfig?: PickConfigOpt<'webpackConfig'>
29922992
} | {
29932993
bundler: 'vite'
2994-
framework: 'react'
2994+
framework: 'react' | 'vue'
29952995
viteConfig?: Omit<Exclude<PickConfigOpt<'viteConfig'>, undefined>, 'base' | 'root'>
29962996
}
29972997

‎npm/angular/cypress/support/component-index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<title>Components App</title>
88
</head>
99
<body>
10-
<div id="__cy_root"></div>
10+
<div data-cy-root></div>
1111
</body>
12-
</html>
12+
</html>

‎npm/create-cypress-tests/src/component-testing/init-component-testing.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ describe('init component tests script', () => {
226226
}) as any)
227227

228228
await initComponentTesting({ config: {}, cypressConfigPath, useYarn: true })
229-
expect(execStub).to.be.calledWith('yarn add @cypress/vue@3 --dev')
229+
expect(execStub).to.be.calledWith('yarn add @cypress/vue --dev')
230230
})
231231

232232
it('suggest the right instruction based on user template choice', async () => {

0 commit comments

Comments
 (0)