From 5367346990e9c4b98f4c93382293eae7eb23ebc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Farkas=20J=C3=B3zsef?= Date: Thu, 1 Sep 2016 17:07:57 +0200 Subject: [PATCH] refactor: Remove moduleIds --- package.json | 1 - src/components/popover/popover.component.ts | 1 - .../popover/tab/keymap/keymap-tab.component.ts | 1 - .../popover/tab/keypress/keypress-tab.component.ts | 1 - .../popover/tab/layer/layer-tab.component.ts | 1 - .../popover/tab/macro/macro-item.component.ts | 1 - .../popover/tab/macro/macro-tab.component.ts | 1 - .../popover/tab/mouse/mouse-tab.component.ts | 1 - src/components/popover/tab/none/none-tab.component.ts | 1 - .../capture-keystroke-button.component.ts | 1 - src/components/popover/widgets/icon/icon.component.ts | 1 - .../svg-icon-text-key/svg-icon-text-key.component.ts | 1 - .../svg-one-line-text-key.component.ts | 1 - .../svg-single-icon-key.component.ts | 1 - .../svg-switch-keymap-key.component.ts | 1 - .../svg-text-icon-key/svg-text-icon-key.component.ts | 1 - .../svg-two-line-text-key.component.ts | 1 - src/main-app/main-app.component.ts | 1 - src/webpack.config.js | 11 ----------- 19 files changed, 29 deletions(-) diff --git a/package.json b/package.json index d8a8bc75..f2340f37 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "path": "^0.12.7", "raw-loader": "^0.5.1", "sass-loader": "^4.0.0", - "string-replace-loader": "^1.0.3", "stylelint": "^7.0.3", "ts-loader": "^0.8.2", "tslint": "^3.14.0", diff --git a/src/components/popover/popover.component.ts b/src/components/popover/popover.component.ts index 786954ce..97ae8c2e 100644 --- a/src/components/popover/popover.component.ts +++ b/src/components/popover/popover.component.ts @@ -27,7 +27,6 @@ enum TabName { } @Component({ - moduleId: module.id, selector: 'popover', template: require('./popover.component.html'), styles: [require('./popover.component.scss')], diff --git a/src/components/popover/tab/keymap/keymap-tab.component.ts b/src/components/popover/tab/keymap/keymap-tab.component.ts index 32b59b30..43f9a17d 100644 --- a/src/components/popover/tab/keymap/keymap-tab.component.ts +++ b/src/components/popover/tab/keymap/keymap-tab.component.ts @@ -10,7 +10,6 @@ import {SwitchKeymapAction} from '../../../../config-serializer/config-items/Swi import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2'; @Component({ - moduleId: module.id, selector: 'keymap-tab', template: require('./keymap-tab.component.html'), styles: [require('./keymap-tab.component.scss')], diff --git a/src/components/popover/tab/keypress/keypress-tab.component.ts b/src/components/popover/tab/keypress/keypress-tab.component.ts index 19cdd320..f13e0fe0 100644 --- a/src/components/popover/tab/keypress/keypress-tab.component.ts +++ b/src/components/popover/tab/keypress/keypress-tab.component.ts @@ -10,7 +10,6 @@ import {CaptureKeystrokeButtonComponent} from '../../widgets/capture-keystroke'; import {Tab} from '../tab'; @Component({ - moduleId: module.id, selector: 'keypress-tab', template: require('./keypress-tab.component.html'), styles: [require('./keypress-tab.component.scss')], diff --git a/src/components/popover/tab/layer/layer-tab.component.ts b/src/components/popover/tab/layer/layer-tab.component.ts index c42eba03..62d1e928 100644 --- a/src/components/popover/tab/layer/layer-tab.component.ts +++ b/src/components/popover/tab/layer/layer-tab.component.ts @@ -9,7 +9,6 @@ import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2'; import {Tab} from '../tab'; @Component({ - moduleId: module.id, selector: 'layer-tab', template: require('./layer-tab.component.html'), styles: [require('./layer-tab.component.scss')], diff --git a/src/components/popover/tab/macro/macro-item.component.ts b/src/components/popover/tab/macro/macro-item.component.ts index bb928a88..da967cb3 100644 --- a/src/components/popover/tab/macro/macro-item.component.ts +++ b/src/components/popover/tab/macro/macro-item.component.ts @@ -14,7 +14,6 @@ import {IconComponent} from '../../widgets/icon'; import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers'; @Component({ - moduleId: module.id, selector: 'macro-item', template: require('./macro-item.component.html'), styles: [require('./macro-item.component.scss')], diff --git a/src/components/popover/tab/macro/macro-tab.component.ts b/src/components/popover/tab/macro/macro-tab.component.ts index e8920039..ba647587 100644 --- a/src/components/popover/tab/macro/macro-tab.component.ts +++ b/src/components/popover/tab/macro/macro-tab.component.ts @@ -11,7 +11,6 @@ import {MacroItemComponent} from './macro-item.component'; import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2'; @Component({ - moduleId: module.id, selector: 'macro-tab', template: require('./macro-tab.component.html'), styles: [require('./macro-tab.component.scss')], diff --git a/src/components/popover/tab/mouse/mouse-tab.component.ts b/src/components/popover/tab/mouse/mouse-tab.component.ts index 3c128e72..bda321bf 100644 --- a/src/components/popover/tab/mouse/mouse-tab.component.ts +++ b/src/components/popover/tab/mouse/mouse-tab.component.ts @@ -6,7 +6,6 @@ import {KeyAction} from '../../../../config-serializer/config-items/KeyAction'; import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction'; @Component({ - moduleId: module.id, selector: 'mouse-tab', template: require('./mouse-tab.component.html'), styles: [require('./mouse-tab.component.scss')], diff --git a/src/components/popover/tab/none/none-tab.component.ts b/src/components/popover/tab/none/none-tab.component.ts index ff727fb8..74044ddf 100644 --- a/src/components/popover/tab/none/none-tab.component.ts +++ b/src/components/popover/tab/none/none-tab.component.ts @@ -4,7 +4,6 @@ import {Tab} from '../tab'; import {NoneAction} from '../../../../config-serializer/config-items/NoneAction'; @Component({ - moduleId: module.id, selector: 'none-tab', template: require('./none-tab.component.html'), styles: [require('./none-tab.component.scss')] diff --git a/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts b/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts index b2320c22..ebb2d271 100644 --- a/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts +++ b/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; @Component({ - moduleId: module.id, selector: 'capture-keystroke-button', template: require('./capture-keystroke-button.component.html'), styles: [require('./capture-keystroke-button.component.scss')] diff --git a/src/components/popover/widgets/icon/icon.component.ts b/src/components/popover/widgets/icon/icon.component.ts index 0cc4f3df..19a74b6f 100644 --- a/src/components/popover/widgets/icon/icon.component.ts +++ b/src/components/popover/widgets/icon/icon.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit, Input } from '@angular/core'; import { NgSwitch, NgSwitchCase } from '@angular/common'; @Component({ - moduleId: module.id, selector: 'icon', template: require('./icon.component.html'), styles: [require('./icon.component.scss')], diff --git a/src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts b/src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts index 02e64d03..561aa260 100644 --- a/src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts +++ b/src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ - moduleId: module.id, selector: 'g[svg-icon-text-key]', template: require('./svg-icon-text-key.component.html') }) diff --git a/src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts b/src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts index 80786fb3..dc75e656 100644 --- a/src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts +++ b/src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ - moduleId: module.id, selector: 'g[svg-one-line-text-key]', template: require('./svg-one-line-text-key.component.html') }) diff --git a/src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts b/src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts index 4e056e28..2b06fba5 100644 --- a/src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts +++ b/src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ - moduleId: module.id, selector: 'g[svg-single-icon-key]', template: require('./svg-single-icon-key.component.html') }) diff --git a/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts index 4e75d080..4e4672e8 100644 --- a/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts +++ b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts @@ -3,7 +3,6 @@ import { Component, OnInit, Input } from '@angular/core'; import {MapperService} from '../../../../services/mapper.service'; @Component({ - moduleId: module.id, selector: 'g[svg-switch-keymap-key]', template: require('./svg-switch-keymap-key.component.html') }) diff --git a/src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts b/src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts index e0bff515..0515be87 100644 --- a/src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts +++ b/src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ - moduleId: module.id, selector: 'g[svg-text-icon-key]', template: require('./svg-text-icon-key.component.html') }) diff --git a/src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts b/src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts index 9973e171..bfbe79f4 100644 --- a/src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts +++ b/src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ - moduleId: module.id, selector: 'g[svg-two-line-text-key]', template: require('./svg-two-line-text-key.component.html') }) diff --git a/src/main-app/main-app.component.ts b/src/main-app/main-app.component.ts index d41cb07b..cc121ab8 100644 --- a/src/main-app/main-app.component.ts +++ b/src/main-app/main-app.component.ts @@ -4,7 +4,6 @@ import { ROUTER_DIRECTIVES } from '@angular/router'; import { SideMenuComponent } from '../components/side-menu'; @Component({ - moduleId: module.id, selector: 'main-app', template: require('./main-app.component.html'), styles: [require('./main-app.component.scss')], diff --git a/src/webpack.config.js b/src/webpack.config.js index b37987ca..b82f31cd 100644 --- a/src/webpack.config.js +++ b/src/webpack.config.js @@ -18,17 +18,6 @@ module.exports = { modulesDirectories: ['node_modules'] }, module: { - preLoaders: [ - { - test: /(.js|.ts)$/, - loader: 'string-replace-loader', - query: { - search: 'moduleId: module.id,', - replace: '', - flags: 'g' - } - } - ], loaders: [ { test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ }, { test: /\.html$/, loader: 'html-loader' },