Skip to content

Commit 18c0612

Browse files
committed
Release 9.0.0
1 parent 3a9145f commit 18c0612

Some content is hidden

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

62 files changed

+2600
-1240
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Contributing to oraclejet-tooling
22

33
*Copyright (c) 2014, 2020 Oracle and/or its affiliates
4-
The Universal Permissive License (UPL), Version 1.0*
4+
Licensed under The Universal Permissive License (UPL), Version 1.0
5+
as shown at https://oss.oracle.com/licenses/upl/*
56

67
**Pull requests are currently not being accepted for the Oracle JET project.**
78

LICENSE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Copyright (c) 2020 Oracle and/or its affiliates.
44

5-
The Universal Permissive License (UPL), Version 1.0
5+
Licensed under The Universal Permissive License (UPL), Version 1.0
6+
as shown at https://oss.oracle.com/licenses/upl/
67

78
Subject to the condition set forth below, permission is hereby granted to any
89
person obtaining a copy of this software, associated documentation and/or data

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# @oracle/oraclejet-tooling 8.3.0
1+
# @oracle/oraclejet-tooling 9.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=jet830&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=jet900&id=homepage).
1010

1111
## [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

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-
### 8.3.0
3+
### 9.0.0
44
* No changes
55

66
### 5.2.0

config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{"eslintDirs": ["lib", "hooks"],
2-
"eslintFilter": ["!**/parser/**"],
1+
{"eslintDirs": ["../oraclejet-tooling/lib", "../oraclejet-tooling/hooks"],
2+
"eslintFilter": ["!../oraclejet-tooling/**/parser/**"],
33
"fixup": ["package.json"]}

config/eslintcustom.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/**
22
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
3-
The Universal Permissive License (UPL), Version 1.0
3+
Licensed under The Universal Permissive License (UPL), Version 1.0
4+
as shown at https://oss.oracle.com/licenses/upl/
5+
46
*/
57
//
68
// Custom eslint rules file, used to deal with linbreak-style

hooks/jetAfterPrepare.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/usr/bin/env node
22
/**
33
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
4-
The Universal Permissive License (UPL), Version 1.0
4+
Licensed under The Universal Permissive License (UPL), Version 1.0
5+
as shown at https://oss.oracle.com/licenses/upl/
6+
57
*/
68

79
'use strict';

hooks/jetInjector.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/**
22
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
3-
The Universal Permissive License (UPL), Version 1.0
3+
Licensed under The Universal Permissive License (UPL), Version 1.0
4+
as shown at https://oss.oracle.com/licenses/upl/
5+
46
*/
57
'use strict';
68

lib/add.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#! /usr/bin/env node
22
/**
33
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
4-
The Universal Permissive License (UPL), Version 1.0
4+
Licensed under The Universal Permissive License (UPL), Version 1.0
5+
as shown at https://oss.oracle.com/licenses/upl/
6+
57
*/
68

79
'use strict';

lib/addpcss.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#! /usr/bin/env node
22
/**
33
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
4-
The Universal Permissive License (UPL), Version 1.0
4+
Licensed under The Universal Permissive License (UPL), Version 1.0
5+
as shown at https://oss.oracle.com/licenses/upl/
6+
57
*/
68

79
'use strict';

lib/addsass.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#! /usr/bin/env node
22
/**
33
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
4-
The Universal Permissive License (UPL), Version 1.0
4+
Licensed under The Universal Permissive License (UPL), Version 1.0
5+
as shown at https://oss.oracle.com/licenses/upl/
6+
57
*/
68

79
'use strict';

lib/addtypescript.js

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#! /usr/bin/env node
22
/**
33
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
4-
The Universal Permissive License (UPL), Version 1.0
4+
Licensed under The Universal Permissive License (UPL), Version 1.0
5+
as shown at https://oss.oracle.com/licenses/upl/
6+
57
*/
68

79
'use strict';
@@ -29,26 +31,22 @@ const path = require('path');
2931
* @private
3032
* @returns {Promise}
3133
*/
32-
function installTypescipt(validGlobalTypescriptAvailable) {
34+
function installTypescipt() {
3335
return new Promise((resolve) => {
34-
if (validGlobalTypescriptAvailable) {
35-
resolve();
36-
} else {
37-
util.log('Installing Typescript');
38-
exec('npm install typescript --save-dev=true', {
39-
env: {
40-
...process.env,
41-
// speed up npm install when on vpn
42-
NO_UPDATE_NOTIFIER: true
43-
}
44-
}, (error) => {
45-
if (error) {
46-
util.log.error(error);
47-
} else {
48-
resolve();
49-
}
50-
});
51-
}
36+
util.log('Installing Typescript');
37+
exec(`npm install typescript@${CONSTANTS.TYPESCRIPT_VERSION} --save-dev=true`, {
38+
env: {
39+
...process.env,
40+
// speed up npm install when on vpn
41+
NO_UPDATE_NOTIFIER: true
42+
}
43+
}, (error) => {
44+
if (error) {
45+
util.log.error(error);
46+
} else {
47+
resolve();
48+
}
49+
});
5250
});
5351
}
5452

@@ -112,8 +110,7 @@ function injectTypescriptConfig() {
112110
* @returns {Promise}
113111
*/
114112
module.exports = function () {
115-
return util.validGlobalTypescriptAvailable()
116-
.then(installTypescipt)
113+
return installTypescipt()
117114
.then(injectTypescriptConfig)
118115
.catch(util.log.error);
119116
};

lib/build.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/**
22
Copyright (c) 2015, 2020, Oracle and/or its affiliates.
3-
The Universal Permissive License (UPL), Version 1.0
3+
Licensed under The Universal Permissive License (UPL), Version 1.0
4+
as shown at https://oss.oracle.com/licenses/upl/
5+
46
*/
57
'use strict';
68

@@ -9,6 +11,9 @@ const buildHybrid = require('./buildHybrid');
911
const buildComponent = require('./buildComponent');
1012
const valid = require('./validations');
1113
const config = require('./config');
14+
const util = require('./util');
15+
const path = require('path');
16+
1217
/**
1318
* # API
1419
* ## ojet.build([platform],[options])
@@ -45,6 +50,16 @@ module.exports = function build(platform, options) {
4550
const validOptions = valid.buildOptions(options, validPlatform);
4651
const validBuildType = valid.buildType(validOptions);
4752
if (Object.prototype.hasOwnProperty.call(options, 'component')) {
53+
// Check for invalid use of path separators.
54+
// Recommend using ojet build if the user has tried to build an individual pack component.
55+
const [pack, component] = path.normalize(options.component).split(path.sep);
56+
if (pack && component) {
57+
if (util.isWebComponent({ pack, component })) {
58+
util.log.error('Builds of individual pack components are not supported. Please use ojet build instead.');
59+
} else {
60+
util.log.error(`Invalid syntax for component - path separators (${path.sep}) are not supported.`);
61+
}
62+
}
4863
return buildComponent(options.component, validOptions);
4964
}
5065
config.set('platform', validPlatform);

0 commit comments

Comments
 (0)