Skip to content

Commit

Permalink
Merge f1d8d0c into 9ae37c0
Browse files Browse the repository at this point in the history
  • Loading branch information
igorschoester authored Jan 22, 2024
2 parents 9ae37c0 + f1d8d0c commit 1c577ba
Show file tree
Hide file tree
Showing 12 changed files with 4,288 additions and 1,237 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Set up node and enable caching of dependencies
uses: actions/setup-node@v4
with:
node-version: '14'
node-version-file: './.nvmrc'
cache: 'yarn'

- name: "Debug info: show tooling versions"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Set up node and enable caching of dependencies
uses: actions/setup-node@v4
with:
node-version: '14'
node-version-file: './.nvmrc'
cache: 'yarn'

- name: Yarn install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/jstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Set up node and enable caching of dependencies
uses: actions/setup-node@v4
with:
node-version: '14'
node-version-file: './.nvmrc'
cache: 'yarn'

- name: Yarn install
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
if: ${{ steps.checks-run.outputs.should == 'true' }}
uses: actions/setup-node@v4
with:
node-version: '14'
node-version-file: './.nvmrc'
cache: 'yarn'

- name: Yarn install
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/gallium
18
36 changes: 36 additions & 0 deletions VERSIONS.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"comment": "JSON format versions of tooling and languages used by automations to build, deploy and test this branch",
"tools": {
"composer": {
"name": "composer",
"version": "--2.2",
"comment": "Used with Jenkins GH-actions unknown ATM"
},
"node": {
"name": "nodeJS",
"node-version-file": "./.nvmrc",
"comment": "We use the version set in the .nvmrc file, so Devs will see the same version as CI and release processes"
},
"php": {
"name": "PHP",
"GH-Actions_version": "7.2",
"GH-Actions-comment": "This is hard code ATM in the GH-actions and is currently below the version we use to release",
"version": "7.4",
"possible version values": [
"7.4",
"8.0",
"8.1",
"8.2"
],
"container": "bullseye",
"possible container values": [
"bullseye"
],
"comment": "Used Jenkins container will be made of <version>-<container> see https://hub.docker.com/r/yoastseo/jenkins-plugin-release/tags"
},
"yarn": {
"name": "yarn",
"comment": "We use the version set in .yarnrc (line yarn-path), this is the method used by Yarn itself"
}
}
}
6 changes: 3 additions & 3 deletions config/webpack/webpack.config.base.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// External dependencies
const DependencyExtractionWebpackPlugin = require( "@wordpress/dependency-extraction-webpack-plugin" );
const defaultConfig = require( "@wordpress/scripts/config/webpack.config" );
const MiniCSSExtractPlugin = require( "mini-css-extract-plugin" );
const MiniCssExtractPlugin = require( "mini-css-extract-plugin" );
const { BundleAnalyzerPlugin } = require( "webpack-bundle-analyzer" );

// Internal dependencies
Expand Down Expand Up @@ -31,7 +31,7 @@ module.exports = function( { entry, output, combinedOutputFile, cssExtractFileNa
...defaultConfig.plugins.filter(
( plugin ) =>
plugin.constructor.name !== "DependencyExtractionWebpackPlugin" &&
plugin.constructor.name !== "MiniCSSExtractPlugin" &&
plugin.constructor.name !== "MiniCssExtractPlugin" &&
plugin.constructor.name !== "CleanWebpackPlugin" &&
plugin.constructor.name !== "BundleAnalyzerPlugin"
),
Expand Down Expand Up @@ -89,7 +89,7 @@ module.exports = function( { entry, output, combinedOutputFile, cssExtractFileNa
}
},
} ),
new MiniCSSExtractPlugin( { filename: cssExtractFileName } ),
new MiniCssExtractPlugin( { filename: cssExtractFileName } ),
process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin( {
analyzerPort: analyzerPort++,
} ),
Expand Down
2 changes: 1 addition & 1 deletion config/webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = [
filename: outputFilename,
},
combinedOutputFile: root + "src/generated/assets/plugin.php",
cssExtractFileName: root + "../../css/dist/plugin-" + pluginVersionSlug + ".css",
cssExtractFileName: "../../../css/dist/plugin-" + pluginVersionSlug + ".css",
}
),
baseConfig(
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@tailwindcss/forms": "^0.5.2",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"@wordpress/dependency-extraction-webpack-plugin": "^3.1.0",
"@wordpress/scripts": "^17.1.0",
"@wordpress/dependency-extraction-webpack-plugin": "^4.28.0",
"@wordpress/scripts": "^26.16.0",
"@yoast/babel-preset": "^1.1.0",
"@yoast/browserslist-config": "^1.2.2",
"@yoast/grunt-plugin-tasks": "^2.4",
Expand Down
55 changes: 28 additions & 27 deletions packages/browserslist-config/package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
{
"name": "@yoast/browserslist-config",
"version": "1.2.2",
"repository": {
"type": "git",
"url": "https://github.com/yoast/javascript",
"directory": "packages/browserslist-config"
},
"description": "The browserslist configuration for Yoast projects",
"author": "Team Yoast",
"homepage": "https://github.com/Yoast/javascript#readme",
"license": "GPL-3.0",
"private": false,
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"scripts": {
"test": "jest",
"lint": "eslint . --max-warnings=0",
"prepublishOnly": "rm -rf dist && cp -R src dist && cp package.json dist/package.json && json -I -f dist/package.json -e \\\"this.main='index.js'\\\""
},
"bugs": {
"url": "https://github.com/Yoast/javascript/issues"
},
"devDependencies": {
"browserslist": "^4.7.3"
}
"name": "@yoast/browserslist-config",
"version": "1.2.2",
"repository": {
"type": "git",
"url": "https://github.com/yoast/javascript",
"directory": "packages/browserslist-config"
},
"description": "The browserslist configuration for Yoast projects",
"author": "Team Yoast",
"homepage": "https://github.com/Yoast/javascript#readme",
"license": "GPL-3.0",
"private": false,
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"scripts": {
"test": "jest",
"lint": "eslint . --max-warnings=0",
"prepublishOnly": "rm -rf dist && cp -R src dist && cp package.json dist/package.json && json -I -f dist/package.json -e \\\"this.main='index.js'\\\""
},
"bugs": {
"url": "https://github.com/Yoast/javascript/issues"
},
"devDependencies": {
"browserslist": "^4.7.3",
"jest": "^29.7.0"
}
}
6 changes: 3 additions & 3 deletions packages/ui-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"watch": "yarn watch:js & yarn watch:css",
"watch:js": "yarn build:js --watch",
"watch:css": "node ./scripts/watch-css.js",
"storybook": "start-storybook -p 6006",
"build:storybook": "build-storybook",
"storybook": "NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006",
"build:storybook": "NODE_OPTIONS=--openssl-legacy-provider build-storybook",
"publish:storybook": "./scripts/publish-storybook.sh",
"test:storyshots": "yarn build-storybook --quiet && jest tests/storyshots.js",
"test:storyshots": "NODE_OPTIONS=--openssl-legacy-provider yarn build-storybook --quiet && jest tests/storyshots.js",
"test": "yarn test:storyshots",
"lint": "eslint src --max-warnings=0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/yoastseo/grunt/config/shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ module.exports = function( grunt ) {
"get-current-branch": {
command: getCurrentBranchCommand,
options: {
// eslint-disable-next-line handle-callback-err
// eslint-disable-next-line handle-callback-err,require-jsdoc
callback: function( err, stdout, stderr, cb ) {
grunt.config.set( "currentBranch", stdout );

Expand Down
Loading

0 comments on commit 1c577ba

Please sign in to comment.