newspack-scripts 5.5.1 → 5.5.2

package/scripts/typescript-check.js

@@ -1,18 +1,17 @@
-"use strict";
+'use strict';
 
-const spawn = require("cross-spawn");
-const path = require("path");
-const modules = require("./utils/modules");
-const utils = require("./utils/index.js");
+const spawn = require( 'cross-spawn' );
+const utils = require( './utils/index.js' );
+const tsc = require.resolve( 'typescript/bin/tsc' );
 
-utils.log("Starting TypeScript check…");
+utils.log( 'Starting TypeScript check…' );
 
-const result = spawn.sync(`${process.cwd()}/node_modules/.bin/tsc`, [], {
-  stdio: "inherit",
-});
+const result = spawn.sync( tsc, [], {
+	stdio: 'inherit',
+} );
 
-if (result.status === 0) {
-  utils.log("All good!");
+if ( result.status === 0 ) {
+	utils.log( 'All good!' );
 }
 
-process.exit(result.status);
+process.exit( result.status );

package/scripts/utils/babelJestTransformer.js

@@ -1,14 +1,13 @@
-"use strict";
+'use strict';
 
-const babelJest = require("babel-jest").default;
+const babelJest = require( 'babel-jest' ).default;
 
-module.exports = babelJest.createTransformer({
-  presets: [
-    require.resolve("@babel/preset-env"),
-    require.resolve("@babel/preset-typescript"),
-    require.resolve("@automattic/calypso-build/babel/default"),
-    require.resolve("@automattic/calypso-build/babel/wordpress-element"),
-  ],
-  babelrc: false,
-  configFile: false,
-});
+module.exports = babelJest.createTransformer( {
+	presets: [
+		require.resolve( '@babel/preset-env' ),
+		require.resolve( '@babel/preset-typescript' ),
+		require.resolve( '@wordpress/babel-preset-default' ),
+	],
+	babelrc: false,
+	configFile: false,
+} );

package/scripts/utils/index.js

@@ -1,25 +1,25 @@
-const { exec } = require("child_process");
+const { exec } = require( 'child_process' );
 
-const { version } = require("../../package.json");
+const { version } = require( '../../package.json' );
 
-const log = (content, type) => {
-  console.log(
-    `[newspack-scripts@${version}]${type ? `[${type}]` : ""} ${content}`
-  );
+const log = ( content, type ) => {
+	console.log(
+		`[newspack-scripts@${ version }]${ type ? `[${ type }]` : '' } ${ content }`
+	);
 };
 
 const getGitBranch = () =>
-  new Promise((resolve, reject) => {
-    return exec("git rev-parse --abbrev-ref HEAD", (err, stdout) => {
-      if (err) {
-        reject(`getGitBranch Error: ${err}`);
-      } else if (typeof stdout === "string") {
-        resolve(stdout.trim());
-      }
-    });
-  });
+	new Promise( ( resolve, reject ) => {
+		return exec( 'git rev-parse --abbrev-ref HEAD', ( err, stdout ) => {
+			if ( err ) {
+				reject( `getGitBranch Error: ${ err }` );
+			} else if ( typeof stdout === 'string' ) {
+				resolve( stdout.trim() );
+			}
+		} );
+	} );
 
 module.exports = {
-  log,
-  getGitBranch,
+	log,
+	getGitBranch,
 };

package/scripts/utils/jestSetup.js

@@ -1,45 +1,45 @@
-import "@testing-library/jest-dom";
+import '@testing-library/jest-dom';
 
 // matchMedia does not exist in JSDOM, see https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
-Object.defineProperty(window, "matchMedia", {
-  writable: true,
-  value: jest.fn().mockImplementation((query) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: jest.fn(), // deprecated
-    removeListener: jest.fn(), // deprecated
-    addEventListener: jest.fn(),
-    removeEventListener: jest.fn(),
-    dispatchEvent: jest.fn(),
-  })),
-});
+Object.defineProperty( window, 'matchMedia', {
+	writable: true,
+	value: jest.fn().mockImplementation( ( query ) => ( {
+		matches: false,
+		media: query,
+		onchange: null,
+		addListener: jest.fn(), // deprecated
+		removeListener: jest.fn(), // deprecated
+		addEventListener: jest.fn(),
+		removeEventListener: jest.fn(),
+		dispatchEvent: jest.fn(),
+	} ) ),
+} );
 
 // IntersectionObserver does not exist in JSDOM.
 // https://stackoverflow.com/a/58651649/3772847
 class MockIntersectionObserver {
-  constructor(fn) {
-    this.root = null;
-    this.rootMargin = "";
-    this.thresholds = [];
-    this.disconnect = () => null;
-    this.observe = () => null;
-    this.takeRecords = () => [];
-    this.unobserve = () => null;
+	constructor( fn ) {
+		this.root = null;
+		this.rootMargin = '';
+		this.thresholds = [];
+		this.disconnect = () => null;
+		this.observe = () => null;
+		this.takeRecords = () => [];
+		this.unobserve = () => null;
 
-    // Pass a single entry, which is intersecting.
-    fn([{ isIntersecting: true }]);
-  }
+		// Pass a single entry, which is intersecting.
+		fn( [ { isIntersecting: true } ] );
+	}
 }
 
-Object.defineProperty(window, "IntersectionObserver", {
-  writable: true,
-  configurable: true,
-  value: MockIntersectionObserver,
-});
+Object.defineProperty( window, 'IntersectionObserver', {
+	writable: true,
+	configurable: true,
+	value: MockIntersectionObserver,
+} );
 
-Object.defineProperty(global, "IntersectionObserver", {
-  writable: true,
-  configurable: true,
-  value: MockIntersectionObserver,
-});
+Object.defineProperty( global, 'IntersectionObserver', {
+	writable: true,
+	configurable: true,
+	value: MockIntersectionObserver,
+} );

package/scripts/utils/modules.js

@@ -1,6 +1,25 @@
-const fs = require("fs");
+const fs = require( 'fs' );
+
+const rootDirectory = fs.realpathSync( process.cwd() );
 
 module.exports = {
-  rootDirectory: fs.realpathSync(process.cwd()),
-  calypsoBuild: require.resolve("@automattic/calypso-build/bin/calypso-build"),
+	rootDirectory,
+	// Get webpack bundle args for `build` and `start` commands.
+	buildArgs: ( cmd, args = [] ) => {
+		if ( 'build' !== cmd && 'start' !== cmd ) {
+			return [ cmd, ...args ];
+		}
+
+		const defaults = [
+			'--config',
+			'webpack.config.js',
+		];
+
+		// Default build path: ./dist
+		if ( ! args.includes( '--output-path' ) ) {
+			defaults.push( '--output-path', 'dist' );
+		}
+
+		return [ cmd, ...defaults, ...args ];
+	},
 };

package/scripts/wp-scripts.js

@@ -0,0 +1,23 @@
+'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' );
+
+const args = process.argv.slice( 2 );
+const cmd = args.shift();
+
+utils.log( `Running ${ cmd }...` );
+
+const result = spawn.sync( wpScripts, modules.buildArgs( cmd, args ), {
+	cwd: modules.rootDirectory,
+	stdio: 'inherit',
+	env: { ...process.env, NODE_ENV: 'build' === cmd ? 'production' : 'development' },
+} );
+
+if ( result.status === 0 ) {
+	utils.log( `${ cmd } complete!` );
+}
+
+process.exit( result.status );

package/src/jobs/lint-js-scss.yml

@@ -1,5 +1,5 @@
 description: >
-  Lint the JS & SCSS files.
+  Lint the JS & SCSS (temporarily skipped) files.
 
 executor: default
 
@@ -8,4 +8,4 @@ steps:
   - set_node_version
   - run:
       name: Run Linter
-      command: npm run lint
+      command: npm run lint:js # Temporarily skip linting SCSS due to stylelint config updates. Remove :js when ready to re-enable linting of SCSS.

package/scripts/build.js

@@ -1,19 +0,0 @@
-"use strict";
-
-const spawn = require("cross-spawn");
-const modules = require("./utils/modules");
-const utils = require("./utils/index.js");
-
-utils.log("Starting to build…");
-
-const buildResult = spawn.sync(process.execPath, [modules.calypsoBuild], {
-  cwd: modules.rootDirectory,
-  stdio: "inherit",
-  env: { ...process.env, NODE_ENV: "production" },
-});
-
-if (buildResult.status === 0) {
-  utils.log("Build succeeded!");
-}
-
-process.exit(buildResult.status);

package/scripts/watch.js

@@ -1,13 +0,0 @@
-"use strict";
-
-const spawn = require("cross-spawn");
-const modules = require("./utils/modules");
-const utils = require("./utils/index.js");
-
-utils.log("Starting to watch…");
-
-spawn.sync(process.execPath, [modules.calypsoBuild, "--watch"], {
-  cwd: modules.rootDirectory,
-  stdio: "inherit",
-  env: { ...process.env, NODE_ENV: "development" },
-});