working!

fabricjs · Jan 31, 2023 · 46eb9fd · 46eb9fd
1 parent a1534c4
commit 46eb9fd
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 64 deletions.
diff --git a/index.ts b/index.ts
@@ -1,3 +1,3 @@
 import './src/env/browser';
 
-export * as default from './fabric';
+export * from './fabric';
diff --git a/node.ts b/node.ts
@@ -1,3 +1,3 @@
 import './src/env/node';
 
-export * as default from './fabric';
+export * from './fabric';
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "module": "./dist/fabric.js",
-  "main": "./dist/fabric.umd.js",
+  "module": "./dist/fabric.mjs",
+  "main": "./dist/fabric.cjs",
   "types": "./dist/fabric.d.ts"
 }
diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -2,92 +2,77 @@ import json from '@rollup/plugin-json';
 import terser from '@rollup/plugin-terser';
 import ts from '@rollup/plugin-typescript';
 import { babel } from '@rollup/plugin-babel';
+import path from 'path';
 // import dts from "rollup-plugin-dts";
 
 const splitter = /\n|\s|,/g;
 
+const outputFilePath = process.env.BUILD_OUTPUT || './dist/fabric.js';
+
+const dirname = path.dirname(outputFilePath);
+const basename = path.basename(outputFilePath, '.js');
+
+const plugins = [
+  json(),
+  ts({
+    noForceEmit: true,
+    tsconfig: './tsconfig.json',
+  }),
+  babel({
+    extensions: ['.ts', '.js'],
+    babelHelpers: 'bundled',
+  }),
+];
+
 // https://rollupjs.org/guide/en/#configuration-files
 export default [
   {
     input: process.env.BUILD_INPUT?.split(splitter) || ['./index.ts'],
     output: [
       {
-        file: process.env.BUILD_OUTPUT || './dist/fabric.umd.js',
+        file: path.resolve(dirname, `${basename}.mjs`),
+        name: 'fabric',
+        format: 'es',
+        sourcemap: true,
+      },
+      {
+        file: path.resolve(dirname, `${basename}.cjs`),
         name: 'fabric',
         format: 'umd',
         sourcemap: true,
       },
       Number(process.env.MINIFY)
         ? {
-            file: process.env.BUILD_MIN_OUTPUT || './dist/fabric.umd.min.js',
+            file: path.resolve(dirname, `${basename}.min.js`),
             name: 'fabric',
             format: 'umd',
             plugins: [terser()],
           }
         : null,
     ],
-    plugins: [
-      json(),
-      ts({
-        noForceEmit: true,
-        tsconfig: './tsconfig.json',
-      }),
-      babel({
-        extensions: ['.ts', '.js'],
-        babelHelpers: 'bundled',
-      }),
-    ],
+    plugins,
   },
   {
-    input: process.env.BUILD_INPUT?.split(splitter) || ['./fabric.ts'],
+    input: ['./node.ts'],
     output: [
       {
-        file: process.env.BUILD_OUTPUT || './dist/fabric.js',
+        file: path.resolve(dirname, `${basename}.node.mjs`),
         name: 'fabric',
         format: 'es',
         sourcemap: true,
       },
-    ],
-    plugins: [
-      json(),
-      ts({
-        noForceEmit: true,
-        tsconfig: './tsconfig.json',
-      }),
-      babel({
-        extensions: ['.ts', '.js'],
-        babelHelpers: 'bundled',
-      }),
-    ],
-  },
-  {
-    input: ['./node.ts'],
-    output: [
       {
-        file: './dist/fabric.node.js',
+        file: path.resolve(dirname, `${basename}.node.cjs`),
         name: 'fabric',
-        format: 'umd',
+        format: 'cjs',
         sourcemap: true,
       },
-      Number(process.env.MINIFY)
-        ? {
-            file: './dist/fabric.node.min.js',
-            name: 'fabric',
-            format: 'umd',
-            plugins: [terser()],
-          }
-        : null,
     ],
-    plugins: [
-      json(),
-      ts({
-        noForceEmit: true,
-        tsconfig: './tsconfig.json',
-      }),
-      babel({
-        extensions: ['.ts', '.js'],
-        babelHelpers: 'bundled',
-      }),
+    plugins,
+    external: [
+      'jsdom',
+      'jsdom/lib/jsdom/living/generated/utils',
+      'jsdom/lib/jsdom/utils',
     ],
   },
 ];
diff --git a/scripts/build.mjs b/scripts/build.mjs
@@ -32,13 +32,6 @@ export function build({ watch, fast, input, output, stats = false } = {}) {
       MINIFY: Number(!fast),
       BUILD_INPUT: Array.isArray(input) ? input.join(' ') : input,
       BUILD_OUTPUT: output,
-      BUILD_MIN_OUTPUT:
-        output && !fast
-          ? path.resolve(
-              path.dirname(output),
-              `${path.basename(output, '.js')}.min.js`
-            )
-          : undefined,
       BUILD_STATS: Number(stats),
     },
   };

diff --git a/test/node_test_setup.js b/test/node_test_setup.js
@@ -25,7 +25,7 @@ QUnit.recreateVisualRefs = Number(process.env.QUNIT_RECREATE_VISUAL_REFS);
 QUnit.config.filter = process.env.QUNIT_FILTER;
 
 
-global.fabric = require('../dist/fabric.node');
+global.fabric = require('../dist/fabric.node.cjs');
 global.pixelmatch = require('pixelmatch');
 global.fs = require('fs');
 global.visualCallback = {

diff --git a/test/testem.config.js b/test/testem.config.js
@@ -6,7 +6,7 @@
 module.exports = {
   framework: 'qunit',
   serve_files: [
-    'dist/fabric.umd.js',
+    'dist/fabric.cjs',
     'test/lib/assert.js'
   ],
   styles: [