Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Maintenance] Update JS dependencies #14319

Merged
merged 3 commits into from
Sep 20, 2022
Merged

[Maintenance] Update JS dependencies #14319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1e3b26
Bump JS dependencies' versions
jakubtobiasz Sep 5, 2022
3352a85
Update node versions used for testing
jakubtobiasz Sep 16, 2022
344de36
Replace custom script fixing semantic with @semantic-ui-react/css-patch
jakubtobiasz Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}]
]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ jobs:
run: |
curl -sS https://get.symfony.com/cli/installer | bash
mv /home/runner/.symfony5/bin/symfony /usr/local/bin/symfony

-
name: Restrict Symfony version
if: matrix.symfony != ''
Expand Down Expand Up @@ -387,7 +387,7 @@ jobs:
run: |
curl -sS https://get.symfony.com/cli/installer | bash
mv /home/runner/.symfony5/bin/symfony /usr/local/bin/symfony

-
name: Restrict Symfony version
if: matrix.symfony != ''
Expand Down Expand Up @@ -659,7 +659,7 @@ jobs:
matrix:
php: ["8.0", "8.1"]
symfony: ["^5.4"]
node: ["14.x", "16.x"]
node: ["16.x", "18.x"]
mysql: ["5.7", "8.0"]

env:
Expand Down Expand Up @@ -819,8 +819,8 @@ jobs:
matrix:
php: ["8.0", "8.1"]
symfony: ["^5.4"]
node: ["14.x", "16.x"]
mysql: [ "5.7", "8.0" ]
node: ["16.x", "18.x"]
mysql: [ "5.7", "8.0" ]

env:
APP_ENV: test_cached
Expand Down
73 changes: 38 additions & 35 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -9,51 +9,54 @@
"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",
"@semantic-ui-react/css-patch": "^1.1.2",
"@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": "semantic-ui-css-patch"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-polyfill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import 'babel-polyfill';
import '@babel/polyfill';
20 changes: 9 additions & 11 deletions src/Sylius/Bundle/AdminBundle/gulpfile.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -147,7 +147,7 @@ export const buildAdminJs = async function buildAdminJs() {
babelrc: false,
exclude: `${nodeModulesPath}/**`,
presets: [
['env', {
['@babel/preset-env', {
targets: {
browsers: [
'last 2 versions',
Expand All @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-polyfill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import 'babel-polyfill';
import '@babel/polyfill';
20 changes: 9 additions & 11 deletions src/Sylius/Bundle/ShopBundle/gulpfile.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -151,7 +151,7 @@ export const buildShopJs = async function buildShopJs() {
babelrc: false,
exclude: `${nodeModulesPath}/**`,
presets: [
['env', {
['@babel/preset-env', {
targets: {
browsers: [
'last 2 versions',
Expand All @@ -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,
});
Expand Down