fix: move ng-package.schema.json to dist root directory

BREAKING CHANGES: the `ng-package.schema.json` was accidentally moved to `lib` folder in a previous release. Restore it in its original location!

Author: dherges

integration/samples.js

@@ -14,7 +14,7 @@ require('ts-node').register({
   project: path.join(__dirname, '..', 'tsconfig.packagr.json')
 });
 
-const ngPackagr = require('../lib/ng-packagr');
+const ngPackagr = require('../src/lib/ng-packagr');
 
 let promise = Promise.resolve();
 while (SAMPLES.length > 0) {

package.json

@@ -74,7 +74,7 @@
     "prebuild": "rimraf dist && yarn schema",
     "build": "tsc -p tsconfig.packagr.json",
     "postbuild": "node scripts/postbuild.js",
-    "schema": "json2ts --input src/lib/ng-package.schema.json --output src/lib/ng-package.schema.ts",
+    "schema": "json2ts --input src/ng-package.schema.json --output src/ng-package.schema.ts",
     "prerelease": "yarn build",
     "release": "standard-version --message 'chore: cut release for v%s' --prerelease pre",
     "postrelease": "node scripts/prepublish.js",

scripts/postbuild.js

@@ -19,7 +19,7 @@ const copy = (paths, opts) => {
 // copyfiles 'lib/conf/**/*.json' dist",
 
 copy(['src/cli/*', 'dist'], {up: 1})
-  .then(() => copy(['src/lib/ng-package.schema.json', 'dist'], {up: 1}))
+  .then(() => copy(['src/ng-package.schema.json', 'dist'], {up: 1}))
   .then(() => copy(['src/lib/conf/**/*.json', 'dist'], {up: 1}))
   .catch((err) => {
     console.error("Cannot copy files", err);

src/lib/.gitignore renamed to src/.gitignore

@@ -1,4 +1,4 @@
-import { NgPackageConfig } from '../ng-package.schema';
+import { NgPackageConfig } from '../../ng-package.schema';
 const path = require('path');
 
 const SCOPE_PREFIX = '@';

src/lib/model/ng-package.ts

@@ -17,7 +17,7 @@ import { error, warn, info, success, debug } from './util/log';
 
 // `ng-package.json` config
 import { NgPackage } from './model/ng-package';
-import { NgPackageConfig } from './ng-package.schema';
+import { NgPackageConfig } from '../ng-package.schema';
 
 
 

src/lib/ng-packagr.ts

@@ -1,43 +1,35 @@
 import * as path from 'path';
 import { SchemaClass, SchemaClassFactory } from '@ngtools/json-schema';
-import { NgPackageConfig } from '../ng-package.schema';
+import { NgPackageConfig } from '../../ng-package.schema';
 import { NgPackage } from '../model/ng-package';
-import { findFromDirectory } from '../util/fs';
 import { readJson, writeJson } from '../util/json';
 
+const schemaPromise = readJson(path.resolve(__dirname, '..', '..', 'ng-package.schema.json'))
+  .then((jsonSchema: any) => SchemaClassFactory<NgPackageConfig>(jsonSchema));
 
 /**
  * Reads an Angular package definition file from 'ng-package.json'
  *
- * @param file `ng-package.json` definition file
+ * @param file path pointing to `ng-package.json` file
  */
 export const readPackage = (file: string): Promise<NgPackage> => {
   const base = path.dirname(file);
 
-  return readJson(file)
-    .then((ngPkg: NgPackageConfig) => {
-      // resolve pathes relative to `ng-package.json` file
-      const dir = path.resolve(base, ngPkg.src || '.');
+  // read 'ng-package.json'
+  return readJson(file).then((ngPkg: NgPackageConfig) => {
+    // resolve pathes relative to `ng-package.json` file
+    const dir = path.resolve(base, ngPkg.src || '.');
 
-      return readJson(`${dir}/package.json`)
-        .then((pkg: any) => {
+    // read 'package.json'
+    return readJson(path.resolve(dir, 'package.json')).then((pkg: any) => {
+      // read 'ng-package.schema.json'
+      return schemaPromise.then((SchemaClass) => {
+        const schema = new SchemaClass(ngPkg);
 
-          return new Promise((resolve, reject) => {
-
-            findFromDirectory(__dirname, 'ng-package.schema.json', (fileName: string) => {
-              resolve(fileName);
-            });
-          })
-          .then((schemaFileName: string) => readJson(schemaFileName))
-          .then((schemaJson: any) => {
-            const NgPackageSchema = SchemaClassFactory(schemaJson);
-            const schema: SchemaClass<NgPackageConfig> = new NgPackageSchema(ngPkg);
-
-            return Promise.resolve(new NgPackage(base, schema.$$root(), pkg));
-          });
-
-        });
+        return Promise.resolve(new NgPackage(pkg, ngPkg, base, schema));
+      });
     });
+  });
 }
 
 
@@ -51,16 +43,14 @@ export const readPackage = (file: string): Promise<NgPackage> => {
  */
 export const createPackage = (src: string, dest: string, additionalProperties?: {}): Promise<any> => {
 
-  return readJson(`${src}/package.json`)
-    .then((packageJson) => {
+  return readJson(path.resolve(src, 'package.json')).then((packageJson) => {
+    // set additional properties
+    if (additionalProperties) {
+      Object.keys(additionalProperties).forEach((key) => {
+        packageJson[key] = additionalProperties[key];
+      });
+    }
 
-      // set additional properties
-      if (additionalProperties) {
-        Object.keys(additionalProperties).forEach((key) => {
-          packageJson[key] = additionalProperties[key];
-        });
-      }
-
-      return writeJson(packageJson, `${dest}/package.json`);
-    });
+    return writeJson(packageJson, `${dest}/package.json`);
+  });
 }

src/lib/steps/package.ts

@@ -8,7 +8,7 @@
     "inlineSources": true,
     "declaration": true,
     "lib": ["es2015", "dom"],
-    "outDir": "dist/lib",
+    "outDir": "dist",
     "experimentalDecorators": true,
     "noEmitOnError": true,
     "noImplicitAny": false,