Skip to content

Commit 115b419

Browse files
author
dxa-team
committed
2.1.0 RC1
2 parents 90701a5 + 27bcdcb commit 115b419

2,743 files changed

Lines changed: 15609 additions & 9582 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Jenkinsfile

Lines changed: 0 additions & 27 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
root = true
2-
3-
[*]
4-
indent_style = space
5-
indent_size = 4
6-
end_of_line = crlf
7-
charset = utf-8
8-
trim_trailing_whitespace = true
9-
insert_final_newline = true
10-
11-
[*.json]
12-
indent_style = space
13-
indent_size = 2
14-
15-
[*.md]
16-
trim_trailing_whitespace = false
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 4
6+
end_of_line = crlf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
11+
[*.json]
12+
indent_style = space
13+
indent_size = 2
14+
15+
[*.md]
16+
trim_trailing_whitespace = false

boilerplate/Jenkinsfile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Dynamic Documentation GUI build pipeline
2+
pipeline {
3+
4+
agent {
5+
label 'dxadocker'
6+
}
7+
8+
options {
9+
buildDiscarder(logRotator(numToKeepStr: '5'))
10+
disableConcurrentBuilds()
11+
}
12+
13+
parameters {
14+
string name: "tempFolder", defaultValue: "C:\\Temp\\DXA\\DDGUIBoilerplate", description: 'Temporary folder'
15+
string name: "packageName", defaultValue: 'Sdl.Dxa.Modules.DynamicDocumentation.Boilerplate', description: 'Name of the package we are going to publish'
16+
string name: "version", defaultValue: '2.1.0', description: 'Version of the package we are going to publish'
17+
booleanParam name: "isPreRelease", defaultValue: true, description: "If we add 'beta' prefix to the version"
18+
}
19+
20+
stages {
21+
stage('Building DD GUI Boilerplate') {
22+
steps {
23+
dir("boilerplate") {
24+
powershell 'mvn clean package'
25+
}
26+
}
27+
}
28+
}
29+
30+
post {
31+
always {
32+
dir("boilerplate") {
33+
archiveArtifacts artifacts: 'target/**', fingerprint: true
34+
}
35+
}
36+
}
37+
}
38+
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
4+
Copyright (c) 2014 All Rights Reserved by the SDL Group.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
20+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
23+
<id>dist</id>
24+
<formats>
25+
<format>zip</format>
26+
</formats>
27+
<baseDirectory>../</baseDirectory>
28+
<fileSets>
29+
<fileSet>
30+
<directory>${project.basedir}</directory>
31+
<useDefaultExcludes>true</useDefaultExcludes>
32+
<excludes>
33+
<exclude>assembly/</exclude>
34+
<exclude>target/</exclude>
35+
<exclude>nuget/</exclude>
36+
<exclude>node/</exclude>
37+
<exclude>node_modules/</exclude>
38+
<exclude>pom.xml</exclude>
39+
</excludes>
40+
<includes>
41+
<include>**</include>
42+
</includes>
43+
<outputDirectory>.</outputDirectory>
44+
</fileSet>
45+
<fileSet>
46+
<directory>${project.basedir}/../gui/src</directory>
47+
<useDefaultExcludes>true</useDefaultExcludes>
48+
<includes>
49+
<include>theming/</include>
50+
</includes>
51+
<outputDirectory>./src/</outputDirectory>
52+
</fileSet>
53+
</fileSets>
54+
</assembly>

dynamic-documentation-gui/build/gulp-tasks/package-project.js renamed to boilerplate/build/gulp-tasks/package-project.js

Lines changed: 53 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,53 @@
1-
'use strict';
2-
3-
/**
4-
* Package current project.
5-
* @module package-project
6-
* @param {Object} buildOptions Build options.
7-
*/
8-
module.exports = (buildOptions) => {
9-
const webpack = require('webpack');
10-
11-
return (cb) => {
12-
const config = require('../../webpack.config')(buildOptions.isTest, buildOptions.isDebug);
13-
let firstRun = true;
14-
let compiler;
15-
16-
const onCompleted = (err, stats) => {
17-
console.log(stats.toString({
18-
chunks: false, // Makes the build much quieter
19-
colors: true
20-
}));
21-
22-
if (firstRun) {
23-
firstRun = false;
24-
const jsonStats = stats.toJson();
25-
const error = err || (jsonStats.errors && jsonStats.errors.length > 0 ? new Error('Failed to create bundles') : null);
26-
cb(error, {
27-
config,
28-
compiler
29-
});
30-
}
31-
};
32-
33-
compiler = webpack(config, onCompleted);
34-
}
35-
};
1+
/**
2+
*
3+
* Copyright (c) 2014 All Rights Reserved by the SDL Group.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
*/
18+
19+
'use strict';
20+
21+
/**
22+
* Package current project.
23+
* @module package-project
24+
* @param {Object} buildOptions Build options.
25+
*/
26+
module.exports = (buildOptions) => {
27+
const webpack = require('webpack');
28+
29+
return (cb) => {
30+
const config = require('../../webpack.config')(buildOptions.isTest, buildOptions.isDebug);
31+
let firstRun = true;
32+
let compiler;
33+
34+
const onCompleted = (err, stats) => {
35+
console.log(stats.toString({
36+
chunks: false, // Makes the build much quieter
37+
colors: true
38+
}));
39+
40+
if (firstRun) {
41+
firstRun = false;
42+
const jsonStats = stats.toJson();
43+
const error = err || (jsonStats.errors && jsonStats.errors.length > 0 ? new Error('Failed to create bundles') : null);
44+
cb(error, {
45+
config,
46+
compiler
47+
});
48+
}
49+
};
50+
51+
compiler = webpack(config, onCompleted);
52+
}
53+
};
Lines changed: 56 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,56 @@
1-
'use strict';
2-
3-
/**
4-
* Verify code quality of TypeScript using TSLint.
5-
* @module run-tslint
6-
* @param {Object} buildOptions Build options.
7-
* @param {Object} gulp Instance of gulp.
8-
*/
9-
module.exports = function (buildOptions, gulp) {
10-
var gulpTSLint = require('gulp-tslint');
11-
var gulpDebug = require('gulp-debug');
12-
var tsLintRules = require('../../tslint.json').rules;
13-
tsLintRules['no-debugger'] = !buildOptions.isDebug;
14-
15-
return function (cb) {
16-
gulp.src(
17-
[
18-
buildOptions.sourcesPath + '**/*.ts',
19-
buildOptions.sourcesPath + '**/*.tsx',
20-
buildOptions.testPath + '**/*.ts',
21-
buildOptions.testPath + '**/*.tsx'
22-
])
23-
.pipe(gulpTSLint({
24-
configuration: {
25-
rules: tsLintRules
26-
},
27-
formatter: 'verbose'
28-
}))
29-
.pipe(gulpDebug({ title: 'Validated with TSLint' }))
30-
.pipe(gulpTSLint.report({
31-
reportLimit: 100
32-
}))
33-
.on('error', function (err) {
34-
cb(new Error('TSLint returned errors.'));
35-
})
36-
.on('end', cb);
37-
}
38-
}
1+
/**
2+
*
3+
* Copyright (c) 2014 All Rights Reserved by the SDL Group.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
*/
18+
19+
'use strict';
20+
21+
/**
22+
* Verify code quality of TypeScript using TSLint.
23+
* @module run-tslint
24+
* @param {Object} buildOptions Build options.
25+
* @param {Object} gulp Instance of gulp.
26+
*/
27+
module.exports = function (buildOptions, gulp) {
28+
var gulpTSLint = require('gulp-tslint');
29+
var gulpDebug = require('gulp-debug');
30+
var tsLintRules = require('../../tslint.json').rules;
31+
tsLintRules['no-debugger'] = !buildOptions.isDebug;
32+
33+
return function (cb) {
34+
gulp.src(
35+
[
36+
buildOptions.sourcesPath + '**/*.ts',
37+
buildOptions.sourcesPath + '**/*.tsx',
38+
buildOptions.testPath + '**/*.ts',
39+
buildOptions.testPath + '**/*.tsx'
40+
])
41+
.pipe(gulpTSLint({
42+
configuration: {
43+
rules: tsLintRules
44+
},
45+
formatter: 'verbose'
46+
}))
47+
.pipe(gulpDebug({ title: 'Validated with TSLint' }))
48+
.pipe(gulpTSLint.report({
49+
reportLimit: 100
50+
}))
51+
.on('error', function (err) {
52+
cb(new Error('TSLint returned errors.'));
53+
})
54+
.on('end', cb);
55+
}
56+
}

0 commit comments

Comments
 (0)