Update to fix package deployments.

benfeely · benfeely · commit 16509fd9fadf · 2018-04-16T23:08:57.000-07:00
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -6,13 +6,12 @@
   },
   "apps": [
     {
-      "name": "docs",
-      "root": "apps/docs/src",
-      "outDir": "dist/apps/docs",
+      "name": "demo",
+      "root": "apps/demo/src",
+      "outDir": "dist/apps/demo",
       "assets": [
         "assets",
-        "favicon.ico",
-        "404.html"
+        "favicon.ico"
       ],
       "index": "index.html",
       "main": "main.ts",
@@ -22,7 +21,7 @@
       "testTsconfig": "../../../tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "styles.scss"
+        "styles.css"
       ],
       "scripts": [],
       "environmentSource": "environments/environment.ts",
@@ -33,7 +32,7 @@
       "tags": []
     },
     {
-      "name": "demo",
+      "name": "demo-from-packages",
       "root": "apps/demo/src",
       "outDir": "dist/apps/demo",
       "assets": [
@@ -44,7 +43,7 @@
       "main": "main.ts",
       "polyfills": "polyfills.ts",
       "test": "../../../test.js",
-      "tsconfig": "tsconfig.app.json",
+      "tsconfig": "tsconfig.packages.json",
       "testTsconfig": "../../../tsconfig.spec.json",
       "prefix": "app",
       "styles": [
@@ -58,13 +57,41 @@
       },
       "tags": []
     },
+    {
+      "name": "docs",
+      "root": "apps/docs/src",
+      "outDir": "dist/apps/docs",
+      "assets": [
+        "assets",
+        "favicon.ico",
+        "404.html"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "../../../test.js",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "../../../tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.scss"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      },
+      "tags": []
+    },
     {
       "name": "docs-from-packages",
       "root": "apps/docs/src",
       "outDir": "dist/apps/docs",
       "assets": [
         "assets",
-        "favicon.ico"
+        "favicon.ico",
+        "404.html"
       ],
       "index": "index.html",
       "main": "main.ts",
diff --git a/apps/docs/src/tsconfig.app.json b/apps/docs/src/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/out-tsc/apps/docs-from-packages",
+    "outDir": "../../../dist/out-tsc/apps/docs",
     "module": "es2015"
   },
   "include": [
diff --git a/libs/fabric/build.ts b/libs/fabric/build.ts
@@ -0,0 +1,7 @@
+import * as path from 'path';
+import { ngPackagr } from 'ng-packagr';
+
+ngPackagr()
+  .forProject(path.resolve(__dirname, 'package.json'))
+  .withTsConfig(path.resolve(__dirname, 'tsconfig-custom.json'))
+  .build();
diff --git a/libs/fabric/package.json b/libs/fabric/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../node_modules/ng-packagr/package.schema.json",
   "name": "@angular-react/fabric",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "ngPackage": {
     "lib": {
       "entryFile": "index.ts",
diff --git a/libs/fabric/tsconfig-custom.json b/libs/fabric/tsconfig-custom.json
@@ -0,0 +1,33 @@
+{
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "flatModuleId": "AUTOGENERATED",
+    "flatModuleOutFile": "AUTOGENERATED",
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true
+  },
+  "buildOnSave": false,
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "",
+    "target": "es2015",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "skipLibCheck": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "lib": ["dom", "es2015"],
+    "paths": {
+      "@angular-react/*": [
+        "../../@angular-react/*"
+      ]
+    }
+  },
+  "exclude": ["node_modules", "dist", "**/*.ngfactory.ts", "**/*.shim.ts", "**/*.spec.ts"],
+  "files": ["AUTOGENERATED"]
+}
diff --git a/libs/semantic-ui/build.ts b/libs/semantic-ui/build.ts
@@ -0,0 +1,7 @@
+import * as path from 'path';
+import { ngPackagr } from 'ng-packagr';
+
+ngPackagr()
+  .forProject(path.resolve(__dirname, 'package.json'))
+  .withTsConfig(path.resolve(__dirname, 'tsconfig-custom.json'))
+  .build();
diff --git a/libs/semantic-ui/tsconfig-custom.json b/libs/semantic-ui/tsconfig-custom.json
@@ -0,0 +1,33 @@
+{
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "flatModuleId": "AUTOGENERATED",
+    "flatModuleOutFile": "AUTOGENERATED",
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true
+  },
+  "buildOnSave": false,
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "",
+    "target": "es2015",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "skipLibCheck": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "lib": ["dom", "es2015"],
+    "paths": {
+      "@angular-react/*": [
+        "../../@angular-react/*"
+      ]
+    }
+  },
+  "exclude": ["node_modules", "dist", "**/*.ngfactory.ts", "**/*.shim.ts", "**/*.spec.ts"],
+  "files": ["AUTOGENERATED"]
+}
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "start": "ng serve",
     "start:demo": "ng serve --app demo",
     "start:docs": "ng serve --app docs",
+
     "build": "ng build",
     "build:demo": "ng build --app demo",
     "build:demo:prod": "ng build --app demo --prod",
@@ -15,10 +16,13 @@
     "build:docs:prod": "ng build --app docs --prod",
     "build:docs:prod:package": "ng build --app docs-from-packages --prod",
     "build:docs:github": "ng build --app docs --prod --output-path docs --base-href https://benfeely.github.io/angular-react/",
-    "build:core": "ng-packagr -p libs/core/package.json",
-    "postbuild:core": "copyfiles README.md ./@angular-react/core",
-    "build:fabric": "ng-packagr -p libs/fabric/package.json",
-    "build:semantic-ui": "ng-packagr -p libs/semantic-ui/package.json",
+
+    "build:libs": "npm run build:libs:core && npm run build:libs:fabric && npm run build:libs:semantic-ui",
+    "build:libs:core": "ng-packagr -p libs/core/package.json",
+    "postbuild:libs:core": "copyfiles README.md ./@angular-react/core",
+    "build:libs:fabric": "ts-node libs/fabric/build.ts",
+    "build:libs:semantic-ui": "ts-node libs/semantic-ui/build.ts",
+
     "test": "ng test",
     "lint": "./node_modules/.bin/nx lint && ng lint",
     "e2e": "ng e2e",
@@ -32,9 +36,10 @@
     "update:check": "./node_modules/.bin/nx update check",
     "update:skip": "./node_modules/.bin/nx update skip",
     "postinstall": "./node_modules/.bin/nx postinstall",
-    "publish:core": "npm run build:core && npm adduser && npm publish ./@angular-react/core --access=public",
-    "publish:fabric": "npm run build:fabric && npm adduser && npm publish ./@angular-react/fabric.tgz --access=public",
-    "publish:semantic-ui": "npm run build:semantic-ui && npm adduser && npm publish ./@angular-react/material.tgz --access=public"
+
+    "publish:core": "npm run build:libs && npm adduser && npm publish ./@angular-react/core --access=public",
+    "publish:fabric": "npm run build:libs && npm adduser && npm publish ./@angular-react/fabric.tgz --access=public",
+    "publish:semantic-ui": "npm run build:libs && npm adduser && npm publish ./@angular-react/semantic-ui.tgz --access=public"
   },
   "private": false,
   "dependencies": {
@@ -64,6 +69,8 @@
     "zone.js": "^0.8.19"
   },
   "devDependencies": {
+    "@angular-devkit/core": "0.4.6",
+    "@angular-devkit/schematics": "0.4.6",
     "@angular/cli": "^1.7.4",
     "@angular/compiler-cli": "5.2.7",
     "@angular/language-service": "5.2.7",
@@ -87,6 +94,8 @@
     "prettier": "1.10.2",
     "protractor": "~5.1.2",
     "ts-node": "~4.1.0",
+    "tsickle": "^0.27.5",
+    "tslib": "^1.9.0",
     "tslint": "~5.9.1",
     "typescript": "2.6.2"
   }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../../../tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "outDir": "../../../dist/out-tsc/apps/docs-from-packages",`
	`4`	`+ "outDir": "../../../dist/out-tsc/apps/docs",`
`5`	`5`	`"module": "es2015"`
`6`	`6`	`},`
`7`	`7`	`"include": [`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../node_modules/ng-packagr/package.schema.json",`
`3`	`3`	`"name": "@angular-react/fabric",`
`4`		`- "version": "0.1.0",`
	`4`	`+ "version": "0.1.1",`
`5`	`5`	`"ngPackage": {`
`6`	`6`	`"lib": {`
`7`	`7`	`"entryFile": "index.ts",`