Skip to content
This repository was archived by the owner on Mar 5, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/webpack-options/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
7 changes: 7 additions & 0 deletions examples/webpack-options/cypress.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"fixturesFolder": false,
"testFiles": "**/*cy-spec.js",
"viewportWidth": 500,
"viewportHeight": 500,
"experimentalComponentTesting": true
}
9 changes: 9 additions & 0 deletions examples/webpack-options/cypress/component/Test.cy-spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react'
import { mount } from 'cypress-react-unit-test'

describe('components', () => {
it('works', () => {
mount(<div>Text</div>)
cy.contains('Text')
})
})
6 changes: 6 additions & 0 deletions examples/webpack-options/cypress/integration/cy-spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/// <reference types="cypress" />
describe('integration spec', () => {
it('works', () => {
expect(1).to.equal(1)
})
})
9 changes: 9 additions & 0 deletions examples/webpack-options/cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// @ts-check
const webpackPreprocessor = require('@cypress/webpack-preprocessor')
module.exports = (on, config) => {
on(
'file:preprocessor',
// @ts-ignore
webpackPreprocessor(webpackPreprocessor.defaultOptions),
)
}
1 change: 1 addition & 0 deletions examples/webpack-options/cypress/support/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('cypress-react-unit-test/dist/hooks')
12 changes: 12 additions & 0 deletions examples/webpack-options/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "example-webpack-options",
"description": "Using default Webpack options to transpile simple tests",
"private": true,
"scripts": {
"test": "../../node_modules/.bin/cypress run",
"cy:open": "../../node_modules/.bin/cypress open"
},
"devDependencies": {
"cypress-react-unit-test": "file:../.."
}
}
9 changes: 3 additions & 6 deletions plugins/cra-v3/file-preprocessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ const findWebpack = require('find-webpack')
const webpackPreprocessor = require('@cypress/webpack-preprocessor')
const { addImageRedirect } = require('../utils/add-image-redirect')

const getWebpackOptions = opts => {
const getWebpackPreprocessorOptions = opts => {
debug('top level opts %o', opts)

const webpackOptions = findWebpack.getWebpackOptions()
if (!webpackOptions) {
console.error('⚠️ Could not find Webpack options, using defaults')
return {
webpackOptions: webpackPreprocessor.defaultOptions,
watchOptions: {},
}
return webpackPreprocessor.defaultOptions
}
debug('webpack options: %o', webpackOptions)
findWebpack.cleanForCypress(opts, webpackOptions)
Expand Down Expand Up @@ -42,7 +39,7 @@ module.exports = config => {
addFolderToTranspile: config.componentFolder,
coverage: !coverageIsDisabled,
}
const preprocessorOptions = getWebpackOptions(opts)
const preprocessorOptions = getWebpackPreprocessorOptions(opts)

debug('final webpack options %o', preprocessorOptions.webpackOptions)

Expand Down