Skip to content

Commit

Permalink
feat(angular): bump package versions for Angular 15
Browse files Browse the repository at this point in the history
  • Loading branch information
@Coly010
Coly010 committed Sep 29, 2022
1 parent 8c8c29c commit 3d0b306
Show file tree
Hide file tree
Showing 21 changed files with 774 additions and 878 deletions.
1 change: 0 additions & 1 deletion e2e/angular-extensions/src/misc.test.ts
View file
Expand Up @@ -35,7 +35,6 @@ describe('Move Angular Project', () => {

// just check the output
expect(moveOutput).toContain(`DELETE apps/${app1}`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/.browserslistrc`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/jest.config.ts`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/tsconfig.app.json`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/tsconfig.json`);
Expand Down
25 changes: 12 additions & 13 deletions package.json
View file
Expand Up @@ -26,19 +26,19 @@
"echo": "echo 123458"
},
"devDependencies": {
"@angular-devkit/architect": "~0.1402.0",
"@angular-devkit/build-angular": "~14.2.0",
"@angular-devkit/core": "~14.2.0",
"@angular-devkit/schematics": "~14.2.0",
"@angular-devkit/architect": "~0.1500.0-next.3",
"@angular-devkit/build-angular": "~15.0.0-next.3",
"@angular-devkit/core": "~15.0.0-next.3",
"@angular-devkit/schematics": "~15.0.0-next.3",
"@angular-eslint/eslint-plugin": "~14.0.4",
"@angular-eslint/eslint-plugin-template": "~14.0.4",
"@angular-eslint/template-parser": "~14.0.4",
"@angular/cli": "~14.2.0",
"@angular/common": "~14.2.0",
"@angular/compiler": "~14.2.0",
"@angular/compiler-cli": "~14.2.0",
"@angular/core": "~14.2.0",
"@angular/router": "~14.2.0",
"@angular/cli": "~15.0.0-next.3",
"@angular/common": "~15.0.0-next.4",
"@angular/compiler": "~15.0.0-next.4",
"@angular/compiler-cli": "~15.0.0-next.4",
"@angular/core": "~15.0.0-next.4",
"@angular/router": "~15.0.0-next.4",
"@babel/core": "^7.15.0",
"@babel/helper-create-regexp-features-plugin": "^7.14.5",
"@babel/preset-typescript": "^7.15.0",
Expand Down Expand Up @@ -73,7 +73,7 @@
"@rollup/plugin-image": "^2.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.4",
"@schematics/angular": "~14.2.0",
"@schematics/angular": "~15.0.0-next.3",
"@storybook/addon-essentials": "~6.5.9",
"@storybook/addon-knobs": "~6.3.0",
"@storybook/angular": "~6.5.9",
Expand Down Expand Up @@ -187,7 +187,7 @@
"mini-css-extract-plugin": "~2.4.7",
"minimatch": "3.0.5",
"next-sitemap": "^3.1.10",
"ng-packagr": "~14.2.0",
"ng-packagr": "~15.0.0-next.3",
"node-fetch": "^2.6.7",
"nx": "14.8.0",
"open": "^8.4.0",
Expand Down Expand Up @@ -308,4 +308,3 @@
"minimist": "^1.2.6"
}
}

51 changes: 51 additions & 0 deletions packages/angular/migrations.json
View file
Expand Up @@ -184,6 +184,12 @@
"version": "15.0.0-beta.0",
"description": "Update the usages of @nrwl/angular/testing to import jasmine-marbles symbols from jasmine-marbles itself.",
"factory": "./src/migrations/update-15-0-0/switch-to-jasmine-marbles"
},
"update-angular-cli-version-15-0-0": {
"cli": "nx",
"version": "16.0.0-beta.0",
"description": "Update the @angular/cli package version to ~15.0.0.",
"factory": "./src/migrations/update-16-0-0/update-angular-cli"
}
},
"packageJsonUpdates": {
Expand Down Expand Up @@ -1551,6 +1557,51 @@
"alwaysAddToPackageJson": false
}
}
},
"16.0.0": {
"version": "16.0.0-beta.0",
"packages": {
"@angular-devkit/architect": {
"version": "~0.1500.0-next.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-angular": {
"version": "~15.0.0-next.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-webpack": {
"version": "~0.1500.0-next.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/core": {
"version": "~15.0.0-next.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/schematics": {
"version": "~15.0.0-next.3",
"alwaysAddToPackageJson": false
},
"@schematics/angular": {
"version": "~15.0.0-next.3",
"alwaysAddToPackageJson": false
},
"@angular/core": {
"version": "~15.0.0-next.4",
"alwaysAddToPackageJson": true
},
"@angular/material": {
"version": "~15.0.0-next.2",
"alwaysAddToPackageJson": false
},
"@angular/cdk": {
"version": "~15.0.0-next.2",
"alwaysAddToPackageJson": false
},
"ng-packagr": {
"version": "~15.0.0-next.3",
"alwaysAddToPackageJson": false
}
}
}
}
}
4 changes: 2 additions & 2 deletions packages/angular/package.json
View file
Expand Up @@ -39,7 +39,7 @@
"migrations": "./migrations.json"
},
"dependencies": {
"@angular-devkit/schematics": "~14.2.0",
"@angular-devkit/schematics": "~15.0.0-next.3",
"@nrwl/cypress": "file:../cypress",
"@nrwl/devkit": "file:../devkit",
"@nrwl/jest": "file:../jest",
Expand All @@ -48,7 +48,7 @@
"@nrwl/webpack": "file:../webpack",
"@nrwl/workspace": "file:../workspace",
"@phenomnomnominal/tsquery": "4.1.1",
"@schematics/angular": "~14.2.0",
"@schematics/angular": "~15.0.0-next.3",
"chalk": "4.1.0",
"chokidar": "^3.5.1",
"http-server": "^14.1.0",
Expand Down
7 changes: 6 additions & 1 deletion packages/angular/plugins/component-testing.ts
View file
Expand Up @@ -167,7 +167,12 @@ function normalizeBuildTargetOptions(
const buildOptions = withSchemaDefaults(options);

// paths need to be unix paths for angular devkit
buildOptions.polyfills = joinPathFragments(offset, buildOptions.polyfills);
buildOptions.polyfills =
buildOptions.polyfills.length > 0
? (buildOptions.polyfills as string[]).map((p) =>
joinPathFragments(offset, p)
)
: joinPathFragments(offset, buildOptions.polyfills as string);
buildOptions.main = joinPathFragments(offset, buildOptions.main);
buildOptions.index =
typeof buildOptions.index === 'string'
Expand Down
50 changes: 6 additions & 44 deletions ...gular/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.ts
View file
Expand Up @@ -17,7 +17,7 @@ import {
saveCacheEntry,
} from 'ng-packagr/lib/utils/cache';
import * as log from 'ng-packagr/lib/utils/log';
import { dirname, extname, join, resolve } from 'path';
import { dirname, extname, join } from 'path';
import * as postcssPresetEnv from 'postcss-preset-env';
import * as postcssUrl from 'postcss-url';
import {
Expand All @@ -26,6 +26,7 @@ import {
tailwindDirectives,
TailwindSetup,
} from '../../../utilities/tailwindcss';
import { pathToFileURL } from 'url';

const postcss = require('postcss');

Expand Down Expand Up @@ -250,12 +251,10 @@ export class StylesheetProcessor {
case '.sass':
case '.scss': {
return (await import('sass'))
.renderSync({
file: filePath,
data: css,
indentedSyntax: '.sass' === ext,
importer: customSassImporter,
includePaths: this.styleIncludePaths,
.compileString(css, {
url: pathToFileURL(filePath),
syntax: '.sass' === ext ? 'indented' : 'scss',
loadPaths: this.styleIncludePaths,
})
.css.toString();
}
Expand All @@ -271,27 +270,6 @@ export class StylesheetProcessor {

return content;
}
case '.styl':
case '.stylus': {
const stylus = (await import('stylus')).default;

return (
stylus(css)
// add paths for resolve
.set('paths', [
this.basePath,
'.',
...this.styleIncludePaths,
'node_modules',
])
// add support for resolving plugins from node_modules
.set('filename', filePath)
// turn on url resolver in stylus, same as flag --resolve-url
.set('resolve url', true)
.define('url', stylus.resolver(undefined))
.render()
);
}
case '.css':
default:
return css;
Expand Down Expand Up @@ -340,19 +318,3 @@ function transformSupportedBrowsersToTargets(

return transformed.length ? transformed : undefined;
}

function customSassImporter(
url: string,
prev: string
): { file: string; prev: string } | undefined {
// NB: Sass importer should always be sync as otherwise it will cause
// sass to go in the async path which is slower.
if (url[0] !== '~') {
return undefined;
}

return {
file: url.substring(1),
prev,
};
}
48 changes: 5 additions & 43 deletions packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts
View file
Expand Up @@ -26,6 +26,7 @@ import {
tailwindDirectives,
TailwindSetup,
} from '../../../utilities/tailwindcss';
import { pathToFileURL } from 'url';

const postcss = require('postcss');

Expand Down Expand Up @@ -243,12 +244,10 @@ export class StylesheetProcessor {
case '.sass':
case '.scss': {
return (await import('sass'))
.renderSync({
file: filePath,
data: css,
indentedSyntax: '.sass' === ext,
importer: customSassImporter,
includePaths: this.styleIncludePaths,
.compileString(css, {
url: pathToFileURL(filePath),
syntax: '.sass' === ext ? 'indented' : 'scss',
loadPaths: this.styleIncludePaths,
})
.css.toString();
}
Expand All @@ -264,27 +263,6 @@ export class StylesheetProcessor {

return content;
}
case '.styl':
case '.stylus': {
const stylus = await import('stylus');

return (
stylus(css)
// add paths for resolve
.set('paths', [
this.basePath,
'.',
...this.styleIncludePaths,
'node_modules',
])
// add support for resolving plugins from node_modules
.set('filename', filePath)
// turn on url resolver in stylus, same as flag --resolve-url
.set('resolve url', true)
.define('url', stylus.resolver(undefined))
.render()
);
}
case '.css':
default:
return css;
Expand Down Expand Up @@ -333,19 +311,3 @@ function transformSupportedBrowsersToTargets(

return transformed.length ? transformed : undefined;
}

function customSassImporter(
url: string,
prev: string
): { file: string; prev: string } | undefined {
// NB: Sass importer should always be sync as otherwise it will cause
// sass to go in the async path which is slower.
if (url[0] !== '~') {
return undefined;
}

return {
file: url.substring(1),
prev,
};
}
20 changes: 6 additions & 14 deletions packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
View file
Expand Up @@ -164,12 +164,6 @@ Object {
"type": "anyComponentStyle",
},
],
"fileReplacements": Array [
Object {
"replace": "apps/my-dir/my-app/src/environments/environment.ts",
"with": "apps/my-dir/my-app/src/environments/environment.prod.ts",
},
],
"outputHashing": "all",
},
},
Expand All @@ -182,7 +176,9 @@ Object {
"index": "apps/my-dir/my-app/src/index.html",
"main": "apps/my-dir/my-app/src/main.ts",
"outputPath": "dist/apps/my-dir/my-app",
"polyfills": "apps/my-dir/my-app/src/polyfills.ts",
"polyfills": Array [
"zone.js",
],
"scripts": Array [],
"styles": Array [
"apps/my-dir/my-app/src/styles.css",
Expand Down Expand Up @@ -336,12 +332,6 @@ Object {
"type": "anyComponentStyle",
},
],
"fileReplacements": Array [
Object {
"replace": "apps/my-app/src/environments/environment.ts",
"with": "apps/my-app/src/environments/environment.prod.ts",
},
],
"outputHashing": "all",
},
},
Expand All @@ -354,7 +344,9 @@ Object {
"index": "apps/my-app/src/index.html",
"main": "apps/my-app/src/main.ts",
"outputPath": "dist/apps/my-app",
"polyfills": "apps/my-app/src/polyfills.ts",
"polyfills": Array [
"zone.js",
],
"scripts": Array [],
"styles": Array [
"apps/my-app/src/styles.css",
Expand Down
3 changes: 1 addition & 2 deletions packages/angular/src/generators/application/lib/update-config-files.ts
View file
Expand Up @@ -38,7 +38,7 @@ function updateTsConfigOptions(host: Tree, options: NormalizedSchema) {
// tsconfig.json
updateJson(host, `${options.appProjectRoot}/tsconfig.json`, (json) => ({
...json,
compilerOptions: { ...json.compilerOptions, target: 'es2020' },
compilerOptions: { ...json.compilerOptions, target: 'es2022' },
}));
}

Expand Down Expand Up @@ -119,5 +119,4 @@ function updateAppAndE2EProjectConfigurations(

// delete some default test configs
host.delete(`${options.appProjectRoot}/karma.conf.js`);
host.delete(`${options.appProjectRoot}/src/test.ts`);
}
2 changes: 1 addition & 1 deletion packages/angular/src/generators/library/lib/update-tsconfig.ts
View file
Expand Up @@ -54,7 +54,7 @@ function updateProjectConfig(
// tsconfig.json
updateJson(host, `${options.projectRoot}/tsconfig.json`, (json) => ({
...json,
compilerOptions: { ...json.compilerOptions, target: 'es2020' },
compilerOptions: { ...json.compilerOptions, target: 'es2022' },
}));
}

Expand Down
1 change: 0 additions & 1 deletion packages/angular/src/generators/library/library.spec.ts
View file
Expand Up @@ -397,7 +397,6 @@ describe('lib', () => {
// ASSERT
const tsconfigJson = readJson(tree, 'libs/my-lib/tsconfig.lib.json');
expect(tsconfigJson.exclude).toEqual([
'src/test.ts',
'**/*.spec.ts',
'jest.config.ts',
'**/*.test.ts',
Expand Down

0 comments on commit 3d0b306

Please sign in to comment.