Skip to content
This repository has been archived by the owner on Aug 19, 2024. It is now read-only.

Merge branch 'b27.3.0' into latest #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Merge branch 'b27.3.0' into latest #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1775a7
Merge branch 'b27.3.0' into latest
seanlandsman May 17, 2022
df78025
Move to v12
StephenCooper May 23, 2022
ba5ce35
add test styles
StephenCooper May 23, 2022
6dd670f
remove withComponents
StephenCooper May 23, 2022
b614968
correct repo url
StephenCooper May 27, 2022
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
17 changes: 17 additions & 0 deletions .browserslistrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
115 changes: 43 additions & 72 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,36 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"ag-grid-angular-cli": {
"ag-grid-angular-cli-example": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
},
"@schematics/angular:application": {
"strict": true
}
},
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/",
"outputPath": "dist/ag-grid-angular-cli-example",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"preserveSymlinks": true,
"aot": true,
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
"src/images"
],
"styles": [
"styles.css"
"src/styles.scss"
],
"scripts": []
},
Expand All @@ -38,92 +44,57 @@
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ag-grid-angular-cli:build"
},
"configurations": {
"production": {
"browserTarget": "ag-grid-angular-cli:build:production"
"browserTarget": "ag-grid-angular-cli-example:build:production"
},
"development": {
"browserTarget": "ag-grid-angular-cli-example:build:development"
}
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ag-grid-angular-cli:build"
"browserTarget": "ag-grid-angular-cli-example:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "tests/test.ts",
"tsConfig": "tests/tsconfig.spec.json",
"polyfills": "tests/polyfills.ts",
"karmaConfig": "tests/karma.conf.js",
"preserveSymlinks": true,
"styles": [
],
"scripts": [],
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"tests/tsconfig.spec.json"
"src/assets"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"ag-grid-angular-cli-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "ag-grid-angular-cli:serve"
},
"configurations": {
"production": {
"devServerTarget": "ag-grid-angular-cli:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
"styles": [
"src/styles.scss"
],
"scripts": []
}
}
}
}
},
"defaultProject": "ag-grid-angular-cli"
"defaultProject": "ag-grid-angular-cli-example"
}
12 changes: 0 additions & 12 deletions browserslist
View file
Open in desktop

This file was deleted.

51 changes: 30 additions & 21 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,49 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/0.13/config/configuration-file.html
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', 'angular-cli'],
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-remap-istanbul'),
require('angular-cli/plugins/karma')
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
],
files: [

],
preprocessors: {
'./src/test.ts': ['angular-cli']
client: {
jasmine: {
// you can add configuration options for Jasmine here
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
// for example, you can disable the random execution with `random: false`
// or set a specific seed with `seed: 4321`
},
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
remapIstanbulReporter: {
dir: require('path').join(__dirname, 'coverage'), reports: {
html: 'coverage',
lcovonly: './coverage/coverage.lcov'
}
jasmineHtmlReporter: {
suppressAll: true // removes the duplicated traces
},
angularCli: {
config: './angular-cli.json',
environment: 'dev'
coverageReporter: {
dir: require('path').join(__dirname, './coverage/ag-grid-angular-cli-example'),
subdir: '.',
reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
},
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'karma-remap-istanbul']
: ['progress'],
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
singleRun: false,
restartOnFileChange: true,
// not strictly required for testing but useful when debugging the grid in action
files: [
'../node_modules/@ag-grid-community/core/dist/styles/ag-grid.css',
'../node_modules/@ag-grid-community/core/dist/styles/ag-theme-balham.css'
]
});
};
70 changes: 34 additions & 36 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,53 @@
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/ag-grid/ag-grid-angular-cli.git"
"url": "https://github.com/ag-grid/ag-grid-angular-cli-example.git"
},
"author": "Sean Landsman <[email protected]>",
"angular-cli": {},
"scripts": {
"start": "ng serve --port 8080",
"build": "ng build --aot --prod && npm run hash",
"build": "ng build --aot && npm run hash",
"build-prod": "npm run build",
"hash": "sh ./hashDirectory.sh > .hash",
"lint": "tslint \"src/**/*.ts\""
},
"private": true,
"dependencies": {
"@ag-grid-community/angular": "~27.3.0",
"@ag-grid-enterprise/all-modules": "~27.3.0",
"@angular/animations": "11.2.14",
"@angular/common": "11.2.14",
"@angular/compiler": "11.2.14",
"@angular/core": "11.2.14",
"@angular/forms": "11.2.14",
"@angular/platform-browser": "11.2.14",
"@angular/platform-browser-dynamic": "11.2.14",
"@angular/router": "11.2.14",
"@ag-grid-community/core": "~27.3.0",
"@ag-grid-community/client-side-row-model": "~27.3.0",
"@ag-grid-enterprise/menu": "~27.3.0",
"@ag-grid-enterprise/side-bar": "~27.3.0",
"@ag-grid-enterprise/column-tool-panel": "~27.3.0",
"@ag-grid-enterprise/filter-tool-panel": "~27.3.0",
"@ag-grid-enterprise/row-grouping": "~27.3.0",
"@ag-grid-enterprise/set-filter": "~27.3.0",
"@ag-grid-enterprise/status-bar": "~27.3.0",
"@angular/animations": "~12.2.0",
"@angular/common": "~12.2.0",
"@angular/compiler": "~12.2.0",
"@angular/core": "~12.2.0",
"@angular/forms": "~12.2.0",
"@angular/platform-browser": "~12.2.0",
"@angular/platform-browser-dynamic": "~12.2.0",
"@angular/router": "~12.2.0",
"bootstrap": "4.5.0",
"rxjs": "6.5.5",
"tslib": "2.0.3",
"zone.js": "0.10.3"
"rxjs": "~6.6.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"webdriver-manager": "12.1.7",
"@angular-devkit/build-angular": "0.1102.11",
"@angular/cli": "11.2.14",
"@angular/compiler-cli": "11.2.14",
"@angular/language-service": "11.2.14",
"@types/jasmine": "3.6.11",
"@types/jasminewd2": "2.0.10",
"@types/node": "12.20.52",
"codelyzer": "6.0.2",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "5.0.2",
"karma": "6.1.2",
"karma-chrome-launcher": "3.1.1",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "4.0.2",
"karma-jasmine-html-reporter": "1.5.4",
"ng-packagr": "11.0.3",
"protractor": "7.0.0",
"ts-node": "8.10.2",
"tslint": "6.1.3",
"typescript": "4.0.8"
"@angular-devkit/build-angular": "~12.2.17",
"@angular/cli": "~12.2.17",
"@angular/compiler-cli": "~12.2.0",
"@types/jasmine": "~3.8.0",
"@types/node": "^12.11.1",
"jasmine-core": "~3.8.0",
"karma": "~6.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"typescript": "~4.3.5"
}
}
32 changes: 0 additions & 32 deletions protractor.conf.js
View file
Open in desktop

This file was deleted.

Loading