140 rollup packs

examples/next-starter/packages/app/next.config.js

@@ -15,7 +15,9 @@ if (!files.length) {
   console.error(new Error('no files'));
   process.exit(1);
 }
-const withTm = require('next-transpile-modules')([...files, '@onr/plugin-antd', '@onr/core']);
+/** need to transpile the stuff, when using `next` in package
+ */
+const withTm = require('next-transpile-modules')([...files, '@onr/core', '@onr/plugin-antd']);
 
 const withPWA = require('next-pwa');
 const withAntdLess = require('next-plugin-antd-less');

examples/next-starter/packages/app/src/pages/api/auth/[...nextauth].ts

@@ -1,4 +1,4 @@
-import { createNextAuthApi } from '@onr/core/api';
+import { createNextAuthApi } from '@onr/core/lib/api';
 import { AuthService } from '@onr/plugin-auth';
 import { app } from '../../../components/app';
 

packages/core/package.json

@@ -7,10 +7,6 @@
   "license": "ISC",
   "main": "lib/index.js",
   "source": "src/index.ts",
-  "exports": {
-    ".": "./lib/index.js",
-    "./api": "./lib/api/index.js"
-  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -22,16 +18,16 @@
     "api",
     "api.js"
   ],
-  "types": "types/index.d.ts",
+  "types": "lib/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/OnrampLab/onr-react-ui.git"
   },
   "scripts": {
-    "dev": "yarn build && tsc --watch --preserveWatchOutput",
+    "dev": "rollup -c ./rollup.config.js -w --environment NODE_ENV:development",
     "lint": "prettier -c 'src/**/*'; eslint src --ext .ts,.tsx",
     "format": "prettier --write 'src/**/*'; eslint src --fix --ext .ts,.tsx",
-    "build": "tsc && node ./config/build.js",
+    "build": "rollup -c --environment NODE_ENV:production",
     "test": "jest --coverage --passWithNoTests",
     "test:watch": "yarn test --watch",
     "prepublishOnly": "yarn build"
@@ -62,11 +58,16 @@
     "@babel/preset-typescript": "^7.12.7",
     "@onr/eslint-config": "^0.3.0",
     "@onr/prettier-config": "^1.1.1",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-multi-entry": "^4.1.0",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@types/lodash-es": "^4.17.5",
     "@types/node": "^14.14.21",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "eslint": "^7.29.0",
+    "rollup": "^2.62.0",
+    "rollup-plugin-dts": "^4.1.0",
     "typescript": "^4.3.4"
   },
   "prettier": "@onr/prettier-config",

packages/core/rollup.config.js

@@ -0,0 +1,14 @@
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from '@rollup/plugin-typescript';
+import { defineConfig } from 'rollup';
+export default defineConfig({
+  input: { index: './src/index.ts', api: './src/api/index.ts' },
+  output: {
+    dir: 'lib',
+    format: 'es',
+  },
+  plugins: [typescript({ tsconfig: './tsconfig.json' }), commonjs()],
+  treeshake: {
+    correctVarValueBeforeDeclaration: true,
+  },
+});

packages/core/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.components.json",
   "compilerOptions": {
     "outDir": "lib",
-    "declarationDir": "./types",
+    "declarationDir": "./lib",
     "sourceMap": true
   },
   "include": [

packages/logging/package.json

@@ -16,16 +16,16 @@
     "types",
     "src"
   ],
-  "types": "types/index.d.ts",
+  "types": "lib/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/OnrampLab/onr-react-ui.git"
   },
   "scripts": {
-    "dev": "tsc --watch --preserveWatchOutput",
+    "dev": "rollup -c ./rollup.config.js -w --environment NODE_ENV:development",
     "lint": "prettier -c 'src/**/*'; eslint src --ext .ts,.tsx",
     "format": "prettier --write 'src/**/*'; eslint src --fix --ext .ts,.tsx",
-    "build": "tsc --build tsconfig.json",
+    "build": "rollup -c ./rollup.config.js --environment NODE_ENV:production",
     "prepublishOnly": "yarn build",
     "test": "jest --coverage --passWithNoTests"
   },
@@ -37,22 +37,25 @@
     "@livy/contracts": "^1.1.1",
     "@livy/http-handler": "^1.0.3",
     "@livy/logger": "^1.0.5",
-    "@livy/util": "^1.0.5"
+    "@livy/util": "^1.0.5",
+    "typescript": "^4.3.4"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.12.7",
     "@onr/eslint-config": "^0.3.0",
     "@onr/prettier-config": "^1.1.1",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@types/debug": "^4.1.5",
     "@types/luxon": "^1.25.0",
     "debug": "^4.3.1",
     "eslint": "^7.29.0",
     "prettier": "^1.18.2",
+    "rollup": "^2.62.0",
     "typescript": "^4.3.4"
   },
   "prettier": "@onr/prettier-config",
   "publishConfig": {
     "access": "public"
   },
   "type": "module"
-}
+}

packages/logging/rollup.config.js

@@ -0,0 +1,15 @@
+import typescript from '@rollup/plugin-typescript';
+import { defineConfig } from 'rollup';
+export default defineConfig({
+  input: ['./src/index.ts', './src/ConsoleHandler.ts'],
+  output: {
+    dir: 'lib',
+    format: 'es',
+  },
+  plugins: [typescript({ tsconfig: './tsconfig.json' })],
+  treeshake: {
+    correctVarValueBeforeDeclaration: true,
+  },
+});
+
+console.log(process.env.NODE_ENV);

packages/logging/tsconfig.json

@@ -2,10 +2,16 @@
   "extends": "../../tsconfig.components.json",
   "compilerOptions": {
     "outDir": "lib",
-    "declarationDir": "./types",
+    "declarationDir": "./lib",
     "sourceMap": true,
-    "target": "es6"
+    "target": "es2021",
+    "module": "ESNext",
+    "moduleResolution": "Node"
   },
-  "include": ["src/**/*"],
-  "exclude": ["**/*.spec.tsx?"]
-}
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "**/*.spec.tsx?"
+  ]
+}

packages/tsconfig/tsconfig.components.json

@@ -3,7 +3,7 @@
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "ES2016" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "target": "ES2018" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
     "module": "ESnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
     // "lib": [],                             /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
@@ -61,4 +61,4 @@
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
     "resolveJsonModule": true
   }
-}
+}

plugins/antd/package.json

@@ -15,16 +15,16 @@
     "types",
     "src"
   ],
-  "types": "types/index.d.ts",
+  "types": "lib/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/OnrampLab/onr-react-ui.git"
   },
   "scripts": {
-    "dev": "tsc --watch --preserveWatchOutput",
+    "dev": "rollup -c ./rollup.config.js -w --environment NODE_ENV:development",
     "lint": "prettier -c 'src/**/*'; eslint src --ext .ts,.tsx",
     "format": "prettier --write 'src/**/*'; eslint src --fix --ext .ts,.tsx",
-    "build": "tsc --build tsconfig.json",
+    "build": "rollup -c --environment NODE_ENV:production",
     "test": "jest --coverage --passWithNoTests",
     "test:watch": "yarn test --watch",
     "prepublishOnly": "yarn build"
@@ -55,18 +55,21 @@
     "@babel/preset-typescript": "^7.12.7",
     "@onr/eslint-config": "^0.3.0",
     "@onr/prettier-config": "^1.1.1",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@types/antd": "^1.0.0",
     "@types/lodash-es": "^4.17.5",
     "@types/node": "^14.14.21",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "change-case": "^4.1.2",
     "eslint": "^7.29.0",
+    "rollup": "^2.62.0",
     "typescript": "^4.3.4"
   },
   "prettier": "@onr/prettier-config",
   "publishConfig": {
     "access": "public"
   },
   "type": "module"
-}
+}

plugins/antd/rollup.config.js

@@ -0,0 +1,14 @@
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from '@rollup/plugin-typescript';
+import { defineConfig } from 'rollup';
+export default defineConfig({
+  input: './src/index.ts',
+  output: {
+    dir: 'lib',
+    format: 'es',
+  },
+  plugins: [typescript({ tsconfig: './tsconfig.json' }), commonjs()],
+  treeshake: {
+    correctVarValueBeforeDeclaration: true,
+  },
+});

plugins/antd/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.components.json",
   "compilerOptions": {
     "outDir": "lib",
-    "declarationDir": "./types",
+    "declarationDir": "./lib",
     "sourceMap": true
   },
   "include": [

plugins/user/src/containers/UserListPage.tsx

@@ -108,7 +108,8 @@ const UserListContainer: React.FC = () => {
       message.success(`User ${user.name} deleted`);
       fetchUserListData();
     } catch (e) {
-      message.error(`Failed to delete user${e.message && `: ${e.message}`}`);
+      if (e instanceof Error)
+        message.error(`Failed to delete user${e.message && `: ${e.message}`}`);
     }
   };
 

tsconfig.components.json

@@ -2,6 +2,5 @@
   "extends": "@onr/tsconfig/tsconfig.components.json",
   "compilerOptions": {
     "importHelpers": true,
-    "target": "ES2016"
   }
 }