Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change how tsconfig is aliased in webpack-batteries-included-preprocessor #27706

Merged
merged 5 commits into from
Aug 31, 2023
Merged

fix: change how tsconfig is aliased in webpack-batteries-included-preprocessor #27706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96b534a
chore: change how tsconfig is aliased in webpack-batteries-included-p…
chrisbreiding Aug 30, 2023
26f592d
use --target-reference so snyk analyzes current branch
chrisbreiding Aug 30, 2023
847f2c6
fix missing space
chrisbreiding Aug 30, 2023
852dd3b
use pull_request instead of pull_request_target for snyk actions
chrisbreiding Aug 31, 2023
4db3cb0
Merge branch 'develop' into fix-erroneous-tsconfig-quote-vulnerabilit…
chrisbreiding Aug 31, 2023
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
4 changes: 2 additions & 2 deletions npm/webpack-batteries-included-preprocessor/index.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28700,7 +28700,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