-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
274 changed files
with
6,317 additions
and
3,820 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,28 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| const { includeTypes } = require('./utils') | ||
| const shell = require('shelljs') | ||
| const { join } = require('path') | ||
| const resolvePkg = require('resolve-pkg') | ||
|
|
||
| shell.set('-v') // verbose | ||
| shell.set('-e') // any error is fatal | ||
|
|
||
| // We include the TypeScript definitions for the bundled 3rd party tools | ||
| // thus we need to copy them from "dev" dependencies into our types folder | ||
| // and we need to sometimes tweak these types files to use relative paths | ||
| // This ensures that globals like Cypress.$, Cypress._ etc are property typed | ||
| // yet we do not install "@types/.." packages with "npm install cypress" | ||
| // because they can conflict with user's own libraries | ||
|
|
||
| includeTypes.forEach((folder) => { | ||
| const source = resolvePkg(`@types/${folder}`, { cwd: join(__dirname, '..', '..') }) | ||
|
|
||
| shell.cp('-R', source, 'types') | ||
| const fs = require('../lib/fs') | ||
| const path = require('path') | ||
|
|
||
| /** | ||
| * https://github.com/cypress-io/cypress/pull/5780 | ||
| * Folder names in "node_modules/@types" that were copied to cli/types to generate index.d.ts. | ||
| * They cause type errors in type checker. So, they should be removed. | ||
| */ | ||
| const includeTypes = [ | ||
| 'blob-util', | ||
| 'bluebird', | ||
| 'lodash', | ||
| 'mocha', | ||
| 'minimatch', | ||
| 'sinon', | ||
| 'sinon-chai', | ||
| 'chai', | ||
| 'chai-jquery', | ||
| 'jquery', | ||
| ] | ||
|
|
||
| includeTypes.forEach((t) => { | ||
| const dir = path.join(__dirname, '../types', t) | ||
|
|
||
| if (fs.existsSync(dir)) { | ||
| fs.removeSync(dir) | ||
| } | ||
| }) | ||
|
|
||
| // jQuery v3.3.x includes "dist" folder that just references back to itself | ||
| // causing dtslint to think there are double definitions. Remove that folder. | ||
| const typesJqueryDistFolder = join('types', 'jquery', 'dist') | ||
|
|
||
| shell.rm('-rf', typesJqueryDistFolder) | ||
|
|
||
| // fix paths to Chai, jQuery and other types to be relative | ||
| shell.sed( | ||
| '-i', | ||
| '<reference types="chai" />', | ||
| '<reference path="../chai/index.d.ts" />', | ||
| join('types', 'chai-jquery', 'index.d.ts'), | ||
| ) | ||
|
|
||
| shell.sed( | ||
| '-i', | ||
| '<reference types="jquery" />', | ||
| '<reference path="../jquery/index.d.ts" />', | ||
| join('types', 'chai-jquery', 'index.d.ts'), | ||
| ) | ||
|
|
||
| const sinonChaiFilename = join('types', 'sinon-chai', 'index.d.ts') | ||
|
|
||
| shell.sed( | ||
| '-i', | ||
| '<reference types="chai" />', | ||
| '<reference path="../chai/index.d.ts" />', | ||
| sinonChaiFilename, | ||
| ) | ||
|
|
||
| // also use relative import via path for sinon-chai | ||
| // there is reference comment line we need to fix to be relative | ||
| shell.sed( | ||
| '-i', | ||
| '<reference types="sinon" />', | ||
| '<reference path="../sinon/index.d.ts" />', | ||
| sinonChaiFilename, | ||
| ) | ||
|
|
||
| // and an import sinon line to be changed to relative path | ||
| shell.sed('-i', 'from \'sinon\';', 'from \'../sinon\';', sinonChaiFilename) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.