newspack-scripts 5.6.0-alpha.1 → 5.6.0-alpha.3

package/bin/newspack-scripts.js

@@ -8,15 +8,12 @@ const [ scriptName, ...nodeArgs ] = process.argv.slice( 2 );
 if (
 	[
 		'test',
-		'build',
-		'watch',
 		'commit',
 		'commitlint',
-		'eslint',
-		'proxy',
-		'stylelint',
 		'release',
+		'semantic-release',
 		'typescript-check',
+		'wp-scripts',
 	].includes( scriptName )
 ) {
 	const result = spawn.sync(

package/config/eslintrc.js

@@ -32,14 +32,12 @@ module.exports = {
 			},
 		},
 	},
-	ignorePatterns: [ 'dist/', 'node_modules/', 'scripts/' ],
-	parser: '@typescript-eslint/parser',
+	ignorePatterns: [ 'dist/', 'node_modules/', 'release/', 'scripts/', '/vendor' ],
 	rules: {
 		'arrow-parens': 'off',
 		camelcase: 'off',
 		'no-console': 'off',
 		'no-mixed-operators': 'off',
-		'space-before-function-paren': 'off',
 		'wrap-iife': 'off',
 		// Some dependencies are injected by WP, and should not be declared in package.json (won't be used anyway).
 		// See https://github.com/WordPress/gutenberg/blob/e035f71/packages/dependency-extraction-webpack-plugin/README.md#behavior-with-scripts
@@ -70,5 +68,6 @@ module.exports = {
 		'@typescript-eslint/no-shadow': 'error',
 		'@typescript-eslint/ban-ts-comment': 'warn',
 		'@typescript-eslint/no-explicit-any': 'warn',
+		'prettier/prettier': 'off',
 	},
 };

package/config/prettier.config.js

@@ -0,0 +1,6 @@
+const wpConfig = require( '@wordpress/prettier-config' );
+
+module.exports = {
+	...wpConfig,
+	arrowParens: 'avoid',
+};

package/config/stylelint.config.js

@@ -1,5 +1,7 @@
 module.exports = {
-	extends: [ 'stylelint-config-standard' ],
+	extends: [
+		'@wordpress/stylelint-config',
+	],
 	rules: {
 		'rule-empty-line-before': null,
 		'at-rule-empty-line-before': null,
@@ -26,7 +28,6 @@ module.exports = {
 				ignoreAnnotations: [ '/default/' ],
 			},
 		],
-		'media-query-no-invalid': null,
 		'media-feature-range-notation': null,
 	},
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack-scripts",
-	"version": "5.6.0-alpha.1",
+	"version": "5.6.0-alpha.3",
 	"description": "",
 	"bin": {
 		"newspack-scripts": "./bin/newspack-scripts.js"
@@ -36,7 +36,9 @@
 		"@wordpress/icons": "^10.0.0",
 		"@wordpress/keycodes": "^4.0.0",
 		"@wordpress/plugins": "^7.0.0",
-		"@wordpress/scripts": "^28.0.0",
+		"@wordpress/prettier-config": "^4.1.0",
+		"@wordpress/scripts": "^28.1.0",
+		"@wordpress/stylelint-config": "^22.1.0",
 		"@wordpress/url": "^4.0.0",
 		"autoprefixer": "^10.4.19",
 		"commitizen": "^4.3.0",
@@ -54,8 +56,6 @@
 		"prettier": "^3.3.2",
 		"semantic-release": "^19.0.5",
 		"semantic-release-version-bump": "^1.4.1",
-		"stylelint": "^16.6.1",
-		"stylelint-config-standard": "^36.0.0",
 		"typescript": "^5.4.5",
 		"yargs": "^17.7.2"
 	},
@@ -81,5 +81,6 @@
 	},
 	"browserslist": [
 		"extends @wordpress/browserslist-config"
-	]
+	],
+	"prettier": "@wordpress/prettier-config"
 }

package/scripts/commitlint.js

@@ -2,9 +2,10 @@
 
 const spawn = require( 'cross-spawn' );
 const path = require( 'path' );
+const commitlint = require.resolve( '@commitlint/cli/cli' );
 
 const result = spawn.sync(
-	`${ process.cwd() }/node_modules/.bin/commitlint`,
+	commitlint,
 	[ '--config', path.resolve( __dirname, '../config/commitlint.config.js' ) ],
 	{
 		stdio: 'inherit',

package/scripts/semantic-release.js

@@ -0,0 +1,25 @@
+/**
+ * A proxy for the semantic-release executable.
+ * Note: most Newspack repos use the `release` script.
+ * Only newspack-theme currently uses this script.
+ */
+
+'use strict';
+
+const spawn = require( 'cross-spawn' );
+const utils = require( './utils/index.js' );
+const sr = require.resolve( 'semantic-release/bin/semantic-release' );
+
+utils.log( 'Starting TypeScript check…' );
+
+const args = process.argv.slice( 2 ) || [];
+
+const result = spawn.sync( sr, args, {
+	stdio: 'inherit',
+} );
+
+if ( result.status === 0 ) {
+	utils.log( 'All good!' );
+}
+
+process.exit( result.status );

package/scripts/typescript-check.js

@@ -1,13 +1,12 @@
 'use strict';
 
 const spawn = require( 'cross-spawn' );
-const path = require( 'path' );
-const modules = require( './utils/modules' );
 const utils = require( './utils/index.js' );
+const tsc = require.resolve( 'typescript/bin/tsc' );
 
 utils.log( 'Starting TypeScript check…' );
 
-const result = spawn.sync( `${ process.cwd() }/node_modules/.bin/tsc`, [], {
+const result = spawn.sync( tsc, [], {
 	stdio: 'inherit',
 } );
 

package/scripts/utils/modules.js

@@ -4,18 +4,22 @@ const rootDirectory = fs.realpathSync( process.cwd() );
 
 module.exports = {
 	rootDirectory,
-	args: ( cmd, opts = [] ) => {
+	// Get webpack bundle args for `build` and `start` commands.
+	buildArgs: ( cmd, args = [] ) => {
+		if ( 'build' !== cmd && 'start' !== cmd ) {
+			return [ cmd, ...args ];
+		}
+
 		const defaults = [
-			cmd,
 			'--config',
 			'webpack.config.js',
 		];
 
 		// Default build path: ./dist
-		if ( ! opts.includes( '--output-path' ) ) {
+		if ( ! args.includes( '--output-path' ) ) {
 			defaults.push( '--output-path', 'dist' );
 		}
 
-		return [ ...defaults, ...opts ];
+		return [ cmd, ...defaults, ...args ];
 	},
 };

package/scripts/{build.js → wp-scripts.js}

@@ -5,18 +5,19 @@ const modules = require( './utils/modules' );
 const utils = require( './utils/index.js' );
 const wpScripts = require.resolve( '@wordpress/scripts/bin/wp-scripts' );
 
-utils.log( 'Starting to build…' );
-
 const args = process.argv.slice( 2 );
+const cmd = args.shift();
+
+utils.log( `Running ${ cmd }...` );
 
-const buildResult = spawn.sync( wpScripts, modules.args( 'build', args ), {
+const result = spawn.sync( wpScripts, modules.buildArgs( cmd, args ), {
 	cwd: modules.rootDirectory,
 	stdio: 'inherit',
-	env: { ...process.env, NODE_ENV: 'production' },
+	env: { ...process.env, NODE_ENV: 'build' === cmd ? 'production' : 'development' },
 } );
 
-if ( buildResult.status === 0 ) {
-	utils.log( 'Build succeeded!' );
+if ( result.status === 0 ) {
+	utils.log( `${ cmd } complete!` );
 }
 
-process.exit( buildResult.status );
+process.exit( result.status );

package/scripts/proxy.js

@@ -1,29 +0,0 @@
-'use strict';
-
-/**
- * Run a command via newspack-script's dependencies.
- * Usage: newspack-scripts proxy <command> [args]
- */
-
-const path = require( 'path' );
-const spawn = require( 'cross-spawn' );
-const modules = require( './utils/modules' );
-const utils = require( './utils/index.js' );
-
-const args = process.argv.slice( 2 );
-const dependency = args.shift();
-const cmd = path.resolve( __dirname, `../node_modules/.bin/${ dependency }` );
-
-utils.log( `Running command: ${ dependency } ${ args.join( ' ' ) }` );
-
-const result = spawn.sync(
-	cmd,
-	args,
-	{
-		cwd: modules.rootDirectory,
-		stdio: 'inherit',
-		env: { ...process.env, NODE_ENV: 'semantic-release' === cmd ? 'production' : 'development' },
-	}
-);
-
-process.exit( result.status );

package/scripts/watch.js

@@ -1,16 +0,0 @@
-'use strict';
-
-const spawn = require( 'cross-spawn' );
-const modules = require( './utils/modules' );
-const utils = require( './utils/index.js' );
-const wpScripts = require.resolve( '@wordpress/scripts/bin/wp-scripts' );
-
-utils.log( 'Starting to watch…' );
-
-const args = process.argv.slice( 2 );
-
-spawn.sync( wpScripts, modules.args( 'start', args ), {
-	cwd: modules.rootDirectory,
-	stdio: 'inherit',
-	env: { ...process.env, NODE_ENV: 'development' },
-} );