Skip to content

Commit

Permalink
feat(core): Update to TypeScript v4.9.5
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbromley committed Mar 2, 2023
1 parent dff1011 commit 99da585
Show file tree
Hide file tree
Showing 43 changed files with 30,974 additions and 36,313 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"lint-staged": "^10.5.4",
"prettier": "^2.2.1",
"ts-jest": "^27.0.4",
"ts-node": "^10.2.1",
"ts-node": "^10.9.1",
"tslint": "^6.1.3",
"typescript": "4.5.5"
"typescript": "4.9.5"
},
"resolutions": {
"npm-packlist": "1.1.12"
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-ui-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@vendure/core": "^2.0.0-next.28",
"express": "^4.17.1",
"rimraf": "^3.0.2",
"typescript": "4.5.5"
"typescript": "4.9.5"
},
"dependencies": {
"fs-extra": "^10.0.0"
Expand Down
15 changes: 13 additions & 2 deletions packages/admin-ui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:browser-esbuild",
"options": {
"baseHref": "/admin/",
"outputPath": "dist",
Expand All @@ -38,8 +38,19 @@
"graphql-tag",
"zen-observable",
"lodash",
"dayjs",
"apollo-upload-client",
"@vendure/common/lib/simple-deep-clone"
"@clr/icons",
"@clr/icons/shapes/all-shapes",
"@vendure/common/lib/generated-types",
"@vendure/common/lib/simple-deep-clone",
"@vendure/common/lib/shared-constants",
"@vendure/common/lib/shared-utils",
"@vendure/common/lib/normalize-string",
"@vendure/common/lib/unique",
"@vendure/common/lib/omit",
"@vendure/common/lib/pick",
"@messageformat/core"
],
"vendorChunk": true,
"extractLicenses": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/admin-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"ng": "ng",
"start": "node scripts/set-version.js && ng serve",
"build:app": "yarn ng build --configuration production",
"build:app": "yarn ng build vendure-admin --configuration production",
"build": "node scripts/copy-package-json.js && node scripts/set-version.js && node scripts/build-public-api.js && yarn ng build vendure-admin-lib --configuration production && node scripts/compile-styles.js",
"watch": "ng build --watch=true",
"test": "ng test --watch=false --browsers=ChromeHeadlessCI --progress=false",
Expand Down Expand Up @@ -91,6 +91,6 @@
"puppeteer": "^8.0.0",
"rimraf": "^3.0.2",
"tslint": "~6.1.3",
"typescript": "4.8.4"
"typescript": "4.9.5"
}
}
2 changes: 1 addition & 1 deletion packages/admin-ui/scripts/compile-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const outFile = path.join(__dirname, '../package/static/theme.min.css');
const result = sass.renderSync({
file: path.join(__dirname, '../src/lib/static/styles/ui-extension-theme.scss'),
importer,
includePaths: [path.join(__dirname, '../src/lib/static/styles')],
includePaths: [path.join(__dirname, '../src/lib/static/styles'), path.join(__dirname, '../node_modules')],
outputStyle: 'compressed',
outFile,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
SelectionManager,
ServerConfigService,
} from '@vendure/admin-ui/core';
import { SortOrder } from '@vendure/common/lib/generated-shop-types';
import { SortOrder } from '@vendure/common/lib/generated-types';
import { EMPTY, Observable } from 'rxjs';
import { debounceTime, filter, map, switchMap, takeUntil, tap } from 'rxjs/operators';

Expand Down
Loading

0 comments on commit 99da585

Please sign in to comment.