Skip to content

Commit 7875265

Browse files
committed
Release 8.0.0
1 parent 3013e4f commit 7875265

Some content is hidden

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

47 files changed

+2760
-1029
lines changed

LICENSE

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# oraclejet-tooling
2+
3+
Copyright (c) 2019 Oracle and/or its affiliates.
4+
5+
The Universal Permissive License (UPL), Version 1.0
6+
7+
Subject to the condition set forth below, permission is hereby granted to any
8+
person obtaining a copy of this software, associated documentation and/or data
9+
(collectively the "Software"), free of charge and under any and all copyright
10+
rights in the Software, and any and all patent rights owned or freely
11+
licensable by each licensor hereunder covering either (i) the unmodified
12+
Software as contributed to or provided by such licensor, or (ii) the Larger
13+
Works (as defined below), to deal in both
14+
15+
(a) the Software, and
16+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
17+
one is included with the Software (each a "Larger Work" to which the Software
18+
is contributed by such licensors),
19+
20+
without restriction, including without limitation the rights to copy, create
21+
derivative works of, display, perform, and distribute the Software and make,
22+
use, sell, offer for sale, import, export, have made, and have sold the
23+
Software and the Larger Work(s), and to sublicense the foregoing rights on
24+
either these or other terms.
25+
26+
This license is subject to the following condition:
27+
The above copyright notice and either this complete permission notice or at
28+
a minimum a reference to the UPL must be included in all copies or
29+
substantial portions of the Software.
30+
31+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
32+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
33+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
34+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
35+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
36+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
37+
SOFTWARE.

LICENSE.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# @oracle/oraclejet-tooling 7.2.0
1+
# @oracle/oraclejet-tooling 8.0.0
22

33
## About the tooling API
44
This tooling API contains methods to build and serve Oracle JET web and hybrid mobile apps. It is intended to be used with task running tools such as grunt or gulp. The APIs can also be invoked directly.
55

66
This is an open source project maintained by Oracle Corp.
77

88
## Installation
9-
This module will be automatically installed when you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet720&id=homepage).
9+
This module will be automatically installed when you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet800&id=homepage).
1010

11-
## [Contributing](https://github.com/oracle/oraclejet-tooling/tree/master/CONTRIBUTING.md)
11+
## [Contributing](https://github.com/oracle/oraclejet-tooling/blob/master/CONTRIBUTING.md)
1212
Oracle JET is an open source project. Pull Requests are currently not being accepted. See
13-
[CONTRIBUTING](https://github.com/oracle/oraclejet-tooling/tree/master/CONTRIBUTING.md)
13+
[CONTRIBUTING](https://github.com/oracle/oraclejet-tooling/blob/master/CONTRIBUTING.md)
1414
for details.
1515

16-
## [License](https://github.com/oracle/oraclejet-tooling/tree/master/LICENSE.md)
17-
Copyright (c) 2014, 2019 Oracle and/or its affiliates
18-
The Universal Permissive License (UPL), Version 1.0
16+
## [License](https://github.com/oracle/oraclejet-tooling/blob/master/LICENSE)
17+
Copyright (c) 2019 Oracle and/or its affiliates and released under the
18+
[Universal Permissive License (UPL)](https://oss.oracle.com/licenses/upl/), Version 1.0

RELEASENOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Release Notes for oraclejet-tooling ##
22

3-
### 7.2.0
3+
### 8.0.0
44
* No changes
55

66
### 5.2.0

THIRDPARTYLICENSE.txt

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ node_modules/lodash.remove/ MIT
2020
node_modules/lodash.union/ MIT
2121
node_modules/lodash.mergewith/ MIT
2222
node_modules/requirejs/ MIT
23-
node_modules/uglify-es/ BSD-2-Clause
23+
node_modules/terser/ BSD-2-Clause
2424
node_modules/gaze/ MIT
2525
node_modules/connect/ MIT
2626
node_modules/connect-livereload/ MIT
2727
node_moduels/tiny-lr/ MIT
2828
node_modules/serve-static/ MIT
2929
node_modules/serve-index/ MIT
30-
node_moduels/opn/ MIT
30+
node_moduels/open/ MIT
3131
node_modules/svgo/ MIT
3232
node_modules/svg-sprite/ MIT
3333
node_modules/archiver/ MIT
@@ -124,36 +124,6 @@ terms above.
124124
*/
125125

126126

127-
UglifyJS is released under the BSD license:
128-
129-
Copyright 2012-2013 (c) Mihai Bazon <mihai.bazon@gmail.com>
130-
131-
Redistribution and use in source and binary forms, with or without
132-
modification, are permitted provided that the following conditions
133-
are met:
134-
135-
* Redistributions of source code must retain the above
136-
copyright notice, this list of conditions and the following
137-
disclaimer.
138-
139-
* Redistributions in binary form must reproduce the above
140-
copyright notice, this list of conditions and the following
141-
disclaimer in the documentation and/or other materials
142-
provided with the distribution.
143-
144-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
145-
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
146-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
147-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
148-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
149-
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
150-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
151-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
152-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
153-
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
154-
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
155-
SUCH DAMAGE.
156-
157127

158128
Copyright (c) 2018 Kyle Robinson Young
159129

lib/addpcss.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#! /usr/bin/env node
2+
/**
3+
Copyright (c) 2015, 2019, Oracle and/or its affiliates.
4+
The Universal Permissive License (UPL), Version 1.0
5+
*/
6+
7+
'use strict';
8+
9+
/**
10+
* ## Dependencies
11+
*/
12+
const util = require('./util');
13+
const config = require('./config');
14+
15+
/**
16+
* # 'addPcss'
17+
*
18+
* @public
19+
* @returns {Promise}
20+
*/
21+
module.exports = function () {
22+
util.log('Performing \'npm install\'');
23+
config.loadOraclejetConfig();
24+
const sassVer = config.data.sassVer;
25+
26+
return util.spawn('npm', ['install',
27+
`node-sass@${sassVer}`,
28+
'postcss-custom-properties@6.2.0',
29+
'postcss-calc@6.0.1',
30+
'autoprefixer@9.1.5',
31+
'--save-dev=true']);
32+
};

lib/addsass.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* ## Dependencies
1111
*/
1212
const util = require('./util');
13+
const config = require('./config');
1314

1415
/**
1516
* # 'addSass'
@@ -18,6 +19,8 @@ const util = require('./util');
1819
* @returns {Promise}
1920
*/
2021
module.exports = function () {
22+
config.loadOraclejetConfig();
23+
const sassVer = config.data.sassVer;
2124
util.log('Performing \'npm install node-sass\'');
22-
return util.spawn('npm', ['install', 'node-sass@4.11.0', '--save-dev=true']);
25+
return util.spawn('npm', ['install', `node-sass@${sassVer}`, '--save-dev=true']);
2326
};

lib/build.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,31 @@ const config = require('./config');
2525
* @param {string} [options.setDefaultConfig] - String path to default json file
2626
* @param {string} [options.staingPath] - Path to the staging directory
2727
* @param {object} [options.inject] - Object for inject task configuration
28-
* @param {object} [options.uglify] - Object for uglify task configuration
28+
* @param {object} [options.terser] - Object for terser task configuration
2929
* @param {object} [options.copyToRelase] - Object for copyToRelease task configuration
3030
* @param {object} [options.requireJs] - Object for requireJs task configuration
3131
* @param {object} [options.sass] - Object for sass task configuration
3232
* @returns {Promise}
3333
*/
3434
module.exports = function build(platform, options) {
35+
let platformOption = platform;
3536
if (Object.prototype.hasOwnProperty.call(options, 'component')) {
36-
config.loadOraclejetConfig('web');
37-
return buildComponent(options.component);
37+
platformOption = 'web';
3838
}
39-
config.loadOraclejetConfig(platform);
40-
const validPlatform = valid.platform(platform);
39+
config.loadOraclejetConfig(platformOption);
40+
if (Object.prototype.hasOwnProperty.call(options, 'component')) {
41+
// Force component builds
42+
config.set('platform', 'web');
43+
}
44+
const validPlatform = valid.platform(platformOption);
4145
const validOptions = valid.buildOptions(options, validPlatform);
4246
const validBuildType = valid.buildType(validOptions);
47+
if (Object.prototype.hasOwnProperty.call(options, 'component')) {
48+
return buildComponent(options.component, validOptions);
49+
}
4350
config.set('platform', validPlatform);
4451
if (platform === 'web') {
4552
return buildWeb(validBuildType, validOptions);
4653
}
47-
4854
return buildHybrid(validBuildType, validPlatform, validOptions);
4955
};

0 commit comments

Comments
 (0)