Build ESM and CommonJS modules

Use Rollup to bundle ESM and CommonJS modules for all non-Angular
packages. Angular builds are done via ngc.

ESM bundles target 'esnext' while CommonJS bundles continue to
target ES5.

Also adjusts Vue dependencies so that Vue and the respective
template compiler are of the same version.

Author: sdirix

.gitignore

@@ -5,6 +5,7 @@ dist
 lib
 docs
 *.log
+stats.html
 
 .idea/
 .vscode/*

lerna.json

@@ -9,7 +9,6 @@
     "core-js",
     "vue",
     "rollup-plugin-vue",
-    "@vue/test-utils",
-    "@vue/composition-api"
+    "@vue/test-utils"
   ]
 }

package-lock.json

@@ -2,7 +2,7 @@
   "name": "jsonforms-monorepo",
   "scripts": {
     "lerna": "lerna",
-    "preparePublish": "git clean -dfx && npm ci && npm run init && npm run clean && npm run build && npm run bundle && npm run test",
+    "preparePublish": "git clean -dfx && npm ci && npm run init && npm run clean && npm run build && npm run test",
     "merge-report": "mkdir -p coverage && lcov-result-merger 'packages/**/coverage/lcov.info' 'coverage/lcov.info'",
     "check-format": "echo 'temporarily disabled'",
     "init": "lerna bootstrap --hoist",
@@ -14,6 +14,8 @@
     "lint": "tslint 'packages/**/*.{ts,tsx}' -c ./tslint.json"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.5",
     "@istanbuljs/nyc-config-typescript": "0.1.3",
     "@types/jest": "^24.0.23",
     "@types/lodash": "^4.14.149",
@@ -34,7 +36,7 @@
     "source-map-support": "0.5.16",
     "style-loader": "^1.0.1",
     "ts-loader": "^6.2.1",
-    "ts-node": "^8.5.3",
+    "ts-node": "^10.4.0",
     "tslint": "^5.20.1",
     "tslint-loader": "^3.5.4",
     "tslint-react": "^4.1.0",

package.json

@@ -30,11 +30,11 @@
     "layout",
     "customization"
   ],
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/cjs/index.js",
+  "module": "./lib/esm/index.js",
+  "typings": "./lib/esm/index.d.ts",
   "scripts": {
-    "bundle": "webpack --config webpack/webpack.build.js --env=production --display-error-details",
-    "build": "ngc",
+    "build": "ngc && ngc -p tsconfig.cjs.json",
     "dev": "webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
     "clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
     "lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",

packages/angular-material/package.json

@@ -0,0 +1,45 @@
+/*
+  The MIT License
+  
+  Copyright (c) 2017-2019 EclipseSource Munich
+  https://github.com/eclipsesource/jsonforms
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+import { ControlElement, getAjv, getData, isVisible, JsonFormsState, OwnPropsOfRenderer } from '@jsonforms/core';
+
+export const controlWithoutLabel = (scope: string): ControlElement => ({
+  type: 'Control',
+  scope: scope,
+  label: false
+});
+
+export const mapStateToVisible = (
+  state: JsonFormsState,
+  ownProps: OwnPropsOfRenderer
+) => {
+  const visible =
+    ownProps.visible !== undefined
+      ? ownProps.visible
+      : isVisible(ownProps.uischema, getData(state), undefined, getAjv(state));
+
+  return {
+    visible
+  };
+};

packages/angular-material/src/other/util.ts

@@ -9,7 +9,19 @@ module.exports = {
   },
 
   module: {
-    rules: [{
+    rules: [
+      {
+        test: /\.jsx?$/,
+        loader: 'babel-loader',
+        options: {
+          plugins: [
+            '@babel/plugin-proposal-optional-chaining',
+            '@babel/plugin-proposal-nullish-coalescing-operator'
+          ]
+        },
+        exclude: /node_modules/
+      },
+      {
         test: /\.ts$/,
         loaders: [
           {

packages/angular-material/test-config/webpack.test.js

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "outDir": "./lib/cjs",
+    "sourceMap": true,
+    "target": "es5",
+    "module": "commonjs"
+  },
+}

packages/angular-material/tsconfig.cjs.json

@@ -1,8 +1,9 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
-    "outDir": "./lib",
-    "sourceMap": true
+    "outDir": "./lib/esm",
+    "sourceMap": true,
+    "target": "es5"
   },
   "exclude": ["node_modules"],
   "files": ["./src/index.ts"],

packages/angular-material/tsconfig.json

@@ -29,16 +29,16 @@
     "layout",
     "customization"
   ],
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/cjs/index.js",
+  "esm": "./lib/esm/index.js",
+  "typings": "./lib/esm/index.d.ts",
   "scripts": {
-    "bundle": "webpack --config ./webpack.build.js --env=production --display-error-details",
-    "build": "ngc",
+    "build": "ngc && ngc -p tsconfig.cjs.json",
     "clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
     "lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
     "report": "nyc report --reporter=html",
-    "test": "ava",
-    "test-cov": "nyc ava",
+    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} ava",
+    "test-cov": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} nyc ava",
     "doc": "typedoc --name 'JSON Forms Angular Core' --mode file --out docs src"
   },
   "nyc": {
@@ -74,13 +74,11 @@
     "@jsonforms/core": "^3.0.0-alpha.3",
     "ava": "~2.4.0",
     "copy-webpack-plugin": "^5.0.5",
+    "cross-env": "^7.0.2",
     "nyc": "^14.1.1",
     "rimraf": "^3.0.2",
     "rxjs": "^6.4.0",
     "tslint": "^5.20.1",
-    "typedoc": "^0.19.2",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.2.1",
-    "webpack-dev-server": "^3.9.0"
+    "typedoc": "^0.19.2"
   }
 }