sku 12.0.0 → 12.0.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # sku
 
+## 12.0.2
+
+### Patch Changes
+
+- Ensure `sku pre-commit` lints the same files as `sku lint` ([#821](https://github.com/seek-oss/sku/pull/821))
+
+## 12.0.1
+
+### Patch Changes
+
+- Check that paths exist before looking for `*.less` files in them ([#817](https://github.com/seek-oss/sku/pull/817))
+
 ## 12.0.0
 
 ### Major Changes

package/bin/sku.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const debug = require('debug');
 const args = require('../config/args');
 const _validatePeerDeps = require('../lib/validatePeerDeps');
+const validateLessFiles = require('../lib/validateLessFiles');
 const { getPathFromCwd } = require('../lib/cwd');
 const log = debug('sku:bin');
 
@@ -62,8 +63,10 @@ log(`Starting script: ${script}`);
     case 'setup-hosts':
     case 'init':
     case 'configure': {
-      runScript(script);
-      break;
+      if (script !== 'init') {
+        validateLessFiles();
+      }
+      return runScript(script);
     }
 
     case 'test':
@@ -72,8 +75,8 @@ log(`Starting script: ${script}`);
     case 'pre-commit':
     case 'translations': {
       await configureProject();
-      runScript(script);
-      break;
+      validateLessFiles();
+      return runScript(script);
     }
 
     case 'start':
@@ -84,10 +87,9 @@ log(`Starting script: ${script}`);
     case 'build-ssr':
     case 'serve': {
       await configureProject();
-
+      validateLessFiles();
       validatePeerDeps();
-      runScript(script);
-      break;
+      return runScript(script);
     }
 
     default: {

package/config/lintStaged/lintStagedConfig.js

@@ -1,13 +1,14 @@
 const isYarn = require('../../lib/isYarn');
+const { lintExtensions } = require('../../lib/lint');
 
 const steps = {};
 
 // Yarn lock integrity check
 if (isYarn) {
-  steps['+(package.json|yarn.lock)'] = [() => 'yarn check --integrity'];
+  steps['+(package.json|yarn.lock)'] = [() => 'yarn install --check-files'];
 }
 
 // Format & lint
-steps['**/*.{js,ts,tsx,md,less}'] = ['sku format', 'sku lint'];
+steps[`**/*.{${lintExtensions},md,less}`] = ['sku format', 'sku lint'];
 
 module.exports = steps;

package/lib/configure.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 const { writeFile, rm } = require('fs/promises');
 const path = require('path');
-const glob = require('fast-glob');
-const fs = require('fs');
 
 const ensureGitignore = require('ensure-gitignore');
 const { cwd, getPathFromCwd } = require('./cwd');
@@ -11,8 +9,6 @@ const { paths, httpsDevServer, languages } = require('../context');
 const {
   bundleReportFolder,
 } = require('../config/webpack/plugins/bundleAnalyzer');
-const printBanner = require('../lib/banner');
-const chalk = require('chalk');
 const prettierConfig = require('../config/prettier/prettierConfig');
 const eslintConfig = require('../config/eslint/eslintConfig');
 const createTSConfig = require('../config/typescript/tsconfig.js');
@@ -32,12 +28,7 @@ const writeFileToCWD = async (fileName, content, { banner = true } = {}) => {
   await writeFile(outPath, contentStr);
 };
 
-/**
- * @typedef {object} Options
- * @property {boolean | undefined} isPostInit
- * @param {Options}
- */
-module.exports = async ({ isPostInit } = {}) => {
+module.exports = async () => {
   // Ignore webpack bundle report output
   const gitIgnorePatterns = [
     addSep(bundleReportFolder),
@@ -118,32 +109,4 @@ module.exports = async ({ isPostInit } = {}) => {
     comment: 'managed by sku',
     patterns: gitIgnorePatterns.map(convertToForwardSlashPaths),
   });
-
-  // Check for `.less` files only if we haven't just done an init
-  if (!isPostInit) {
-    const lessFileGlobResults = await Promise.all(
-      paths.src
-        .filter((srcPath) => fs.statSync(srcPath).isDirectory())
-        .map(async (srcPath) => await glob(path.join(srcPath, '**/*.less'))),
-    );
-    const srcHasLessFiles = lessFileGlobResults.some(
-      (fileArray) => fileArray.length > 0,
-    );
-    if (srcHasLessFiles) {
-      printBanner('warning', 'LESS styles detected', [
-        `Support for ${chalk.bold('LESS')} has been deprecated.`,
-        `${chalk.bold(
-          'Vanilla Extract',
-        )} is the preferred styling solution supported by ${chalk.bold(
-          'sku',
-        )}, and support for ${chalk.bold(
-          'LESS',
-        )} will be removed in a future release.`,
-        `Consumers are encouraged to migrate to ${chalk.bold(
-          'Vanilla Extract',
-        )} at the earliest opportunity.`,
-        'https://seek-oss.github.io/sku/#/./docs/styling?id=vanilla-extract',
-      ]);
-    }
-  }
 };

package/lib/lint.js

@@ -0,0 +1,8 @@
+const {
+  js: jsExtensions,
+  ts: tsExtensions,
+} = require('eslint-config-seek/extensions');
+
+const lintExtensions = [...tsExtensions, ...jsExtensions];
+
+module.exports = { lintExtensions };

package/lib/runESLint.js

@@ -1,12 +1,9 @@
 const { yellow, cyan, gray } = require('chalk');
 const { ESLint } = require('eslint');
 const eslintConfig = require('../config/eslint/eslintConfig');
-const {
-  js: jsExtensions,
-  ts: tsExtensions,
-} = require('eslint-config-seek/extensions');
+const { lintExtensions } = require('./lint');
 
-const extensions = [...tsExtensions, ...jsExtensions].map((ext) => `.${ext}`);
+const extensions = lintExtensions.map((ext) => `.${ext}`);
 
 /**
  * @param {{ fix?: boolean, paths?: string[] }}

package/lib/validateLessFiles.js

@@ -0,0 +1,38 @@
+const fs = require('fs');
+const path = require('path');
+const glob = require('fast-glob');
+const chalk = require('chalk');
+
+const printBanner = require('./banner');
+const exists = require('./exists');
+const { paths } = require('../context');
+
+module.exports = async () => {
+  const srcPathsExist = await Promise.all(
+    paths.src.map(async (srcPath) => (await exists(srcPath)) && srcPath),
+  );
+  const lessFileGlobResults = await Promise.all(
+    srcPathsExist
+      .filter((srcPath) => srcPath && fs.statSync(srcPath).isDirectory())
+      .map(async (srcPath) => await glob(path.join(srcPath, '**/*.less'))),
+  );
+  const srcHasLessFiles = lessFileGlobResults.some(
+    (fileArray) => fileArray.length > 0,
+  );
+  if (srcHasLessFiles) {
+    printBanner('warning', 'LESS styles detected', [
+      `Support for ${chalk.bold('LESS')} has been deprecated.`,
+      `${chalk.bold(
+        'Vanilla Extract',
+      )} is the preferred styling solution supported by ${chalk.bold(
+        'sku',
+      )}, and support for ${chalk.bold(
+        'LESS',
+      )} will be removed in a future release.`,
+      `Consumers are encouraged to migrate to ${chalk.bold(
+        'Vanilla Extract',
+      )} at the earliest opportunity.`,
+      'https://seek-oss.github.io/sku/#/./docs/styling?id=vanilla-extract',
+    ]);
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sku",
-  "version": "12.0.0",
+  "version": "12.0.2",
   "description": "Front-end development toolkit, powered by Webpack, Babel, CSS Modules, Less and Jest",
   "main": "index.js",
   "bin": {

package/scripts/init.js

@@ -214,7 +214,7 @@ const getTemplateFileDestinationFromRoot =
   await install({ deps, verbose, useYarn });
   await install({ deps: devDeps, type: 'dev', exact: false, verbose, useYarn });
 
-  await configure({ isPostInit: true });
+  await configure();
   await esLintFix();
   await prettierWrite();