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.

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

[Snyk] Security upgrade webpack from 5.76.1 to 5.94.0 #1703

Merged
merged 7 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/mighty-squids-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@compiled/webpack-loader': patch
---

When parsing the Webpack config `rules` option, also handle the situation where a rule might be falsy (null, undefined, 0, "")
8 changes: 5 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ jobs:
- name: Validate
run: yarn lint

- name: Run tests
run: yarn test:cover --ci

- name: Check prettier
run: yarn prettier:check

Expand All @@ -60,6 +57,11 @@ jobs:
- name: Build source for remainder tests
run: yarn build

# Needs to run after `yarn build` so that `packages/webpack-loader/`
# tests can resolve `@compiled/react/runtime` correctly.
- name: Run tests
run: yarn test:cover --ci

- name: Run import test
run: yarn test:imports

Expand Down
2 changes: 1 addition & 1 deletion examples/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"style-loader": "^3.3.2",
"webpack": "^5.76.1",
"webpack": "^5.94.0",
"webpack-cli": "^5.0.1"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
},
{
"path": "./packages/react/dist/browser/runtime/style.js",
"limit": "480B",
"limit": "482B",
"import": "CS",
"ignore": [
"react"
Expand Down
2 changes: 2 additions & 0 deletions packages/parcel-transformer/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import type { ParcelTransformerOpts } from './types';

export function createDefaultResolver(config: ParcelTransformerOpts): Resolver {
const resolver = ResolverFactory.createResolver({
// @ts-expect-error - enhanced-resolve CachedInputFileSystem types are not
// compatible with @types/node fs types
fileSystem: new CachedInputFileSystem(fs, 4000),
...(config.extensions && {
extensions: config.extensions,
Expand Down
6 changes: 5 additions & 1 deletion packages/webpack-loader/src/create-default-resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ export function createDefaultResolver({ resolveOptions, webpackResolveOptions }:
// Setup the default resolver, where webpack will merge any passed in options with the default
// resolve configuration. Ideally, we use this.getResolve({ ...resolve, useSyncFileSystemCalls: true, })
// However, it does not work correctly when in development mode :/

// @ts-expect-error - enhanced-resolve CachedInputFileSystem types are not
// compatible with @types/node fs types
const resolver = ResolverFactory.createResolver({
// @ts-expect-error
// @ts-expect-error - enhanced-resolve CachedInputFileSystem types are not
// compatible with @types/node fs types
fileSystem: new CachedInputFileSystem(fs, 4000),
...(webpackResolveOptions ?? {}),
...resolveOptions,
Expand Down
19 changes: 16 additions & 3 deletions packages/webpack-loader/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import type { Compilation as CompilationType, Compiler, sources, RuleSetRule } from 'webpack';
import type {
Compilation as CompilationType,
Compiler,
sources,
RuleSetRule,
WebpackOptionsNormalized,
} from 'webpack';

/**
* Helper function to set plugin configured option on the @compiled/webpack-loader
Expand All @@ -13,6 +19,7 @@ const setOptionOnCompiledWebpackLoader = (use: RuleSetRule['use'], pluginName: s

for (const nestedUse of use) {
if (
nestedUse &&
typeof nestedUse === 'object' &&
(nestedUse.loader === '@compiled/webpack-loader' ||
nestedUse.loader?.includes('/node_modules/@compiled/webpack-loader'))
Expand All @@ -34,15 +41,21 @@ const setOptionOnCompiledWebpackLoader = (use: RuleSetRule['use'], pluginName: s
* @returns
*/
export const setPluginConfiguredOption = (
rules: (RuleSetRule | '...')[],
rules: WebpackOptionsNormalized['module']['rules'],
pluginName: string
): void => {
for (const r of rules) {
if (!r) {
continue;
}

const rule = r as RuleSetRule;
const nestedRules = rule.oneOf ?? rule.rules;
if (nestedRules) {
for (const nestedRule of nestedRules) {
setOptionOnCompiledWebpackLoader(nestedRule.use, pluginName);
if (nestedRule) {
setOptionOnCompiledWebpackLoader(nestedRule.use, pluginName);
}
}
} else {
setOptionOnCompiledWebpackLoader(rule.use, pluginName);
Expand Down
Loading
Loading