Revert "output CJS module bundles for perspective-viewer packages"

This reverts commit 7a54e43.
finos · Jan 28, 2019 · ca6355e · ca6355e
1 parent 21b4264
commit ca6355e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -121,7 +121,7 @@ website/static/css/material.dark.css
 
 # CPP Compile
 /src/include/boost
-cjs
 obj
+packages/*/cjs
 cppbuild
 .coverage
diff --git a/packages/perspective-viewer-highcharts/package.json b/packages/perspective-viewer-highcharts/package.json
@@ -2,20 +2,17 @@
     "name": "@jpmorganchase/perspective-viewer-highcharts",
     "version": "0.2.12",
     "description": "Perspective.js",
-    "main": "cjs/perspective-viewer-plugin-highcharts.js",
+    "main": "src/js/highcharts.js",
     "files": [
         "build/**/*",
-        "cjs/*",
         "src/**/*",
         "babel.config.js"
     ],
     "scripts": {
         "bench": "npm-run-all bench:build bench:run",
         "bench:build": "echo \"No Benchmarks\"",
         "bench:run": "echo \"No Benchmarks\"",
-        "build:cjs": "webpack --color --config src/config/highcharts.plugin.cjs.config.js",
-        "build:umd": "webpack --color --config src/config/highcharts.plugin.config.js",
-        "build": "npm-run-all build:*",
+        "build": "webpack --color --config src/config/highcharts.plugin.config.js",
         "test:build": "cp test/html/* build",
         "watch": "webpack --color --watch --config src/config/highcharts.plugin.config.js",
         "test:run": "jest --silent --color 2>&1",

diff --git a/packages/perspective-viewer-highcharts/src/config/highcharts.plugin.cjs.config.js b/packages/perspective-viewer-highcharts/src/config/highcharts.plugin.cjs.config.js
diff --git a/packages/perspective-viewer-hypergrid/package.json b/packages/perspective-viewer-hypergrid/package.json
@@ -2,20 +2,17 @@
     "name": "@jpmorganchase/perspective-viewer-hypergrid",
     "version": "0.2.12",
     "description": "Perspective.js",
-    "main": "cjs/perspective-viewer-plugin-hypergrid.js",
+    "main": "src/js/hypergrid.js",
     "files": [
         "build/**/*",
-        "cjs/*",
         "src/**/*",
         "babel.config.js"
     ],
     "scripts": {
         "bench": "npm-run-all bench:build bench:run",
         "bench:build": "echo \"No Benchmarks\"",
         "bench:run": "echo \"No Benchmarks\"",
-        "build:cjs": "webpack --color --config src/config/hypergrid.plugin.cjs.config.js",
-        "build:umd": "webpack --color --config src/config/hypergrid.plugin.config.js",
-        "build": "npm-run-all build:*",
+        "build": "webpack --color --config src/config/hypergrid.plugin.config.js",
         "test:build": "cp test/html/* build",
         "test:run": "jest --silent --color",
         "test": "npm-run-all test:build test:run",

diff --git a/packages/perspective-viewer-hypergrid/src/config/hypergrid.plugin.cjs.config.js b/packages/perspective-viewer-hypergrid/src/config/hypergrid.plugin.cjs.config.js
diff --git a/packages/perspective-viewer/package.json b/packages/perspective-viewer/package.json
@@ -2,19 +2,17 @@
     "name": "@jpmorganchase/perspective-viewer",
     "version": "0.2.12",
     "description": "Perspective.js",
-    "main": "cjs/perspective-viewer.js",
+    "main": "src/js/viewer.js",
     "files": [
         "build/**/*",
-        "cjs/*",
         "src/**/*",
         "babel.config.js"
     ],
     "scripts": {
         "bench": "npm-run-all bench:build bench:run",
         "bench:build": "echo \"No Benchmarks\"",
         "bench:run": "echo \"No Benchmarks\"",
-        "build:cjs": "webpack --color --config src/config/view.cjs.config.js",
-        "build:umd": "webpack --color --config src/config/view.config.js",
+        "build:webpack": "webpack --color --config src/config/view.config.js",
         "build:themes": "webpack --color --config src/config/themes.config.js && rm build/__themes.js",
         "build": "npm-run-all build:*",
         "watch": "webpack --color --watch --config src/config/view.config.js",

diff --git a/packages/perspective-viewer/src/config/view.cjs.config.js b/packages/perspective-viewer/src/config/view.cjs.config.js