Skip to content

Commit 9cad602

Browse files
committed
removed metro4 dependency
1 parent bcdac11 commit 9cad602

File tree

16 files changed

+59
-33
lines changed

16 files changed

+59
-33
lines changed

.idea/runConfigurations/Build.xml

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

.idea/workspace.xml

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

package-lock.json

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

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
"ng": "ng",
66
"start": "ng serve",
77
"build": "ng build",
8+
"build-library": "ng build ng-metro4 --watch",
89
"test": "ng test",
910
"lint": "ng lint",
1011
"e2e": "ng e2e",
1112
"build-schematics": "tsc -p projects/ng-metro4/tsconfig.schematics.json --outDir dist/ng-metro4/schematics && cpx dist/ng-metro4/schematics/src/schematics/** dist/ng-metro4/schematics && cpx projects/ng-metro4/src/schematics/**/{collection.json,schema.json,files/**} dist/ng-metro4/schematics",
12-
"publish": "npm run build -- ng-metro4 && npm run build-schematics && cpx ./README.md ./dist/ng-metro4 && cpx ./projects/ng-metro4/src/metro4/** ./dist/ng-metro4/metro4",
13+
"publish": "npm run build -- ng-metro4 && npm run build-schematics && cpx ./README.md ./dist/ng-metro4 && cd ./dist/ng-metro4 && npm publish",
1314
"publish-doc": "npm run build -- ng-metro4 && ng run metro4-demo:deploy"
1415
},
1516
"private": true,
@@ -25,7 +26,7 @@
2526
"core-js": "^2.5.4",
2627
"highlight.js": "^9.15.10",
2728
"linq4js": "^2.2.2",
28-
"metro4": "^4.3.2",
29+
"ng-metro4-lib": "^1.0.4",
2930
"moment": "^2.24.0",
3031
"ngx-highlightjs": "^3.0.3",
3132
"rxjs": "~6.5.2",

projects/ng-metro4/ng-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"lib": {
55
"entryFile": "src/public_api.ts"
66
}
7-
}
7+
}

projects/ng-metro4/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "ng-metro4",
33
"description": "Angular components for Metro4 UI library in modern ui style.",
4-
"version": "1.0.3",
4+
"version": "1.0.4",
55
"peerDependencies": {
66
"@angular/common": "~8.1.0",
77
"@angular/core": "~8.1.0",
88
"moment": "^2.24.0",
9-
"metro4": "^4.3.2",
9+
"ng-metro4-lib": "^1.0.4",
1010
"rxjs": "~6.5.2"
1111
},
1212
"schematics": "./schematics/collection.json",

projects/ng-metro4/src/lib/base/ng-metro4-base.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { LoadingDirective } from './loading/loading.directive';
77
import { LoadingDisplayDirective } from './loading/loading-display.directive';
88
import { AnimationDirective } from './animation/animation.directive';
99
import { LetDirective } from './let/let.directive';
10-
import 'metro4';
10+
import 'ng-metro4-lib';
1111

1212
const declarations = [
1313
ButtonDirective,

projects/ng-metro4/src/lib/controls/ng-metro4-controls.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { PanelComponent } from './panel/panel.component';
99
import { HotkeyDirective } from './hotkey/hotkey.directive';
1010
import { PopoverComponent } from './popover/popover.component';
1111
import {ActivityService} from './activity/activity.service';
12-
import 'metro4';
12+
import 'ng-metro4-lib';
1313

1414
const declarations = [
1515
GravatarComponent,

projects/ng-metro4/src/lib/form/ng-metro4-forms.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3-
import 'metro4';
3+
import 'ng-metro4-lib';
44

55
import { TagInputComponent } from './tag-input/tag-input.component';
66
import { SelectComponent } from './select/select.component';

projects/ng-metro4/src/lib/information/ng-metro4-information.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { DialogComponent } from './dialog/dialog.component';
55
import {DialogService} from './dialog/dialog.service';
66
import {NotifyService} from './notify/notify.service';
77
import {ToastService} from './toast/toast.service';
8-
import 'metro4';
8+
import 'ng-metro4-lib';
99

1010
const declarations = [
1111
HintDirective,

projects/ng-metro4/src/lib/ng-metro4.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {NgMetro4FormsModule} from './form/ng-metro4-forms.module';
44
import {NgMetro4BaseModule} from './base/ng-metro4-base.module';
55
import {NgMetro4ControlsModule} from './controls/ng-metro4-controls.module';
66
import {NgMetro4InformationModule} from './information/ng-metro4-information.module';
7-
import 'metro4';
7+
import 'ng-metro4-lib';
88

99
const imports = [
1010
NgMetro4BaseModule,

projects/ng-metro4/src/metro4/test.css

Whitespace-only changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export default function(options: NgAddOptions): Rule {
99
return (host: Tree, context: SchematicContext) => {
1010
const version = getLibraryVersion();
1111
addPackageToPackageJson(host, 'ng-metro4', `^${version}`);
12-
const metro4Version = getDependencyVersion('metro4');
13-
addPackageToPackageJson(host, 'metro4', `${metro4Version}`);
12+
const metro4Version = getDependencyVersion('ng-metro4-lib');
13+
addPackageToPackageJson(host, 'ng-metro4-lib', `${metro4Version}`);
1414
const momentVersion = getDependencyVersion('moment');
1515
addPackageToPackageJson(host, 'moment', `${momentVersion}`);
1616
context.logger.log('info',

src/app/home/start/start.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h3>Add dependencies</h3>
5858
To install ng-metro4 in your angular application first execute this command:
5959
</p>
6060

61-
<code>npm install -S ng-metro4 metro4 moment</code>
61+
<code>npm install -S ng-metro4 ng-metro4-lib moment</code>
6262

6363
<h3>Add styles</h3>
6464

@@ -69,7 +69,7 @@ <h3>Add styles</h3>
6969
<pre><code [highlight]="angularJsonContent" [languages]="['ts']"></code></pre>
7070

7171
Instead of adding the css file in your <code>angular.json</code> you could also add
72-
<code>@import '~metro4/build/css/metro-all.min.css';</code> at the top of your <code>styles.less</code> file.
72+
<code>@import '~ng-metro4-lib/build/css/metro-all.min.css';</code> at the top of your <code>styles.less</code> file.
7373

7474
<h3>Include metro4-module</h3>
7575

src/app/home/start/start.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class StartComponent implements OnInit {
1212
"options": {
1313
...
1414
"styles": [
15-
"node_modules/metro4/build/css/metro-all.min.css",
15+
"node_modules/ng-metro4-lib/build/css/metro-all.min.css",
1616
"src/styles.less"
1717
],
1818
...

src/styles.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* You can add global styles to this file, and also import other style files */
22
@import '~highlight.js/styles/vs.css';
33

4+
@import '~ng-metro4-lib/build/css/metro-all.min.css';
45
// css from local build
5-
@import '~metro4/build/css/metro-all.min.css';
66
//@import '../../Metro-UI-CSS/build/css/metro-all.css';
77

88
body {

0 commit comments

Comments
 (0)