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

feat: upgrade to Angular 15 and update cfcs version #31

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/react-dom": "^17.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"@cfcs/core": "~0.0.12"
"@cfcs/core": "~0.1.0"
},
"workspaces": {
"packages": [
Expand Down
2 changes: 1 addition & 1 deletion packages/conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dist/*"
],
"dependencies": {
"@cfcs/core": "~0.0.13",
"@cfcs/core": "^0.1.0",
"@egjs/axes": "3.8.4",
"@egjs/component": "^3.0.1"
},
Expand Down
16 changes: 0 additions & 16 deletions packages/ngx-conveyer/.browserslistrc

This file was deleted.

4 changes: 3 additions & 1 deletion packages/ngx-conveyer/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,7 @@
}
}
},
"defaultProject": "ngx-conveyer-project"
"cli": {
"analytics": false
}
}
28 changes: 14 additions & 14 deletions packages/ngx-conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build ngx-conveyer --prod",
"build": "ng build ngx-conveyer --configuration production",
"watch": "ng build --watch --configuration development",
"test": "ng test"
},
"private": true,
"lernaHelperPublishPath": "./dist/ngx-conveyer",
"dependencies": {
"@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",
"@angular/animations": "^15.2.1",
"@angular/common": "^15.2.1",
"@angular/compiler": "^15.2.1",
"@angular/core": "^15.2.1",
"@angular/forms": "^15.2.1",
"@angular/platform-browser": "^15.2.1",
"@angular/platform-browser-dynamic": "^15.2.1",
"@angular/router": "^15.2.1",
"@egjs/ngx-infinitegrid": "^4.2.0-beta.2",
"rxjs": "~7.4.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.0.3",
"@angular/cli": "~13.0.3",
"@angular/compiler-cli": "~13.0.0",
"@angular-devkit/build-angular": "^15.2.1",
"@angular/cli": "^15.2.1",
"@angular/compiler-cli": "^15.2.1",
"@types/jasmine": "~3.10.0",
"@types/node": "^12.11.1",
"jasmine-core": "~3.10.0",
Expand All @@ -36,7 +36,7 @@
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"ng-packagr": "^13.0.0",
"typescript": "~4.4.3"
"ng-packagr": "^15.2.2",
"typescript": "~4.8.4"
}
}
16 changes: 0 additions & 16 deletions packages/ngx-conveyer/projects/ngx-conveyer/.browserslistrc

This file was deleted.

2 changes: 1 addition & 1 deletion packages/ngx-conveyer/projects/ngx-conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@angular/core": "^13.0.0"
},
"dependencies": {
"@cfcs/angular": "~0.0.13",
"@cfcs/angular": "^0.1.0",
"@egjs/conveyer": "~1.4.8",
"tslib": "^2.3.0"
}
Expand Down
16 changes: 3 additions & 13 deletions packages/ngx-conveyer/projects/ngx-conveyer/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
<T>(id: string): T;
keys(): string[];
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
16 changes: 3 additions & 13 deletions packages/ngx-conveyer/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,10 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
6 changes: 4 additions & 2 deletions packages/ngx-conveyer/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitOverride": true,
Expand All @@ -22,12 +23,13 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2017",
"target": "ES2022",
"module": "es2020",
"lib": [
"es2020",
"dom"
]
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dist/*"
],
"dependencies": {
"@cfcs/react": "~0.0.13",
"@cfcs/react": "^0.1.0",
"@egjs/conveyer": "~1.4.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"typescript": "^4.1.6"
},
"dependencies": {
"@cfcs/svelte": "~0.0.13",
"@cfcs/svelte": "^0.1.0",
"@egjs/conveyer": "~1.4.8"
}
}
2 changes: 1 addition & 1 deletion packages/vue-conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dist/*"
],
"dependencies": {
"@cfcs/vue3": "~0.0.13",
"@cfcs/vue3": "^0.1.0",
"@egjs/conveyer": "~1.4.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue2-conveyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"vue": "^2.0.0"
},
"dependencies": {
"@cfcs/vue2": "~0.0.13",
"@cfcs/vue2": "^0.1.0",
"@egjs/conveyer": "~1.4.8"
}
}
Loading