Skip to content

Commit

Permalink
Merge pull request #103 from gentics/11.x-beta-ng13
Browse files Browse the repository at this point in the history
11.x beta ng13
  • Loading branch information
pschulzk authored Jun 30, 2022
2 parents 4683257 + a8a12d9 commit 7c097aa
Show file tree
Hide file tree
Showing 90 changed files with 43,026 additions and 9,812 deletions.
7 changes: 7 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16.14
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Gentics UI Core Changelog

## 13.0.2 (2022-06-30)

### Features

* Add official support for Angular 13

## 7.10.3 (2021-02-04)

### Fixes
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ platformBrowserDynamic().bootstrapModule(AppModule,
## View Encapsulation
Do not use any ViewEncapsulation other than `ViewEncapsulation.None` (which is the default), because some UI Core components use the CSS `/deep/` selector.
Do not use any ViewEncapsulation other than `ViewEncapsulation.None` (which is the default), because some UI Core components use the CSS `::ng-deep` selector.
## Lazy Loading of Routes
Expand Down Expand Up @@ -127,9 +127,9 @@ import 'web-animations-js'; // Run `npm install --save web-animations-js`.
```SCSS
// styles.scss
@import "~gentics-ui-core/styles/variables";
@import "~gentics-ui-core/styles/mixins";
@import "~gentics-ui-core/styles/core";
@import "node_modules/gentics-ui-core/styles/variables";
@import "node_modules/gentics-ui-core/styles/mixins";
@import "node_modules/gentics-ui-core/styles/core";

// ...
```
Expand Down
39 changes: 9 additions & 30 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"analytics": "cf0654bf-8cab-499a-9d12-97a0bb50a155"
},
"version": 1,
"newProjectRoot": "projects",
"projects": {
"gentics-ui-core": {
"root": "",
"root": "projects/gentics-ui-core",
"sourceRoot": "src",
"projectType": "library",
"prefix": "gtx",
Expand All @@ -23,18 +26,6 @@
"tsConfig": "projects/gentics-ui-core/tsconfig.spec.json",
"karmaConfig": "projects/gentics-ui-core/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/gentics-ui-core/tsconfig.lib.json",
"projects/gentics-ui-core/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
Expand All @@ -45,23 +36,23 @@
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
},
"architect": {
"build": {
"builder": "ngx-build-plus:build",
"builder": "ngx-build-plus:browser",
"options": {
"outputPath": "dist/docs",
"index": "src/docs/index.html",
"main": "src/docs/main.ts",
"polyfills": "src/docs/polyfills.ts",
"tsConfig": "projects/docs/tsconfig.app.json",
"extraWebpackConfig": "webpack.partial.js",
"extraWebpackConfig": "projects/docs/webpack.partial.js",
"assets": [
"src/docs/assets",
{ "glob": "**/*", "input": "../../node_modules/roboto-fontface-woff/fonts/roboto", "output": "./assets/fonts" },
{ "glob": "**/*", "input": "../../node_modules/material-icons-font/fonts", "output": "./assets/fonts" },
{ "glob": "**/*", "input": "../../node_modules/material-icons-font/fonts", "output": "./assets/fonts" }
],
"styles": [
"src/docs/app.scss",
Expand Down Expand Up @@ -106,7 +97,7 @@
"builder": "ngx-build-plus:dev-server",
"options": {
"browserTarget": "docs:build",
"extraWebpackConfig": "webpack.partial.js"
"extraWebpackConfig": "projects/docs/webpack.partial.js"
},
"configurations": {
"production": {
Expand Down Expand Up @@ -136,18 +127,6 @@
"src/docs/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/docs/tsconfig.app.json",
"projects/docs/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
Expand Down
21 changes: 7 additions & 14 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ const del = require('del');
const filter = require('gulp-filter');
const gutil = require('gulp-util');
const path = require('path');
const sass = require('gulp-sass');
const sass = require('gulp-sass')(require('sass'));
const tildeImporter = require('node-sass-tilde-importer');
const npmArgs = JSON.parse(process.env.npm_config_argv);

const paths = {
src: {
Expand Down Expand Up @@ -43,22 +42,16 @@ gulp.task('assets', gulp.series(

// Run only when gentics-ui-core is building
function buildDocsTasks() {
if(npmArgs.remain.indexOf('gentics-ui-core') === -1) {
return new Promise(gulp.series(
cleanDocsFolder,
copyDocsFiles,
copyJekyllConfig
));
}
return resolvePromiseDummy();
return new Promise(gulp.series(
cleanDocsFolder,
copyDocsFiles,
copyJekyllConfig
));
}

// Run only when gentics-ui-core is not building
function buildUiCoreTasks() {
if(npmArgs.remain.indexOf('gentics-ui-core') !== -1) {
return new Promise(gulp.series(compileDistStyles, copyDistReadme));
}
return resolvePromiseDummy();
return new Promise(gulp.series(compileDistStyles, copyDistReadme));
}

function cleanDocsFolder() {
Expand Down
Loading

0 comments on commit 7c097aa

Please sign in to comment.