Bump JS dependencies' versions

hmonglee · Sep 16, 2022 · e1e3b26 · e1e3b26
1 parent 4f19c64
commit e1e3b26
Show file tree

Hide file tree

Showing 8 changed files with 3,196 additions and 4,851 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,14 +1,13 @@
 {
   "presets": [
-    ["env", {
+    ["@babel/preset-env", {
       "targets": {
         "node": "6"
-      },
-      "useBuiltIns": true
+      }
     }]
   ],
   "plugins": [
-    ["transform-object-rest-spread", {
+    ["@babel/plugin-proposal-object-rest-spread", {
       "useBuiltIns": true
     }]
   ]

diff --git a/bin/fix-semantic-css b/bin/fix-semantic-css
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CHECK_OS="`uname -s`"
+if [[ "$CHECK_OS" = "Darwin" ]]; then
+sed -i '' 's/;;/;/g' node_modules/semantic-ui-css/semantic.min.css
+sed -i '' 's/;;/;/g' node_modules/semantic-ui-css/semantic.css
+else
+sed -i 's/;;/;/g' node_modules/semantic-ui-css/semantic.min.css
+sed -i 's/;;/;/g' node_modules/semantic-ui-css/semantic.css
+fi
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "babel-polyfill": "^6.26.0",
+    "@babel/polyfill": "^7.0.0",
     "chart.js": "^3.7.1",
     "jquery": "^3.5.0",
     "jquery.dirtyforms": "^2.0.0",
@@ -9,51 +9,53 @@
     "slick-carousel": "^1.8.1"
   },
   "devDependencies": {
-    "@symfony/webpack-encore": "^0.28.0",
-    "babel-core": "^6.26.3",
-    "babel-plugin-external-helpers": "^6.22.0",
-    "babel-plugin-module-resolver": "^3.1.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-register": "^6.26.0",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-external-helpers": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+    "@babel/preset-env": "^7.18.10",
+    "@babel/register": "^7.0.0",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^22.0.2",
+    "@rollup/plugin-inject": "^4.0.4",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@symfony/webpack-encore": "^3.1.0",
+    "babel-plugin-fast-async": "^6.1.2",
+    "babel-plugin-module-resolver": "^4.1.0",
     "dedent": "^0.7.0",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-import": "^2.11.0",
-    "fast-async": "^6.3.7",
-    "gulp": "^4.0.0",
-    "gulp-chug": "^0.5",
-    "gulp-concat": "^2.6.0",
-    "gulp-debug": "^2.1.2",
-    "gulp-if": "^2.0.0",
-    "gulp-livereload": "^4.0.1",
-    "gulp-order": "^1.1.1",
+    "eslint": "^8.23.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-import-resolver-babel-module": "^5.3.1",
+    "eslint-plugin-import": "^2.26.0",
+    "fast-async": "^6.3.8",
+    "gulp": "^4.0.2",
+    "gulp-chug": "^0.5.1",
+    "gulp-concat": "^2.6.1",
+    "gulp-debug": "^4.0.0",
+    "gulp-if": "^3.0.0",
+    "gulp-livereload": "^4.0.2",
+    "gulp-order": "^1.2.0",
     "gulp-sass": "^5.1.0",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-uglifycss": "^1.0.5",
-    "merge-stream": "^1.0.0",
-    "rollup": "^0.66.2",
-    "rollup-plugin-babel": "^3.0.4",
-    "rollup-plugin-commonjs": "^9.1.3",
-    "rollup-plugin-inject": "^2.0.0",
-    "rollup-plugin-node-resolve": "^3.3.0",
-    "rollup-plugin-uglify": "^6.0.2",
-    "sass": "^1.48.0",
-    "sass-loader": "^7.0.1",
-    "upath": "^1.1.0",
-    "yargs": "^6.4.0"
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-uglifycss": "^1.1.0",
+    "merge-stream": "^2.0.0",
+    "rollup": "^2.79.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "sass": "^1.54.8",
+    "sass-loader": "^13.0.0",
+    "upath": "^2.0.1",
+    "yargs": "^17.5.1"
   },
   "engines": {
-    "node": "^14 || ^16"
+    "node": "^14 || ^16 || ^18"
   },
   "engineStrict": true,
   "scripts": {
     "watch": "gulp watch",
     "build": "gulp build",
     "gulp": "gulp build",
     "lint": "yarn lint:js",
-    "lint:js": "eslint gulpfile.babel.js src/Sylius/Bundle/AdminBundle/gulpfile.babel.js src/Sylius/Bundle/ShopBundle/gulpfile.babel.js src/Sylius/Bundle/UiBundle/Resources/private/js src/Sylius/Bundle/AdminBundle/Resources/private/js src/Sylius/Bundle/ShopBundle/Resources/private/js"
+    "lint:js": "eslint gulpfile.babel.js src/Sylius/Bundle/AdminBundle/gulpfile.babel.js src/Sylius/Bundle/ShopBundle/gulpfile.babel.js src/Sylius/Bundle/UiBundle/Resources/private/js src/Sylius/Bundle/AdminBundle/Resources/private/js src/Sylius/Bundle/ShopBundle/Resources/private/js",
+    "postinstall": "./bin/fix-semantic-css"
   },
   "repository": {
     "type": "git",

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-polyfill.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-polyfill.js
@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';
diff --git a/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js b/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js
@@ -1,18 +1,18 @@
 import { rollup } from 'rollup';
-import { uglify } from 'rollup-plugin-uglify';
-import babel from 'rollup-plugin-babel';
-import commonjs from 'rollup-plugin-commonjs';
+import { terser } from 'rollup-plugin-terser';
+import babel from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
 import concat from 'gulp-concat';
 import dedent from 'dedent';
 import gulp from 'gulp';
 import gulpif from 'gulp-if';
 import gulpSass from 'gulp-sass';
-import inject from 'rollup-plugin-inject';
+import inject from '@rollup/plugin-inject';
 import livereload from 'gulp-livereload';
 import merge from 'merge-stream';
 import order from 'gulp-order';
 import realSass from 'sass';
-import resolve from 'rollup-plugin-node-resolve';
+import resolve from '@rollup/plugin-node-resolve';
 import sourcemaps from 'gulp-sourcemaps';
 import uglifycss from 'gulp-uglifycss';
 import upath from 'upath';
@@ -147,7 +147,7 @@ export const buildAdminJs = async function buildAdminJs() {
         babelrc: false,
         exclude: `${nodeModulesPath}/**`,
         presets: [
-          ['env', {
+          ['@babel/preset-env', {
             targets: {
               browsers: [
                 'last 2 versions',
@@ -161,24 +161,22 @@ export const buildAdminJs = async function buildAdminJs() {
             exclude: [
               'transform-async-to-generator',
               'transform-regenerator',
-            ],
-            useBuiltIns: true,
+            ]
           }],
         ],
         plugins: [
-          ['external-helpers'],
           ['fast-async'],
           ['module-resolver', {
             alias: {
               'sylius/ui': upath.relative('', upath.joinSafe(vendorUiPath, 'Resources/private/js')),
             },
           }],
-          ['transform-object-rest-spread', {
+          ['@babel/plugin-proposal-object-rest-spread', {
             useBuiltIns: false,
           }],
         ],
       }),
-      options.minify && uglify(),
+      options.minify && terser(),
     ],
     treeshake: false,
   });

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-polyfill.js b/src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-polyfill.js
@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';
diff --git a/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js b/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js
@@ -1,18 +1,18 @@
 import { rollup } from 'rollup';
-import { uglify } from 'rollup-plugin-uglify';
-import babel from 'rollup-plugin-babel';
-import commonjs from 'rollup-plugin-commonjs';
+import { terser } from 'rollup-plugin-terser';
+import babel from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
 import concat from 'gulp-concat';
 import dedent from 'dedent';
 import gulp from 'gulp';
 import gulpif from 'gulp-if';
 import gulpSass from 'gulp-sass';
-import inject from 'rollup-plugin-inject';
+import inject from '@rollup/plugin-inject';
 import livereload from 'gulp-livereload';
 import merge from 'merge-stream';
 import order from 'gulp-order';
 import realSass from 'sass';
-import resolve from 'rollup-plugin-node-resolve';
+import resolve from '@rollup/plugin-node-resolve';
 import sourcemaps from 'gulp-sourcemaps';
 import uglifycss from 'gulp-uglifycss';
 import upath from 'upath';
@@ -151,7 +151,7 @@ export const buildShopJs = async function buildShopJs() {
         babelrc: false,
         exclude: `${nodeModulesPath}/**`,
         presets: [
-          ['env', {
+          ['@babel/preset-env', {
             targets: {
               browsers: [
                 'last 2 versions',
@@ -165,24 +165,22 @@ export const buildShopJs = async function buildShopJs() {
             exclude: [
               'transform-async-to-generator',
               'transform-regenerator',
-            ],
-            useBuiltIns: true,
+            ]
           }],
         ],
         plugins: [
-          ['external-helpers'],
           ['fast-async'],
           ['module-resolver', {
             alias: {
               'sylius/ui': upath.relative('', upath.joinSafe(vendorUiPath, 'Resources/private/js')),
             },
           }],
-          ['transform-object-rest-spread', {
+          ['@babel/plugin-proposal-object-rest-spread', {
             useBuiltIns: false,
           }],
         ],
       }),
-      options.minify && uglify(),
+      options.minify && terser(),
     ],
     treeshake: false,
   });
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import 'babel-polyfill';
		import '@babel/polyfill';