Merge pull request jonobr1#424 from adroitwhiz/update-deps

Update/trim dependencies
elShiaLabeouf · Dec 8, 2019 · e81d8ae · e81d8ae
2 parents 708e202 + ce504f4
commit e81d8ae
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -51,15 +51,13 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "animation-frame": "^0.1.7",
-    "blueimp-canvas-to-blob": "^2.1.0",
+    "@node-minify/core": "^5.2.1",
+    "@node-minify/google-closure-compiler": "^5.2.1",
+    "@node-minify/no-compress": "^5.2.0",
     "eslint": "^6.7.2",
     "jsdoc": "~3.5.5",
-    "jsdoc-to-markdown": "^4.0.1",
-    "moment": "^2.22.2",
-    "node-minify": "^2.0.3",
-    "qunitjs": "^2.4.0",
-    "resemblejs": "^1.1.1",
+    "qunit": "^2.9.3",
+    "resemblejs": "^3.2.3",
     "underscore": "^1.9.1"
   },
   "autoupdate": {

diff --git a/tests/index.html b/tests/index.html
@@ -3,16 +3,15 @@
   <head>
     <meta charset="utf-8">
     <title>Two.js Tests</title>
-    <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css">
+    <link rel="stylesheet" href="../node_modules/qunit/qunit/qunit.css">
   </head>
   <body>
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
     <div class="scripts">
 
       <script src="../node_modules/resemblejs/resemble.js"></script>
-      <script src="../node_modules/blueimp-canvas-to-blob/js/canvas-to-blob.js"></script>
-      <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
+      <script src="../node_modules/qunit/qunit/qunit.js"></script>
       <script src="../node_modules/underscore/underscore.js"></script>
 
       <!-- <script src="../build/two.js"></script> -->

diff --git a/tests/noWebGL.html b/tests/noWebGL.html
@@ -3,16 +3,15 @@
   <head>
     <meta charset="utf-8">
     <title>Two.js Tests sans WebGL</title>
-    <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css">
+    <link rel="stylesheet" href="../node_modules/qunit/qunit/qunit.css">
   </head>
   <body>
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
     <div class="scripts">
 
       <script src="../node_modules/resemblejs/resemble.js"></script>
-      <script src="../node_modules/blueimp-canvas-to-blob/js/canvas-to-blob.js"></script>
-      <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
+      <script src="../node_modules/qunit/qunit/qunit.js"></script>
       <script src="../node_modules/underscore/underscore.js"></script>
 
       <script src="../build/two.js"></script>

diff --git a/utils/build.js b/utils/build.js
@@ -1,10 +1,12 @@
 // https://npmjs.org/package/node-minify
 
 var path = require('path');
-var compressor = require('node-minify');
 var _ = require('underscore');
 var fs = require('fs');
-var moment = require('moment');
+
+var minify = require('@node-minify/core');
+var noCompress = require('@node-minify/no-compress');
+var gcc = require('@node-minify/google-closure-compiler');
 
 var files = [
   path.resolve(__dirname, './start-comment.js'),
@@ -39,8 +41,8 @@ var files = [
 ];
 
 // Concatenated
-compressor.minify({
-  compressor: 'no-compress',
+minify({
+  compressor: noCompress,
   input: files,
   output: path.resolve(__dirname, '../build/two.js'),
   callback: function(e) {
@@ -53,15 +55,15 @@ compressor.minify({
       });
       var template = _.template(source);
       source = template({
-        publishDate: moment().format()
+        publishDate: (new Date()).toISOString()
       });
       fs.writeFileSync(path.resolve(__dirname, '../build/two.js'), source, {
         encoding: 'utf-8'
       });
 
       // Minified
-      compressor.minify({
-        compressor: 'gcc',
+      minify({
+        compressor: gcc,
         input: path.resolve(__dirname, '../build/two.js'),
         output: path.resolve(__dirname, '../build/two.min.js'),
         callback: function(e) {
@@ -73,8 +75,8 @@ compressor.minify({
         }
       });
 
-      compressor.minify({
-        compressor: 'no-compress',
+      minify({
+        compressor: noCompress,
         input: [
           path.resolve(__dirname, '../build/two.js'),
           path.resolve(__dirname, './exports.js')