Merge branch 'develop' into release/15.0.0

Author: ryanthemanuel

packages/driver/src/cypress.ts

@@ -173,6 +173,8 @@ class $Cypress {
   sinon = sinon
   lolex = fakeTimers
 
+  areSourceMapsAvailable: boolean = false
+
   static $: any
   static utils: any
 
@@ -188,7 +190,7 @@ class $Cypress {
     this.primaryOriginCommunicator = new PrimaryOriginCommunicator()
     this.specBridgeCommunicator = new SpecBridgeCommunicator()
     this.isCrossOriginSpecBridge = false
-
+    this.areSourceMapsAvailable = false
     this.events = $Events.extend(this)
     this.$ = jqueryProxyFn.bind(this)
 
@@ -365,13 +367,15 @@ class $Cypress {
 
     this.events.proxyTo(this.cy)
 
+    this.areSourceMapsAvailable = false
     $scriptUtils.runScripts({
       browser: this.config('browser'),
       scripts,
       specWindow,
       testingType: this.testingType,
     })
     .then(() => {
+      this.areSourceMapsAvailable = $sourceMapUtils.areSourceMapsAvailable()
       if (this.testingType === 'e2e') {
         return setSpecContentSecurityPolicy(specWindow)
       }

packages/driver/src/cypress/source_map_utils.ts

@@ -114,10 +114,15 @@ const destroySourceMapConsumers = () => {
   sourceMapConsumers = {}
 }
 
+const areSourceMapsAvailable = () => {
+  return Object.keys(sourceMapConsumers).length > 0
+}
+
 export default {
   getSourcePosition,
   getSourceContents,
   extractSourceMap,
   initializeSourceMapConsumer,
   destroySourceMapConsumers,
+  areSourceMapsAvailable,
 }

system-tests/projects/sourcemaps/cypress-disabled.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+  e2e: {
+    supportFile: false,
+    setupNodeEvents (on, config) {
+      require('./cypress-preprocessor.config.js')(on, config)
+    },
+  },
+  env: {
+    areSourceMapsAvailable: false,
+  },
+}

system-tests/projects/sourcemaps/cypress-enabled.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+  e2e: {
+    supportFile: false,
+    setupNodeEvents (on, config) {
+    },
+  },
+  env: {
+    areSourceMapsAvailable: true,
+  },
+}

system-tests/projects/sourcemaps/cypress-preprocessor.config.js

@@ -0,0 +1,31 @@
+const webpack = require('@cypress/webpack-preprocessor')
+
+module.exports = (on, config) => {
+  const options = {
+    webpackOptions: {
+      devtool: false, // This disables sourcemaps
+      resolve: {
+        extensions: ['.js', '.ts', '.jsx', '.tsx'],
+      },
+      module: {
+        rules: [
+          {
+            test: /\.ts$/,
+            exclude: [/node_modules/],
+            use: [
+              {
+                loader: 'ts-loader',
+                options: {
+                  transpileOnly: true,
+                },
+              },
+            ],
+          },
+        ],
+      },
+    },
+    watchOptions: {},
+  }
+
+  on('file:preprocessor', webpack(options))
+}

system-tests/projects/sourcemaps/cypress/e2e/validate-sourcemaps.cy.js

@@ -0,0 +1,3 @@
+it('should validate sourcemaps', () => {
+  expect(Cypress.areSourceMapsAvailable).to.be[Cypress.env('areSourceMapsAvailable')]
+})

system-tests/projects/sourcemaps/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "sourcemaps",
+  "version": "0.0.0-test",
+  "devDependencies": {
+    "@cypress/webpack-preprocessor": "file:../../../npm/webpack-preprocessor"
+  }
+}

system-tests/projects/sourcemaps/yarn.lock

@@ -0,0 +1,38 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@cypress/webpack-preprocessor@file:../../../npm/webpack-preprocessor":
+  version "0.0.0-development"
+  dependencies:
+    bluebird "3.7.1"
+    debug "^4.3.4"
+    lodash "^4.17.20"
+    semver "^7.3.2"
+
+[email protected]:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
+  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
+
+debug@^4.3.4:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
+  dependencies:
+    ms "^2.1.3"
+
+lodash@^4.17.20:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+semver@^7.3.2:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==

system-tests/test/sourcemaps_spec.ts

@@ -0,0 +1,19 @@
+import systemTests from '../lib/system-tests'
+
+describe('e2e sourcemaps', () => {
+  systemTests.setup()
+
+  systemTests.it('detects sourcemaps as enabled', {
+    browser: '!webkit',
+    project: 'sourcemaps',
+    spec: 'validate-sourcemaps.cy.js',
+    configFile: 'cypress-enabled.config.js',
+  })
+
+  systemTests.it('detects sourcemaps as disabled', {
+    browser: '!webkit',
+    project: 'sourcemaps',
+    spec: 'validate-sourcemaps.cy.js',
+    configFile: 'cypress-disabled.config.js',
+  })
+})