Skip to content

Commit c30afa6

Browse files
committed
fix(package): improved the schematics of the library
1 parent b6d1e02 commit c30afa6

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

gulpfile.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ gulp.task('build', ['clean'], (cb) => {
284284
runSequence('compile', 'npm-package', 'rollup-bundle', cb);
285285
});
286286

287+
// Build the schematics in dist
287288
gulp.task('build:schematics', () => {
288289
// return execDemoCmd(`build --preserve-symlinks --prod --aot --build-optimizer`, {cwd: `${config.demoDir}`});
289290
return execCmd('tsc', '-p src/schematics/tsconfig.json').then(exitCode => {
@@ -321,7 +322,7 @@ gulp.task('build:watch-fast', ['build-watch-no-tests'], () => {
321322
/////////////////////////////////////////////////////////////////////////////
322323

323324
// Prepare 'dist' folder for publication to NPM
324-
gulp.task('npm-package', ['build:schematics'], (cb) => {
325+
gulp.task('npm-package', (cb) => {
325326
let pkgJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
326327
let targetPkgJson = {};
327328
let fieldsToCopy = ['version', 'description', 'keywords', 'author', 'repository', 'license', 'bugs', 'homepage', 'schematics'];
@@ -666,7 +667,7 @@ gulp.task('create-new-tag', (cb) => {
666667
});
667668

668669
// Build and then Publish 'dist' folder to NPM
669-
gulp.task('npm-publish', ['build'], () => {
670+
gulp.task('npm-publish', ['build', 'build:schematics'], () => {
670671
return execExternalCmd('npm', `publish ${config.outputDir} --access public`)
671672
});
672673

src/schematics/src/ng-add/index.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export function addPackageJsonDependencies(): Rule {
3333
version: loadPackageVersionGracefully(context) || 'latest',
3434
name: '@angular-material-extensions/pages'
3535
},
36-
{type: NodeDependencyType.Default, version: ngCoreVersionTag || '7.2.10', name: '@angular/animations'},
37-
{type: NodeDependencyType.Default, version: ngCoreVersionTag || '7.2.10', name: '@angular/forms'},
36+
{type: NodeDependencyType.Default, version: ngCoreVersionTag || '7.2.11', name: '@angular/animations'},
37+
{type: NodeDependencyType.Default, version: ngCoreVersionTag || '7.2.11', name: '@angular/forms'},
3838
];
3939

4040
dependencies.forEach(dependency => {
@@ -63,9 +63,10 @@ export function addModuleToImports(options: any): Rule {
6363
// Takes the first project in case it's not provided by CLI
6464
options.project ? options.project : Object.keys(workspace['projects'])[0]
6565
);
66-
const moduleName = 'MatPagesModule';
66+
const moduleName = 'MatPagesModule.forRoot()';
6767

6868
addModuleImportToRootModule(host, moduleName, '@angular-material-extensions/pages', project);
69+
addModuleImportToRootModule(host, 'BrowserAnimationsModule', '@angular/platform-browser/animations', project);
6970
context.logger.log('info', `✅️ "${moduleName}" is imported`);
7071

7172
return host;

tslint.json

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"ignore-params"
5656
],
5757
"no-misused-new": true,
58-
"no-non-null-assertion": true,
5958
"no-shadowed-variable": true,
6059
"no-string-literal": false,
6160
"no-string-throw": true,

0 commit comments

Comments
 (0)