Skip to content
Open
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
29 changes: 29 additions & 0 deletions .depcheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# depcheck — https://github.com/depcheck/depcheck
#
# Ignore-only setup: depcheck's webpack special does not scan webpack.dev.js / loaders.js naming,
# and there is no Stylelint special for .stylelintrc. Listed packages are used via Webpack,
# Stylelint config, or SCSS paths—not plain JS imports.

ignores:
- "@wordpress/stylelint-config"
- stylelint-config-recess-order
- stylelint-scss
- postcss-scss
- css-loader
- cssnano
- esbuild-loader
- imagemin
- imagemin-gifsicle
- imagemin-jpegtran
- imagemin-optipng
- imagemin-svgo
- postcss
- postcss-import
- postcss-loader
- postcss-preset-env
- postcss-pxtorem
- postcss-sort-media-queries
- sass-loader
- svgo
- svgo-loader
- webpack-cli
2 changes: 2 additions & 0 deletions config/loaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ module.exports = {
let obj = {
quietDeps: true,
sourceMap: true,
// Resolve package-style imports (e.g. @fontsource-variable/...) like Node does
loadPaths: [nodeModulesPath],
}

if (isProduction && isEditor(loaderContext)) {
Expand Down
13 changes: 5 additions & 8 deletions config/webpack-theme-json-plugin.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
const chalk = require('chalk')
const path = require('path')
const fs = require('fs')

const logId = '[' + chalk.blue('WebpackThemeJsonPlugin') + ']'

class WebpackThemeJsonPlugin {
/**
* constructor
Expand Down Expand Up @@ -32,7 +29,7 @@ class WebpackThemeJsonPlugin {
/**
* apply
*/
apply() {}
apply() { }

/**
* Generate theme json file
Expand All @@ -51,21 +48,21 @@ class WebpackThemeJsonPlugin {
json = JSON.parse(json)
} catch (e) {
// eslint-disable-next-line no-console
console.error(logId, 'Error parsing JSON file:', file.name)
console.error('WebpackThemeJsonPlugin: Error parsing JSON file:', file.name)
}

if (isPlainObject(json)) {
extend(true, themeJson, json)
} else {
// eslint-disable-next-line no-console
console.error(logId, 'JSON file is not a plain object:', file.name)
console.error('WebpackThemeJsonPlugin: JSON file is not a plain object:', file.name)
}
}
})

fs.writeFileSync(this._output, JSON.stringify(themeJson, null, 2))
// eslint-disable-next-line no-console
console.log(logId, 'JSON files successfully generated !')
console.log('WebpackThemeJsonPlugin: JSON files successfully generated !')

return this
}
Expand Down Expand Up @@ -116,7 +113,7 @@ class WebpackThemeJsonPlugin {
jsonFile = JSON.parse(jsonFile)
} catch (e) {
// eslint-disable-next-line no-console
console.error(logId, 'Error parsing JSON file:', this._output)
console.error('WebpackThemeJsonPlugin: Error parsing JSON file:', this._output)
return this
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"lint:css": "node_modules/.bin/stylelint \"src/scss/**/*.scss\"",
"lint:js": "node_modules/.bin/eslint \"src/js/**/*.js\"",
"lint": "node_modules/.bin/concurrently \"npx yarn lint:css\" \"npx yarn lint:js\"",
"bundle-report": "yarn build && yarn webpack-bundle-analyzer dist/stats.json"
"bundle-report": "yarn build && yarn webpack-bundle-analyzer dist/stats.json",
"depcheck": "npx depcheck"
},
"license": "GPL-2.0",
"dependencies": {
Expand Down Expand Up @@ -55,7 +56,6 @@
"sass": "^1.85.1",
"sass-loader": "^16.0.5",
"sharp": "^0.34.2",
"style-loader": "^2.0.0",
"stylelint": "^14.13.0",
"stylelint-config-recess-order": "^3.0.0",
"stylelint-scss": "^4.3.0",
Expand Down
12 changes: 6 additions & 6 deletions src/scss/03-base/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
*
* 2 - Declare font-face :
* // For Classic font
* @use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
* @use "../../../node_modules/@fontsource/myFont/scss/mixins" as MyFont;
* import the utils mixins from "@fontsource-utils/scss/src/mixins" as fontsource;
* import the font mixins from "@fontsource/myFont/scss/mixins" as MyFont;
* @include fontsource.faces($metadata: MyFont.$metadata, $weights: (400, 700));
* ...
*
* // For Variable font
* @use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
* @use "../../../node_modules/@fontsource-variable/myFont/scss/mixins" as MyFont;
* import the utils mixins from "@fontsource-utils/scss/src/mixins" as fontsource;
* import the font mixins from "@fontsource-variable/myFont/scss/mixins" as MyFont;
* @include fontsource.faces($metadata: MyFont.$metadata, $axes: wght);
* ...
*/

@use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
@use "../../../node_modules/@fontsource/poppins/scss/mixins" as Poppins;
@use "@fontsource-utils/scss/src/mixins" as fontsource;
@use "@fontsource/poppins/scss/mixins" as Poppins;

@include fontsource.faces($metadata: Poppins.$metadata, $weights: (300, 400, 500, 700), $styles: normal);
@include fontsource.faces($metadata: Poppins.$metadata, $weights: (300, 400, 500, 700), $styles: italic);
Expand Down
4 changes: 2 additions & 2 deletions src/scss/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ variables.$entry-file-name: "editor";
* == Contains styles for gutenberg patterns.
*/

// @use "07-patterns/...";
// Import patterns from "07-patterns/...";

/**
* Vendor
* == Plugins or libraries custom styles.
*/

// @use "10-vendor/...";
// Import vendor styles from "10-vendor/...";
4 changes: 2 additions & 2 deletions src/scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ variables.$entry-file-name: "style";
* == Contains styles for gutenberg patterns.
*/

// @use "07-patterns/...";
// Import patterns from "07-patterns/...";

/**
* Template parts
Expand All @@ -108,4 +108,4 @@ variables.$entry-file-name: "style";
* == Plugins or libraries custom styles.
*/

// @use "10-vendor/...";
// Import vendor styles from "10-vendor/...";
19 changes: 3 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2294,7 +2294,6 @@ __metadata:
sass: "npm:^1.85.1"
sass-loader: "npm:^16.0.5"
sharp: "npm:^0.34.2"
style-loader: "npm:^2.0.0"
stylelint: "npm:^14.13.0"
stylelint-config-recess-order: "npm:^3.0.0"
stylelint-scss: "npm:^4.3.0"
Expand Down Expand Up @@ -2678,9 +2677,9 @@ __metadata:
linkType: hard

"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001688, caniuse-lite@npm:^1.0.30001702":
version: 1.0.30001712
resolution: "caniuse-lite@npm:1.0.30001712"
checksum: 10/1831ac3260b9657c5a0236d21c02bea6a6b88fd67a451a0ff166d27da17c95ab398c5721e08aeb24f766bced1d38f562f07c8de84e91a10a065808e83835e89e
version: 1.0.30001791
resolution: "caniuse-lite@npm:1.0.30001791"
checksum: 10/0ec6ef60ca9f5da3da37a57c8b7b645878b6aca406eb5b569dda0bdfa518fe83320e3e2e9e25450a40a8f34854c1537c287f8bd107830aa6f39c3018f98fe408
languageName: node
linkType: hard

Expand Down Expand Up @@ -10725,18 +10724,6 @@ __metadata:
languageName: node
linkType: hard

"style-loader@npm:^2.0.0":
version: 2.0.0
resolution: "style-loader@npm:2.0.0"
dependencies:
loader-utils: "npm:^2.0.0"
schema-utils: "npm:^3.0.0"
peerDependencies:
webpack: ^4.0.0 || ^5.0.0
checksum: 10/129f8d7124bc46ece4363992a38329c6879356298338c8e448e70ec76eeec83f5214339814863324fe0089286bf6860a1971b9a2247718474db609ac6f04990a
languageName: node
linkType: hard

"style-search@npm:^0.1.0":
version: 0.1.0
resolution: "style-search@npm:0.1.0"
Expand Down
Loading