@digigov/cli-build 1.0.0-rc.2 → 1.0.0-rc.4

package/babel.common.js

@@ -1,57 +1,57 @@
 // Mostly shared from
 // https://github.com/mui-org/material-ui/blob/master/babel.config.js
-const lib = require('@digigov/cli/lib');
+const lib = require("@digigov/cli/lib");
 
-function makeBabelConfig(dir, opts = { docs: false, proptypes: false}) {
+function makeBabelConfig(dir, opts = { docs: false, proptypes: false }) {
   const project = lib.resolveProject(dir);
-  const aliases = !project.externalLockFile ? lib.aliases(null, true): {};
+  const aliases = !project.externalLockFile ? lib.aliases(null, true) : {};
 
-  const BABEL_ENV = process.env.BABEL_ENV || 'esm';
+  const BABEL_ENV = process.env.BABEL_ENV || "esm";
   const BABEL_PUBLISH = process.env.BABEL_PUBLISH || false;
   const NODE_ENV = process.env.NODE_ENV;
-  const IS_COMMONJS = BABEL_ENV === 'cjs' || NODE_ENV === 'test';
+  const IS_COMMONJS = BABEL_ENV === "cjs" || NODE_ENV === "test";
 
   const PRESETS = [
     [
-      require.resolve('@babel/preset-env'),
+      require.resolve("@babel/preset-env"),
       {
-        modules: IS_COMMONJS ? 'commonjs' : false,
+        modules: IS_COMMONJS ? "commonjs" : false,
       },
     ],
-    require.resolve('@babel/preset-react'),
+    require.resolve("@babel/preset-react"),
   ];
 
   if (project.isTs) {
-    PRESETS.push(require.resolve('@babel/preset-typescript'));
+    PRESETS.push(require.resolve("@babel/preset-typescript"));
   }
 
   const PLUGINS_COMMON = [
-    require.resolve('babel-plugin-optimize-clsx'),
+    require.resolve("babel-plugin-optimize-clsx"),
     [
-      require.resolve('@babel/plugin-proposal-class-properties'),
+      require.resolve("@babel/plugin-proposal-class-properties"),
       { loose: true },
     ],
     [
-      require.resolve('@babel/plugin-proposal-object-rest-spread'),
+      require.resolve("@babel/plugin-proposal-object-rest-spread"),
       { loose: true },
     ],
     // any package needs to declare 7.4.4 as a runtime dependency. default is ^7.0.0
-    [require.resolve('@babel/plugin-transform-runtime'), { version: '^7.4.4' }],
+    [require.resolve("@babel/plugin-transform-runtime"), { version: "^7.4.4" }],
     // for IE 11 support
-    require.resolve('@babel/plugin-transform-object-assign'),
-    require.resolve('babel-plugin-transform-react-constant-elements'),
+    require.resolve("@babel/plugin-transform-object-assign"),
+    require.resolve("babel-plugin-transform-react-constant-elements"),
   ];
 
   const PLUGINS_PUBLISH = [
-    require.resolve('babel-plugin-transform-dev-warning'),
+    require.resolve("babel-plugin-transform-dev-warning"),
     [
-      require.resolve('babel-plugin-react-remove-properties'),
-      { properties: ['data-testid'] },
+      require.resolve("babel-plugin-react-remove-properties"),
+      { properties: ["data-testid"] },
     ],
     [
-      require.resolve('babel-plugin-transform-react-remove-prop-types'),
+      require.resolve("babel-plugin-transform-react-remove-prop-types"),
       {
-        mode: 'unsafe-wrap',
+        mode: "unsafe-wrap",
       },
     ],
   ];
@@ -63,25 +63,40 @@ function makeBabelConfig(dir, opts = { docs: false, proptypes: false}) {
   // considered a very good practice, one way to provide images via libraries is
   // to embed the image data into the library code.
   if (project.isLib || project.isApp) {
-    PLUGINS.push(require.resolve('babel-plugin-inline-import-data-uri'));
+    PLUGINS.push(require.resolve("babel-plugin-inline-import-data-uri"));
   }
 
-  const RESOLVER = [
-    require.resolve('babel-plugin-module-resolver'),
-    {
-      alias: aliases,
-      extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
-    },
-  ];
-
   if (BABEL_PUBLISH) {
     PLUGINS.push(...PLUGINS_PUBLISH);
-  } else if (!opts.docs) {
+  }
+
+  if (!opts.docs && NODE_ENV !== "test") {
+    const RESOLVER = [
+      require.resolve("babel-plugin-module-resolver"),
+      {
+        root: [`./${project.src}`],
+        alias: {
+          [project.name]: `./${project.src}`,
+        },
+        extensions: [".js", ".jsx", ".ts", ".tsx", ".json"],
+      },
+    ];
     PLUGINS.push(RESOLVER);
   }
 
+  if (NODE_ENV === "test") {
+    const TEST_RESOLVER = [
+      require.resolve("babel-plugin-module-resolver"),
+      {
+        alias: aliases,
+        extensions: [".js", ".jsx", ".ts", ".tsx", ".json"],
+      },
+    ];
+    PLUGINS.push(TEST_RESOLVER);
+  }
+
   if (project.isApp) {
-    PRESETS.push(require.resolve('next/babel'));
+    PRESETS.push(require.resolve("next/babel"));
   }
 
   const CONFIG = {
@@ -90,10 +105,10 @@ function makeBabelConfig(dir, opts = { docs: false, proptypes: false}) {
     ignore: [/@babel[\\|/]runtime/],
     env: {
       coverage: {
-        plugins: [require.resolve('babel-plugin-istanbul')],
+        plugins: [require.resolve("babel-plugin-istanbul")],
       },
       test: {
-        sourceMaps: 'both',
+        sourceMaps: "both",
         plugins: [],
       },
     },

package/copy-files.js

@@ -1,8 +1,9 @@
 /* eslint-disable no-console */
-const path = require('path');
-const fse = require('fs-extra');
-const glob = require('glob');
-const { resolveProject } = require('@digigov/cli/lib');
+const path = require("path");
+const fs = require("fs");
+const fse = require("fs-extra");
+const glob = require("glob");
+const { resolveProject } = require("@digigov/cli/lib");
 
 const project = resolveProject();
 const packagePath = process.cwd();
@@ -15,40 +16,56 @@ async function includeFileInBuild(file) {
   console.log(`Copied ${sourcePath} to ${targetPath}`);
 }
 
-async function createPackageFile() {
+async function createRootPackageFile() {
   const packageData = await fse.readFile(
-    path.resolve(packagePath, './package.json'),
-    'utf8'
+    path.resolve(packagePath, "./package.json"),
+    "utf8",
   );
-  const {
-    nyc,
-    scripts,
-    devDependencies,
-    workspaces,
-    ...packageDataOther
-  } = JSON.parse(packageData);
+  const { nyc, scripts, devDependencies, workspaces, ...packageDataOther } =
+    JSON.parse(packageData);
   const newPackageData = {
     ...packageDataOther,
     private: false,
-    main: './index.js',
-    module: './esm/index.js',
-    typings: './index.d.ts',
+    main: "./cjs/index.js",
+    module: "./index.js",
+    typings: "./index.d.ts",
   };
-  const targetPath = path.resolve(buildPath, './package.json');
+  const targetPath = path.resolve(buildPath, "./package.json");
 
   await fse.writeFile(
     targetPath,
     JSON.stringify(newPackageData, null, 2),
-    'utf8'
+    "utf8",
   );
   console.log(`Created package.json in ${targetPath}`);
 
   return newPackageData;
 }
 
+async function createNestedPackageFiles() {
+  const indexPaths = glob.sync(path.join(buildPath, "**/index.js"));
+
+  indexPaths.forEach((indexPath) => {
+    if (indexPath === path.join(buildPath, "index.js")) return;
+    const packageData = {
+      sideEffects: false,
+      module: "./index.js",
+      types: "./index.d.ts",
+      main: path.relative(
+        path.dirname(indexPath),
+        indexPath.replace(buildPath, path.join(buildPath, "/cjs")),
+      ),
+    };
+    fs.writeFileSync(
+      path.join(path.dirname(indexPath), "package.json"),
+      JSON.stringify(packageData, null, 2),
+    );
+  });
+}
+
 async function prepend(file, string) {
-  const data = await fse.readFile(file, 'utf8');
-  await fse.writeFile(file, string + data, 'utf8');
+  const data = await fse.readFile(file, "utf8");
+  await fse.writeFile(file, string + data, "utf8");
 }
 
 async function addLicense(packageData) {
@@ -59,38 +76,34 @@ async function addLicense(packageData) {
  */
 `;
   await Promise.all(
-    [
-      './index.js',
-      './esm/index.js',
-      './umd/digigov-ui.development.js',
-      './umd/digigov-ui.production.min.js',
-    ].map(async (file) => {
+    ["./index.js", "./index.mjs"].map(async (file) => {
       try {
         await prepend(path.resolve(buildPath, file), license);
       } catch (err) {
-        if (err.code === 'ENOENT') {
+        if (err.code === "ENOENT") {
           console.log(`Skipped license for ${file}`);
         } else {
           throw err;
         }
       }
-    })
+    }),
   );
 }
 
 async function run() {
   try {
-    const packageData = await createPackageFile();
+    const packageData = await createRootPackageFile();
+    await createNestedPackageFiles();
 
     await Promise.all(
       [
         // use enhanced readme from workspace root for `@digigov/ui`
         // packageData.name === '@digigov/ui' ? '../../README.md' : './README.md',
-        './src',
-        './README.md',
-        './CHANGELOG.md',
-        '../../LICENSE',
-      ].map((file) => includeFileInBuild(file))
+        "./src",
+        "./README.md",
+        "./CHANGELOG.md",
+        "../../LICENSE",
+      ].map((file) => includeFileInBuild(file)),
     );
 
     await addLicense(packageData);

package/index.js

@@ -1,99 +1,100 @@
-const {Command, flags} = require('@oclif/command');
-const execa = require('execa');
-const {resolveProject, DigigovCommand} = require('@digigov/cli/lib');
-const path = require('path');
-const fs = require('fs');
+const { Command, flags } = require("@oclif/command");
+const execa = require("execa");
+const { resolveProject, DigigovCommand } = require("@digigov/cli/lib");
+const path = require("path");
+const fs = require("fs");
 
 module.exports = class Build extends DigigovCommand {
-  static description = 'build digigov libraries';
-  static id = 'build';
+  static description = "build digigov libraries";
+  static id = "build";
   dirname = __dirname;
-  static examples = [
-    `$ digigov build`,
-  ];
+  static examples = [`$ digigov build`];
   static strict = false;
   static flags = {
-    subpackages: flags.boolean({char: '--subpackages'}),
+    subpackages: flags.boolean({ char: "--subpackages" }),
   };
-  static load() {return Build;}
-  script = 'babel';
+  static load() {
+    return Build;
+  }
+  script = "babel";
   async run() {
-
-
-    const {argv, flags} = this.parse(Build);
+    const { argv, flags } = this.parse(Build);
     try {
-      await this.exec('rimraf', ['dist']);
+      await this.exec("rimraf", ["dist"]);
       const project = resolveProject();
       const babelArgs = [
-        '--config-file',
-        path.join(__dirname, 'babel.config.js'),
+        "--config-file",
+        path.join(__dirname, "babel.config.js"),
         project.src,
-        '--extensions',
-        '.tsx,.ts,.js,.jsx',
-        '--copy-files',
-        '--out-dir',
+        "--extensions",
+        ".tsx,.ts,.js,.jsx",
+        "--copy-files",
+        "--out-dir",
       ];
       const distDir = path.resolve(project.root, project.distDir);
       const basename = path.basename(project.root);
 
-      if(flags.subpackages) {
-        if(argv.includes('--watch') || argv.includes('-w')) {
-          throw new Error('--watch cannot be combined with --subpackages');
+      if (flags.subpackages) {
+        if (argv.includes("--watch") || argv.includes("-w")) {
+          throw new Error("--watch cannot be combined with --subpackages");
         }
-        const args = argv.filter((a) => a !== '--subpackages');
-        if(project.isTs) {
-          const tsconfigProduction = path.join(project.root, 'tsconfig.production.json');
+        const args = argv.filter((a) => a !== "--subpackages");
+        if (project.isTs) {
+          const tsconfigProduction = path.join(
+            project.root,
+            "tsconfig.production.json",
+          );
           const tsArgs = [];
-          if(fs.existsSync(tsconfigProduction)) {
-            tsArgs.push('--project', tsconfigProduction);
+          if (fs.existsSync(tsconfigProduction)) {
+            tsArgs.push("--project", tsconfigProduction);
           }
-          await this.exec(
-            'tsc',
-            ['--emitDeclarationOnly',
-            '--outDir',
-            'dist',
-              ...tsArgs,
-            ]
-          );
-          if(fs.existsSync(path.join(distDir, basename))) {
+          await this.exec("tsc", [
+            "--emitDeclarationOnly",
+            "--outDir",
+            "dist",
+            ...tsArgs,
+          ]);
+          if (fs.existsSync(path.join(distDir, basename))) {
             const typesIncluded = fs.readdirSync(path.join(distDir));
-            const paths = fs.readdirSync(path.join(distDir, basename, project.src));
+            const paths = fs.readdirSync(
+              path.join(distDir, basename, project.src),
+            );
             paths.forEach((p) => {
               fs.renameSync(
                 path.join(distDir, basename, project.src, p),
-                path.join(distDir, p)
+                path.join(distDir, p),
               );
             });
             typesIncluded.forEach((typesDir) => {
-              fs.rmdirSync(path.join(distDir, typesDir), {recursive: true});
+              fs.rmdirSync(path.join(distDir, typesDir), { recursive: true });
             });
           }
         }
-        await this.exec(this.script, [...babelArgs, 'dist/esm', ...args], {
-          env: {
-            BABEL_ENV: 'esm',
-            BABEL_PUBLISH: 'true',
-          }, stdio: 'inherit'
-        });
-        await this.exec(this.script, [...babelArgs, 'dist/es', ...args], {
+        await this.exec(this.script, [...babelArgs, "dist", ...args], {
           env: {
-            BABEL_ENV: 'es',
-            BABEL_PUBLISH: 'true',
-          }, stdio: 'inherit'
+            BABEL_ENV: "esm",
+            BABEL_PUBLISH: "true",
+          },
+          stdio: "inherit",
         });
-        await execa('node', [path.join(__dirname, 'copy-files.js')], {
+        await execa("node", [path.join(__dirname, "copy-files.js")], {
           env: {},
-          stdio: 'inherit',
+          stdio: "inherit",
         });
       }
-      const proc = this.exec(this.script, [...babelArgs, 'dist', ...argv], {
-        env: {
-          BABEL_ENV: 'cjs',
-          BABEL_PUBLISH: 'true',
-        }, stdio: 'inherit'
-      });
+      const proc = this.exec(
+        this.script,
+        [...babelArgs, `dist${flags.subpackages ? "/cjs" : ""}`, ...argv],
+        {
+          env: {
+            BABEL_ENV: "cjs",
+            BABEL_PUBLISH: "true",
+          },
+          stdio: "inherit",
+        },
+      );
       return proc;
-    } catch(err) {
+    } catch (err) {
       console.log(err);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/cli-build",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.4",
   "description": "Build plugin for Digigov CLI",
   "main": "./index.js",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
@@ -29,7 +29,7 @@
     "glob": "7.1.6",
     "typescript": "4.2.3",
     "@types/node": "16.6.2",
-    "@digigov/babel-ts-to-proptypes": "1.0.0-rc.2",
+    "@digigov/babel-ts-to-proptypes": "1.0.0-rc.4",
     "babel-plugin-istanbul": "6.0.0",
     "publint": "0.1.8"
   },
@@ -37,7 +37,7 @@
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.0.0-rc.2",
+    "@digigov/cli": "1.0.0-rc.4",
     "rimraf": "3.0.2",
     "next": "10.0.9"
   },

package/tsconfig.base.json

@@ -3,90 +3,37 @@
   "compilerOptions": {
     "baseUrl": "../../libs/",
     "paths": {
-      "@digigov/ui/*": [
-        "./ui/src/*"
-      ],
-      "@digigov/ui/": [
-        "./ui/src"
-      ],
-      "@digigov/ui": [
-        "./ui/src"
-      ],
-      "@digigov/ui-dilosi-integration/*": [
-        "./ui-dilosi-integration/src/*"
-      ],
-      "@digigov/ui-dilosi-integration/": [
-        "./ui-dilosi-integration/src"
-      ],
-      "@digigov/ui-dilosi-integration": [
-        "./ui-dilosi-integration/src"
-      ],
-      "@digigov/auth/*": [
-        "./auth/src/*"
-      ],
-      "@digigov/auth/": [
-        "./auth/src"
-      ],
-      "@digigov/auth": [
-        "./auth/src"
-      ],
-      "@digigov/benchmark/*": [
-        "./benchmark/src/*"
-      ],
-      "@digigov/benchmark/": [
-        "./benchmark/src"
-      ],
-      "@digigov/benchmark": [
-        "./benchmark/src"
-      ],
-      "@digigov/form/*": [
-        "./form/src/*"
-      ],
-      "@digigov/form/": [
-        "./form/src"
-      ],
-      "@digigov/form": [
-        "./form/src"
-      ],
-      "@digigov/form-dilosi-integration/*": [
-        "./form-dilosi-integration/src/*"
-      ],
-      "@digigov/form-dilosi-integration/": [
-        "./form-dilosi-integration/src"
-      ],
-      "@digigov/form-dilosi-integration": [
-        "./form-dilosi-integration/src"
-      ],
-      "@digigov/nextjs/*": [
-        "./nextjs/src/*"
-      ],
-      "@digigov/nextjs/": [
-        "./nextjs/src"
-      ],
-      "@digigov/nextjs": [
-        "./nextjs/src"
-      ],
-      "@digigov/react-core/*": [
-        "../libs-ui/react-core/src/*"
-      ],
-      "@digigov/react-core/": [
-        "../libs-ui/react-core/src"
-      ],
-      "@digigov/react-core": [
-        "../libs-ui/react-core/src"
-      ],
-      "@digigov/react-icons/*": [
-        "../libs-ui/react-icons/src/*"
-      ],
-      "@digigov/react-icons/": [
-        "../libs-ui/react-icons/src"
-      ],
-      "@digigov/react-icons": [
-        "../libs-ui/react-icons/src"
-      ],
-      "@digigov/storybook/*": [
-        "../examples/storybook/stories/*"
-      ]
+      "@digigov/ui/*": ["./ui/src/*"],
+      "@digigov/ui/": ["./ui/src"],
+      "@digigov/ui": ["./ui/src"],
+      "@digigov/ui-dilosi-integration/*": ["./ui-dilosi-integration/src/*"],
+      "@digigov/ui-dilosi-integration/": ["./ui-dilosi-integration/src"],
+      "@digigov/ui-dilosi-integration": ["./ui-dilosi-integration/src"],
+      "@digigov/auth/*": ["./auth/src/*"],
+      "@digigov/auth/": ["./auth/src"],
+      "@digigov/auth": ["./auth/src"],
+      "@digigov/benchmark/*": ["./benchmark/src/*"],
+      "@digigov/benchmark/": ["./benchmark/src"],
+      "@digigov/benchmark": ["./benchmark/src"],
+      "@digigov/text-search/*": ["./text-search/src/*"],
+      "@digigov/text-search/": ["./text-search/src"],
+      "@digigov/text-search": ["./text-search/src"],
+      "@digigov/form/*": ["./form/src/*"],
+      "@digigov/form/": ["./form/src"],
+      "@digigov/form": ["./form/src"],
+      "@digigov/form-dilosi-integration/*": ["./form-dilosi-integration/src/*"],
+      "@digigov/form-dilosi-integration/": ["./form-dilosi-integration/src"],
+      "@digigov/form-dilosi-integration": ["./form-dilosi-integration/src"],
+      "@digigov/nextjs/*": ["./nextjs/src/*"],
+      "@digigov/nextjs/": ["./nextjs/src"],
+      "@digigov/nextjs": ["./nextjs/src"],
+      "@digigov/react-core/*": ["../libs-ui/react-core/src/*"],
+      "@digigov/react-core/": ["../libs-ui/react-core/src"],
+      "@digigov/react-core": ["../libs-ui/react-core/src"],
+      "@digigov/react-icons/*": ["../libs-ui/react-icons/src/*"],
+      "@digigov/react-icons/": ["../libs-ui/react-icons/src"],
+      "@digigov/react-icons": ["../libs-ui/react-icons/src"],
+      "@digigov/storybook/*": ["../examples/storybook/stories/*"]
     }
   },
   "include": [
@@ -94,6 +41,10 @@
     "../../libs/auth/src/*.tsx",
     "../../libs/benchmark/src/**/*.tsx",
     "../../libs/benchmark/src/*.tsx",
+    "../../libs/text-search/src/**/*.tsx",
+    "../../libs/text-search/src/*.tsx",
+    "../../libs/text-search/src/**/*.ts",
+    "../../libs/text-search/src/*.ts",
     "../../libs/form/src/**/*.(tsx|ts)",
     "../../libs/form/src/*.(tsx|ts)",
     "../../libs/form-dilosi-integration/src/**/*.(tsx|ts)",