Skip to content

Commit

Permalink
Use angular 11.1.1 (#11)
Browse files Browse the repository at this point in the history
* upgrade dependencies version

* upgrade version to 5.3.0

* upgrade schematics to 11.1

* use AngularWebpackPlugin instead of AngularCompilerPlugin

* update filter value on prime
  • Loading branch information
abadakhshan authored Jan 29, 2021
1 parent dc47127 commit f8d03fa
Show file tree
Hide file tree
Showing 25 changed files with 1,676 additions and 1,705 deletions.
2 changes: 1 addition & 1 deletion build-tools/version.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const fs = require('fs');
const version = '5.2.0';
const version = '5.3.0';
const { lstatSync, readdirSync } = require('fs');
const { join } = require('path');

Expand Down
74 changes: 37 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,77 +25,77 @@
"build:client-storage": "ng build narik-client-storage && node build-tools/copy.js readme.md dist/client-storage",
"build:firebase": "ng build narik-firebase && node build-tools/copy.js readme.md dist/firebase",
"debug:cli": "node --inspect-brk ./node_modules/@angular/cli/bin/ng serve",
"build": "npm run build:infrastructure && npm run build:common && npm run build:core && npm run build:ui-core && npm run build:app-core && npm run build:ui-material && npm run build:ui-ng-bootstrap && npm run build:ui-ngx-bootstrap && npm run build:ui-devextreme && npm run build:ui-nebular && npm run build:ui-primeng && npm run build:ui-swimlane && npm run build:jwt && npm run build:client-storage && npm run build:signalr && npm run build:cli",
"build": "npm run build:infrastructure && npm run build:common && npm run build:core && npm run build:ui-core && npm run build:app-core && npm run build:ui-material && npm run build:ui-ng-bootstrap && npm run build:ui-ngx-bootstrap && npm run build:ui-devextreme && npm run build:ui-nebular && npm run build:ui-primeng && npm run build:ui-swimlane && npm run build:jwt && npm run build:client-storage && npm run build:signalr && npm run build:firebase && npm run build:cli",
"version": "node build-tools/version.js",
"publish": "node build-tools/publish.js"
},
"private": false,
"dependencies": {
"@angular/animations": "~11.0.2",
"@angular/cdk": "~11.0.0",
"@angular/common": "~11.0.2",
"@angular/compiler": "~11.0.2",
"@angular/core": "~11.0.2",
"@angular/animations": "~11.1.1",
"@angular/cdk": "~11.1.1",
"@angular/common": "~11.1.1",
"@angular/compiler": "~11.1.1",
"@angular/core": "~11.1.1",
"@angular/flex-layout": "^11.0.0-beta.33",
"@angular/forms": "~11.0.2",
"@angular/material": "~11.0.0",
"@angular/platform-browser": "~11.0.2",
"@angular/platform-browser-dynamic": "~11.0.2",
"@angular/router": "~11.0.2",
"@angular/forms": "~11.1.1",
"@angular/material": "~11.1.1",
"@angular/platform-browser": "~11.1.1",
"@angular/platform-browser-dynamic": "~11.1.1",
"@angular/router": "~11.1.1",
"@aspnet/signalr": "^1.1.4",
"@angular/fire": "^6.1.4",
"firebase": "^7.0 || ^8.0",
"@fortawesome/fontawesome-free": "^5.15.1",
"@nebular/theme": "^6.2.1",
"@ng-bootstrap/ng-bootstrap": "^8.0.0",
"firebase": "^8.2",
"@fortawesome/fontawesome-free": "^5.15.2",
"@nebular/theme": "^7.0.0",
"@ng-bootstrap/ng-bootstrap": "^9.0.2",
"@ngx-translate/core": "^13.0.0",
"@swimlane/ngx-datatable": "^18.0.0",
"@swimlane/ngx-datatable": "^19.0.0",
"angular2-text-mask": "^9.0.0",
"angular2-uuid": "^1.1.1",
"bootstrap": "^4.5.3",
"class-validator": "^0.12.2",
"core-js": "^3.7.0",
"bootstrap": "^4.6.0",
"class-validator": "^0.13.1",
"core-js": "^3.8.3",
"data-adapter": "^0.2.3",
"devextreme": "^20.2.4",
"devextreme-angular": "^20.2.4",
"devextreme": "^20.2.5",
"devextreme-angular": "^20.2.5",
"localforage": "^1.9.0",
"lodash": "^4.17.20",
"ngforage": "^6.0.0",
"ngx-bootstrap": "^6.2.0",
"ngx-custom-validators": "^10.0.0",
"ngx-toastr": "^13.1.0",
"ngx-custom-validators": "^11.0.1",
"ngx-toastr": "^13.2.0",
"primeicons": "^4.1.0",
"primeng": "^10.0.3",
"primeng": "^11.2.0",
"rxjs": "~6.6.3",
"tslib": "^2.0.0",
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.2",
"@angular-devkit/build-angular": "~0.1101.2",
"@angular-devkit/build-ng-packagr": "~0.1002.0",
"@angular-devkit/schematics": "~11.0.2",
"@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.2",
"@angular/language-service": "~11.0.2",
"@types/jasmine": "~3.6.2",
"@angular-devkit/schematics": "~11.1.2",
"@angular/cli": "~11.1.2",
"@angular/compiler-cli": "~11.1.1",
"@angular/language-service": "~11.1.1",
"@types/jasmine": "~3.6.3",
"@types/jasminewd2": "~2.0.8",
"@types/lodash": "~4.14.165",
"@types/node": "~14.14.9",
"@types/lodash": "~4.14.168",
"@types/node": "~14.14.22",
"codelyzer": "~6.0.1",
"copy": "~0.3.2",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~6.0.0",
"karma": "~5.2.3",
"karma": "~6.0.3",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"ng-packagr": "^11.0.3",
"ng-packagr": "^11.1.2",
"protractor": "~7.0.0",
"ts-node": "~9.0.0",
"ts-node": "~9.1.1",
"tsickle": ">=0.39.1",
"tslib": "~2.0.3",
"tslib": "~2.1.0",
"tslint": "~6.1.3",
"typescript": "~4.0.5"
"typescript": "~4.1.3"
}
}
2 changes: 1 addition & 1 deletion projects/narik-app-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@narik/app-core",
"version": "5.2.0",
"version": "5.3.0",
"peerDependencies": {
"@angular/common": "~11.0.2",
"@angular/core": "~11.0.2",
Expand Down
2 changes: 1 addition & 1 deletion projects/narik-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "narik",
"version": "5.2.0",
"version": "5.3.0",
"scripts": {
"build": "..\\..\\node_modules\\.bin\\tsc -p tsconfig.schematics.json",
"copy:schemas": "node ../../build-tools/copy.js schematics\\*\\schema.json ..\\..\\dist\\narik\\schematics\\ ",
Expand Down
52 changes: 26 additions & 26 deletions projects/narik-cli/schematics/ng-add/files/extra-webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
const path = require("path");
const AngularCompilerPlugin = require("@ngtools/webpack/src");
const LayoutResolver = require("./build-tools/layout-resolver");
const path = require('path');
const AngularCompilerPlugin = require('@ngtools/webpack/src');
const LayoutResolver = require('./build-tools/layout-resolver');

module.exports = (config) => {
const index = config.plugins.findIndex((p) => {
return p instanceof AngularCompilerPlugin.AngularCompilerPlugin;
});
const oldOptions = config.plugins[index]._options;
oldOptions.directTemplateLoading = false;
config.plugins.splice(index);
const index = config.plugins.findIndex((p) => {
return p instanceof AngularCompilerPlugin.ivy.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 AngularCompilerPlugin.ivy.AngularWebpackPlugin(oldOptions)
);

config.module.rules.unshift({
test: /\.html?$/,
use: [
"raw-loader",
{
loader: "@narik/webpack-tools",
options: {
resolver: new LayoutResolver(),
basePath: config.plugins[index]._basePath,
},
},
],
});
config.module.rules.unshift({
test: /\.html?$/,
use: [
'raw-loader',
{
loader: '@narik/webpack-tools',
options: {
resolver: new LayoutResolver(),
basePath: path.dirname(oldOptions.tsconfig),
},
},
],
});

return config;
return config;
};
Loading

0 comments on commit f8d03fa

Please sign in to comment.