Skip to content

fix(ng-add): fix v8 import #189

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

Merged
jorgeucano merged 2 commits into from
Jan 17, 2020
Merged

fix(ng-add): fix v8 import #189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32db507
fix(ng-add): fix v8 import
jorgeucano Jan 16, 2020
71a1553
feat(ng-add): change the lib 8 to v8
jorgeucano Jan 17, 2020
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
12 changes: 8 additions & 4 deletions schematics/scully/src/ng-add/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ export default (options: Schema): Rule => {
runScullySchematic(options),
]);
};

const addDependencies = () => (tree: Tree, context: SchematicContext) => {
addPackageToPackageJson(tree, '@scullyio/scully', `${scullyVersion}`);
const ngCoreVersionTag = getPackageVersionFromPackageJson(tree, '@angular/core');
if (+ngCoreVersionTag.search(/(\^8|~8)/g) === 0) {
context.logger.info('Install ng-lib for Angular v8');
addPackageToPackageJson(tree, '@scullyio/ng-lib-8', `${scullyComponentVersion}`);
addPackageToPackageJson(tree, '@scullyio/ng-lib-v8', `${scullyComponentVersion}`);
} else {
context.logger.info('Install ng-lib for Angular v9');
addPackageToPackageJson(tree, '@scullyio/ng-lib', `${scullyComponentVersion}`);
Expand Down Expand Up @@ -97,9 +96,14 @@ const injectIdleService = () => (tree: Tree, context: SchematicContext) => {
if (appComponent.includes('IdleMonitorService')) {
context.logger.info(`⚠️️ Skipping ${appComponentPath}`);
} else {
const idleImport = `import {IdleMonitorService} from '@scullyio/ng-lib';`;
const ngCoreVersionTag = getPackageVersionFromPackageJson(tree, '@angular/core');
let v8 = '';
if (+ngCoreVersionTag.search(/(\^8|~8)/g) === 0) {
v8 = '-v8';
}
const idleImport = `import {IdleMonitorService} from '@scullyio/ng-lib${v8}';`;
// add
const idImport = `${idleImport} \n ${appComponent}`;
const idImport = `${idleImport}\n${appComponent}`;
const idle = 'private idle: IdleMonitorService';
let output = '';
// check if exist
Expand Down