@elliemae/pui-cli 6.5.3 → 6.6.0

package/lib/cli-commands/lint.js

@@ -5,15 +5,13 @@ const { isTypeScriptEnabled } = require('../typescript/util');
 async function lintCSS(fix = false) {
   const fixIssues = fix ? '--fix' : '';
   await exec(
-    `stylelint ./{lib,app}/**/*.{js,jsx,ts,tsx} ${fixIssues} --color --allowEmptyInput --ignore-pattern /dist/**/*`,
+    `stylelint ./{lib,app}/**/*.{js,jsx,ts,tsx} ${fixIssues} --color --allowEmptyInput`,
   );
 }
 
 async function lintJS(fix = false) {
   const fixIssues = fix ? '--fix' : '';
-  await exec(
-    `eslint --color ${fixIssues} --ignore-pattern '/dist/**/*' --ignore-pattern '/build/**/*'  .`,
-  );
+  await exec(`eslint --color ${fixIssues}  .`);
 }
 
 async function handler(argv) {

package/lib/cli-commands/version.js

@@ -0,0 +1,50 @@
+const { exit } = require('yargs');
+const { logError } = require('./utils');
+const { useWorkspaceVersion } = require('../monorepo/use-workspace-version');
+const { useRegistryVersion } = require('../monorepo/use-registry-version');
+const { deleteMergedTags } = require('../monorepo/delete-merged-tags');
+const {
+  updateRootPackageVersion,
+} = require('../monorepo/update-root-package-version');
+
+async function handler(argv) {
+  try {
+    if (argv.deleteTags) {
+      await deleteMergedTags();
+    } else if (argv.updateRoot) {
+      await updateRootPackageVersion();
+    } else if (argv.useRegistry) {
+      await useRegistryVersion();
+    } else if (argv.useWorkspace) {
+      await useWorkspaceVersion();
+    }
+  } catch (err) {
+    logError('Monorepo versioning failed', err);
+    exit(-1, err);
+  }
+}
+
+exports.command = 'version [options]';
+
+exports.describe = 'version monorepo';
+
+exports.builder = {
+  deleteTags: {
+    type: 'boolean',
+    default: false,
+  },
+  updateRoot: {
+    type: 'boolean',
+    default: false,
+  },
+  useRegistry: {
+    type: 'boolean',
+    default: false,
+  },
+  useWorkspace: {
+    type: 'boolean',
+    default: false,
+  },
+};
+
+exports.handler = handler;

package/lib/lint/eslint/common.js

@@ -147,4 +147,14 @@ exports.baseConfig = {
       },
     },
   },
+  ignorePatterns: [
+    '/build/**/*',
+    '/dist/**/*',
+    '/reports/**/*',
+    '/coverage/**/*',
+    '/demo/**/*',
+    '/docs/**/*',
+    '/temp/**/*',
+    '**/vendor/*.js',
+  ],
 };

package/lib/lint/stylelint.config.js

@@ -1,4 +1,15 @@
 module.exports = {
+  ignoreFiles: [
+    '/dist/**/*',
+    '/coverage/**/*',
+    '/build/**/*',
+    '/reports/**/*',
+    '/temp/**/*',
+    '/docs/**/*',
+    '/demo/**/*',
+    '/node_modules/**/*',
+    '/vendor/**/*',
+  ],
   customSyntax: '@stylelint/postcss-css-in-js',
   extends: [
     'stylelint-config-recommended',

package/lib/monorepo/delete-merged-tags.js

@@ -0,0 +1,48 @@
+const { execSync } = require('child_process');
+const cwd = process.cwd();
+const execaOptions = { cwd, stdio: 'inherit' };
+
+const semVerRegEx =
+  /^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+
+const isSemVersion = (tagName) => semVerRegEx.test(tagName);
+const branchName = (process.env.BRANCH_NAME || 'master').toLowerCase();
+
+const branchTags = {
+  master: /^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/,
+  next: /^v.*-next\.(0|[1-9]\d*)/,
+  alpha: /^v.*-alpha\.(0|[1-9]\d*)/,
+  beta: /^v.*-beta\.(0|[1-9]\d*)/,
+};
+
+const deleteTags = (cmd, filter) => {
+  const result = execSync(cmd, { cwd });
+  if (!result) return;
+  const tags = result.toString().split('\n').join(' ');
+  execSync(`git tag -d ${filter ? filter(tags) : tags}`, { cwd });
+};
+
+const tagsFromOtherBranches = (tags = []) => {
+  const regex = branchTags[branchName] || branchTags.master;
+  return tags
+    .split(' ')
+    .filter((tagName) => isSemVersion(tagName) && !regex.test(tagName))
+    .join(' ');
+};
+
+exports.deleteMergedTags = () => {
+  try {
+    // get tag names
+    if (branchName) {
+      // delete all tags that are not reachable from the current branch
+      deleteTags(`git tag -l --no-merged ${branchName}`);
+      // delete all tags that were not created in current branch
+      deleteTags(`git tag -l --merged ${branchName}`, tagsFromOtherBranches);
+      console.log('Last two tags: ');
+      execSync('git tag --sort=-creatordate | head -n 2', execaOptions);
+    }
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(error);
+  }
+};

package/lib/monorepo/update-root-package-version.js

@@ -0,0 +1,22 @@
+const path = require('path');
+const { readFile, writeFile } = require('fs/promises');
+const { findMonoRepoRoot } = require('./utils');
+
+const monorepoRoot = findMonoRepoRoot();
+
+const getLernaVersion = async () => {
+  const lernaConfig = JSON.parse(
+    await readFile(path.join(monorepoRoot, 'lerna.json'), 'utf8'),
+  );
+  return lernaConfig?.version;
+};
+
+exports.updateRootPackageVersion = async () => {
+  const newVersion = await getLernaVersion();
+  const pkgJSON = JSON.parse(await readFile('./package.json', 'utf8'));
+  pkgJSON.version = newVersion;
+  await writeFile(
+    path.join(monorepoRoot, 'package.json'),
+    JSON.stringify(pkgJSON, null, 2),
+  );
+};

package/lib/monorepo/use-registry-version.js

@@ -0,0 +1,22 @@
+const fg = require('fast-glob');
+const { readFile, writeFile } = require('fs/promises');
+const normalizePath = require('normalize-path');
+const { findMonoRepoRoot } = require('./utils');
+
+const monorepoRoot = normalizePath(findMonoRepoRoot());
+
+exports.useRegistryVersion = async () => {
+  const files = await fg([
+    `${monorepoRoot}/libs/*/package.json`,
+    `${monorepoRoot}/apps/*/package.json`,
+    `${monorepoRoot}/package.json`,
+  ]);
+  Promise.all(
+    files.map(async (file) => {
+      let pkgJSONData = await readFile(file, 'utf8');
+      const pkgVersion = JSON.parse(pkgJSONData).version;
+      pkgJSONData = pkgJSONData.replace(/workspace:\*/g, pkgVersion);
+      await writeFile(file, pkgJSONData);
+    }),
+  );
+};

package/lib/monorepo/use-workspace-version.js

@@ -0,0 +1,29 @@
+const fg = require('fast-glob');
+const { readFile, writeFile } = require('fs/promises');
+const normalizePath = require('normalize-path');
+const { findMonoRepoRoot } = require('./utils');
+
+const monorepoRoot = normalizePath(findMonoRepoRoot());
+
+exports.useWorspaceVersion = async () => {
+  const files = await fg([
+    `${monorepoRoot}/libs/*/package.json`,
+    `${monorepoRoot}/apps/*/package.json`,
+    `${monorepoRoot}/package.json`,
+  ]);
+  Promise.all(
+    files.map(async (file) => {
+      let pkgJSONData = await readFile(file, 'utf8');
+      const pkgVersion = JSON.parse(pkgJSONData).version;
+      pkgJSONData = pkgJSONData.replace(
+        new RegExp(pkgVersion, 'g'),
+        'workspace:*',
+      );
+      pkgJSONData = pkgJSONData.replace(
+        /"version": "workspace:\*"/g,
+        `"version": "${pkgVersion}"`,
+      );
+      await writeFile(file, pkgJSONData);
+    }),
+  );
+};

package/lib/monorepo/utils.js

@@ -4,7 +4,7 @@ const { sync: findUp } = require('find-up');
 const WORKSPACE_DIR_ENV_VAR = 'NPM_CONFIG_WORKSPACE_DIR';
 const WORKSPACE_MANIFEST_FILENAME = 'pnpm-workspace.yaml';
 
-exports.findPnpmWorkspaceDir = (cwd) => {
+exports.findMonoRepoRoot = (cwd = process.cwd()) => {
   const workspaceManifestDirEnvVar =
     process.env[WORKSPACE_DIR_ENV_VAR] ??
     process.env[WORKSPACE_DIR_ENV_VAR.toLowerCase()];

package/lib/testing/jest.config.js

@@ -1,9 +1,8 @@
 const path = require('path');
+const normalizePath = require('normalize-path');
 const { getAppConfig, getAssetPath } = require('../webpack/helpers');
 const swcrcConfig = require('../transpile/swcrc.config.js');
-
-const name = '@elliemae/pui-cli';
-const rootDir = path.join('<rootDir>', 'node_modules', name);
+const { findMonoRepoRoot } = require('../monorepo/utils');
 
 let isReactModule = true;
 try {
@@ -15,19 +14,16 @@ try {
   isReactModule = false;
 }
 
-const getRootDir = () => {
-  try {
-    // eslint-disable-next-line global-require
-    const { name: consumerName } = require(path.join(
-      process.cwd(),
-      'package.json',
-    ));
-    return consumerName === name ? '<rootDir>' : rootDir;
-  } catch (ex) {
-    // eslint-disable-next-line no-console
-    console.log(ex);
-    return '<rootDir>';
-  }
+const getMockFilePath = (fileName) =>
+  normalizePath(path.resolve(__dirname, './mocks', fileName));
+
+const getNodeModulesPath = (fileName) => {
+  const monorepoRoot = findMonoRepoRoot(process.cwd());
+  return normalizePath(
+    monorepoRoot
+      ? path.join(monorepoRoot, 'node_modules', fileName)
+      : `<rootDir>/node_modules/${fileName}`,
+  );
 };
 
 const jestConfig = {
@@ -59,23 +55,25 @@ const jestConfig = {
   coverageReporters: ['lcov', 'html', 'text-summary'],
   moduleDirectories: ['node_modules', 'app', 'lib'],
   moduleNameMapper: {
-    '.*\\webpack-hmr(.[t|j]s)?$': `${getRootDir()}/lib/testing/mocks/webpack-hmr.js`,
-    '.*\\.(css|scss)$': `${getRootDir()}/lib/testing/mocks/cssModule.js`,
-    '.*\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|ico)$': `${getRootDir()}/lib/testing/mocks/image.js`,
-    '.*\\.svg$': `${getRootDir()}/lib/testing/mocks/svg.js`,
-    '.*\\.(html)$': `${getRootDir()}/lib/testing/mocks/html.js`,
-    '^lodash-es$': 'lodash',
-    '@elliemae/pui-user-monitoring': `${getRootDir()}/lib/testing/mocks/pui-user-monitoring.js`,
-    '@elliemae/pui-app-loader': `${getRootDir()}/lib/testing/mocks/pui-app-loader.js`,
-    '@elliemae/pui-diagnostics': `${getRootDir()}/lib/testing/mocks/pui-diagnostics.js`,
-    'react-spring/web': '<rootDir>/node_modules/react-spring/web.cjs.js',
-    'react-spring/renderprops':
-      '<rootDir>/node_modules/react-spring/renderprops.cjs.js',
-    'styled-components':
-      '<rootDir>/node_modules/styled-components/dist/styled-components.cjs.js',
+    '.*\\webpack-hmr(.[t|j]s)?$': getMockFilePath('webpack-hmr.js'),
+    '.*\\.(css|scss)$': getMockFilePath('cssModule.js'),
+    '.*\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|ico)$':
+      getMockFilePath('image.js'),
+    '.*\\.svg$': getMockFilePath('svg.js'),
+    '.*\\.(html)$': getMockFilePath('html.js'),
+    '@elliemae/pui-user-monitoring': getMockFilePath('pui-user-monitoring.js'),
+    '@elliemae/pui-app-loader': getMockFilePath('webpack-hmr.js'),
+    '@elliemae/pui-diagnostics': getMockFilePath('pui-app-loader.js'),
+    'react-spring/web': getNodeModulesPath('react-spring/web.cjs.js'),
+    'react-spring/renderprops': getNodeModulesPath(
+      'react-spring/renderprops.cjs.js',
+    ),
+    'styled-components': getNodeModulesPath(
+      'styled-components/dist/styled-components.cjs.js',
+    ),
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  setupFilesAfterEnv: [`${getRootDir()}/lib/testing/setup-tests.js`],
+  setupFilesAfterEnv: [path.resolve(__dirname, './setup-tests.js')],
   setupFiles: ['raf/polyfill', 'whatwg-fetch'],
   testRegex: '(app|lib).*/tests/.*\\.test\\.[jt]sx?$',
   snapshotSerializers: [],
@@ -97,7 +95,7 @@ const jestConfig = {
 
 if (isReactModule && jestConfig.setupFilesAfterEnv)
   jestConfig.setupFilesAfterEnv.push(
-    `${getRootDir()}/lib/testing/setup-react-env.js`,
+    path.resolve(__dirname, './setup-react-env.js'),
   );
 
 exports.jestConfig = jestConfig;

package/lib/webpack/helpers.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const _ = require('lodash');
 const CompressionPlugin = require('compression-webpack-plugin');
 const zlib = require('zlib');
-const { findPnpmWorkspaceDir } = require('../monorepo/utils');
+const { findMonoRepoRoot } = require('../monorepo/utils');
 
 let pathSep = path.sep;
 if (pathSep === '\\')
@@ -68,7 +68,7 @@ const mapToFolder = (dependencies, folder) =>
   );
 
 const getAlias = () => {
-  const monorepoRoot = findPnpmWorkspaceDir(process.cwd()) || '';
+  const monorepoRoot = findMonoRepoRoot(process.cwd()) || '';
   return mapToFolder(
     [
       '@babel/runtime',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
@@ -63,38 +63,38 @@
     "@babel/preset-react": "~7.16.7",
     "@babel/preset-typescript": "~7.16.7",
     "@babel/runtime": "~7.17.2",
-    "@commitlint/cli": "~16.1.0",
-    "@commitlint/config-conventional": "~16.0.0",
+    "@commitlint/cli": "~16.2.1",
+    "@commitlint/config-conventional": "~16.2.1",
     "@elliemae/browserslist-config-elliemae-latest-browsers": "~1.3.0",
     "@faker-js/faker": "6.0.0-alpha.6",
     "@pmmmwh/react-refresh-webpack-plugin": "~0.5.4",
     "@semantic-release/changelog": "~6.0.1",
     "@semantic-release/exec": "~6.0.3",
     "@semantic-release/git": "~10.0.1",
-    "@storybook/addon-a11y": "~6.4.18",
-    "@storybook/addon-essentials": "~6.4.18",
+    "@storybook/addon-a11y": "~6.4.19",
+    "@storybook/addon-essentials": "~6.4.19",
     "@storybook/addon-events": "~6.2.9",
-    "@storybook/addon-interactions": "~6.4.18",
-    "@storybook/addon-links": "~6.4.18",
-    "@storybook/addon-storysource": "~6.4.18",
-    "@storybook/builder-webpack5": "~6.4.18",
-    "@storybook/manager-webpack5": "~6.4.18",
-    "@storybook/react": "~6.4.18",
-    "@storybook/theming": "~6.4.18",
+    "@storybook/addon-interactions": "~6.4.19",
+    "@storybook/addon-links": "~6.4.19",
+    "@storybook/addon-storysource": "~6.4.19",
+    "@storybook/builder-webpack5": "~6.4.19",
+    "@storybook/manager-webpack5": "~6.4.19",
+    "@storybook/react": "~6.4.19",
+    "@storybook/theming": "~6.4.19",
     "@stylelint/postcss-css-in-js": "~0.37.2",
     "@svgr/webpack": "~6.2.1",
     "@swc/cli": "~0.1.55",
-    "@swc/core": "~1.2.138",
+    "@swc/core": "~1.2.139",
     "@swc/jest": "~0.2.17",
     "@testing-library/jest-dom": "~5.16.2",
     "@testing-library/react": "~12.1.2",
     "@testing-library/react-hooks": "~7.0.2",
     "@types/jest": "~27.4.0",
-    "@types/node": "~17.0.17",
+    "@types/node": "~17.0.18",
     "@types/rimraf": "~3.0.2",
     "@types/testing-library__jest-dom": "~5.14.2",
-    "@typescript-eslint/eslint-plugin": "~5.11.0",
-    "@typescript-eslint/parser": "~5.11.0",
+    "@typescript-eslint/eslint-plugin": "~5.12.0",
+    "@typescript-eslint/parser": "~5.12.0",
     "autoprefixer": "~10.4.2",
     "axe-core": "~4.4.1",
     "babel-loader": "~8.2.3",
@@ -132,7 +132,7 @@
     "esbuild": "~0.14.21",
     "esbuild-loader": "~2.18.0",
     "esbuild-plugin-svgr": "~1.0.0",
-    "eslint": "~8.8.0",
+    "eslint": "~8.9.0",
     "eslint-config-airbnb": "~19.0.4",
     "eslint-config-airbnb-base": "~15.0.0",
     "eslint-config-airbnb-typescript": "~16.1.0",
@@ -145,7 +145,7 @@
     "eslint-plugin-eslint-comments": "~3.2.0",
     "eslint-plugin-import": "~2.25.4",
     "eslint-plugin-jest": "~26.1.0",
-    "eslint-plugin-jsdoc": "~37.9.0",
+    "eslint-plugin-jsdoc": "~37.9.1",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-mdx": "~1.16.0",
     "eslint-plugin-prettier": "~4.0.0",
@@ -161,6 +161,7 @@
     "express-static-gzip": "~2.1.4",
     "favicons": "~6.2.2",
     "favicons-webpack-plugin": "~5.0.2",
+    "fast-glob": "~3.2.11",
     "find-up": "~5.0.0",
     "happy-dom": "~2.31.1",
     "helmet-csp": "~3.4.0",
@@ -176,7 +177,7 @@
     "jest-styled-components": "~7.0.8",
     "jscodeshift": "~0.13.1",
     "jsdoc": "~3.6.10",
-    "lint-staged": "~12.3.3",
+    "lint-staged": "~12.3.4",
     "mini-css-extract-plugin": "~2.5.3",
     "minimist": "~1.2.5",
     "moment": "~2.29.1",
@@ -185,6 +186,7 @@
     "node-gyp": "~8.4.1",
     "node-plop": "~0.30.0",
     "nodemon": "~2.0.15",
+    "normalize-path": "~3.0.0",
     "npm-check-updates": "12.3.0",
     "null-loader": "~4.0.1",
     "pino": "~7.6.5",
@@ -196,7 +198,7 @@
     "postcss-jsx": "~0.36.4",
     "postcss-loader": "~6.2.1",
     "postcss-markdown": "~1.2.0",
-    "postcss-preset-env": "~7.3.1",
+    "postcss-preset-env": "~7.3.3",
     "postcss-syntax": "~0.36.2",
     "prettier": "~2.5.1",
     "pug": "~3.0.2",
@@ -227,8 +229,8 @@
     "update-notifier": "~5.1.0",
     "url-loader": "~4.1.1",
     "uuid": "~8.3.2",
-    "vite": "~2.8.1",
-    "vitest": "~0.3.2",
+    "vite": "~2.8.2",
+    "vitest": "~0.3.5",
     "webpack": "~5.65.0",
     "webpack-bundle-analyzer": "~4.5.0",
     "webpack-cli": "~4.9.2",