Skip to content

Commit 91b78e7

Browse files
Domainvvalorkin
authored andcommitted
feat(css): update bootstrap css to latest (#4999)
* update: update bootstrap css to latest * fix(schematics): add only tested ver of bootstrap css
1 parent d338dbf commit 91b78e7

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"@types/node": "10.0.8",
109109
"@types/tapable": "1.0.2",
110110
"@types/webpack": "4.1.6",
111-
"bootstrap": "4.1.1",
111+
"bootstrap": "4.2.1",
112112
"chai": "4.1.2",
113113
"classlist-polyfill": "1.2.0",
114114
"codecov": "3.1.0",

schematics/src/ng-add/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ import { hasNgModuleImport } from '../utils/ng-module-imports';
2626

2727
const bootstrapStylePath = `./node_modules/bootstrap/dist/css/bootstrap.min.css`;
2828
const datePickerStylePath = `./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css`;
29+
const datepickerComponentName = 'datepicker';
2930

3031
/* tslint:disable-next-line: no-default-export */
3132
export default function (options: Schema): Rule {
3233
return chain([
3334
addPackageJsonDependencies(),
3435
installPackageJsonDependencies(),
35-
!options.component || options.component === 'datepicker'
36+
!options.component || options.component === datepickerComponentName
3637
? addStyles(options, insertCommonStyles)
3738
: addStyles(options, insertBootstrapStyles),
3839
options.component
@@ -88,12 +89,12 @@ function addModuleOfComponent(projectName: string | undefined, componentName: st
8889
function addPackageJsonDependencies(): Rule {
8990
return (host: Tree, context: SchematicContext) => {
9091
const dependencies: { name: string; version: string }[] = [
91-
{ name: 'bootstrap', version: '4.1.1' },
92-
{ name: 'ngx-bootstrap', version: '3.0.1' }
92+
{ name: 'bootstrap', version: '4.2.1' },
93+
{ name: 'ngx-bootstrap', version: '^3.1.4' }
9394
];
9495

9596
dependencies.forEach(dependency => {
96-
addPackageToPackageJson(host, dependency.name, `^${dependency.version}`);
97+
addPackageToPackageJson(host, dependency.name, `${dependency.version}`);
9798
context.logger.log('info', `✅️ Added "${dependency.name}`);
9899
});
99100

0 commit comments

Comments
 (0)