Skip to content

Commit

Permalink
Merge pull request #2 from jadengis/johndengis/ng-14
Browse files Browse the repository at this point in the history
Upgrade to Angular 14
  • Loading branch information
jadengis authored Jun 8, 2022
2 parents 8e75c8a + a764ba1 commit 4a6ae49
Show file tree
Hide file tree
Showing 20 changed files with 22,170 additions and 24,773 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: Test
name: Build

on: push

jobs:
build:
test:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Cache .npm
id: npm-cache
uses: actions/cache@v2
Expand All @@ -33,4 +33,4 @@ jobs:
if: steps.node-modules-cache.outputs.cache-hit != 'true'
run: npm install
- name: Lint workspace
run: npm run test
run: npm run build
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Cache .npm
id: npm-cache
uses: actions/cache@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: Build
name: Test

on: push

jobs:
test:
build:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Cache .npm
id: npm-cache
uses: actions/cache@v2
Expand All @@ -33,4 +33,4 @@ jobs:
if: steps.node-modules-cache.outputs.cache-hit != 'true'
run: npm install
- name: Lint workspace
run: npm run build
run: npm run test
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# 2.0.0

### BREAKING CHANGES

- `InjectControlNameDirective` is now a standalone directive. `InjectControlModule` has been
removed.
- Now peers to Angular `>=14`.

### Features

- Supports Angular 14.

# 1.0.0

### BREAKING CHANGES
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,16 @@ export class EmailInputComponent implements InjectableControl {

#### Module:

`InjectControlNameDirective` is a standalone component and can by imported directly in a module or
component.

```typescript
import { InjectControlModule } from 'ngx-inject-control';
import { InjectControlNameDirective } from 'ngx-inject-control';


@NgModule({
declarations: [EmailInputComponent], // Injectable component must be in scope
imports: [InjectControlModule],
imports: [InjectControlNameDirective],
})
```

Expand Down
2 changes: 1 addition & 1 deletion jest.config.js → jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { getJestProjects } = require('@nrwl/jest');

module.exports = { projects: getJestProjects() };
export default { projects: getJestProjects() };
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nrwl/jest/preset').default;

module.exports = { ...nxPreset };
12 changes: 9 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e"],
"parallel": 1
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"parallel": 1,
"accessToken": "YjZjMzk0NmYtZmE3NC00MzUwLWE0ZTUtOGJkOTgzMjIyNWEzfHJlYWQtd3JpdGU="
}
}
},
Expand Down
Loading

0 comments on commit 4a6ae49

Please sign in to comment.