Skip to content
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.

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

feat: fetch latest NPM package version except of hardcoding those values #161

Merged
merged 5 commits into from
Apr 8, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/schematics/library-versions.ts

This file was deleted.

25 changes: 25 additions & 0 deletions src/schematics/ng-add/dependencies.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { NodeDependencyType, NodeDependency } from '@schematics/angular/utility/dependencies';

export function getSingleSpaAngularDependency(): NodeDependency {
return {
name: 'single-spa-angular',
version: require('../../../package.json').version,
overwrite: false,
type: NodeDependencyType.Default,
};
}

/**
* We have to install `@angular-builders/custom-webpack` version compatible with the current
* version of Angular. If Angular is 8 then `custom-webpack@8.4.1` has to be installed.
*/
export function getAngularBuildersCustomWebpackDependency(): NodeDependency {
const { VERSION } = require('@angular/core');

return {
name: '@angular-builders/custom-webpack',
version: `^${VERSION.major}`,
overwrite: false,
type: NodeDependencyType.Dev,
};
}
10 changes: 9 additions & 1 deletion src/schematics/ng-add/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,22 @@ describe('ng-add', () => {
expect(tree.files).toBeDefined();
});

test('should add single-spa dependency', async () => {
test('should add single-spa to dependencies', async () => {
const tree = await testRunner
.runSchematicAsync<NgAddOptions>('ng-add', {}, defaultAppTree)
.toPromise();
const packageJSON = JSON.parse(getFileContent(tree, '/package.json'));
expect(packageJSON.dependencies['single-spa-angular']).toBeDefined();
});

test('should add @angular-builders/custom-webpack to devDependencies', async () => {
const tree = await testRunner
.runSchematicAsync<NgAddOptions>('ng-add', {}, defaultAppTree)
.toPromise();
const packageJSON = JSON.parse(getFileContent(tree, '/package.json'));
expect(packageJSON.devDependencies['@angular-builders/custom-webpack']).toBeDefined();
});

test('should add main-single-spa.ts', async () => {
const tree = await testRunner
.runSchematicAsync<NgAddOptions>('ng-add', {}, defaultAppTree)
Expand Down
30 changes: 17 additions & 13 deletions src/schematics/ng-add/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ import {
applyTemplates,
SchematicsException,
} from '@angular-devkit/schematics';
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';

import { getWorkspace, getWorkspacePath } from '@schematics/angular/utility/config';
import { normalize, join } from 'path';
import { addPackageJsonDependency, NodeDependency } from '@schematics/angular/utility/dependencies';
import { WorkspaceProject, Builders, BrowserBuilderOptions } from '@schematics/angular/utility/workspace-models';

import { normalize, join } from 'path';

import { Schema as NgAddOptions } from './schema';
import * as versions from '../library-versions';
import { addPackageToPackageJson } from '../utils';
import { getSingleSpaAngularDependency, getAngularBuildersCustomWebpackDependency } from './dependencies';

interface CustomWebpackBuilderOptions extends BrowserBuilderOptions {
customWebpackConfig: {
Expand All @@ -28,22 +29,25 @@ interface CustomWebpackBuilderOptions extends BrowserBuilderOptions {

export default function (options: NgAddOptions): Rule {
return chain([
addDependencies(options),
addDependencies(),
createMainEntry(options),
updateConfiguration(options),
addNPMScripts(options),
]);
}

export function addDependencies(options: NgAddOptions) {
return (host: Tree, context: SchematicContext) => {
addPackageToPackageJson(host, 'single-spa-angular', versions.singleSpaAngular);
if (atLeastAngular8()) {
addPackageToPackageJson(host, '@angular-builders/custom-webpack', versions.angularBuilderCustomWebpack);
export function addDependencies(): Rule {
const dependencies: NodeDependency[] = [
getSingleSpaAngularDependency(),
getAngularBuildersCustomWebpackDependency(),
];

return (tree: Tree, context: SchematicContext) => {
for (const dependency of dependencies) {
addPackageJsonDependency(tree, dependency);
context.logger.info(`Added '${dependency.name}' as a dependency`);
}
context.addTask(new NodePackageInstallTask());
context.logger.info(`Added 'single-spa-angular' as a dependency`);
}
};
}

export function createMainEntry(options: NgAddOptions): Rule {
Expand Down
31 changes: 0 additions & 31 deletions src/schematics/utils.ts

This file was deleted.