Skip to content

Commit

Permalink
fix: change how tsconfig is aliased in webpack-batteries-included-pre…
Browse files Browse the repository at this point in the history
…processor (#27706)

* chore: change how tsconfig is aliased in webpack-batteries-included-preprocessor

* use --target-reference so snyk analyzes current branch

* fix missing space

* use pull_request instead of pull_request_target for snyk actions
  • Loading branch information
chrisbreiding authored Aug 31, 2023
1 parent cee7dfc commit 6081751
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/snyk_sca_scan.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Snyk Software Composition Analysis Scan
# This git workflow leverages Snyk actions to perform a Software Composition
# This git workflow leverages Snyk actions to perform a Software Composition
# Analysis scan on our Opensource libraries upon Pull Requests to the
# "develop" branch. We use this as a control to prevent vulnerable packages
# from being introduced into the codebase.
# "develop" branch. We use this as a control to prevent vulnerable packages
# from being introduced into the codebase.
# Enhancements were made to this action to build the yarn packages to reduce
# Snyk scan errors that were complaining about the yarn.locks etc. Also
# Snyk scan errors that were complaining about the yarn.locks etc. Also
# implemented PAT token for actions to resolve an issue with the action not
# running and reporting back to the PR status checks
on:
pull_request_target:
branches:
pull_request:
branches:
- develop
jobs:
Snyk_SCA_Scan:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/snyk_static_analysis_scan.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Snyk Static Analysis Scan
# This git workflow leverages Snyk actions to perform a Static Application
# This git workflow leverages Snyk actions to perform a Static Application
# Testing scan (SAST) on our first-party code upon Pull Requests to the
# "develop" branch. We use this as a control to prevent vulnerabilities
# from being introduced into the codebase.
# "develop" branch. We use this as a control to prevent vulnerabilities
# from being introduced into the codebase.
on:
pull_request_target:
branches:
pull_request:
branches:
- develop
jobs:
Snyk_SAST_Scan :
Expand Down
4 changes: 2 additions & 2 deletions npm/webpack-batteries-included-preprocessor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const addTypeScriptConfig = (file, options) => {

const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin')
// node will try to load a projects tsconfig.json instead of the node
// package using require('tsconfig'), so we alias it as 'tsconfig-package'
const configFile = require('tsconfig-package').findSync(path.dirname(file.filePath))
// package using require('tsconfig'), so we alias it as 'tsconfig-aliased-for-wbip'
const configFile = require('tsconfig-aliased-for-wbip').findSync(path.dirname(file.filePath))

webpackOptions.module.rules.push({
test: /\.tsx?$/,
Expand Down
2 changes: 1 addition & 1 deletion npm/webpack-batteries-included-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"stream-http": "^3.2.0",
"timers-browserify": "^2.0.12",
"ts-loader": "9.4.4",
"tsconfig-package": "npm:tsconfig@^7.0.0",
"tsconfig-aliased-for-wbip": "npm:tsconfig@^7.0.0",
"tsconfig-paths-webpack-plugin": "^3.5.2",
"tty-browserify": "^0.0.1",
"url": "^0.11.1",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28692,7 +28692,7 @@ ts-pnp@^1.1.6:
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a"
integrity sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==

"tsconfig-package@npm:tsconfig@^7.0.0":
"tsconfig-aliased-for-wbip@npm:tsconfig@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==
Expand Down

2 comments on commit 6081751

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 6081751 Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.1.0/linux-x64/develop-6081751c411a45bb9eaf7ba200d4921acdcc2422/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 6081751 Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.1.0/darwin-x64/develop-6081751c411a45bb9eaf7ba200d4921acdcc2422/cypress.tgz

Please sign in to comment.