Skip to content

Feature: Migrate to v11 finished #11

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Feature: Migrate to v11 finished #11

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
190f982
migration to v11
paulbuechner Jan 25, 2021
787f3a2
try solving issues
paulbuechner Jan 25, 2021
4a571f4
updated postcss-loader @4.2.0
paulbuechner Jan 26, 2021
24caeb5
Ivy compilation added
paulbuechner Jan 26, 2021
d6db29c
formatting/restructuring
paulbuechner Jan 26, 2021
44d013e
Ivy compilation for extra-webpack-plain added
paulbuechner Jan 26, 2021
b56bcec
Merge pull request #9 from paulbuechner/migration
gquinteros93 Mar 15, 2021
3800543
CSS modules working in Angular Version 11
gquinteros93 Mar 16, 2021
3cefb04
npm audit fix
gquinteros93 Dec 28, 2021
217c880
Finish Angular 11 Migration
gquinteros93 Dec 28, 2021
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
0 browserslist → .browserslistrc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion e2e/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down
12 changes: 6 additions & 6 deletions extra-webpack-plain.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');
const AngularCompilerPlugin = require('@ngtools/webpack');
const AngularWebpackPlugin = require('@ngtools/webpack/src/ivy/plugin');

module.exports = (config, options) => {
module.exports = (config, _) => {

/* HTML EXTEND */
config.module.rules.unshift(
Expand All @@ -21,10 +21,10 @@ module.exports = (config, options) => {
},
);

const index = config.plugins.findIndex(p => p instanceof AngularCompilerPlugin.AngularCompilerPlugin);
const oldOptions = config.plugins[index]._options;
const index = config.plugins.findIndex(p => p instanceof AngularWebpackPlugin.AngularWebpackPlugin);
const oldOptions = config.plugins[index].pluginOptions;
oldOptions.directTemplateLoading = false;
config.plugins.splice(index);
config.plugins.push(new AngularCompilerPlugin.AngularCompilerPlugin(oldOptions));
config.plugins.push(new AngularWebpackPlugin.AngularWebpackPlugin(oldOptions));
return config;
};
};
19 changes: 9 additions & 10 deletions extra-webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
const postcssModules = require('postcss-modules');
const path = require('path');
const AngularCompilerPlugin = require('@ngtools/webpack');

const AngularWebpackPlugin = require('@ngtools/webpack/src/ivy/plugin');

module.exports = (config, options) => {

/* SCSS EXTEND */
const scssRule = config.module.rules.find(x => x.test.toString().includes('scss'));
const postcssLoader = scssRule.use.find(x => x.loader.toString().includes('postcss-loader'));
const pluginFunc = postcssLoader.options.plugins;
const pluginFunc = postcssLoader.options.postcssOptions;
const newPluginFunc = function () {
var plugs = pluginFunc.apply(this, arguments);
plugs.splice(plugs.length - 1, 0, postcssModules({ generateScopedName: "[hash:base64:5]" }));
plugs.plugins.splice(plugs.plugins.length - 1, 0, postcssModules({ generateScopedName: "[hash:base64:5]" }));
return plugs;
}
postcssLoader.options.plugins = newPluginFunc;
postcssLoader.options.postcssOptions = newPluginFunc;

/* HTML EXTEND */

config.module.rules.unshift(
{
test: /\.html$/,
use:(info) => {
use:(info) => {
return [
{ loader: 'raw-loader' },
{
Expand All @@ -47,10 +46,10 @@ module.exports = (config, options) => {
},
);

const index = config.plugins.findIndex(p => p instanceof AngularCompilerPlugin.AngularCompilerPlugin);
const oldOptions = config.plugins[index]._options;
const index = config.plugins.findIndex(p => p instanceof AngularWebpackPlugin.AngularWebpackPlugin);
const oldOptions = config.plugins[index].pluginOptions;
oldOptions.directTemplateLoading = false;
config.plugins.splice(index);
config.plugins.push(new AngularCompilerPlugin.AngularCompilerPlugin(oldOptions));
config.plugins.push(new AngularWebpackPlugin.AngularWebpackPlugin(oldOptions));
return config;
};
};
Loading