feat: add packages for libraries and schematics (#11)

Co-authored-by: Nacho Vazquez <[email protected]>

Author: LayZeeDK

.github/workflows/test.yml renamed to .github/workflows/ci.yml

@@ -1,24 +1,33 @@
-name: 'build-test'
-on: # rebuild any PRs and main branch changes
+name: '@ngworker/angular-versions-action CI'
+
+on:
   pull_request:
   push:
     branches:
       - main
-      - 'releases/*'
 
 jobs:
-  build: # make sure build/ci work properly
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: |
-          yarn
-      - run: |
-          yarn ci
-  test: # make sure the action works on a clean machine without building
+      - run: yarn install
+
+      - run: yarn build
+
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - run: yarn install
+
+      - run: yarn test
+
+  e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
       - uses: ./
         with:
           angular_version: 8.0.x

__tests__/override-angular-versions.test.ts

@@ -1,72 +1,96 @@
+import {fullWithTsickleJson} from './package-json-versions/full-with-tsickle';
 import {
-  packageJsonWithV8Dependencies,
-  packageJsonWithV8DevDependencies,
-  packageJsonWithV8All,
+  packageJsonWithV11_1Dependencies,
+  packageJsonWithV11_1DevDependencies,
+  packageJsonWithV11_1All,
   fullPackageJson,
   packageUnmatching,
   packageJsonWithoutNgPackagr,
-  packageJsonWithV8AllWithoutNgPackagr
+  packageJsonWith11_1AllWithoutNgPackagr,
+  packageJsonV8WithForceDependencies
 } from './package-json-versions';
 import {overrideAngularVersions} from '../src/override-angular-versions';
 import {getAngularVersions} from '../src/get-angular-versions';
 
 describe(overrideAngularVersions.name, () => {
   describe('replaces versions existing in both sources', () => {
     test('replace ONLY Angular versions in dependencies', () => {
-      const v8 = getAngularVersions('8.0.x');
-      (v8.devDependencies as any) = {};
+      const v11_1 = getAngularVersions('11.1.x');
+      (v11_1.devDependencies as any) = {};
 
       const actualPackageJson = overrideAngularVersions({
         projectVersions: fullPackageJson,
-        angularVersions: v8
+        angularVersions: v11_1
       });
 
-      expect(actualPackageJson).toEqual(packageJsonWithV8Dependencies);
+      expect(actualPackageJson).toEqual(packageJsonWithV11_1Dependencies);
     });
 
     test('replace ONLY Angular versions in devDependencies', () => {
-      const v8 = getAngularVersions('8.0.x');
-      (v8.dependencies as any) = {};
+      const v11_1 = getAngularVersions('11.1.x');
+      (v11_1.dependencies as any) = {};
 
       const actualPackageJson = overrideAngularVersions({
         projectVersions: fullPackageJson,
-        angularVersions: v8
+        angularVersions: v11_1
       });
 
-      expect(actualPackageJson).toEqual(packageJsonWithV8DevDependencies);
+      expect(actualPackageJson).toEqual(packageJsonWithV11_1DevDependencies);
     });
 
     test('replace Angular versions in devDependencies and dependencies', () => {
-      const v8 = getAngularVersions('8.0.x');
+      const v11_1 = getAngularVersions('11.1.x');
 
       const actualPackageJson = overrideAngularVersions({
         projectVersions: fullPackageJson,
-        angularVersions: v8
+        angularVersions: v11_1
       });
 
-      expect(actualPackageJson).toEqual(packageJsonWithV8All);
+      expect(actualPackageJson).toEqual(packageJsonWithV11_1All);
     });
 
     test('no override package with unmatching versions', () => {
-      const v8 = getAngularVersions('8.0.x');
+      const v11_1 = getAngularVersions('11.1.x');
 
       const actualPackageJson = overrideAngularVersions({
         projectVersions: packageUnmatching as any,
-        angularVersions: v8
+        angularVersions: v11_1
       });
 
       expect(actualPackageJson).toEqual(packageUnmatching);
     });
 
     test('no add ng-packagr dependency when it is not present in the package', () => {
-      const v8 = getAngularVersions('8.0.x');
+      const v11_1 = getAngularVersions('11.1.x');
 
       const actualPackageJson = overrideAngularVersions({
         projectVersions: packageJsonWithoutNgPackagr as any,
+        angularVersions: v11_1
+      });
+
+      expect(actualPackageJson).toEqual(packageJsonWith11_1AllWithoutNgPackagr);
+    });
+
+    test('add forced dependencies when not present in the package', () => {
+      const v8 = getAngularVersions('8.0.x');
+
+      const actualPackageJson = overrideAngularVersions({
+        projectVersions: fullPackageJson as any,
+        angularVersions: v8
+      });
+
+      expect(actualPackageJson).toEqual(packageJsonV8WithForceDependencies);
+    });
+
+    test('replace forced dependencies when present in the package', () => {
+      const v8 = getAngularVersions('8.0.x');
+
+      const actualPackageJson = overrideAngularVersions({
+        projectVersions: fullWithTsickleJson as any,
         angularVersions: v8
       });
 
-      expect(actualPackageJson).toEqual(packageJsonWithV8AllWithoutNgPackagr);
+      expect(actualPackageJson).toEqual(packageJsonV8WithForceDependencies);
     });
   });
 });

__tests__/package-json-versions/full-package-json.ts

@@ -47,6 +47,7 @@ export const fullPackageJson = {
   devDependencies: {
     '@angular-devkit/build-angular': '~0.1001.7',
     '@angular-devkit/build-ng-packagr': '~0.1001.7',
+    '@angular-devkit/schematics-cli': '~0.1001.7',
     '@angular/cli': '~10.1.7',
     '@angular/compiler-cli': '~10.1.6',
     '@commitlint/cli': '8.1.0',

__tests__/package-json-versions/v8-all-override-without-ng-packagr.ts renamed to __tests__/package-json-versions/full-with-tsickle.ts

@@ -1,4 +1,4 @@
-export const packageJsonWithV8AllWithoutNgPackagr = {
+export const fullWithTsickleJson = {
   name: 'lumberjack',
   version: '0.0.0',
   scripts: {
@@ -32,22 +32,24 @@ export const packageJsonWithV8AllWithoutNgPackagr = {
   },
   private: true,
   dependencies: {
-    '@angular/animations': '~8.0.3',
-    '@angular/common': '~8.0.3',
-    '@angular/compiler': '~8.0.3',
-    '@angular/core': '~8.0.3',
-    '@angular/forms': '~8.0.3',
-    '@angular/platform-browser': '~8.0.3',
-    '@angular/platform-browser-dynamic': '~8.0.3',
-    '@angular/router': '~8.0.3',
+    '@angular/animations': '~8.2.0',
+    '@angular/common': '~8.2.0',
+    '@angular/compiler': '~8.2.0',
+    '@angular/core': '~8.2.0',
+    '@angular/forms': '~8.2.0',
+    '@angular/platform-browser': '~8.2.0',
+    '@angular/platform-browser-dynamic': '~8.2.0',
+    '@angular/router': '~8.2.0',
     rxjs: '~6.4.0',
-    tslib: '^1.9.0',
+    tslib: '^1.10.0',
     'zone.js': '~0.9.1'
   },
   devDependencies: {
-    '@angular-devkit/build-angular': '~0.800.6',
-    '@angular/cli': '~8.0.6',
-    '@angular/compiler-cli': '~8.0.3',
+    '@angular-devkit/build-angular': '~0.803.0',
+    '@angular-devkit/build-ng-packagr': '~0.803.0',
+    '@angular-devkit/schematics-cli': '~0.1001.7',
+    '@angular/cli': '~8.3.0',
+    '@angular/compiler-cli': '~8.2.0',
     '@commitlint/cli': '8.1.0',
     '@commitlint/config-angular': '^8.3.4',
     '@commitlint/config-conventional': '^8.3.4',
@@ -69,15 +71,16 @@ export const packageJsonWithV8AllWithoutNgPackagr = {
     'karma-jasmine': '~3.3.1',
     'karma-jasmine-html-reporter': '^1.5.0',
     'lint-staged': '^9.5.0',
-    'ng-packagr': '^10.0.0',
+    'ng-packagr': '^5.3.0',
     prettier: '^2.0.5',
     protractor: '~7.0.0',
     'standard-version': '^6.0.1',
     'ts-node': '~7.0.0',
+    tsickle: '~0.36.0',
     tslint: '~5.15.0',
     'tslint-config-prettier': '^1.18.0',
     'tslint-plugin-prettier': '^2.3.0',
-    typescript: '~3.4.3'
+    typescript: '~3.5.3'
   },
   config: {
     commitizen: {

__tests__/package-json-versions/index.ts

@@ -1,7 +1,9 @@
 export * from './full-package-json';
-export * from './v8-dep-overrided';
-export * from './v8-devdep-override';
-export * from './v8-all-override';
+export * from './full-with-tsickle';
+export * from './v11_1-dep-overrided';
+export * from './v11_1-devdep-override';
+export * from './v11_1-all-override';
 export * from './package-unmatching';
 export * from './package-without-ng-packagr';
-export * from './v8-all-override-without-ng-packagr';
+export * from './v11_1-all-override-without-ng-packagr';
+export * from './v8-with-forced-dependencies';

__tests__/package-json-versions/package-unmatching.ts

@@ -55,7 +55,6 @@ export const packageUnmatching = {
     'karma-jasmine': '~3.3.1',
     'karma-jasmine-html-reporter': '^1.5.0',
     'lint-staged': '^9.5.0',
-    'ng-packagr': '^10.0.0',
     prettier: '^2.0.5',
     protractor: '~7.0.0',
     'standard-version': '^6.0.1',

__tests__/package-json-versions/package-without-ng-packagr.ts

@@ -46,6 +46,7 @@ export const packageJsonWithoutNgPackagr = {
   },
   devDependencies: {
     '@angular-devkit/build-angular': '~0.1001.7',
+    '@angular-devkit/schematics-cli': '~0.1001.7',
     '@angular/cli': '~10.1.7',
     '@angular/compiler-cli': '~10.1.6',
     '@commitlint/cli': '8.1.0',
@@ -69,7 +70,6 @@ export const packageJsonWithoutNgPackagr = {
     'karma-jasmine': '~3.3.1',
     'karma-jasmine-html-reporter': '^1.5.0',
     'lint-staged': '^9.5.0',
-    'ng-packagr': '^10.0.0',
     prettier: '^2.0.5',
     protractor: '~7.0.0',
     'standard-version': '^6.0.1',

__tests__/package-json-versions/v11_1-all-override-without-ng-packagr.ts

@@ -0,0 +1,100 @@
+export const packageJsonWith11_1AllWithoutNgPackagr = {
+  name: 'lumberjack',
+  version: '0.0.0',
+  scripts: {
+    ng: 'ng',
+    start: 'ng serve lumberjack-app',
+    build: 'ng build lumberjack-app --prod',
+    test: 'ng test lumberjack-app',
+    'test:ci': 'yarn test --configuration=ci',
+    lint: 'ng lint',
+    e2e: 'ng e2e lumberjack-app-e2e',
+    'contributors:add': 'all-contributors add',
+    'hooks:pre-commit': 'node hooks/pre-commit.js',
+    commit: 'git-cz',
+    'release:first': 'yarn release -- --first-release',
+    'build:lib':
+      'ng build ngworker-lumberjack --prod && npx copy README.md ./dist/ngworker/lumberjack',
+    'test:lib': 'ng test ngworker-lumberjack',
+    'test:lib:ci': 'yarn test:lib --configuration=ci',
+    'test:internal':
+      'ng test internal-test-util && ng test internal-console-driver-test-util',
+    'test:internal:ci':
+      'ng test internal-test-util --configuration=ci && ng test internal-console-driver-test-util --configuration=ci',
+    release:
+      'cd libs/ngworker/lumberjack && standard-version --infile ../../../CHANGELOG.md',
+    publish: 'cd dist/ngworker/lumberjack && npm publish',
+    ci:
+      'yarn install && yarn lint && yarn build:lib && yarn test:internal:ci && yarn test:lib:ci && yarn build && yarn test:ci && yarn e2e',
+    format:
+      'npx prettier --config prettier.config.js --write "**/*.*" "!dist/**" "!yarn.lock"',
+    'delete-path-alias': 'node tools/delete-path-alias.js'
+  },
+  private: true,
+  dependencies: {
+    '@angular/animations': '~11.1.0',
+    '@angular/common': '~11.1.0',
+    '@angular/compiler': '~11.1.0',
+    '@angular/core': '~11.1.0',
+    '@angular/forms': '~11.1.0',
+    '@angular/platform-browser': '~11.1.0',
+    '@angular/platform-browser-dynamic': '~11.1.0',
+    '@angular/router': '~11.1.0',
+    rxjs: '~6.6.0',
+    tslib: '^2.0.0',
+    'zone.js': '~0.11.3'
+  },
+  devDependencies: {
+    '@angular-devkit/build-angular': '~0.1101.0',
+    '@angular-devkit/schematics-cli': '~0.1101.0',
+    '@angular/cli': '~11.1.0',
+    '@angular/compiler-cli': '~11.1.0',
+    '@commitlint/cli': '8.1.0',
+    '@commitlint/config-angular': '^8.3.4',
+    '@commitlint/config-conventional': '^8.3.4',
+    '@ngneat/spectator': '^6.0.0',
+    '@types/jasmine': '~3.5.0',
+    '@types/jasminewd2': '~2.0.3',
+    '@types/node': '^12.11.1',
+    'all-contributors-cli': '^6.8.1',
+    codelyzer: '^6.0.0',
+    copy: '~0.3.2',
+    'git-cz': '^3.3.0',
+    husky: '^3.1.0',
+    'jasmine-core': '~3.5.0',
+    'jasmine-spec-reporter': '~5.0.2',
+    json: '^10.0.0',
+    karma: '~5.0.9',
+    'karma-chrome-launcher': '~3.1.0',
+    'karma-coverage-istanbul-reporter': '~3.0.2',
+    'karma-jasmine': '~3.3.1',
+    'karma-jasmine-html-reporter': '^1.5.0',
+    'lint-staged': '^9.5.0',
+    prettier: '^2.0.5',
+    protractor: '~7.0.0',
+    'standard-version': '^6.0.1',
+    'ts-node': '~8.3.0',
+    tslint: '~6.1.0',
+    'tslint-config-prettier': '^1.18.0',
+    'tslint-plugin-prettier': '^2.3.0',
+    typescript: '~4.1.2'
+  },
+  config: {
+    commitizen: {
+      path: 'cz-conventional-changelog'
+    }
+  },
+  'lint-staged': {
+    '*.{js,json,css,scss,ts,html,component.html}': [
+      'prettier --write',
+      'git add'
+    ]
+  },
+  husky: {
+    hooks: {
+      'commit-msg': 'commitlint -e $HUSKY_GIT_PARAMS',
+      'pre-commit': 'yarn hooks:pre-commit && lint-staged && yarn lint',
+      'pre-push': 'yarn test:lib:ci'
+    }
+  }
+};