Skip to content

Commit e6518fb

Browse files
dgrammatikolaoneoHLeithner
authored
[5.0] Drop es5 js files (#39618)
 --------- Co-authored-by: Allon Moritz <[email protected]> Co-authored-by: Harald Leithner <[email protected]>
1 parent 2535bd2 commit e6518fb

File tree

42 files changed

+325
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+325
-465
lines changed

‎administrator/templates/atum/joomla.asset.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@
4848
{
4949
"name": "template.atum-es5",
5050
"description": "The file containing the javascript for this template.",
51+
"deprecated": true,
5152
"type": "script",
52-
"uri": "media/templates/administrator/atum/js/template-es5.min.js",
53+
"uri": "",
5354
"dependencies": [
5455
"core"
5556
],
@@ -64,7 +65,7 @@
6465
"type": "script",
6566
"uri": "media/templates/administrator/atum/js/template.min.js",
6667
"dependencies": [
67-
"template.atum-es5"
68+
"core"
6869
],
6970
"attributes": {
7071
"type": "module"

‎build/build-modules-js/javascript/build-bootstrap-js.es6.js‎

Lines changed: 6 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const rollup = require('rollup');
88
const { nodeResolve } = require('@rollup/plugin-node-resolve');
99
const replace = require('@rollup/plugin-replace');
1010
const { babel } = require('@rollup/plugin-babel');
11-
const commonjs = require('@rollup/plugin-commonjs');
1211
const bsVersion = require('../../../package.json').dependencies.bootstrap.replace(/^\^|~/, '');
1312

1413
const tasks = [];
@@ -48,21 +47,19 @@ const build = async () => {
4847
targets: {
4948
browsers: [
5049
'> 1%',
51-
'not ie 11',
5250
'not op_mini all',
51+
/** https://caniuse.com/es6-module */
52+
'chrome >= 61',
53+
'safari >= 11',
54+
'edge >= 16',
55+
'Firefox >= 60',
5356
],
5457
},
5558
},
5659
],
5760
],
5861
}),
5962
],
60-
external: [
61-
'./base-component.js',
62-
...domImports.map((file) => `./dom/${file}`),
63-
...domImports.map((file) => `./${file}`),
64-
...utilImports.map((file) => `./util/${file}`),
65-
],
6663
manualChunks: {
6764
alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'],
6865
button: ['build/media_source/vendor/bootstrap/js/button.es6.js'],
@@ -95,55 +92,6 @@ const build = async () => {
9592
await bundle.close();
9693
};
9794

98-
const buildLegacy = async () => {
99-
// eslint-disable-next-line no-console
100-
console.log('Building Legacy...');
101-
102-
const bundle = await rollup.rollup({
103-
input: resolve(inputFolder, 'index.es6.js'),
104-
plugins: [
105-
commonjs(),
106-
nodeResolve(),
107-
replace({
108-
preventAssignment: true,
109-
'process.env.NODE_ENV': '\'production\'',
110-
}),
111-
babel({
112-
exclude: 'node_modules/core-js/**',
113-
babelHelpers: 'bundled',
114-
babelrc: false,
115-
presets: [
116-
[
117-
'@babel/preset-env',
118-
{
119-
corejs: '3.8',
120-
useBuiltIns: 'usage',
121-
targets: {
122-
chrome: '58',
123-
ie: '11',
124-
},
125-
loose: true,
126-
bugfixes: true,
127-
modules: false,
128-
},
129-
],
130-
],
131-
}),
132-
],
133-
external: [],
134-
});
135-
136-
await bundle.write({
137-
format: 'iife',
138-
sourcemap: false,
139-
name: 'bootstrap',
140-
file: resolve(outputFolder, 'bootstrap-es5.js'),
141-
});
142-
143-
// closes the bundle
144-
await bundle.close();
145-
};
146-
14795
module.exports.bootstrapJs = async () => {
14896
rimraf.sync(resolve(outputFolder));
14997

@@ -160,23 +108,7 @@ module.exports.bootstrapJs = async () => {
160108
tasks.push(createMinified(file));
161109
});
162110

163-
return Promise.all(tasks).then(async () => {
164-
// eslint-disable-next-line no-console
165-
console.log('✅ ES6 components ready');
166-
167-
try {
168-
await buildLegacy(inputFolder, 'index.es6.js');
169-
const es5File = await readFile(resolve(outputFolder, 'bootstrap-es5.js'), { encoding: 'utf8' });
170-
const mini = await minify(es5File, { sourceMap: false, format: { comments: false } });
171-
await writeFile(resolve(outputFolder, 'bootstrap-es5.min.js'), mini.code, { encoding: 'utf8', mode: 0o644 });
172-
// eslint-disable-next-line no-console
173-
console.log('✅ Legacy done!');
174-
} catch (error) {
175-
// eslint-disable-next-line no-console
176-
console.error(error);
177-
process.exit(1);
178-
}
179-
}).catch((er) => {
111+
return Promise.all(tasks).catch((er) => {
180112
// eslint-disable-next-line no-console
181113
console.log(er);
182114
process.exit(1);

‎build/build-modules-js/javascript/build-com_media-js.es6.js‎

Lines changed: 12 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const { resolve } = require('path');
2-
const { writeFile, copyFile, rm } = require('fs').promises;
3-
const { existsSync } = require('fs');
2+
const { writeFile, copyFile } = require('fs').promises;
43
const rollup = require('rollup');
54
const { nodeResolve } = require('@rollup/plugin-node-resolve');
65
const replace = require('@rollup/plugin-replace');
@@ -13,61 +12,6 @@ require('dotenv').config();
1312
const inputJS = 'administrator/components/com_media/resources/scripts/mediamanager.es6.js';
1413
const isProduction = process.env.NODE_ENV !== 'DEVELOPMENT';
1514

16-
const buildLegacy = async (file) => {
17-
// eslint-disable-next-line no-console
18-
console.log('Building Legacy Media Manager...');
19-
20-
const bundle = await rollup.rollup({
21-
input: file,
22-
plugins: [
23-
nodeResolve(),
24-
commonjs(),
25-
babel({
26-
exclude: 'node_modules/core-js/**',
27-
babelHelpers: 'bundled',
28-
babelrc: false,
29-
presets: [
30-
[
31-
'@babel/preset-env',
32-
{
33-
corejs: '3.8',
34-
useBuiltIns: 'usage',
35-
targets: {
36-
ie: '11',
37-
},
38-
loose: true,
39-
bugfixes: true,
40-
modules: false,
41-
ignoreBrowserslistConfig: true,
42-
},
43-
],
44-
],
45-
}),
46-
],
47-
external: [],
48-
});
49-
50-
await bundle.write({
51-
format: 'iife',
52-
sourcemap: false,
53-
name: 'JoomlaMediaManager',
54-
file: 'media/com_media/js/media-manager-es5.js',
55-
})
56-
.then((value) => minifyJsCode(value.output[0].code))
57-
.then((content) => {
58-
// eslint-disable-next-line no-console
59-
console.log('✅ Legacy Media Manager ready');
60-
return writeFile(resolve('media/com_media/js/media-manager-es5.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
61-
})
62-
.catch((error) => {
63-
// eslint-disable-next-line no-console
64-
console.error(error);
65-
});
66-
67-
// closes the bundle
68-
await bundle.close();
69-
};
70-
7115
module.exports.mediaManager = async () => {
7216
// eslint-disable-next-line no-console
7317
console.log('Building Media Manager ES Module...');
@@ -102,8 +46,12 @@ module.exports.mediaManager = async () => {
10246
targets: {
10347
browsers: [
10448
'> 1%',
105-
'not ie 11',
10649
'not op_mini all',
50+
/** https://caniuse.com/es6-module */
51+
'chrome >= 61',
52+
'safari >= 11',
53+
'edge >= 16',
54+
'Firefox >= 60',
10755
],
10856
},
10957
loose: true,
@@ -126,17 +74,10 @@ module.exports.mediaManager = async () => {
12674
if (isProduction) {
12775
// eslint-disable-next-line no-console
12876
console.log('✅ ES2017 Media Manager ready');
129-
writeFile(resolve('media/com_media/js/media-manager.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
130-
return buildLegacy(resolve('media/com_media/js/media-manager.js'));
77+
return writeFile(resolve('media/com_media/js/media-manager.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
13178
}
13279
// eslint-disable-next-line no-console
13380
console.log('✅ ES2017 Media Manager ready');
134-
if (existsSync(resolve('media/com_media/js/media-manager-es5.js'))) {
135-
rm(resolve('media/com_media/js/media-manager-es5.js'));
136-
}
137-
if (existsSync(resolve('media/com_media/js/media-manager-es5.min.js'))) {
138-
rm(resolve('media/com_media/js/media-manager-es5.min.js'));
139-
}
14081
return copyFile(resolve('media/com_media/js/media-manager.js'), resolve('media/com_media/js/media-manager.min.js'));
14182
})
14283
.catch((error) => {
@@ -149,12 +90,6 @@ module.exports.mediaManager = async () => {
14990
};
15091

15192
module.exports.watchMediaManager = async () => {
152-
if (existsSync(resolve('media/com_media/js/media-manager-es5.js'))) {
153-
rm(resolve('media/com_media/js/media-manager-es5.js'));
154-
}
155-
if (existsSync(resolve('media/com_media/js/media-manager-es5.min.js'))) {
156-
rm(resolve('media/com_media/js/media-manager-es5.min.js'));
157-
}
15893
// eslint-disable-next-line no-console
15994
console.log('Watching Media Manager js+vue files...');
16095
// eslint-disable-next-line no-console
@@ -189,8 +124,12 @@ module.exports.watchMediaManager = async () => {
189124
targets: {
190125
browsers: [
191126
'> 1%',
192-
'not ie 11',
193127
'not op_mini all',
128+
/** https://caniuse.com/es6-module */
129+
'chrome 61',
130+
'safari 11',
131+
'edge 16',
132+
'Firefox 60',
194133
],
195134
},
196135
loose: true,

‎build/build-modules-js/javascript/compile-to-es2017.es6.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const { babel } = require('@rollup/plugin-babel');
1010
const Postcss = require('postcss');
1111
const { renderSync } = require('sass-embedded');
1212
const { minifyJsCode } = require('./minify.es6.js');
13-
const { handleESMToLegacy } = require('./compile-to-es5.es6.js');
1413

1514
const getWcMinifiedCss = async (file) => {
1615
let scssFileExists = false;
@@ -73,8 +72,12 @@ module.exports.handleESMFile = async (file) => {
7372
targets: {
7473
browsers: [
7574
'> 1%',
76-
'not ie 11',
7775
'not op_mini all',
76+
/** https://caniuse.com/es6-module */
77+
'chrome >= 61',
78+
'safari >= 11',
79+
'edge >= 16',
80+
'Firefox >= 60',
7881
],
7982
},
8083
bugfixes: true,
@@ -99,7 +102,6 @@ module.exports.handleESMFile = async (file) => {
99102

100103
return writeFile(resolve(`${newPath}.min.js`), content.code, { encoding: 'utf8', mode: 0o644 });
101104
})
102-
.then(() => handleESMToLegacy(resolve(`${newPath}.js`)))
103105
.catch((error) => {
104106
// eslint-disable-next-line no-console
105107
console.error(error);

‎build/build-modules-js/javascript/compile-to-es5.es6.js‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)