@vitus-labs/tools-rollup 0.41.0 → 0.42.0

package/lib/types/declarations/index.d.ts

@@ -0,0 +1,17 @@
+export {};
+declare global {
+    const __BROWSER__: true;
+    const __WEB__: true;
+    const __NATIVE__: true;
+    const __NODE__: true;
+    const __CLIENT__: true;
+}
+declare global {
+    interface Window {
+        __BROWSER__: true;
+        __WEB__: true;
+        __NATIVE__: true;
+        __NODE__: true;
+        __CLIENT__: true;
+    }
+}

package/lib/types/{config/rollup.d.ts → rollup/config.d.ts}

@@ -1,10 +1,6 @@
-declare const rollupConfig: ({ file, format, env, types, platform }: {
-    file: any;
-    format: any;
-    env: any;
-    types: any;
-    platform: any;
-}) => {
+declare const rollupConfig: ({ file, format, env, types, platform, }: Record<string, any>) => {
+    makeAbsoluteExternalsRelative: boolean;
+    preserveEntrySignatures: string;
     input: any;
     output: {
         file: any;
@@ -13,6 +9,12 @@ declare const rollupConfig: ({ file, format, env, types, platform }: {
         sourcemap: boolean;
         exports: string | undefined;
         name: any;
+        esModule: boolean;
+        generatedCode: {
+            reservedNamesAsProps: boolean;
+        };
+        interop: string;
+        systemNullSetters: boolean;
     };
     external: any;
     plugins: import("rollup").Plugin[];

package/lib/types/rollup/createBuildPipeline.d.ts

@@ -0,0 +1,2 @@
+declare const createBuildPipeline: () => Record<string, any>[];
+export default createBuildPipeline;

package/lib/types/rollup/index.d.ts

@@ -0,0 +1,3 @@
+import config from './config';
+import createBuildPipeline from './createBuildPipeline';
+export { createBuildPipeline, config };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@vitus-labs/tools-rollup",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.com>",
   "maintainers": [
     "Vit Bokisch <vit@bokisch.com>"
   ],
-  "main": "./index.js",
-  "types": "typings/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/typings/index.d.ts",
   "bin": {
     "vl_build": "bin/run-build.js",
     "vl_build-watch": "bin/run-watch.js"
@@ -15,16 +15,20 @@
   "engines": {
     "node": ">= 14"
   },
+  "scripts": {
+    "prepublish": "yarn build",
+    "build": "tsc"
+  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@microsoft/api-extractor": "^7.33.7",
-    "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.3.0",
     "@types/node": "^18.11.18",
+    "@vitus-labs/tools-core": "0.42.0",
     "chalk": "^4.1.2",
     "find-up": "^5.0.0",
     "lodash.merge": "^4.6.2",
@@ -38,5 +42,5 @@
     "tslib": "^2.4.1",
     "ttypescript": "^1.5.15"
   },
-  "gitHead": "ca8e6a7725965352158bc5e1de1b79c6d8f15319"
+  "gitHead": "e271a9b9bd8bb25150fdff84ac86b4f30fad55a9"
 }

package/src/config/{baseConfig.js → baseConfig.ts}

@@ -1,8 +1,9 @@
-module.exports = {
+export default {
   sourceDir: 'src',
   outputDir: 'lib',
   typesDir: 'lib/types',
   typescript: true,
+  esModulesOnly: false,
   replaceGlobals: true,
   visualise: {
     template: 'network',

package/src/config/index.ts

@@ -0,0 +1,10 @@
+import { loadVLToolsConfig, PKG } from '@vitus-labs/tools-core'
+import baseConfig from './baseConfig'
+
+const CONFIG_KEY = 'rollup'
+
+const CONFIG = loadVLToolsConfig(CONFIG_KEY).merge(baseConfig).config
+
+const PLATFORMS = ['browser', 'node', 'web', 'native']
+
+export { CONFIG, PKG, PLATFORMS }

package/src/index.ts

@@ -0,0 +1,3 @@
+import runBuild from './scripts/build'
+
+export default runBuild

package/src/{config/rollup.js → rollup/config.ts}

@@ -1,22 +1,19 @@
-const typescript = require('rollup-plugin-typescript2')
-const ttypescript = require('ttypescript')
-const pathsTransformer = require('ts-transform-paths').default
-const { apiExtractor } = require('rollup-plugin-api-extractor')
-const { nodeResolve } = require('@rollup/plugin-node-resolve')
-const filesize = require('rollup-plugin-filesize')
-const { visualizer } = require('rollup-plugin-visualizer')
-const replace = require('@rollup/plugin-replace')
-const { terser } = require('@rollup/plugin-terser')
-// const babel = require('@rollup/plugin-babel')
-const baseConfig = require('./baseConfig')
-const { PKG, loadConfig, swapGlobals } = require('../utils')
-
-const CONFIG = loadConfig(baseConfig)
+import { swapGlobals } from '@vitus-labs/tools-core'
+import typescript from 'rollup-plugin-typescript2'
+import ttypescript from 'ttypescript'
+import pathsTransformer from 'ts-transform-paths'
+import { apiExtractor } from 'rollup-plugin-api-extractor'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import filesize from 'rollup-plugin-filesize'
+import { visualizer } from 'rollup-plugin-visualizer'
+import replace from '@rollup/plugin-replace'
+import terser from '@rollup/plugin-terser'
+import { CONFIG, PKG, PLATFORMS } from '../config'
 
 const defineExtensions = (platform) => {
-  const platformExtensions = []
+  const platformExtensions: string[] = []
 
-  if (['browser', 'node', 'web', 'native'].includes(platform)) {
+  if (PLATFORMS.includes(platform)) {
     CONFIG.extensions.forEach((item) => {
       platformExtensions.push(`.${platform}${item}`)
     })
@@ -27,38 +24,30 @@ const defineExtensions = (platform) => {
 
 const loadPlugins = ({ env, platform, types, file }) => {
   const extensions = defineExtensions(platform)
+  const plugins = [nodeResolve({ extensions, browser: platform === 'browser' })]
 
-  // const babelConfig = {
-  //   extensions,
-  //   include: [CONFIG.sourceDir],
-  //   exclude: CONFIG.exclude,
-  //   babelHelpers: 'bundled',
-  // }
-
-  const tsConfig = {
-    typescript: ttypescript,
-    transformers: [(service) => pathsTransformer(service)],
-    exclude: CONFIG.exclude,
-    useTsconfigDeclarationDir: true,
-    clean: true,
-    tsconfigDefaults: {
+  if (CONFIG.typescript) {
+    const tsConfig: Record<string, any> = {
+      typescript: ttypescript,
+      transformers: [(service) => pathsTransformer(service)],
       exclude: CONFIG.exclude,
-      include: CONFIG.include,
-      compilerOptions: {
-        types: ['@vitus-labs/tools-rollup'],
+      useTsconfigDeclarationDir: true,
+      clean: true,
+      tsconfigDefaults: {
+        exclude: CONFIG.exclude,
+        include: CONFIG.include,
+        compilerOptions: {
+          types: ['@vitus-labs/tools-rollup'],
+        },
       },
-    },
-  }
-
-  if (types) {
-    tsConfig.tsconfigDefaults.compilerOptions.declarationMap = types
-    tsConfig.tsconfigDefaults.compilerOptions.declaration = types
-    tsConfig.tsconfigDefaults.compilerOptions.declarationDir = CONFIG.typesDir
-  }
+    }
 
-  const plugins = [nodeResolve({ extensions, browser: platform === 'browser' })]
+    if (types) {
+      tsConfig.tsconfigDefaults.compilerOptions.declarationMap = types
+      tsConfig.tsconfigDefaults.compilerOptions.declaration = types
+      tsConfig.tsconfigDefaults.compilerOptions.declarationDir = CONFIG.typesDir
+    }
 
-  if (CONFIG.typescript) {
     plugins.push(typescript(tsConfig))
 
     if (types) {
@@ -66,10 +55,11 @@ const loadPlugins = ({ env, platform, types, file }) => {
         apiExtractor({
           cleanUpRollup: true,
           configuration: {
-            mainEntryPointFilePath: `${CONFIG.typesDir}/index.d.ts`,
+            mainEntryPointFilePath: `<projectFolder>/${CONFIG.typesDir}/index.d.ts`,
             projectFolder: process.cwd(),
             compiler: {
               tsconfigFilePath: '<projectFolder>/tsconfig.json',
+              skipLibCheck: true,
             },
             dtsRollup: {
               enabled: true,
@@ -100,9 +90,8 @@ const loadPlugins = ({ env, platform, types, file }) => {
     plugins.push(replace({ preventAssignment: true, values: replaceOptions }))
   }
 
-  // plugins.push(babel(babelConfig))
-
   // generate visualised graphs in dist folder
+
   if (CONFIG.visualise) {
     const filePath = file.split('/')
     const fileName = filePath.pop()
@@ -130,7 +119,13 @@ const loadPlugins = ({ env, platform, types, file }) => {
   return plugins
 }
 
-const rollupConfig = ({ file, format, env, types, platform }) => {
+const rollupConfig = ({
+  file,
+  format,
+  env,
+  types,
+  platform,
+}: Record<string, any>) => {
   const plugins = loadPlugins({ file, env, types, platform })
 
   const buildOutput = {
@@ -158,4 +153,4 @@ const rollupConfig = ({ file, format, env, types, platform }) => {
   return buildOutput
 }
 
-module.exports = rollupConfig
+export default rollupConfig

package/src/{scripts/utils.js → rollup/createBuildPipeline.ts}

@@ -1,12 +1,14 @@
-const { PKG } = require('../utils')
+import { PKG, CONFIG } from '../config'
 
+const isESMModule = PKG.type === 'module'
+const { esModulesOnly } = CONFIG
 const shouldBuildNative = PKG['react-native'] !== PKG.module
 const shouldGenerateTypes = !!(PKG.types || PKG.typings)
 
 const hasDifferentBrowserBuild = (type) => {
   if (!PKG.browser) return false
 
-  return Object.entries(PKG.browser).some(([key, value]) => {
+  return Object.entries(PKG.browser).some(([key, value]: [string, string]) => {
     const source = key.substring(2)
     const output = value.substring(2)
 
@@ -16,7 +18,7 @@ const hasDifferentBrowserBuild = (type) => {
 
 const BASE_VARIANTS = {
   main: {
-    format: 'cjs',
+    format: esModulesOnly ? 'es' : 'cjs',
     env: 'development',
     platform: 'universal',
   },
@@ -35,40 +37,40 @@ const BASE_VARIANTS = {
 }
 
 const getExportsOptions = () => {
-  const exportsOptions = PKG['exports']
+  const exportsOptions = PKG.exports
 
   if (!exportsOptions) return []
 
   if (typeof exportsOptions === 'string') {
     return [
       {
-        file: PKG['exports'],
-        ...BASE_VARIANTS['module'],
+        file: PKG.exports,
+        ...BASE_VARIANTS.module,
       },
     ]
   }
 
   if (typeof exportsOptions === 'object') {
-    const result = []
+    const result: Record<string, any>[] = []
 
     if (exportsOptions.import) {
       result.push({
         file: exportsOptions.import,
-        ...BASE_VARIANTS['module'],
+        ...BASE_VARIANTS.module,
       })
     }
 
     if (exportsOptions.require) {
       result.push({
         file: exportsOptions.require,
-        ...BASE_VARIANTS['main'],
+        ...BASE_VARIANTS.main,
       })
     }
 
     if (exportsOptions.node) {
       result.push({
         file: exportsOptions.node,
-        ...BASE_VARIANTS['module'],
+        ...BASE_VARIANTS.module,
         platform: 'node',
       })
     }
@@ -76,7 +78,7 @@ const getExportsOptions = () => {
     if (exportsOptions.default) {
       result.push({
         file: exportsOptions.default,
-        ...BASE_VARIANTS['module'],
+        ...BASE_VARIANTS.module,
       })
     }
 
@@ -87,10 +89,9 @@ const getExportsOptions = () => {
 }
 
 const createBasicBuildVariants = () => {
-  const isModule = PKG['type'] === 'module'
-  let result = []
+  let result: Record<string, any>[] = []
 
-  if (isModule) result = [...getExportsOptions()]
+  if (isESMModule) result = [...getExportsOptions()]
 
   Object.keys(BASE_VARIANTS).forEach((key) => {
     const PKGOutDir = PKG[key]
@@ -108,7 +109,9 @@ const createBasicBuildVariants = () => {
         if (shouldBuildNative) {
           add()
         }
-      } else if (hasBrowserBuild) {
+      }
+
+      if (hasBrowserBuild) {
         // if has a different browser build, set default platform to node
         // as there is going to be created a separate browser build as well
         add({ platform: 'node' })
@@ -122,10 +125,10 @@ const createBasicBuildVariants = () => {
 }
 
 const createBrowserBuildVariants = () => {
-  const result = []
+  const result: Record<string, any>[] = []
   if (!PKG.browser) return result
 
-  Object.entries(PKG.browser).forEach(([key, value]) => {
+  Object.entries(PKG.browser).forEach(([key, value]: [string, string]) => {
     const source = key.substring(2) // strip './' from the beginning of path
     const output = value.substring(2) // strip './' from the beginning of path
 
@@ -155,4 +158,4 @@ const createBuildPipeline = () => {
   return result
 }
 
-module.exports = createBuildPipeline
+export default createBuildPipeline

package/src/rollup/index.ts

@@ -0,0 +1,4 @@
+import config from './config'
+import createBuildPipeline from './createBuildPipeline'
+
+export { createBuildPipeline, config }

package/src/scripts/{build.js → build.ts}

@@ -1,17 +1,20 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const chalk = require('chalk')
-const rimraf = require('rimraf')
-const rollup = require('rollup')
-const { rollupConfig, baseConfig } = require('../config')
-const { loadConfig } = require('../utils')
-const createBuildPipeline = require('./utils')
+import chalk from 'chalk'
+import rimraf from 'rimraf'
+import rollup from 'rollup'
+import { CONFIG } from '../config'
+import { config as rollupConfig, createBuildPipeline } from '../rollup'
 
 const { log } = console
-const CONFIG = loadConfig(baseConfig)
 const allBuilds = createBuildPipeline()
-// const allBuilds = allBuildOptions.map((item) => rollupConfig(item)).flat()
 const allBuildsCount = allBuilds.length
 
+const MODULE_TYPES = {
+  cjs: 'CommonJS',
+  es: 'ES Module',
+  umd: 'UMD module',
+}
+
 // --------------------------------------------------------
 // BUILD rollup
 // --------------------------------------------------------
@@ -29,32 +32,17 @@ const createBuilds = async () => {
 
   // serialize builds
   allBuilds.forEach((item, i) => {
-    const buildOptions = rollupConfig(item)
-
-    // it might be an array for such a cases like typescript optimization file
-    // which we want to do in one iteration only
-    if (Array.isArray(buildOptions)) {
-      const [buildConfig, typescriptConfig] = buildOptions
-
-      const { output, ...input } = buildConfig
-      const { output: tsOutput, ...tsInput } = typescriptConfig
+    const { output, ...input } = rollupConfig(item)
+    const type = output.format
 
-      p = p.then(() => {
-        log(chalk.green(`🚧  Creating a build ${i + 1}/${allBuildsCount}`))
-        return build({ inputOptions: input, outputOptions: output })
-      })
-
-      p = p.then(() =>
-        build({ inputOptions: tsInput, outputOptions: tsOutput })
+    p = p.then(() => {
+      log(
+        chalk.green(`🚧  Creating a build ${i + 1}/${allBuildsCount}`),
+        chalk.gray(`(format: ${MODULE_TYPES[type]})`)
       )
-    } else {
-      const { output, ...input } = buildOptions
-
-      p = p.then(() => {
-        log(chalk.green(`🚧  Creating a build ${i + 1}/${allBuildsCount}`))
-        return build({ inputOptions: input, outputOptions: output })
-      })
-    }
+
+      return build({ inputOptions: input, outputOptions: output })
+    })
   })
 
   p.catch((e) => {
@@ -103,4 +91,4 @@ const runBuild = async () => {
     })
 }
 
-module.exports = runBuild
+export default runBuild

package/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "extends": "@vitus-labs/tools-typescript/lib",
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "outDir": "lib",
+    "rootDir": "src",
+    "baseUrl": ".",
+    "declarationDir": "./lib/types",
+    "paths": {
+      "~/*": [
+        "src/*"
+      ]
+    },
+  },
+  "include": [
+    "typings",
+    "src",
+  ],
+  "exclude": [
+    "node_modules",
+    "__stories__",
+    "lib"
+  ]
+}