diff --git a/.angular-cli.json b/.angular-cli.json index 523122b..94544bf 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -1,12 +1,14 @@ { - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "$schema": "./node_modules/@nrwl/schematics/src/schema.json", "project": { - "name": "existing-proj" + "name": "existing-proj", + "npmScope": "first-suite", + "latestMigration": "20180130-angular-devkit-schematics" }, "apps": [ { - "root": "src", - "outDir": "dist", + "root": "apps\\first-client\\src", + "outDir": "dist\\apps\\first-client", "assets": [ "assets", "favicon.ico" @@ -14,9 +16,60 @@ "index": "index.html", "main": "main.ts", "polyfills": "polyfills.ts", - "test": "test.ts", + "test": "../../../test.js", "tsconfig": "tsconfig.app.json", - "testTsconfig": "tsconfig.spec.json", + "testTsconfig": "../../../tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + }, + "name": "first-client" + }, + { + "name": "second-client", + "root": "apps/second-client/src", + "outDir": "dist/apps/second-client", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "../../../test.js", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "../../../tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + }, + { + "name": "third-client", + "root": "apps/third-client/src", + "outDir": "dist/apps/third-client", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "../../../test.js", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "../../../tsconfig.spec.json", "prefix": "app", "styles": [ "styles.css" @@ -27,6 +80,24 @@ "dev": "environments/environment.ts", "prod": "environments/environment.prod.ts" } + }, + { + "name": "first-lib", + "root": "libs/first-lib/src", + "test": "../../../test.js", + "appRoot": "" + }, + { + "name": "second-lib", + "root": "libs/second-lib/src", + "test": "../../../test.js", + "appRoot": "" + }, + { + "name": "third-lib", + "root": "libs/third-lib/src", + "test": "../../../test.js", + "appRoot": "" } ], "e2e": { @@ -36,15 +107,31 @@ }, "lint": [ { - "project": "src/tsconfig.app.json", + "project": "apps\\first-client\\src/tsconfig.app.json", + "exclude": "**/node_modules/**" + }, + { + "project": "./tsconfig.spec.json", + "exclude": "**/node_modules/**" + }, + { + "project": "first-client/tsconfig.e2e.json", "exclude": "**/node_modules/**" }, { - "project": "src/tsconfig.spec.json", + "project": "apps/second-client/src/tsconfig.app.json", "exclude": "**/node_modules/**" }, { - "project": "e2e/tsconfig.e2e.json", + "project": "apps/second-client/e2e/tsconfig.e2e.json", + "exclude": "**/node_modules/**" + }, + { + "project": "apps/third-client/src/tsconfig.app.json", + "exclude": "**/node_modules/**" + }, + { + "project": "apps/third-client/e2e/tsconfig.e2e.json", "exclude": "**/node_modules/**" } ], @@ -54,6 +141,14 @@ } }, "defaults": { + "schematics": { + "collection": "@nrwl/schematics", + "postGenerate": "npm run format", + "newProject": [ + "app", + "lib" + ] + }, "styleExt": "css", "component": {} } diff --git a/.angular_cli165.tgz b/.angular_cli165.tgz new file mode 100644 index 0000000..9664ba0 Binary files /dev/null and b/.angular_cli165.tgz differ diff --git a/e2e/app.e2e-spec.ts b/apps/first-client/e2e/app.e2e-spec.ts similarity index 100% rename from e2e/app.e2e-spec.ts rename to apps/first-client/e2e/app.e2e-spec.ts diff --git a/e2e/app.po.ts b/apps/first-client/e2e/app.po.ts similarity index 100% rename from e2e/app.po.ts rename to apps/first-client/e2e/app.po.ts diff --git a/apps/first-client/e2e/tsconfig.e2e.json b/apps/first-client/e2e/tsconfig.e2e.json new file mode 100644 index 0000000..246beb0 --- /dev/null +++ b/apps/first-client/e2e/tsconfig.e2e.json @@ -0,0 +1,20 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc/e2e/first-client", + "baseUrl": "./", + "module": "commonjs", + "target": "es5", + "types": [ + "jasmine", + "jasminewd2", + "node" + ] + }, + "exclude": [ + "**/*.spec.ts" + ], + "include": [ + "../**/*.ts" + ] +} \ No newline at end of file diff --git a/src/app/app.component.css b/apps/first-client/src/app/app.component.css similarity index 100% rename from src/app/app.component.css rename to apps/first-client/src/app/app.component.css diff --git a/src/app/app.component.html b/apps/first-client/src/app/app.component.html similarity index 95% rename from src/app/app.component.html rename to apps/first-client/src/app/app.component.html index fa2706a..75a9ad8 100644 --- a/src/app/app.component.html +++ b/apps/first-client/src/app/app.component.html @@ -5,7 +5,7 @@

Angular Logo -

Here are some links to help you start:

+

First Client: