Skip to content

Commit

Permalink
update to Angular 13.3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Enlcxx committed Dec 22, 2022
1 parent afdd13a commit c3ed707
Show file tree
Hide file tree
Showing 11 changed files with 254 additions and 267 deletions.
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"build:tools": "rm -rf dist/tools && tsc -p tools",
"w:tools": "rm -rf dist/tools && tsc -p tools -w",
"build:@alyle/ui": "./ci/scripts/build-docs-artifacts.sh",
"tools:prepare-lib": "yarn && ts-node tools/src/prepare-lib",
"tools:prepare-lib": "yarn && ts-node --esm --project ./tools/tsconfig.tn.json tools/src/prepare-lib.ts",
"tools:bump": "ts-node tools/*/bump-version && yarn changelog",
"tools:bump-nightly": "ts-node tools/src/bump-version --nightly",
"tools:deploy": "ts-node tools/src/deploy",
Expand All @@ -40,18 +40,18 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^13.2.5",
"@angular/cdk": "^13.2.5",
"@angular/common": "^13.2.5",
"@angular/compiler": "^13.2.5",
"@angular/core": "^13.2.5",
"@angular/elements": "^13.2.5",
"@angular/forms": "^13.2.5",
"@angular/platform-browser": "^13.2.5",
"@angular/platform-browser-dynamic": "^13.2.5",
"@angular/platform-server": "^13.2.5",
"@angular/router": "^13.2.5",
"@angular/service-worker": "^13.2.5",
"@angular/animations": "^13.3.12",
"@angular/cdk": "^13.3.9",
"@angular/common": "^13.3.12",
"@angular/compiler": "^13.3.12",
"@angular/core": "^13.3.12",
"@angular/elements": "^13.3.12",
"@angular/forms": "^13.3.12",
"@angular/platform-browser": "^13.3.12",
"@angular/platform-browser-dynamic": "^13.3.12",
"@angular/platform-server": "^13.3.12",
"@angular/router": "^13.3.12",
"@angular/service-worker": "^13.3.12",
"@nguniversal/express-engine": "^13.1.1",
"@stackblitz/sdk": "^1.6.0",
"ansi-colors": "^4.1.3",
Expand All @@ -67,11 +67,11 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^13.2.5",
"@angular-devkit/schematics": "^13.2.5",
"@angular/cli": "^13.2.5",
"@angular/compiler-cli": "^13.2.5",
"@nguniversal/builders": "^13.0.2",
"@angular-devkit/build-angular": "^13.3.10",
"@angular-devkit/schematics": "^13.3.10",
"@angular/cli": "^13.3.10",
"@angular/compiler-cli": "^13.3.10",
"@nguniversal/builders": "^13.1.1",
"@octokit/request": "^5.3.1",
"@types/chroma-js": "^1.4.1",
"@types/express": "^4.16.1",
Expand Down Expand Up @@ -112,7 +112,7 @@
"ts-node": "^10.9.1",
"tsconfig-paths": "^3.13.0",
"tslint": "^6.1.3",
"typescript": "~4.5.5",
"typescript": "~4.6.2",
"yargs": "^13.2.2"
},
"schematics": "./dist/@alyle/ui/schematics/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion postinstall.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set -e

. ./init.sh
ts-node tools/update-schematics.ts
ts-node --esm tools/update-schematics.ts
cd tools && yarn
2 changes: 1 addition & 1 deletion src/assets/stackblitz-files.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/stackblitz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@alyle/ui": "13.3.0",
"@angular/animations": "~13.2.0",
"@angular/cdk": "^13.2.5",
"@angular/cdk": "^13.3.9",
"@angular/common": "~13.2.0",
"@angular/compiler": "~13.2.0",
"@angular/core": "~13.2.0",
Expand All @@ -25,9 +25,9 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^13.2.5",
"@angular/cli": "^13.2.5",
"@angular/compiler-cli": "^13.2.5",
"@angular-devkit/build-angular": "^13.3.10",
"@angular/cli": "^13.3.10",
"@angular/compiler-cli": "^13.3.10",
"@types/jasmine": "~3.10.0",
"@types/node": "^16.11.9",
"jasmine-core": "~4.0.0",
Expand All @@ -36,6 +36,6 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"typescript": "~4.5.5"
"typescript": "~4.6.2"
}
}
1 change: 1 addition & 0 deletions tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"main": "index.js",
"license": "MIT",
"private": true,
"type": "module",
"devDependencies": {
"typedoc": "0.22.10",
"typescript": "~4.5.5"
Expand Down
8 changes: 4 additions & 4 deletions tools/src/build-lib.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import * as _replace from 'replace-in-file';
const replace: typeof _replace.default = require('replace-in-file');
import _replace from 'replace-in-file';
const { replaceInFileSync } = _replace;

// fix typings
const changes = replace.sync({
const changes = replaceInFileSync({
files: 'dist/@alyle/ui/**/*.d.ts',
from: /(:?\.\.\/)+@alyle\/ui/g,
to: '@alyle/ui'
}).filter(({ hasChanged }) => hasChanged);

// fix path
const changesSchematics = replace.sync({
const changesSchematics = replaceInFileSync({
files: 'dist/@alyle/ui/schematics/**/*.js',
from: /require\(\"\@schematics\/angular\/node_modules\/typescript\"\)/g,
to: 'require("typescript")'
Expand Down
2 changes: 1 addition & 1 deletion tools/src/config/package.conf.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as jsyaml from 'js-yaml';
import jsyaml from 'js-yaml';
import { readFileSync } from 'fs';

export const PackageConf = jsyaml.load(readFileSync(`${process.cwd()}/.package.conf.yml`, 'utf8').toString());
3 changes: 2 additions & 1 deletion tools/src/copy-readme.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { copySync } from 'fs-extra';
import __fsExtra from 'fs-extra';
const { copySync } = __fsExtra;

copySync(`${process.cwd()}/README.md`, `${process.cwd()}/dist/@alyle/ui/README.md`);
14 changes: 7 additions & 7 deletions tools/src/prepare-lib.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { readFileSync } from 'fs';
import { writeFileSync, removeSync, copySync, pathExistsSync } from 'fs-extra';
import __fsExtra from 'fs-extra';
import { join } from 'path';
import { tslintConfig } from './config/tslint-config';
import { tsConfigSpec } from './config/tsconfig-spec';
import { testConfig } from './config/test-config';
import { karmaConf } from './config/karma.conf';
import { PackageConf } from './config/package.conf';

import { tslintConfig } from './config/tslint-config.js';
import { tsConfigSpec } from './config/tsconfig-spec.js';
import { testConfig } from './config/test-config.js';
import { karmaConf } from './config/karma.conf.js';
import { PackageConf } from './config/package.conf.js';
const { writeFileSync, removeSync, copySync, pathExistsSync } = __fsExtra;
// const camelCase = (str: string) => str.replace(/(?:^\w|[A-Z]|\b\w)/g, (ltr, idx) => idx === 0 ? ltr.toLowerCase() : ltr.toUpperCase()).replace(/\s+/g, '');

const dirLib = `${process.cwd()}/src/lib`;
Expand Down
7 changes: 3 additions & 4 deletions tools/update-schematics.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import * as path from 'path';
import { replaceInFile } from 'replace-in-file';
import __replace from 'replace-in-file';
import * as fs from 'fs';
import * as globby from 'globby';
const { readFile, writeFile, readdir } = fs.promises;


const pkg = require(path.join(process.cwd(), './package.json'));
const { replaceInFile } = __replace;
const pkg = JSON.parse(await readFile(path.join(process.cwd(), './package.json'), 'utf-8'));
const AUI_VERSION = pkg.version;
const HAMMERJS_VERSION = pkg.dependencies.hammerjs;
const ANGULAR_CDK_VERSION = pkg.dependencies['@angular/cdk'];
Expand Down
Loading

0 comments on commit c3ed707

Please sign in to comment.