Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #161

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
update
Jimmysh committed Jul 12, 2022
commit 5dc24b47039ec5bd2e98ab03fa1400fceb6c9241
2 changes: 1 addition & 1 deletion libs/nest-angular-universal/src/lib/interface.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FastifyStaticOptions } from 'fastify-static';
import { FastifyStaticOptions } from '@fastify/static';

import type { NgSetupOptions } from '@aiao/universal-fastify-engine';

347 changes: 343 additions & 4 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -2,11 +2,350 @@
"migrations": [
{
"cli": "nx",
"version": "13.8.1",
"description": "Angular doesn't attach styles.js to index.html with type=module in dev mode, meaning an error is written to the console. Cypress falls over on this error. Add logic to Cypress e2e projects to ignore this error.",
"factory": "./src/migrations/update-13-8-1/add-cypress-mfe-workaround",
"version": "14.0.6",
"description": "Remove root property from project.json files",
"implementation": "./src/migrations/update-14-0-6/remove-roots",
"package": "nx",
"name": "14-0-6-remove-root"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Add JSON Schema to Nx configuration files",
"implementation": "./src/migrations/update-14-2-0/add-json-schema",
"package": "nx",
"name": "14-2-0-add-json-schema"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Remove default collection from configuration to switch to prompts for collection",
"implementation": "./src/migrations/update-14-2-0/remove-default-collection",
"package": "nx",
"name": "14-2-0-remove-default-collection"
},
{
"cli": "nx",
"version": "14.2.0-beta.5",
"description": "Replace all ./ and ../ in outputs with absolute paths",
"implementation": "./src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute",
"package": "nx",
"name": "14-2-0-replace-relative-outputs-with-absolute"
},
{
"cli": "nx",
"version": "14.3.4-beta.1",
"description": "Replace targetDependencies with targetDefaults",
"implementation": "./src/migrations/update-14-3-4/create-target-defaults",
"package": "nx",
"name": "14.3.4-create-target-defaults"
},
{
"version": "13.9.0-beta.0",
"description": "Replace @nrwl/tao with nx",
"cli": "nx",
"implementation": "./src/migrations/update-13-9-0/replace-tao-with-nx",
"package": "@nrwl/workspace",
"name": "13-9-0-replace-tao-with-nx"
},
{
"version": "13.10.0-beta.0",
"description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-decorate-cli",
"package": "@nrwl/workspace",
"name": "13-10-0-update-decorate-cli"
},
{
"version": "13.10.0-beta.0",
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/worksapce",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-tasks-runner",
"package": "@nrwl/workspace",
"name": "13-10-0-update-tasks-runner"
},
{
"version": "14.0.0-beta.0",
"description": "Changes the presets in nx.json to come from the nx package",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-nx-json-presets",
"package": "@nrwl/workspace",
"name": "14-0-0-change-nx-json-presets"
},
{
"version": "14.0.0-beta.0",
"description": "Migrates from @nrwl/workspace:run-script to nx:run-script",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-npm-script-executor",
"package": "@nrwl/workspace",
"name": "14-0-0-change-npm-script-executor"
},
{
"version": "14.2.0",
"description": "Explicitly enable sourceAnalysis for all workspaces extending from npm.json or core.json (this was default behavior prior to 14.2)",
"cli": "nx",
"implementation": "./src/migrations/update-14-2-0/enable-source-analysis",
"package": "@nrwl/workspace",
"name": "14-2-0-enable-source-analysis"
},
{
"version": "14.0.0-beta.2",
"cli": "nx",
"description": "Update move jest config files to .ts files.",
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
"package": "@nrwl/jest",
"name": "update-jest-config-extensions"
},
{
"version": "14.1.5-beta.0",
"cli": "nx",
"description": "Update to export default in jest config and revert jest.preset.ts to jest.preset.js",
"factory": "./src/migrations/update-14-1-5/update-exports-jest-config",
"package": "@nrwl/jest",
"name": "update-to-export-default"
},
{
"cli": "nx",
"version": "13.8.4",
"description": "Karma coverage is broken since Angular 13 upgarde and the karma config is severely out of date. Bring it up to date fixing the coverage issue.",
"factory": "./src/migrations/update-13-8-4/migrate-karma-conf",
"package": "@nrwl/angular",
"name": "migrate-karma-config"
},
{
"cli": "nx",
"version": "13.9.0-beta.4",
"description": "Set buildLibsFromSource property to false to not break existing usage.",
"factory": "./src/migrations/update-13-9-0/set-build-libs-from-source",
"package": "@nrwl/angular",
"name": "set-build-libs-from-source"
},
{
"cli": "nx",
"version": "14.0.0-beta.1",
"description": "Rename mfe.config.js to module-federation.config.js for consistent terminology.",
"factory": "./src/migrations/update-14-0-0/rename-mf-config",
"package": "@nrwl/angular",
"name": "rename-module-federation-config"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Remove 'showCircularDependencies' option from browser and server executors.",
"factory": "./src/migrations/update-14-2-0/remove-show-circular-dependencies-option",
"package": "@nrwl/angular",
"name": "remove-show-circular-dependencies-option"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Update the @angular/cli package version.",
"factory": "./src/migrations/update-14-2-0/update-angular-cli",
"package": "@nrwl/angular",
"name": "add-cypress-mfe-workaround"
"name": "update-angular-cli-version"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Remove 'package.json' files from library projects secondary entrypoints.",
"factory": "./src/migrations/update-14-2-0/update-libraries-secondary-entrypoints",
"package": "@nrwl/angular",
"name": "update-libraries-secondary-entrypoints"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Update postinstall script running ngcc to use ES2020 target.",
"factory": "./src/migrations/update-14-2-0/update-ngcc-target",
"package": "@nrwl/angular",
"name": "update-postinstall-script-ngcc-target"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Update TypeScript compilation target to 'ES2020'.",
"factory": "./src/migrations/update-14-2-0/update-tsconfig-target",
"package": "@nrwl/angular",
"name": "update-tsconfig-target"
},
{
"cli": "nx",
"version": "14.2.0-beta.6",
"description": "Update `initialNavigation: 'enabled'` to `initialNavigation: 'enabledBlocking'`.",
"factory": "./src/migrations/update-14-2-0/update-router-initial-navigation",
"package": "@nrwl/angular",
"name": "update-router-initial-navigation"
},
{
"version": "14.0.0-beta",
"description": "As of Angular version 13, `entryComponents` are no longer necessary.",
"factory": "./migrations/entry-components/index",
"package": "@angular/core",
"name": "migration-entry-components"
},
{
"version": "14.0.0-beta",
"description": "As of Angular version 14, Forms model classes accept a type parameter, and existing usages must be opted out to preserve backwards-compatibility.",
"factory": "./migrations/typed-forms/index",
"package": "@angular/core",
"name": "migration-v14-typed-forms"
},
{
"version": "14.0.0-beta",
"description": "In Angular version 14, the `pathMatch` property of `Routes` was updated to be a strict union of the two valid options: `'full'|'prefix'`. `Routes` and `Route` variables need an explicit type so TypeScript does not infer the property as the looser `string`.",
"factory": "./migrations/path-match-type/index",
"package": "@angular/core",
"name": "migration-v14-path-match-type"
},
{
"version": "14.0.0-0",
"description": "Updates the Angular Material to v14",
"factory": "./ng-update/index#updateToV14",
"package": "@angular/material",
"name": "migration-v14"
},
{
"version": "14.0.0-0",
"description": "Updates the Angular CDK to v14",
"factory": "./ng-update/index#updateToV14",
"package": "@angular/cdk",
"name": "migration-v14"
},
{
"cli": "nx",
"version": "14.1.9-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/linter",
"name": "add-swc-deps"
},
{
"cli": "nx",
"version": "14.2.3-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to prior mistake)",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/linter",
"name": "add-swc-deps-again"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/node:build to @nrwl/node:webpack",
"factory": "./src/migrations/update-13-8-5/rename-build-to-webpack",
"package": "@nrwl/node",
"name": "rename-build-to-webpack"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/node:execute to @nrwl/node:node",
"factory": "./src/migrations/update-13-8-5/rename-execute-to-node",
"package": "@nrwl/node",
"name": "rename-execute-to-node"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/node:package to @nrwl/js:tsc",
"factory": "./src/migrations/update-13-8-5/update-package-to-tsc",
"package": "@nrwl/node",
"name": "update-package-to-tsc"
},
{
"cli": "nx",
"version": "14.1.9-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/nx-plugin",
"name": "add-swc-deps"
},
{
"cli": "nx",
"version": "14.2.3-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to bad version on earlier migration)",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/nx-plugin",
"name": "add-swc-deps-again"
},
{
"cli": "nx",
"version": "13.10.0-beta.0",
"description": "Update to React 18",
"factory": "./src/migrations/update-13-10-0/update-13-10-0",
"package": "@nrwl/react",
"name": "update-react-18-13.10.0"
},
{
"cli": "nx",
"version": "14.0.0-beta.0",
"description": "Update to React DOM render call to React 18 API.",
"factory": "./src/migrations/update-14-0-0/update-react-dom-render-for-v18",
"package": "@nrwl/react",
"name": "update-react-dom-render-14.0.0"
},
{
"cli": "nx",
"version": "14.0.0-beta.0",
"description": "Replace deprecated '@testing-library/react-hook' package with `renderHook` from '@testing-library/react'.",
"factory": "./src/migrations/update-14-0-0/replace-testing-library-react-hook",
"package": "@nrwl/react",
"name": "replace-testing-library-react-hook-14.0.0"
},
{
"cli": "nx",
"version": "14.0.0-beta.0",
"description": "Add a default development configuration for build and serve targets.",
"factory": "./src/migrations/update-14-0-0/add-default-development-configurations",
"package": "@nrwl/react",
"name": "add-default-development-configurations-14.0.0"
},
{
"cli": "nx",
"version": "14.1.0-beta.0",
"description": "Update external option in projects for Emotion",
"factory": "./src/migrations/update-14-1-0/update-external-emotion-jsx-runtime",
"package": "@nrwl/react",
"name": "update-external-emotion-jsx-runtime-14.1.0"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/js:node to @nrwl/node:node",
"factory": "./src/migrations/update-13-8-5/update-node-executor",
"package": "@nrwl/js",
"name": "update-node-executor"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Adjust .swcrc to .lib.swcrc",
"factory": "./src/migrations/update-13-8-5/update-swcrc",
"package": "@nrwl/js",
"name": "update-swcrc"
},
{
"cli": "nx",
"version": "13.10.1-beta.1",
"description": "Update .lib.swcrc to exclude missing test files",
"factory": "./src/migrations/update-13-10-1/update-lib-swcrc-exclude",
"package": "@nrwl/js",
"name": "update-swcrc-exclude"
},
{
"cli": "nx",
"version": "14.0.0-beta.2",
"description": "Exclude jest config from .lib.swcrc",
"factory": "./src/migrations/update-14-0-0/exclude-jest-config-swcrc",
"package": "@nrwl/js",
"name": "exclude-jest-config-swcrc"
},
{
"cli": "nx",
"version": "14.1.5-beta.0",
"description": "Rename option swcrcPath to swcrc, and resolve relative to workspace root",
"factory": "./src/migrations/update-14.1.5-beta.0/update-swcrc-path",
"package": "@nrwl/js",
"name": "update-swcrc-path"
}
]
}
130 changes: 65 additions & 65 deletions package.json
Original file line number Diff line number Diff line change
@@ -42,19 +42,20 @@
},
"private": true,
"dependencies": {
"@angular/animations": "13.2.1",
"@angular/cdk": "13.2.1",
"@angular/common": "13.2.1",
"@angular/compiler": "13.2.1",
"@angular/core": "13.2.1",
"@angular/elements": "13.2.1",
"@angular/forms": "13.2.1",
"@angular/material": "13.2.1",
"@angular/platform-browser": "13.2.1",
"@angular/platform-browser-dynamic": "13.2.1",
"@angular/platform-server": "13.2.1",
"@angular/router": "13.2.1",
"@angular/service-worker": "13.2.1",
"@angular/animations": "14.0.5",
"@angular/cdk": "14.0.4",
"@angular/common": "14.0.5",
"@angular/compiler": "14.0.5",
"@angular/core": "14.0.5",
"@angular/elements": "14.0.5",
"@angular/forms": "14.0.5",
"@angular/material": "14.0.4",
"@angular/platform-browser": "14.0.5",
"@angular/platform-browser-dynamic": "14.0.5",
"@angular/platform-server": "14.0.5",
"@angular/router": "14.0.5",
"@angular/service-worker": "14.0.5",
"@fastify/static": "^6.4.0",
"@ionic/angular": "^6.0.0",
"@ionic/angular-toolkit": "^6.0.0",
"@ionic/core": "^6.0.0",
@@ -69,7 +70,7 @@
"@nestjs/typeorm": "^9.0.0-next.1",
"@nguniversal/common": "^13.0.1",
"@nguniversal/express-engine": "^13.0.1",
"@nrwl/angular": "13.8.3",
"@nrwl/angular": "14.4.2",
"@webcomponents/custom-elements": "^1.4.1",
"class-transformer": "^0.5.1",
"class-validator": "^0.13.1",
@@ -81,16 +82,15 @@
"fastify-cookie": "^5.3.1",
"fastify-http-proxy": "^6.0.0",
"fastify-plugin": "^3.0.0",
"fastify-static": "^4.0.0",
"ionicons": "^6.0.0",
"ismobilejs": "^1.1.1",
"lodash": "^4.17.15",
"monaco-editor": "^0.32.1",
"pg": "^8.3.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-router": "^5.0.1",
"react-router-dom": "^5.2.0",
"react-router-dom": "6.3.0",
"reflect-metadata": "^0.1.13",
"regenerator-runtime": "^0.13.7",
"rxjs": "~7.4.0",
@@ -106,13 +106,13 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "13.2.2",
"@angular-eslint/eslint-plugin": "~13.0.1",
"@angular-eslint/eslint-plugin-template": "~13.0.1",
"@angular-eslint/template-parser": "~13.0.1",
"@angular/cli": "13.2.2",
"@angular/compiler-cli": "13.2.1",
"@angular/language-service": "13.2.1",
"@angular-devkit/build-angular": "14.0.5",
"@angular-eslint/eslint-plugin": "14.0.2",
"@angular-eslint/eslint-plugin-template": "14.0.2",
"@angular-eslint/template-parser": "14.0.2",
"@angular/cli": "13.3.8",
"@angular/compiler-cli": "14.0.5",
"@angular/language-service": "14.0.5",
"@babel/core": "^7.15.0",
"@babel/plugin-proposal-async-generator-functions": "^7.16.5",
"@babel/plugin-transform-modules-commonjs": "^7.15.4",
@@ -122,81 +122,81 @@
"@nestjs/schematics": "^8.0.0",
"@nestjs/testing": "^8.0.0",
"@nguniversal/builders": "^13.0.1",
"@nrwl/cli": "13.8.3",
"@nrwl/cypress": "13.8.3",
"@nrwl/devkit": "13.8.3",
"@nrwl/eslint-plugin-nx": "13.8.3",
"@nrwl/express": "13.8.3",
"@nrwl/jest": "13.8.3",
"@nrwl/js": "13.8.3",
"@nrwl/linter": "13.8.3",
"@nrwl/nest": "13.8.3",
"@nrwl/node": "13.8.3",
"@nrwl/nx-cloud": "13.1.4",
"@nrwl/nx-plugin": "13.8.3",
"@nrwl/react": "13.8.3",
"@nrwl/web": "13.8.3",
"@nrwl/workspace": "13.8.3",
"@nrwl/cli": "14.4.2",
"@nrwl/cypress": "14.4.2",
"@nrwl/devkit": "14.4.2",
"@nrwl/eslint-plugin-nx": "14.4.2",
"@nrwl/express": "14.4.2",
"@nrwl/jest": "14.4.2",
"@nrwl/js": "14.4.2",
"@nrwl/linter": "14.4.2",
"@nrwl/nest": "14.4.2",
"@nrwl/node": "14.4.2",
"@nrwl/nx-cloud": "14.2.0",
"@nrwl/nx-plugin": "14.4.2",
"@nrwl/react": "14.4.2",
"@nrwl/web": "14.4.2",
"@nrwl/workspace": "14.4.2",
"@samatech/postcss-basics": "^0.4.2",
"@stencil/core": "^2.0.0",
"@stencil/react-output-target": "^0.3.1",
"@stencil/sass": "^1.3.1",
"@stencil/vue-output-target": "^0.6.0",
"@testing-library/react": "12.1.2",
"@testing-library/react": "13.3.0",
"@testing-library/react-hooks": "7.0.2",
"@types/express": "4.17.13",
"@types/fs-extra": "^9.0.1",
"@types/jest": "27.0.2",
"@types/jest": "27.4.1",
"@types/lodash": "^4.14.149",
"@types/node": "^16.11.9",
"@types/react": "17.0.30",
"@types/react-dom": "17.0.9",
"@types/react-router-dom": "^5.1.7",
"@types/node": "18.0.0",
"@types/react": "18.0.14",
"@types/react-dom": "18.0.5",
"@types/react-router-dom": "5.3.3",
"@types/shelljs": "^0.8.9",
"@types/ua-parser-js": "^0.7.36",
"@typescript-eslint/eslint-plugin": "5.10.2",
"@typescript-eslint/parser": "5.10.2",
"@typescript-eslint/eslint-plugin": "5.30.6",
"@typescript-eslint/parser": "5.30.6",
"@vitejs/plugin-vue": "^2.1.0",
"@vue/compiler-sfc": "^3.2.29",
"@vue/eslint-config-typescript": "^10.0.0",
"babel-jest": "27.2.3",
"babel-jest": "27.5.1",
"chalk": "^4.1.2",
"codelyzer": "6.0.1",
"compare-versions": "^4.0.1",
"cypress": "^9.0.0",
"cz-customizable": "^6.2.0",
"dotenv": "10.0.0",
"eslint": "8.7.0",
"eslint": "8.15.0",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "2.25.2",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-react": "7.26.1",
"eslint-plugin-react-hooks": "4.3.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsx-a11y": "6.6.0",
"eslint-plugin-react": "7.30.1",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-vue": "^8.0.3",
"fs-extra": "^10.0.0",
"husky": "^7.0.1",
"jest": "27.2.3",
"jest-preset-angular": "11.1.1",
"jest": "27.5.1",
"jest-preset-angular": "11.1.2",
"lerna": "^4.0.0",
"ng-packagr": "13.2.1",
"ng-packagr": "14.0.3",
"nx-vue3-vite": "^0.14.0",
"ora": "5.4.1",
"postcss": "^8.3.6",
"postcss-import": "^14.0.2",
"postcss-preset-env": "^6.7.0",
"postcss-url": "^10.1.3",
"prettier": "2.5.1",
"react-test-renderer": "17.0.2",
"postcss-import": "14.1.0",
"postcss-preset-env": "7.5.0",
"postcss-url": "10.1.3",
"prettier": "2.7.1",
"react-test-renderer": "18.2.0",
"shelljs": "^0.8.4",
"ts-jest": "27.0.5",
"ts-jest": "27.1.4",
"ts-morph": "^13.0.2",
"ts-node": "10.5.0",
"ts-node": "10.8.2",
"tslib": "^2.0.0",
"tslint": "6.1.3",
"tslint-ionic-rules": "^0.0.21",
"tslint-react": "^5.0.0",
"typescript": "4.5.5",
"typescript": "4.7.4",
"unplugin-vue-components": "^0.17.15",
"vite": "^2.7.13",
"vite-plugin-vue-images": "^0.6.1",

This file was deleted.

3 changes: 2 additions & 1 deletion tools/workspace.ts
Original file line number Diff line number Diff line change
@@ -31,7 +31,8 @@ export const WORKSPACE_SCOPES = [
export const WORKSPACE_TYPES = ['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'chore'];

// 需要预先编译的库
export const NEED_CHECK_LIBS = ['elements', 'elements-vue', 'elements-react'];
export const NEED_CHECK_LIBS = [];
// export const NEED_CHECK_LIBS = ['elements', 'elements-vue', 'elements-react'];

// 需要检查提交的分支名
export const NEED_CHECK_COMMIT_BRANCH_NAMES = ['master'];
8,339 changes: 4,571 additions & 3,768 deletions yarn.lock

Large diffs are not rendered by default.