Skip to content

Commit

Permalink
Feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
sainthkh committed Aug 3, 2022
1 parent e1b887f commit 166cc8a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ system-tests/lib/fixtureDirs.ts
# from npm/webpack-dev-server
/npm/webpack-dev-server/cypress/videos

# from runner
/packages/runner/cypress/screenshots

# from errors
/packages/errors/__snapshot-images__
/packages/errors/__snapshot-md__
Expand Down
4 changes: 3 additions & 1 deletion packages/runner/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ This is an old package, deprecated in favor of `@packages/app`. It has two remai

1. Bundles `@packages/reporter` and `@packages/driver` via webpack. Once those can be directly imported to `@packages/app`, we can remove this.
2. Bundles styles for `@packages/reporter`, loaded in `main.scss`. Ideally, reporter should import its own styles.
3. Some existing tests in `cypress/e2e` should be migrated to `@packages/app/cypress/e2e/runner`.
3. Contains `dom.js`, which uses proprietary webpack loaders and cannot easily be imported with Vite (dev server in `@packages/app`). Once `dom.js` is free of webpack-specific loader code, we should move it to `@packages/app`.
4. Contains Cypress Studio Recorder code, which was marked as experimental in Cypress 9.x and won't be part of Cypress 10.x initially. It will return at a later date. Until then, the code will be here. It's not currently used in the app. @see https://github.com/cypress-io/cypress/issues/22870
5. Contains Legacy Cypress styles, most of these can likely be removed.
3 changes: 0 additions & 3 deletions packages/runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@
"@fortawesome/fontawesome-free": "6.0.0",
"@packages/driver": "0.0.0-development",
"@packages/icons": "0.0.0-development",
"@packages/network": "0.0.0-development",
"@packages/reporter": "0.0.0-development",
"@packages/rewriter": "0.0.0-development",
"@packages/socket": "0.0.0-development",
"@packages/web-config": "0.0.0-development",
"@popperjs/core": "2.9.2",
"babel-plugin-prismjs": "1.0.2",
Expand Down
14 changes: 13 additions & 1 deletion packages/runner/webpack.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import _ from 'lodash'
import { getCommonConfig, getSimpleConfig } from '@packages/web-config/webpack.config.base'
import { getCommonConfig, getSimpleConfig, getCopyWebpackPlugin } from '@packages/web-config/webpack.config.base'
import * as cyIcons from '@packages/icons'
import path from 'path'
import webpack from 'webpack'

const commonConfig = getCommonConfig()
const CopyWebpackPlugin = getCopyWebpackPlugin()

// @ts-ignore
const babelLoader = _.find(commonConfig.module.rules, (rule) => {
Expand Down Expand Up @@ -56,6 +58,16 @@ const mainConfig: webpack.Configuration = {
},
}

// @ts-ignore
mainConfig.plugins = [
// @ts-ignore
...mainConfig.plugins,
new CopyWebpackPlugin([{
// @ts-ignore // There's a race condition in how these types are generated.
from: cyIcons.getPathToFavicon('favicon.ico'),
}]),
]

mainConfig.resolve = {
...mainConfig.resolve,
alias: {
Expand Down

0 comments on commit 166cc8a

Please sign in to comment.