@elliemae/pui-cli 6.0.0-beta.32 → 6.0.0-beta.36

package/lib/lint/eslint/common.js

@@ -4,6 +4,7 @@ const webpackConfig = require('../../webpack/webpack.prod.babel');
 
 exports.baseExtends = [
   'plugin:eslint-comments/recommended',
+  'plugin:import/recommended',
   'plugin:prettier/recommended',
   'plugin:jest/recommended',
   'plugin:jsdoc/recommended',
@@ -12,7 +13,8 @@ exports.baseExtends = [
   'plugin:storybook/recommended',
 ];
 
-const basePlugins = ['testing-library', 'jest', 'jsdoc', 'wdio'];
+const basePlugins = ['testing-library', 'jest', 'jsdoc', 'wdio', 'import'];
+exports.basePlugins = basePlugins;
 
 exports.baseOverrides = [
   {
@@ -105,6 +107,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/eslint/typescript/common.js

@@ -1,7 +1,8 @@
-const { baseExtends } = require('../common');
+const { baseExtends, basePlugins } = require('../common');
 
 exports.tsBaseExtends = [
   'plugin:@typescript-eslint/recommended',
+  'plugin:import/typescript',
   'plugin:@typescript-eslint/recommended-requiring-type-checking',
 ].concat(baseExtends);
 
@@ -24,6 +25,7 @@ exports.tsBaseRules = {
 exports.tsBaseConfig = {
   files: ['*.ts', '*.tsx'],
   parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'].concat(basePlugins),
   parserOptions: {
     tsconfigRootDir: process.cwd(),
     project: 'tsconfig.json',
@@ -34,5 +36,8 @@ exports.tsBaseConfig = {
         alwaysTryTypes: true,
       },
     },
+    'import/parsers': {
+      '@typescript-eslint/parser': ['.ts', '.tsx'],
+    },
   },
 };

package/lib/lint/eslint/typescript/non-react.js

@@ -4,7 +4,7 @@ const { tsBaseExtends, tsBaseRules, tsBaseConfig } = require('./common');
 
 exports.tsConfig = {
   ...tsBaseConfig,
-  extends: ['airbnb-typescript/base'].concat(tsBaseExtends),
+  extends: ['airbnb-base', 'airbnb-typescript/base'].concat(tsBaseExtends),
   rules: {
     ...baseRules,
     ...tsBaseRules,

package/lib/lint/eslint/typescript/react.js

@@ -4,7 +4,12 @@ const { tsBaseExtends, tsBaseRules, tsBaseConfig } = require('./common');
 
 exports.tsReactConfig = {
   ...tsBaseConfig,
-  extends: ['airbnb-typescript'].concat(tsBaseExtends),
+  extends: [
+    'airbnb',
+    'airbnb/hooks',
+    'plugin:redux-saga/recommended',
+    'airbnb-typescript',
+  ].concat(tsBaseExtends),
   rules: {
     ...baseRules,
     ...tsBaseRules,

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

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

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

@@ -1,7 +1,8 @@
-const { spawnSync } = require('child_process');
+const execa = require('execa');
 const fs = require('fs');
+const path = require('path');
 
-const { randomChars, resolveFromModule, resolveFromRoot } = require('./utils');
+const { randomChars, resolveFromRoot } = require('./utils');
 
 const args = process.argv.slice(2);
 const argsProjectIndex = args.findIndex((arg) =>
@@ -46,16 +47,20 @@ const tmpTsconfig = {
 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' },
-);
+let status = 0;
+try {
+  execa.sync(
+    path.resolve(
+      process.cwd(),
+      `./node_modules/.bin/tsc${process.platform === 'win32' ? '.cmd' : ''}`,
+    ),
+    ['-p', tmpTsconfigPath, ...remainingArgsToForward],
+    { stdio: 'inherit' },
+  );
+} catch (ex) {
+  status = ex.exitCode;
+}
 
 // Delete temp config file
 fs.unlinkSync(tmpTsconfigPath);
-
 process.exit(status);

package/lib/webpack/webpack.dev.babel.js

@@ -72,6 +72,7 @@ const devConfig = {
 
   // Add development plugins
   plugins: [
+    new webpack.ProgressPlugin(),
     new webpack.HotModuleReplacementPlugin(), // Tell webpack we want hot reloading
     new ReactRefreshWebpackPlugin({
       overlay: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.0.0-beta.32",
+  "version": "6.0.0-beta.36",
   "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,17 +83,17 @@
     "@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.126",
     "@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.6",
+    "@types/node": "~17.0.7",
     "@types/rimraf": "~3.0.2",
     "@types/testing-library__jest-dom": "~5.14.2",
-    "@typescript-eslint/eslint-plugin": "~5.8.1",
-    "@typescript-eslint/parser": "~5.8.1",
+    "@typescript-eslint/eslint-plugin": "~5.9.0",
+    "@typescript-eslint/parser": "~5.9.0",
     "autoprefixer": "~10.4.1",
     "axe-core": "~4.3.5",
     "babel-loader": "~8.2.3",
@@ -134,19 +134,19 @@
     "esbuild-loader": "~2.18.0",
     "esbuild-plugin-svgr": "~1.0.0",
     "eslint": "~8.6.0",
-    "eslint-config-airbnb": "~18.2.1",
+    "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-jsdoc": "~37.5.0",
+    "eslint-plugin-import": "~2.25.4",
+    "eslint-plugin-jest": "~25.3.4",
+    "eslint-plugin-jsdoc": "~37.5.1",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-mdx": "~1.16.0",
     "eslint-plugin-prettier": "~4.0.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",