Skip to content

Commit

Permalink
chore!: version 13 (#1051)
Browse files Browse the repository at this point in the history
* ci: add update scripts

* chore(jest): update jest-preset-angular version
  • Loading branch information
just-jeb authored Nov 7, 2021
1 parent dea4afb commit 1a8157c
Show file tree
Hide file tree
Showing 37 changed files with 178 additions and 251 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 12.14
node-version: 12.20.0
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/graduate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 12.14
node-version: 12.20.0
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Evgeny Barabanov",
"license": "MIT",
"engines": {
"node": ">=12.14.1"
"node": ">=12.20.0"
},
"scripts": {
"bootstrap:packages": "lerna bootstrap --scope '@angular-builders/*'",
Expand All @@ -23,11 +23,14 @@
"format": "prettier --write \"**/*.{js,ts,html,md}\"",
"clean": "lerna clean",
"graduate": "lerna publish --conventional-commits --conventional-graduate",
"prepare": "husky install"
"prepare": "husky install",
"update:packages": "lerna exec --concurrency 1 --scope '@angular-builders/*' 'node \"$LERNA_ROOT_PATH\"/scripts/update-package.js'",
"update:examples": "lerna exec --concurrency 1 --ignore '@angular-builders/*' 'node \"$LERNA_ROOT_PATH\"/scripts/update-example.js'",
"update:root": "node ./scripts/update-package.js"
},
"devDependencies": {
"@angular/compiler": "^12.0.0",
"@angular/compiler-cli": "^12.0.0",
"@angular/compiler": "^13.0.0",
"@angular/compiler-cli": "^13.0.0",
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@types/jest": "^26.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('custom webpack browser builder test', () => {
});

it('Should fit the schema of @angular-devkit/build-angular:browser', () => {
const originalBrowserSchema = require('@angular-devkit/build-angular/src/browser/schema.json');
const originalBrowserSchema = require('@angular-devkit/build-angular/src/builders/browser/schema.json');
customWebpackBrowserSchema.properties['customWebpackConfig'] = undefined;
customWebpackBrowserSchema.properties['indexTransform'] = undefined;
expect(originalBrowserSchema.properties).toEqual(customWebpackBrowserSchema.properties);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('custom webpack karma builder test', () => {
});

it('Should fit the schema of @angular-devkit/build-angular:karma', () => {
const originalBrowserSchema = require('@angular-devkit/build-angular/src/karma/schema.json');
const originalBrowserSchema = require('@angular-devkit/build-angular/src/builders/karma/schema.json');
customWebpackBrowserSchema.properties['customWebpackConfig'] = undefined;
customWebpackBrowserSchema.properties['indexTransform'] = undefined;
expect(originalBrowserSchema.properties).toEqual(customWebpackBrowserSchema.properties);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('custom webpack server builder test', () => {
});

it('Should fit the schema of @angular-devkit/build-angular:server', () => {
const originalBrowserSchema = require('@angular-devkit/build-angular/src/server/schema.json');
const originalBrowserSchema = require('@angular-devkit/build-angular/src/builders/server/schema.json');
customWebpackBrowserSchema.properties['customWebpackConfig'] = undefined;
customWebpackBrowserSchema.properties['indexTransform'] = undefined;
expect(originalBrowserSchema.properties).toEqual(customWebpackBrowserSchema.properties);
Expand Down
1 change: 1 addition & 0 deletions packages/custom-webpack/examples/full-cycle-app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
13 changes: 0 additions & 13 deletions packages/custom-webpack/examples/full-cycle-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down
28 changes: 14 additions & 14 deletions packages/custom-webpack/examples/full-cycle-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^12.0.0",
"@angular/common": "^12.0.0",
"@angular/compiler": "^12.0.0",
"@angular/core": "^12.0.0",
"@angular/forms": "^12.0.0",
"@angular/platform-browser": "^12.0.0",
"@angular/platform-browser-dynamic": "^12.0.0",
"@angular/router": "^12.0.0",
"@angular/animations": "^13.0.0",
"@angular/common": "^13.0.0",
"@angular/compiler": "^13.0.0",
"@angular/core": "^13.0.0",
"@angular/forms": "^13.0.0",
"@angular/platform-browser": "^13.0.0",
"@angular/platform-browser-dynamic": "^13.0.0",
"@angular/router": "^13.0.0",
"rxjs": "~6.5.2",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/custom-webpack": "latest",
"@angular-devkit/build-angular": "^12.0.0",
"@angular/cli": "^12.0.0",
"@angular/compiler-cli": "^12.0.0",
"@angular/language-service": "^12.0.0",
"@angular-devkit/build-angular": "^13.0.1",
"@angular/cli": "^13.0.1",
"@angular/compiler-cli": "^13.0.0",
"@angular/language-service": "^13.0.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
Expand All @@ -45,6 +45,6 @@
"puppeteer": "^5.5.0",
"ts-node": "~8.1.1",
"tslint": "~6.1.0",
"typescript": "~4.2.4"
"typescript": "~4.4.4"
}
}
}
10 changes: 0 additions & 10 deletions packages/custom-webpack/examples/full-cycle-app/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
* BROWSER POLYFILLS
*/

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
Expand Down
4 changes: 3 additions & 1 deletion packages/custom-webpack/examples/full-cycle-app/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import {
declare const require: any;

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false },
});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
Expand Down
1 change: 1 addition & 0 deletions packages/custom-webpack/examples/sanity-app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
13 changes: 0 additions & 13 deletions packages/custom-webpack/examples/sanity-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down
28 changes: 14 additions & 14 deletions packages/custom-webpack/examples/sanity-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^12.0.0",
"@angular/common": "^12.0.0",
"@angular/compiler": "^12.0.0",
"@angular/core": "^12.0.0",
"@angular/forms": "^12.0.0",
"@angular/platform-browser": "^12.0.0",
"@angular/platform-browser-dynamic": "^12.0.0",
"@angular/router": "^12.0.0",
"@angular/animations": "^13.0.0",
"@angular/common": "^13.0.0",
"@angular/compiler": "^13.0.0",
"@angular/core": "^13.0.0",
"@angular/forms": "^13.0.0",
"@angular/platform-browser": "^13.0.0",
"@angular/platform-browser-dynamic": "^13.0.0",
"@angular/router": "^13.0.0",
"rxjs": "~6.5.2",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/custom-webpack": "latest",
"@angular-devkit/build-angular": "^12.0.0",
"@angular/cli": "^12.0.0",
"@angular/compiler-cli": "^12.0.0",
"@angular/language-service": "^12.0.0",
"@angular-devkit/build-angular": "^13.0.1",
"@angular/cli": "^13.0.1",
"@angular/compiler-cli": "^13.0.0",
"@angular/language-service": "^13.0.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
Expand All @@ -44,6 +44,6 @@
"puppeteer": "^5.5.0",
"ts-node": "~8.2.0",
"tslint": "~6.1.0",
"typescript": "~4.2.4"
"typescript": "~4.4.4"
}
}
}
10 changes: 0 additions & 10 deletions packages/custom-webpack/examples/sanity-app/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
* BROWSER POLYFILLS
*/

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
Expand Down
4 changes: 3 additions & 1 deletion packages/custom-webpack/examples/sanity-app/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import {
declare const require: any;

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false },
});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
Expand Down
8 changes: 4 additions & 4 deletions packages/custom-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "JeB Barabanov",
"license": "MIT",
"engines": {
"node": ">=12.14.1"
"node": ">=12.20.0"
},
"keywords": [
"cli",
Expand All @@ -37,9 +37,9 @@
},
"builders": "builders.json",
"dependencies": {
"@angular-devkit/architect": ">=0.1200.0 < 0.1300.0",
"@angular-devkit/build-angular": "^12.0.0",
"@angular-devkit/core": "^12.0.0",
"@angular-devkit/architect": ">=0.1300.0 < 0.1400.0",
"@angular-devkit/build-angular": "^13.0.0",
"@angular-devkit/core": "^13.0.0",
"lodash": "^4.17.15",
"ts-node": "^10.0.0",
"tsconfig-paths": "^3.9.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/custom-webpack/src/schemes.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
// Base schemes from [email protected]
module.exports = [
{
originalSchemaPath: '@angular-devkit/build-angular/src/browser/schema.json',
originalSchemaPath: '@angular-devkit/build-angular/src/builders/browser/schema.json',
schemaExtensionPaths: [`${__dirname}/browser/schema.ext.json`, `${__dirname}/schema.ext.json`],
newSchemaPath: `${__dirname}/../dist/browser/schema.json`,
},
{
originalSchemaPath: '@angular-devkit/build-angular/src/server/schema.json',
originalSchemaPath: '@angular-devkit/build-angular/src/builders/server/schema.json',
schemaExtensionPaths: [`${__dirname}/server/schema.ext.json`, `${__dirname}/schema.ext.json`],
newSchemaPath: `${__dirname}/../dist/server/schema.json`,
},
{
originalSchemaPath: '@angular-devkit/build-angular/src/karma/schema.json',
originalSchemaPath: '@angular-devkit/build-angular/src/builders/karma/schema.json',
schemaExtensionPaths: [`${__dirname}/karma/schema.ext.json`, `${__dirname}/schema.ext.json`],
newSchemaPath: `${__dirname}/../dist/karma/schema.json`,
},
{
originalSchemaPath: '@angular-devkit/build-angular/src/dev-server/schema.json',
originalSchemaPath: '@angular-devkit/build-angular/src/builders/dev-server/schema.json',
schemaExtensionPaths: [`${__dirname}/dev-server/schema.ext.json`],
newSchemaPath: `${__dirname}/../dist/dev-server/schema.json`,
},
{
originalSchemaPath: '@angular-devkit/build-angular/src/extract-i18n/schema.json',
originalSchemaPath: '@angular-devkit/build-angular/src/builders/extract-i18n/schema.json',
schemaExtensionPaths: [`${__dirname}/extract-i18n/schema.ext.json`],
newSchemaPath: `${__dirname}/../dist/extract-i18n/schema.json`,
},
Expand Down
1 change: 1 addition & 0 deletions packages/jest/examples/multiple-apps/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
38 changes: 0 additions & 38 deletions packages/jest/examples/multiple-apps/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,6 @@
"globalMocks": ["getComputedStyle", "styleTransform"]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/my-first-app/tsconfig.app.json",
"projects/my-first-app/tsconfig.spec.json",
"projects/my-first-app/e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down Expand Up @@ -197,19 +184,6 @@
"test": {
"builder": "@angular-builders/jest:run"
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/my-second-app/tsconfig.app.json",
"projects/my-second-app/tsconfig.spec.json",
"projects/my-second-app/e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down Expand Up @@ -249,18 +223,6 @@
},
"test": {
"builder": "@angular-builders/jest:run"
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/my-shared-library/tsconfig.lib.json",
"projects/my-shared-library/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}},
Expand Down
Loading

0 comments on commit 1a8157c

Please sign in to comment.