You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2019/06/07 20:29:02 UTC
[nifi-fds] branch master updated (605e950 -> 8c3cefe)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git.
from 605e950 [NIFI-6263] theme links style color [NIFI-6263] update typography demo documentation
new ae7cc16 NIFI-6249 - simplify usage for es6 applications
new 8c3cefe NIFI-6249 - put license headers back in package files.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 28 ++-------
package-lock.json | 2 +-
platform/core/common/fds-common.module.js | 2 +-
.../common/services/fds-storage.service.spec.js | 4 +-
platform/core/core.testbed-factory.js | 2 +-
.../confirm-dialog.component.spec.js | 4 +-
platform/core/dialogs/fds-dialog.component.js | 4 +-
.../core/dialogs/fds-dialogs.component.spec.js | 4 +-
platform/core/dialogs/fds-dialogs.module.js | 6 +-
platform/core/dialogs/services/dialog.service.js | 2 +-
platform/core/flow-design-system.module.js | 4 +-
platform/core/index.js | 70 ++++++++++++++++++++++
platform/core/package.json | 6 +-
.../core/snackbars/coaster/coaster.component.js | 6 +-
.../snackbars/coaster/coaster.component.spec.js | 4 +-
platform/core/snackbars/fds-snackbar.component.js | 4 +-
.../core/snackbars/fds-snackbar.component.spec.js | 4 +-
platform/core/snackbars/fds-snackbars.module.js | 8 ++-
.../core/snackbars/services/snackbar.service.js | 2 +-
webapp/components/flow-design-system/fds-demo.js | 6 +-
webapp/fds.js | 4 +-
webapp/fds.module.js | 2 +-
webapp/services/fds.service.js | 3 +-
webpack.alias.js | 17 +-----
24 files changed, 123 insertions(+), 75 deletions(-)
create mode 100644 platform/core/index.js
[nifi-fds] 02/02: NIFI-6249 - put license headers back in package
files.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit 8c3cefe551fd77630373eddc2c923e52f95a258a
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Fri Jun 7 16:18:50 2019 -0400
NIFI-6249 - put license headers back in package files.
This closes #30
Signed-off-by: Scott Aslan <sc...@gmail.com>
---
package-lock.json | 16 +++++++++++++++-
package.json | 13 +++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index b073b00..b323fd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,20 @@
{
+ "//": "Licensed to the Apache Software Foundation (ASF) under one or more",
+ "//": "contributor license agreements. See the NOTICE file distributed with",
+ "//": "this work for additional information regarding copyright ownership.",
+ "//": "The ASF licenses this file to You under the Apache License, Version 2.0",
+ "//": "(the \"License\"); you may not use this file except in compliance with",
+ "//": "the License. You may obtain a copy of the License at",
+ "//": "",
+ "//": "http://www.apache.org/licenses/LICENSE-2.0",
+ "//": "",
+ "//": "Unless required by applicable law or agreed to in writing, software",
+ "//": "distributed under the License is distributed on an \"AS IS\" BASIS,",
+ "//": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+ "//": "See the License for the specific language governing permissions and",
+ "//": "limitations under the License.",
"name": "nifi-fds",
- "version": "0.1.0",
+ "version": "0.2.0-SNAPSHOT",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 166716b..f51f300 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,17 @@
{
+ "//": "Licensed to the Apache Software Foundation (ASF) under one or more",
+ "//": "contributor license agreements. See the NOTICE file distributed with",
+ "//": "this work for additional information regarding copyright ownership.",
+ "//": "The ASF licenses this file to You under the Apache License, Version 2.0",
+ "//": "(the \"License\"); you may not use this file except in compliance with",
+ "//": "the License. You may obtain a copy of the License at",
+ "//": "",
+ "//": "http://www.apache.org/licenses/LICENSE-2.0",
+ "//": "",
+ "//": "Unless required by applicable law or agreed to in writing, software",
+ "//": "distributed under the License is distributed on an \"AS IS\" BASIS,",
+ "//": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+ "//": "See the License for the specific language governing permissions and",
"//": "limitations under the License.",
"name": "nifi-fds",
"version": "0.2.0-SNAPSHOT",
[nifi-fds] 01/02: NIFI-6249 - simplify usage for es6 applications
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit ae7cc16a9a97d50db32f7ee492f4c20d825250fb
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Thu Jun 6 20:43:18 2019 -0400
NIFI-6249 - simplify usage for es6 applications
---
README.md | 28 ++-------
package-lock.json | 14 -----
package.json | 13 ----
platform/core/common/fds-common.module.js | 2 +-
.../common/services/fds-storage.service.spec.js | 4 +-
platform/core/core.testbed-factory.js | 2 +-
.../confirm-dialog.component.spec.js | 4 +-
platform/core/dialogs/fds-dialog.component.js | 4 +-
.../core/dialogs/fds-dialogs.component.spec.js | 4 +-
platform/core/dialogs/fds-dialogs.module.js | 6 +-
platform/core/dialogs/services/dialog.service.js | 2 +-
platform/core/flow-design-system.module.js | 4 +-
platform/core/index.js | 70 ++++++++++++++++++++++
platform/core/package.json | 6 +-
.../core/snackbars/coaster/coaster.component.js | 6 +-
.../snackbars/coaster/coaster.component.spec.js | 4 +-
platform/core/snackbars/fds-snackbar.component.js | 4 +-
.../core/snackbars/fds-snackbar.component.spec.js | 4 +-
platform/core/snackbars/fds-snackbars.module.js | 8 ++-
.../core/snackbars/services/snackbar.service.js | 2 +-
webapp/components/flow-design-system/fds-demo.js | 6 +-
webapp/fds.js | 4 +-
webapp/fds.module.js | 2 +-
webapp/services/fds.service.js | 3 +-
webpack.alias.js | 17 +-----
25 files changed, 122 insertions(+), 101 deletions(-)
diff --git a/README.md b/README.md
index a83185b..a8e277d 100644
--- a/README.md
+++ b/README.md
@@ -10,33 +10,15 @@ The demo application serves 2 main purposes
For developers not interested in building the FDS NgModule you can use **npm** to install the distribution files.
```bash
-npm install @nifi-fds/core
+npm install @nifi-fds/core --save
```
-Clients will need to configure a few aliases within their preferred module loader/javascript bundler:
-
+#### ES6
```javascript
-const path = require('path');
-
-module.exports = {
- '@flow-design-system/core': path.resolve(__dirname, 'node_modules/@nifi-fds/core/flow-design-system.module.js'),
- '@flow-design-system/dialogs': path.resolve(__dirname, 'node_modules/@nifi-fds/core/dialogs/fds-dialogs.module.js'),
- '@flow-design-system/dialog-component': path.resolve(__dirname, 'node_modules/@nifi-fds/core/dialogs/fds-dialog.component.js'),
- '@flow-design-system/dialog-service': path.resolve(__dirname, 'node_modules/@nifi-fds/core/dialogs/services/dialog.service.js'),
- '@flow-design-system/confirm-dialog-component': path.resolve(__dirname, 'node_modules/@nifi-fds/core/dialogs/confirm-dialog/confirm-dialog.component.js'),
- '@flow-design-system/snackbars': path.resolve(__dirname, 'node_modules/@nifi-fds/core/snackbars/fds-snackbars.module.js'),
- '@flow-design-system/snackbar-component': path.resolve(__dirname, 'node_modules/@nifi-fds/core/snackbars/fds-snackbar.component.js'),
- '@flow-design-system/snackbar-service': path.resolve(__dirname, 'node_modules/@nifi-fds/core/snackbars/services/snackbar.service.js'),
- '@flow-design-system/coaster-component': path.resolve(__dirname, 'node_modules/@nifi-fds/core/snackbars/coaster/coaster.component.js'),
- '@flow-design-system/common/storage-service': path.resolve(__dirname, 'node_modules/@nifi-fds/core/common/services/fds-storage.service.js'),
- '@flow-design-system/common/animations': path.resolve(__dirname, 'node_modules/@nifi-fds/core/common/fds.animations.js')
-};
-```
+import { FdsCoreModule } from '@nifi-fds/core';
-Once you have configured your module loader, you can import the **Apache NiFi Flow Design System** NgModule into your angular application.
+function AppModule() {}
-```javascript
-var fdsCore = require('@flow-design-system/core');
AppModule.prototype = {
constructor: AppModule
};
@@ -44,7 +26,7 @@ AppModule.prototype = {
AppModule.annotations = [
new ngCore.NgModule({
imports: [
- fdsCore,
+ FdsCoreModule,
...
],
...
diff --git a/package-lock.json b/package-lock.json
index 2381f93..b073b00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,4 @@
{
- "//": "Licensed to the Apache Software Foundation (ASF) under one or more",
- "//": "contributor license agreements. See the NOTICE file distributed with",
- "//": "this work for additional information regarding copyright ownership.",
- "//": "The ASF licenses this file to You under the Apache License, Version 2.0",
- "//": "(the \"License\"); you may not use this file except in compliance with",
- "//": "the License. You may obtain a copy of the License at",
- "//": "",
- "//": "http://www.apache.org/licenses/LICENSE-2.0",
- "//": "",
- "//": "Unless required by applicable law or agreed to in writing, software",
- "//": "distributed under the License is distributed on an \"AS IS\" BASIS,",
- "//": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
- "//": "See the License for the specific language governing permissions and",
- "//": "limitations under the License.",
"name": "nifi-fds",
"version": "0.1.0",
"lockfileVersion": 1,
diff --git a/package.json b/package.json
index f51f300..166716b 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,4 @@
{
- "//": "Licensed to the Apache Software Foundation (ASF) under one or more",
- "//": "contributor license agreements. See the NOTICE file distributed with",
- "//": "this work for additional information regarding copyright ownership.",
- "//": "The ASF licenses this file to You under the Apache License, Version 2.0",
- "//": "(the \"License\"); you may not use this file except in compliance with",
- "//": "the License. You may obtain a copy of the License at",
- "//": "",
- "//": "http://www.apache.org/licenses/LICENSE-2.0",
- "//": "",
- "//": "Unless required by applicable law or agreed to in writing, software",
- "//": "distributed under the License is distributed on an \"AS IS\" BASIS,",
- "//": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
- "//": "See the License for the specific language governing permissions and",
"//": "limitations under the License.",
"name": "nifi-fds",
"version": "0.2.0-SNAPSHOT",
diff --git a/platform/core/common/fds-common.module.js b/platform/core/common/fds-common.module.js
index 429a5a2..ee0924c 100644
--- a/platform/core/common/fds-common.module.js
+++ b/platform/core/common/fds-common.module.js
@@ -16,7 +16,7 @@
*/
import { NgModule } from '@angular/core';
-import { FdsStorageService } from '@flow-design-system/storage-service';
+import FdsStorageService from './services/fds-storage.service';
/**
* FdsCommonsModule constructor.
diff --git a/platform/core/common/services/fds-storage.service.spec.js b/platform/core/common/services/fds-storage.service.spec.js
index 174605c..9929d0b 100644
--- a/platform/core/common/services/fds-storage.service.spec.js
+++ b/platform/core/common/services/fds-storage.service.spec.js
@@ -17,9 +17,9 @@
import { TestBed } from '@angular/core/testing';
-import initTestBed from '@flow-design-system/testbed-factory';
+import initTestBed from '../../core.testbed-factory';
-import FdsStorageService from '@flow-design-system/common/storage-service';
+import FdsStorageService from './fds-storage.service';
describe('FdsStorageService isolated unit tests', function () {
let fdsStorage;
diff --git a/platform/core/core.testbed-factory.js b/platform/core/core.testbed-factory.js
index 962e3ba..011a681 100644
--- a/platform/core/core.testbed-factory.js
+++ b/platform/core/core.testbed-factory.js
@@ -17,7 +17,7 @@
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
import { TestBed } from '@angular/core/testing';
-import FdsCoreModule from '@flow-design-system/core';
+import FdsCoreModule from './flow-design-system.module';
const initTestBed = ({ providers } = { providers: [] }) => {
TestBed.resetTestEnvironment();
diff --git a/platform/core/dialogs/confirm-dialog/confirm-dialog.component.spec.js b/platform/core/dialogs/confirm-dialog/confirm-dialog.component.spec.js
index 0f77a7c..1802b47 100644
--- a/platform/core/dialogs/confirm-dialog/confirm-dialog.component.spec.js
+++ b/platform/core/dialogs/confirm-dialog/confirm-dialog.component.spec.js
@@ -17,9 +17,9 @@
import { TestBed } from '@angular/core/testing';
-import initTestBed from '@flow-design-system/testbed-factory';
+import initTestBed from '../../core.testbed-factory';
-import { FdsConfirmDialogComponent } from '@flow-design-system/confirm-dialog-component';
+import { FdsConfirmDialogComponent } from './confirm-dialog.component';
describe('coasterComponent isolated unit tests', function () {
let fdsConfirmDialogComponent;
diff --git a/platform/core/dialogs/fds-dialog.component.js b/platform/core/dialogs/fds-dialog.component.js
index 1f3d71b..2ccaaba 100644
--- a/platform/core/dialogs/fds-dialog.component.js
+++ b/platform/core/dialogs/fds-dialog.component.js
@@ -59,7 +59,7 @@ FdsDialogActionsDirective.decorators = [
*
* @constructor
*/
-export function FdsDialogComponent() {
+function FdsDialogComponent() {
this.dialogTitle = '';
this.dialogContent = '';
this.dialogActions = '';
@@ -97,3 +97,5 @@ FdsDialogComponent.annotations = [
];
FdsDialogComponent.parameters = [];
+
+export { FdsDialogComponent };
diff --git a/platform/core/dialogs/fds-dialogs.component.spec.js b/platform/core/dialogs/fds-dialogs.component.spec.js
index b68a31f..47eeb8a 100644
--- a/platform/core/dialogs/fds-dialogs.component.spec.js
+++ b/platform/core/dialogs/fds-dialogs.component.spec.js
@@ -16,9 +16,9 @@
*/
import { TestBed } from '@angular/core/testing';
-import { FdsDialogComponent } from '@flow-design-system/dialog-component';
+import { FdsDialogComponent } from './fds-dialog.component';
-import initTestBed from '@flow-design-system/testbed-factory';
+import initTestBed from '../core.testbed-factory';
describe('FdsDialogComponent isolated unit tests', function () {
let fdsDialogs;
diff --git a/platform/core/dialogs/fds-dialogs.module.js b/platform/core/dialogs/fds-dialogs.module.js
index 294d450..1d20601 100644
--- a/platform/core/dialogs/fds-dialogs.module.js
+++ b/platform/core/dialogs/fds-dialogs.module.js
@@ -30,12 +30,12 @@ import {
FdsDialogContentDirective,
FdsDialogActionsDirective,
FdsDialogComponent
-} from '@flow-design-system/dialog-component';
+} from './fds-dialog.component';
import {
IConfirmConfig,
FdsDialogService
-} from '@flow-design-system/dialog-service';
-import { FdsConfirmDialogComponent } from '@flow-design-system/confirm-dialog-component';
+} from './services/dialog.service';
+import { FdsConfirmDialogComponent } from './confirm-dialog/confirm-dialog.component';
const FDS_DIALOGS = [
FdsDialogComponent,
diff --git a/platform/core/dialogs/services/dialog.service.js b/platform/core/dialogs/services/dialog.service.js
index d28b62a..3d398af 100644
--- a/platform/core/dialogs/services/dialog.service.js
+++ b/platform/core/dialogs/services/dialog.service.js
@@ -20,7 +20,7 @@ import {
MatDialogConfig,
MatDialog
} from '@angular/material';
-import { FdsConfirmDialogComponent } from '@flow-design-system/confirm-dialog-component';
+import { FdsConfirmDialogComponent } from '../confirm-dialog/confirm-dialog.component';
function IDialogConfig() {
this.title = '';
diff --git a/platform/core/flow-design-system.module.js b/platform/core/flow-design-system.module.js
index 97b288b..084afb8 100644
--- a/platform/core/flow-design-system.module.js
+++ b/platform/core/flow-design-system.module.js
@@ -61,8 +61,8 @@ import {
CovalentExpansionPanelModule,
CovalentPagingModule
} from '@covalent/core/bundles/covalent-core.umd.min.js';
-import { FdsDialogsModule } from '@flow-design-system/dialogs';
-import { FdsSnackBarsModule } from '@flow-design-system/snackbars';
+import { FdsDialogsModule } from './dialogs/fds-dialogs.module';
+import { FdsSnackBarsModule } from './snackbars/fds-snackbars.module';
/**
* FlowDesignSystemModule constructor.
diff --git a/platform/core/index.js b/platform/core/index.js
new file mode 100644
index 0000000..6bd5284
--- /dev/null
+++ b/platform/core/index.js
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+ FdsDialogsModule,
+ FdsConfirmDialogComponent,
+ FdsDialogActionsDirective,
+ FdsDialogComponent,
+ FdsDialogContentDirective,
+ FdsDialogService,
+ FdsDialogTitleDirective,
+ IConfirmConfig
+} from './dialogs/fds-dialogs.module';
+
+import {
+ FdsCommonsModule,
+ FdsStorageService
+} from './common/fds-common.module';
+
+import FdsAnimations from './common/fds.animations';
+
+import {
+ FdsCoasterComponent,
+ FdsSnackBarActionsDirective,
+ FdsSnackBarComponent,
+ FdsSnackBarContentDirective,
+ FdsSnackBarService,
+ FdsSnackBarsModule,
+ FdsSnackBarTitleDirective,
+ ICoasterConfig
+} from './snackbars/fds-snackbars.module';
+
+import FlowDesignSystemModule from './flow-design-system.module';
+
+export {
+ FdsDialogsModule,
+ FdsConfirmDialogComponent,
+ FdsDialogActionsDirective,
+ FdsDialogComponent,
+ FdsDialogContentDirective,
+ FdsDialogService,
+ FdsDialogTitleDirective,
+ IConfirmConfig,
+ FdsCommonsModule,
+ FdsStorageService,
+ FdsAnimations,
+ FdsCoasterComponent,
+ FdsSnackBarActionsDirective,
+ FdsSnackBarComponent,
+ FdsSnackBarContentDirective,
+ FdsSnackBarService,
+ FdsSnackBarsModule,
+ FdsSnackBarTitleDirective,
+ ICoasterConfig,
+ FlowDesignSystemModule as FdsCoreModule
+};
diff --git a/platform/core/package.json b/platform/core/package.json
index 9b2d1a3..33b321d 100644
--- a/platform/core/package.json
+++ b/platform/core/package.json
@@ -12,8 +12,7 @@
"nifi-fds",
"flow design system"
],
- "scripts": {
- },
+ "scripts": {},
"repository": {
"type": "git",
"url": "https://github.com/apache/nifi-fds.git"
@@ -43,5 +42,6 @@
"roboto-fontface": "0.10.0",
"rxjs": "6.4.0",
"zone.js": "0.9.0"
- }
+ },
+ "dependencies": {}
}
diff --git a/platform/core/snackbars/coaster/coaster.component.js b/platform/core/snackbars/coaster/coaster.component.js
index 22d4358..485a9a4 100644
--- a/platform/core/snackbars/coaster/coaster.component.js
+++ b/platform/core/snackbars/coaster/coaster.component.js
@@ -23,7 +23,7 @@ import $ from 'jquery';
*
* @constructor
*/
-export function FdsCoasterComponent() {
+function FdsCoasterComponent() {
this.title = '';
this.message = '';
this.icon = '';
@@ -66,3 +66,7 @@ FdsCoasterComponent.annotations = [
];
FdsCoasterComponent.parameters = [];
+
+export {
+ FdsCoasterComponent
+};
diff --git a/platform/core/snackbars/coaster/coaster.component.spec.js b/platform/core/snackbars/coaster/coaster.component.spec.js
index c3ddf55..0b33db1 100644
--- a/platform/core/snackbars/coaster/coaster.component.spec.js
+++ b/platform/core/snackbars/coaster/coaster.component.spec.js
@@ -16,9 +16,9 @@
*/
import { TestBed } from '@angular/core/testing';
-import { FdsCoasterComponent } from '@flow-design-system/coaster';
+import { FdsCoasterComponent } from './coaster.component';
-import initTestBed from '@flow-design-system/testbed-factory';
+import initTestBed from '../../core.testbed-factory';
describe('coasterComponent isolated unit tests', function () {
let coaster;
diff --git a/platform/core/snackbars/fds-snackbar.component.js b/platform/core/snackbars/fds-snackbar.component.js
index bbc506c..17760fe 100644
--- a/platform/core/snackbars/fds-snackbar.component.js
+++ b/platform/core/snackbars/fds-snackbar.component.js
@@ -55,7 +55,7 @@ FdsSnackBarActionsDirective.decorators = [
*
* @constructor
*/
-export function FdsSnackBarComponent() {
+function FdsSnackBarComponent() {
this.snackBarTitle = '';
this.snackBarContent = '';
this.snackBarActions = '';
@@ -93,3 +93,5 @@ FdsSnackBarComponent.annotations = [
];
FdsSnackBarComponent.parameters = [];
+
+export { FdsSnackBarComponent };
diff --git a/platform/core/snackbars/fds-snackbar.component.spec.js b/platform/core/snackbars/fds-snackbar.component.spec.js
index 67c36fb..40cdf06 100644
--- a/platform/core/snackbars/fds-snackbar.component.spec.js
+++ b/platform/core/snackbars/fds-snackbar.component.spec.js
@@ -16,9 +16,9 @@
*/
import { TestBed } from '@angular/core/testing';
-import { FdsSnackBarComponent } from '@flow-design-system/snackbar';
+import { FdsSnackBarComponent } from './fds-snackbar.component';
-import initTestBed from '@flow-design-system/testbed-factory';
+import initTestBed from '../core.testbed-factory';
describe('FdsSnackBarComponent isolated unit tests', function () {
let fdsSnackBar;
diff --git a/platform/core/snackbars/fds-snackbars.module.js b/platform/core/snackbars/fds-snackbars.module.js
index 8682047..79638ef 100644
--- a/platform/core/snackbars/fds-snackbars.module.js
+++ b/platform/core/snackbars/fds-snackbars.module.js
@@ -30,12 +30,14 @@ import {
FdsSnackBarTitleDirective,
FdsSnackBarActionsDirective,
FdsSnackBarContentDirective
-} from '@flow-design-system/snackbar';
+} from './fds-snackbar.component';
+
import {
ICoasterConfig,
FdsSnackBarService
-} from '@flow-design-system/snackbar-service';
-import { FdsCoasterComponent } from '@flow-design-system/coaster';
+} from './services/snackbar.service';
+
+import { FdsCoasterComponent } from './coaster/coaster.component';
const FDS_SNACKBARS = [
FdsSnackBarComponent,
diff --git a/platform/core/snackbars/services/snackbar.service.js b/platform/core/snackbars/services/snackbar.service.js
index a514c9a..18d4ace 100644
--- a/platform/core/snackbars/services/snackbar.service.js
+++ b/platform/core/snackbars/services/snackbar.service.js
@@ -19,8 +19,8 @@ import {
MatSnackBarConfig,
MatSnackBar
} from '@angular/material';
-import { FdsCoasterComponent } from '@flow-design-system/coaster';
import $ from 'jquery';
+import { FdsCoasterComponent } from '../coaster/coaster.component';
export function ISnackBarConfig() {
this.title = '';
diff --git a/webapp/components/flow-design-system/fds-demo.js b/webapp/components/flow-design-system/fds-demo.js
index 39e0233..16d325e 100644
--- a/webapp/components/flow-design-system/fds-demo.js
+++ b/webapp/components/flow-design-system/fds-demo.js
@@ -17,10 +17,8 @@
import { Component } from '@angular/core';
import { TdDataTableService } from '@covalent/core/bundles/covalent-core.umd.min.js';
-import animations from '@flow-design-system/common/animations';
import { MatDialog } from '@angular/material';
-import { FdsDialogService } from '@flow-design-system/dialogs';
-import { FdsSnackBarService } from '@flow-design-system/snackbars';
+import { FdsDialogService, FdsSnackBarService, FdsAnimations } from '@nifi-fds/core';
import FdsService from 'webapp/services/fds.service.js';
import FdsDemoDialog from 'webapp/components/flow-design-system/dialogs/demo/fds-demo-dialog.js';
@@ -1050,7 +1048,7 @@ FdsDemo.prototype = {
FdsDemo.annotations = [
new Component({
templateUrl: './fds-demo.html',
- animations: [animations.slideInLeftAnimation],
+ animations: [FdsAnimations.slideInLeftAnimation],
host: {
'[@routeAnimation]': 'routeAnimation'
}
diff --git a/webapp/fds.js b/webapp/fds.js
index 1119ecd..4c38cf1 100644
--- a/webapp/fds.js
+++ b/webapp/fds.js
@@ -21,7 +21,7 @@ import {
ChangeDetectorRef
} from '@angular/core';
import FdsService from 'webapp/services/fds.service.js';
-import animations from '@flow-design-system/common/animations';
+import { FdsAnimations } from '@nifi-fds/core';
/**
* Fds constructor.
@@ -62,7 +62,7 @@ Fds.annotations = [
queries: {
sidenav: new ViewChild('sidenav')
},
- animations: [animations.flyInOutAnimation]
+ animations: [FdsAnimations.flyInOutAnimation]
})
];
diff --git a/webapp/fds.module.js b/webapp/fds.module.js
index f847eb7..12bfaa5 100644
--- a/webapp/fds.module.js
+++ b/webapp/fds.module.js
@@ -16,7 +16,7 @@
*/
import { NgModule } from '@angular/core';
-import FdsCoreModule from '@flow-design-system/core';
+import { FdsCoreModule } from '@nifi-fds/core';
import FdsRoutes from 'webapp/fds.routes.js';
import Fds from 'webapp/fds.js';
import FdsDemo from 'webapp/components/flow-design-system/fds-demo.js';
diff --git a/webapp/services/fds.service.js b/webapp/services/fds.service.js
index 3dfc39b..784609e 100644
--- a/webapp/services/fds.service.js
+++ b/webapp/services/fds.service.js
@@ -16,8 +16,7 @@
*/
import { TdDataTableService } from '@covalent/core/bundles/covalent-core.umd.min.js';
-import { FdsDialogService } from '@flow-design-system/dialogs';
-import { FdsSnackBarService } from '@flow-design-system/snackbars';
+import { FdsDialogService, FdsSnackBarService } from '@nifi-fds/core';
import {version} from '../../package.json';
/**
diff --git a/webpack.alias.js b/webpack.alias.js
index 935a15f..7d7b160 100644
--- a/webpack.alias.js
+++ b/webpack.alias.js
@@ -18,20 +18,6 @@
const path = require('path');
module.exports = {
- // Flow Design System
- '@flow-design-system/core': path.resolve(__dirname, 'platform/core/flow-design-system.module.js'),
- '@flow-design-system/dialogs': path.resolve(__dirname, 'platform/core/dialogs/fds-dialogs.module.js'),
- '@flow-design-system/dialog-component': path.resolve(__dirname, 'platform/core/dialogs/fds-dialog.component.js'),
- '@flow-design-system/dialog-service': path.resolve(__dirname, 'platform/core/dialogs/services/dialog.service.js'),
- '@flow-design-system/confirm-dialog-component': path.resolve(__dirname, 'platform/core/dialogs/confirm-dialog/confirm-dialog.component.js'),
- '@flow-design-system/snackbars': path.resolve(__dirname, 'platform/core/snackbars/fds-snackbars.module.js'),
- '@flow-design-system/snackbar': path.resolve(__dirname, 'platform/core/snackbars/fds-snackbar.component.js'),
- '@flow-design-system/snackbar-service': path.resolve(__dirname, 'platform/core/snackbars/services/snackbar.service.js'),
- '@flow-design-system/coaster': path.resolve(__dirname, 'platform/core/snackbars/coaster/coaster.component.js'),
- '@flow-design-system/common/storage-service': path.resolve(__dirname, 'platform/core/common/services/fds-storage.service.js'),
- '@flow-design-system/common/animations': path.resolve(__dirname, 'platform/core/common/fds.animations.js'),
- '@flow-design-system/testbed-factory': path.resolve(__dirname, 'platform/core/core.testbed-factory'),
-
// Application
'webapp/fds.module.js': path.resolve(__dirname, 'webapp/fds.module.js'),
'webapp/fds.routes.js': path.resolve(__dirname, 'webapp/fds.routes.js'),
@@ -42,6 +28,9 @@ module.exports = {
'webapp/components/flow-design-system/fds-demo.js': path.resolve(__dirname, 'webapp/components/flow-design-system/fds-demo.js'),
'webapp/components/flow-design-system/dialogs/demo/fds-demo-dialog.js': path.resolve(__dirname, 'webapp/components/flow-design-system/dialogs/demo/fds-demo-dialog.js'),
+ // create an alias for the demo app to use that simulates how real consumers would use it
+ '@nifi-fds/core': path.resolve(__dirname, 'platform/core'),
+
// SCSS
'platform/core': path.resolve(__dirname, 'platform/core')
};