Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions ibexa/commerce/5.0/encore/ibexa.webpack.config.js

This file was deleted.

5 changes: 4 additions & 1 deletion ibexa/commerce/5.0/encore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
"dev-server": "encore dev-server",
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress"
"build": "encore production --progress",
"ibexa:dev": "encore dev --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs",
"ibexa:watch": "encore dev --watch --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs",
"ibexa:build": "encore production --progress --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs"
},
"packageManager": "[email protected]"
}
54 changes: 21 additions & 33 deletions ibexa/commerce/5.0/encore/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
const path = require('path');
const fs = require('fs');

const path = require('path');
const Encore = require('@symfony/webpack-encore');
const getIbexaConfig = require('@ibexa/frontend-config/webpack-config');
const getCustomConfigs = require('@ibexa/frontend-config/webpack-config/custom');

const bundles = require('./var/encore/ibexa.config.js');
const managers = require('./var/encore/ibexa.config.manager.js');
const setups = require('./var/encore/ibexa.config.setup.js');
const getWebpackConfigs = require('@ibexa/frontend-config/webpack-config/get-configs');
const customConfigsPaths = require('./var/encore/ibexa.webpack.custom.config.js');

const ibexaConfig = getIbexaConfig(Encore, {
bundles,
managers,
setups
});
const customConfigs = getCustomConfigs(Encore, customConfigsPaths);
const customConfigs = getWebpackConfigs(Encore, customConfigsPaths);
const isReactBlockPathCreated = fs.existsSync('./assets/page-builder/react/blocks');

Encore.reset();
Encore.setOutputPath('public/build/')
Encore
.setOutputPath('public/build/')
.setPublicPath('/build')
.enableSassLoader()
.enableReactPreset((options) => {
Expand All @@ -31,32 +21,30 @@ Encore.setOutputPath('public/build/')
to: 'images/[path][name].[ext]',
pattern: /\.(png|svg)$/,
})

// enables @babel/preset-env polyfills
.configureBabelPresetEnv((config) => {
config.useBuiltIns = 'usage';
config.corejs = 3;
});

// Welcome page stylesheets
Encore.addEntry('welcome-page-css', [
path.resolve(__dirname, './assets/scss/welcome-page.scss'),
]);
// Welcome page stylesheets
Encore.addEntry('welcome-page-css', [
path.resolve(__dirname, './assets/scss/welcome-page.scss'),
]);

// Welcome page javascripts
Encore.addEntry('welcome-page-js', [
path.resolve(__dirname, './assets/js/welcome.page.js'),
]);
// Welcome page javascripts
Encore.addEntry('welcome-page-js', [
path.resolve(__dirname, './assets/js/welcome.page.js'),
]);

if (isReactBlockPathCreated) {
// React Blocks javascript
Encore.addEntry('react-blocks-js', './assets/js/react.blocks.js');
}
if (isReactBlockPathCreated) {
// React Blocks javascript
Encore.addEntry('react-blocks-js', './assets/js/react.blocks.js');
}

Encore.addEntry('app', './assets/app.js');
Encore.addEntry('app', './assets/app.js');

const projectConfig = Encore.getWebpackConfig();
const projectConfig = Encore.getWebpackConfig();

projectConfig.name = 'app';
projectConfig.name = 'app';

module.exports = [ibexaConfig, ...customConfigs, projectConfig];
module.exports = [...customConfigs, projectConfig];
3 changes: 2 additions & 1 deletion ibexa/commerce/5.0/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
"yarn ibexa-generate-tsconfig": "script",
"ibexa:encore:compile --config-name app": "symfony-cmd",
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
"ibexa:encore:compile": "symfony-cmd"
"ibexa:encore:compile": "symfony-cmd",
"ibexa:encore:compile --frontend-configs-name ibexa,internals,libs,richtext": "symfony-cmd"
}
}
60 changes: 0 additions & 60 deletions ibexa/experience/5.0/encore/ibexa.webpack.config.js

This file was deleted.

6 changes: 5 additions & 1 deletion ibexa/experience/5.0/encore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
"dev-server": "encore dev-server",
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress"
"build": "encore production --progress",
"ibexa:dev": "encore dev --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs",
"ibexa:watch": "encore dev --watch --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs",
"ibexa:build": "encore production --progress --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs"
},
"packageManager": "[email protected]"
}

54 changes: 21 additions & 33 deletions ibexa/experience/5.0/encore/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
const path = require('path');
const fs = require('fs');

const path = require('path');
const Encore = require('@symfony/webpack-encore');
const getIbexaConfig = require('@ibexa/frontend-config/webpack-config');
const getCustomConfigs = require('@ibexa/frontend-config/webpack-config/custom');

const bundles = require('./var/encore/ibexa.config.js');
const managers = require('./var/encore/ibexa.config.manager.js');
const setups = require('./var/encore/ibexa.config.setup.js');
const getWebpackConfigs = require('@ibexa/frontend-config/webpack-config/get-configs');
const customConfigsPaths = require('./var/encore/ibexa.webpack.custom.config.js');

const ibexaConfig = getIbexaConfig(Encore, {
bundles,
managers,
setups
});
const customConfigs = getCustomConfigs(Encore, customConfigsPaths);
const customConfigs = getWebpackConfigs(Encore, customConfigsPaths);
const isReactBlockPathCreated = fs.existsSync('./assets/page-builder/react/blocks');

Encore.reset();
Encore.setOutputPath('public/build/')
Encore
.setOutputPath('public/build/')
.setPublicPath('/build')
.enableSassLoader()
.enableReactPreset((options) => {
Expand All @@ -31,32 +21,30 @@ Encore.setOutputPath('public/build/')
to: 'images/[path][name].[ext]',
pattern: /\.(png|svg)$/,
})

// enables @babel/preset-env polyfills
.configureBabelPresetEnv((config) => {
config.useBuiltIns = 'usage';
config.corejs = 3;
});

// Welcome page stylesheets
Encore.addEntry('welcome-page-css', [
path.resolve(__dirname, './assets/scss/welcome-page.scss'),
]);
// Welcome page stylesheets
Encore.addEntry('welcome-page-css', [
path.resolve(__dirname, './assets/scss/welcome-page.scss'),
]);

// Welcome page javascripts
Encore.addEntry('welcome-page-js', [
path.resolve(__dirname, './assets/js/welcome.page.js'),
]);
// Welcome page javascripts
Encore.addEntry('welcome-page-js', [
path.resolve(__dirname, './assets/js/welcome.page.js'),
]);

if (isReactBlockPathCreated) {
// React Blocks javascript
Encore.addEntry('react-blocks-js', './assets/js/react.blocks.js');
}
if (isReactBlockPathCreated) {
// React Blocks javascript
Encore.addEntry('react-blocks-js', './assets/js/react.blocks.js');
}

Encore.addEntry('app', './assets/app.js');
Encore.addEntry('app', './assets/app.js');

const projectConfig = Encore.getWebpackConfig();
const projectConfig = Encore.getWebpackConfig();

projectConfig.name = 'app';
projectConfig.name = 'app';

module.exports = [ibexaConfig, ...customConfigs, projectConfig];
module.exports = [...customConfigs, projectConfig];
3 changes: 2 additions & 1 deletion ibexa/experience/5.0/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
"yarn ibexa-generate-tsconfig": "script",
"ibexa:encore:compile --config-name app": "symfony-cmd",
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
"ibexa:encore:compile": "symfony-cmd"
"ibexa:encore:compile": "symfony-cmd",
"ibexa:encore:compile --frontend-configs-name ibexa,internals,libs,richtext": "symfony-cmd"
}
}
60 changes: 0 additions & 60 deletions ibexa/headless/5.0/encore/ibexa.webpack.config.js

This file was deleted.

5 changes: 4 additions & 1 deletion ibexa/headless/5.0/encore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
"dev-server": "encore dev-server",
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress"
"build": "encore production --progress",
"ibexa:dev": "encore dev --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs",
"ibexa:watch": "encore dev --watch --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs",
"ibexa:build": "encore production --progress --config ./node_modules/@ibexa/frontend-config/ibexa.webpack.${configName:-all}.configs"
},
"packageManager": "[email protected]"
}
Loading