@elliemae/pui-cli 6.0.0-beta.30 → 6.0.0-beta.34

package/lib/cli-commands/test.js

@@ -4,9 +4,7 @@ const { exec, logError, logSuccess } = require('./utils');
 const { CI = false } = process.env;
 
 async function test(commandOptions) {
-  await exec(
-    `cross-env FORCE_COLOR=true NODE_OPTIONS=--experimental-vm-modules NODE_ENV=test jest ${commandOptions}`,
-  );
+  await exec(`cross-env FORCE_COLOR=true NODE_ENV=test jest ${commandOptions}`);
 }
 
 // eslint-disable-next-line max-statements

package/lib/cli-commands/tsc.js

@@ -0,0 +1,103 @@
+const { exit } = require('yargs');
+const { dirname, join } = require('path');
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+const { logInfo, logError } = require('./utils');
+
+const randomChars = () => Math.random().toString(36).slice(2);
+
+const resolveFromModule = (moduleName, ...paths) => {
+  const modulePath = dirname(require.resolve(`${moduleName}/package.json`));
+  return join(modulePath, ...paths);
+};
+
+const resolveFromRoot = (...paths) => join(process.cwd(), ...paths);
+
+const validateTypescript = async () => {
+  const args = process.argv.slice(2);
+  const argsProjectIndex = args.findIndex((arg) =>
+    ['-p', '--project'].includes(arg),
+  );
+  const argsProjectValue =
+    argsProjectIndex !== -1 ? args[argsProjectIndex + 1] : undefined;
+
+  const files = args.filter((file) => /\.(ts|tsx)$/.test(file));
+  if (files.length === 0) {
+    process.exit(0);
+  }
+
+  const remainingArgsToForward = args
+    .slice()
+    .filter((arg) => !files.includes(arg));
+
+  if (argsProjectIndex !== -1) {
+    remainingArgsToForward.splice(argsProjectIndex, 2);
+  }
+
+  // Load existing config
+  const tsconfigPath = argsProjectValue || resolveFromRoot('tsconfig.json');
+  const tsconfigContent = fs.readFileSync(tsconfigPath).toString();
+  // Use 'eval' to read the JSON as regular JavaScript syntax so that comments are allowed
+  // eslint-disable-next-line prefer-const
+  let tsconfig = {};
+  // eslint-disable-next-line no-eval
+  eval(`tsconfig = ${tsconfigContent}`);
+
+  // Write a temp config file
+  const tmpTsconfigPath = resolveFromRoot(`tsconfig.${randomChars()}.json`);
+  const tmpTsconfig = {
+    ...tsconfig,
+    compilerOptions: {
+      ...tsconfig.compilerOptions,
+      skipLibCheck: true,
+    },
+    files,
+    include: ['shared/typings'],
+  };
+  fs.writeFileSync(tmpTsconfigPath, JSON.stringify(tmpTsconfig, null, 2));
+
+  // Type-check our files
+  const { status } = spawnSync(
+    resolveFromModule(
+      'typescript',
+      `../.bin/tsc${process.platform === 'win32' ? '.cmd' : ''}`,
+    ),
+    ['-p', tmpTsconfigPath, ...remainingArgsToForward],
+    { stdio: 'inherit' },
+  );
+
+  // Delete temp config file
+  fs.unlinkSync(tmpTsconfigPath);
+
+  process.exit(status);
+};
+
+async function handler(argv) {
+  try {
+    await validateTypescript(argv.p);
+    logInfo('Typescript validation started');
+  } catch (err) {
+    logError('Typescript validation failed', err);
+    exit(-1, err);
+  }
+}
+
+exports.command = 'tsc [options]';
+
+exports.describe = 'validate typescript code';
+
+exports.builder = {
+  project: {
+    alias: 'p',
+    type: 'boolean',
+    default: false,
+  },
+  docs: {
+    type: 'boolean',
+    default: false,
+  },
+};
+
+exports.handler = handler;
+
+exports.validateTypescript = validateTypescript;

package/lib/lint/eslint/common.js

@@ -105,6 +105,10 @@ const reactRules = {
     1,
     { extensions: ['.js', '.jsx', '.tsx', '.mdx'] },
   ],
+  'react/function-component-definition': [
+    2,
+    { namedComponents: 'arrow-function' },
+  ],
   'redux-saga/no-yield-in-race': 2,
   'redux-saga/yield-effects': 2,
 };

package/lib/lint/lint-staged.config.js

@@ -1,5 +1,12 @@
+const path = require('path');
+
 module.exports = {
-  '*.{ts,tsx}': ['tsc-files --noEmit --emitDeclarationOnly false'],
+  '*.{ts,tsx}': [
+    `node ${path.resolve(
+      __dirname,
+      '../typescript/tsc-files/index.js',
+    )} --noEmit --emitDeclarationOnly false`,
+  ],
   '*.{js,ts,jsx,tsx}': [
     'npm run lint:fix',
     'npm run test:staged',

package/lib/testing/jest.config.js

@@ -95,7 +95,7 @@ const jestConfig = {
   //   ],
   // },
   transformIgnorePatterns: [
-    'node_modules/(?!(@elliemae/pui-cli|lodash-es|react-select|react-dates)/)',
+    'node_modules/(?!(.*@elliemae/pui-cli|lodash-es|react-select|react-dates)/)',
   ],
   globals: {
     APP_CONFIG: getAppConfig(),

package/lib/typescript/tsc-files/index.js

@@ -0,0 +1,61 @@
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+
+const { randomChars, resolveFromModule, resolveFromRoot } = require('./utils');
+
+const args = process.argv.slice(2);
+const argsProjectIndex = args.findIndex((arg) =>
+  ['-p', '--project'].includes(arg),
+);
+const argsProjectValue =
+  argsProjectIndex !== -1 ? args[argsProjectIndex + 1] : undefined;
+
+const files = args.filter((file) => /\.(ts|tsx)$/.test(file));
+if (files.length === 0) {
+  process.exit(0);
+}
+
+const remainingArgsToForward = args
+  .slice()
+  .filter((arg) => !files.includes(arg));
+
+if (argsProjectIndex !== -1) {
+  remainingArgsToForward.splice(argsProjectIndex, 2);
+}
+
+// Load existing config
+const tsconfigPath = argsProjectValue || resolveFromRoot('tsconfig.json');
+const tsconfigContent = fs.readFileSync(tsconfigPath).toString();
+// Use 'eval' to read the JSON as regular JavaScript syntax so that comments are allowed
+// eslint-disable-next-line prefer-const
+let tsconfig = {};
+// eslint-disable-next-line no-eval
+eval(`tsconfig = ${tsconfigContent}`);
+
+// Write a temp config file
+const tmpTsconfigPath = resolveFromRoot(`tsconfig.${randomChars()}.json`);
+const tmpTsconfig = {
+  ...tsconfig,
+  compilerOptions: {
+    ...tsconfig.compilerOptions,
+    skipLibCheck: true,
+  },
+  files,
+  include: ['app', 'lib'],
+};
+fs.writeFileSync(tmpTsconfigPath, JSON.stringify(tmpTsconfig, null, 2));
+
+// Type-check our files
+const { status } = spawnSync(
+  resolveFromModule(
+    'typescript',
+    `../.bin/tsc${process.platform === 'win32' ? '.cmd' : ''}`,
+  ),
+  ['-p', tmpTsconfigPath, ...remainingArgsToForward],
+  { stdio: 'inherit' },
+);
+
+// Delete temp config file
+fs.unlinkSync(tmpTsconfigPath);
+
+process.exit(status);

package/lib/typescript/tsc-files/utils.js

@@ -0,0 +1,16 @@
+const { dirname, join } = require('path');
+
+const randomChars = () => Math.random().toString(36).slice(2);
+
+const resolveFromModule = (moduleName, ...paths) => {
+  const modulePath = dirname(require.resolve(`${moduleName}/package.json`));
+  return join(modulePath, ...paths);
+};
+
+const resolveFromRoot = (...paths) => join(process.cwd(), ...paths);
+
+module.exports = {
+  randomChars,
+  resolveFromModule,
+  resolveFromRoot,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.0.0-beta.30",
+  "version": "6.0.0-beta.34",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
@@ -34,7 +34,7 @@
     "release": "semantic-release",
     "test": "ts-node -r tsconfig-paths/register ./lib/cli test -p",
     "test:staged": "jest --coverage --passWithNoTests --bail --findRelatedTests",
-    "setup": "rimraf -r node_modules && rimraf package-lock.json && npm i",
+    "setup": "rimraf -r node_modules && rimraf pnpm-lock.yaml && pnpm i",
     "storybook:build": "exit 0",
     "storybook:docs:build": "exit 0",
     "upgrade": "ncu -u && npm run setup",
@@ -83,13 +83,13 @@
     "@stylelint/postcss-css-in-js": "~0.37.2",
     "@svgr/webpack": "~6.1.2",
     "@swc/cli": "~0.1.55",
-    "@swc/core": "~1.2.124",
+    "@swc/core": "~1.2.125",
     "@swc/jest": "~0.2.15",
     "@testing-library/jest-dom": "~5.16.1",
     "@testing-library/react": "~12.1.2",
     "@testing-library/react-hooks": "~7.0.2",
     "@types/jest": "~27.4.0",
-    "@types/node": "~17.0.5",
+    "@types/node": "~17.0.6",
     "@types/rimraf": "~3.0.2",
     "@types/testing-library__jest-dom": "~5.14.2",
     "@typescript-eslint/eslint-plugin": "~5.8.1",
@@ -129,23 +129,23 @@
     "dotenv-webpack": "~7.0.3",
     "duplicate-package-checker-webpack-plugin": "~3.0.0",
     "enhanced-resolve": "~5.8.3",
-    "esbuild": "~0.14.9",
+    "esbuild": "~0.14.10",
     "esbuild-jest": "~0.5.0",
     "esbuild-loader": "~2.18.0",
     "esbuild-plugin-svgr": "~1.0.0",
-    "eslint": "~8.5.0",
-    "eslint-config-airbnb": "~18.2.1",
+    "eslint": "~8.6.0",
+    "eslint-config-airbnb": "~19.0.4",
     "eslint-config-airbnb-base": "~15.0.0",
-    "eslint-config-airbnb-typescript": "~15.0.0",
+    "eslint-config-airbnb-typescript": "~16.1.0",
     "eslint-config-prettier": "~8.3.0",
-    "eslint-config-react-app": "~6.0.0",
+    "eslint-config-react-app": "~7.0.0",
     "eslint-import-resolver-babel-module": "~5.3.1",
     "eslint-import-resolver-typescript": "~2.5.0",
     "eslint-import-resolver-webpack": "~0.13.2",
-    "eslint-plugin-compat": "~3.13.0",
+    "eslint-plugin-compat": "~4.0.0",
     "eslint-plugin-eslint-comments": "~3.2.0",
-    "eslint-plugin-import": "~2.25.3",
-    "eslint-plugin-jest": "~25.3.3",
+    "eslint-plugin-import": "~2.25.4",
+    "eslint-plugin-jest": "~25.3.4",
     "eslint-plugin-jsdoc": "~37.5.0",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-mdx": "~1.16.0",
@@ -178,7 +178,7 @@
     "jest-styled-components": "~7.0.8",
     "jscodeshift": "~0.13.0",
     "jsdoc": "~3.6.7",
-    "lint-staged": "~12.1.4",
+    "lint-staged": "~12.1.5",
     "mini-css-extract-plugin": "~2.4.5",
     "minimist": "~1.2.5",
     "moment": "~2.29.1",
@@ -187,7 +187,7 @@
     "node-gyp": "~8.4.1",
     "node-plop": "~0.30.0",
     "nodemon": "~2.0.15",
-    "npm-check-updates": "12.0.5",
+    "npm-check-updates": "12.1.0",
     "null-loader": "~4.0.1",
     "pino": "~7.6.2",
     "pino-pretty": "~7.3.0",
@@ -199,7 +199,7 @@
     "postcss-markdown": "~1.2.0",
     "postcss-syntax": "~0.36.2",
     "postcss-loader": "~6.2.1",
-    "postcss-preset-env": "~7.1.0",
+    "postcss-preset-env": "~7.2.0",
     "prettier": "~2.5.1",
     "pug": "~3.0.2",
     "pug-loader": "~2.4.0",