Skip to content

Commit 32fdd3f

Browse files
committed
17.0.0
1 parent 14059c0 commit 32fdd3f

File tree

33 files changed

+3871
-3556
lines changed

33 files changed

+3871
-3556
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @oracle/ojet-cli 16.1.0
1+
# @oracle/ojet-cli 17.0.0
22

33
## About the module
44
This module contains a command line interface for Oracle JET web application development.
@@ -59,7 +59,7 @@ Or view help on adding a plugin:
5959
ojet help add plugin
6060
```
6161

62-
For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1610&id=homepage).
62+
For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1700&id=homepage).
6363

6464
## Contributing
6565
This project is not accepting external contributions at this time. For bugs or enhancement requests, please file a GitHub issue unless it’s security related. When filing a bug remember that the better written the bug is, the more likely it is to be fixed. If you think you’ve found a security vulnerability, do not raise a GitHub issue and follow the instructions in our [security policy](./SECURITY.md).

RELEASENOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Release Notes for ojet-cli ##
22

3+
### 17.0.0
4+
5+
* New applications created with ojet will now require nodejs versions 16 or higher
6+
* In the oraclejetconfig.json file, a new property called unversioned has been added. This property controls whether components in the staging folder are versioned. If unversioned is set to true, components will not be versioned; if set to false, components will be versioned. This setting will override the --omit-component-version flag during the build process. If unversioned is not defined, then the --omit-component-version flag will be respected. By default, unversioned is set to true.
7+
* Update typescript version to 5.4.5
8+
39
### 16.1.0
410

511
* Update version of Express to 4.19.2

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ sufficiently hardened for production use.
3535
[1]: mailto:secalert_us@oracle.com
3636
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
3737
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
38-
[4]: https://www.oracle.com/security-alerts/
38+
[4]: https://www.oracle.com/security-alerts/

common/template/npm.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ function _copyNpmTemplate(generator, templateSpec, destination) {
8787
let indexHTML = fs.readFileSync(filePath, { encoding: 'utf-8' });
8888
const scriptsInjector = injectorUtils.scriptsInjector;
8989
const themeInjector = injectorUtils.themeInjector;
90+
const fontInjector = injectorUtils.fontInjector;
9091
// remove content between injector:scripts token
9192
indexHTML = injectorUtils.removeInjectorTokensContent({
9293
content: indexHTML,
@@ -109,6 +110,17 @@ function _copyNpmTemplate(generator, templateSpec, destination) {
109110
startTag: `\t\t${themeInjector.startTag}`,
110111
endTag: `\t\t${themeInjector.endTag}`
111112
});
113+
// remove content between injector:font token
114+
indexHTML = injectorUtils.removeInjectorTokensContent({
115+
content: indexHTML,
116+
pattern: injectorUtils.getInjectorTagsRegExp(
117+
fontInjector.startTag,
118+
fontInjector.endTag
119+
),
120+
eol: injectorUtils.getLineEnding(indexHTML),
121+
startTag: `\t\t${fontInjector.startTag}`,
122+
endTag: `\t\t${fontInjector.endTag}`
123+
});
112124
// write to /src
113125
filePathDest = path.join(destination, '..', filePathFromTemplateRoot);
114126
fs.outputFileSync(filePathDest, indexHTML, { encoding: 'utf-8' });

config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ const config = {
633633
default: '35729'
634634
},
635635
'server-only': {
636-
description: 'Shortcut for --destination=server-only'
636+
description: 'Start server without opening browser'
637637
},
638638
'server-url': {
639639
description: 'Specify the server to serve from',

generators/app/templates/common/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"version": "1.0.0",
44
"description": "An Oracle JavaScript Extension Toolkit(JET) web app",
55
"dependencies": {
6-
"@oracle/oraclejet": "~16.1.0",
7-
"@oracle/oraclejet-core-pack": "~16.1.0"
6+
"@oracle/oraclejet": "~17.0.0",
7+
"@oracle/oraclejet-core-pack": "~17.0.0"
88
},
99
"devDependencies": {
1010
"extract-zip": "^1.7.0",
1111
"fs-extra": "^8.1.0",
12-
"glob": "7.2.0",
12+
"glob": "10.4.5",
1313
"underscore": "^1.10.2",
14-
"@oracle/ojet-cli": "~16.1.0"
14+
"@oracle/ojet-cli": "~17.0.0"
1515
},
1616
"engines": {
17-
"node": ">=12.21.0"
17+
"node": ">=16.0.0"
1818
},
1919
"private": true
2020
}

lib/util/injectors.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@ const themeInjector = {
3939
endTag: '<!-- endinjector -->'
4040
};
4141

42+
const fontInjector = {
43+
startTag: '<!-- injector:font -->',
44+
endTag: '<!-- endinjector:font -->'
45+
};
46+
4247
module.exports = {
4348
getInjectorTagsRegExp,
4449
getLineEnding,
4550
removeInjectorTokensContent,
4651
scriptsInjector,
47-
themeInjector
52+
themeInjector,
53+
fontInjector
4854
};

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@oracle/ojet-cli",
3-
"version": "16.1.0",
3+
"version": "17.0.0",
44
"description": "Oracle JET Command Line Interface",
55
"license": "UPL-1.0",
66
"homepage": "http://www.oracle.com/jet",
@@ -11,11 +11,14 @@
1111
"dependencies": {
1212
"adm-zip": "~0.4.7",
1313
"fs-extra": "~8.1.0",
14-
"glob": "7.2.0",
14+
"glob": "10.4.5",
1515
"inquirer": "~8.2.2",
1616
"minimist": "~1.2.0",
17-
"@oracle/oraclejet-tooling": "~16.1.0",
18-
"@oracle/oraclejet-templates": "~16.1.0"
17+
"@oracle/oraclejet-tooling": "~17.0.0",
18+
"@oracle/oraclejet-templates": "~17.0.0"
19+
},
20+
"overrides": {
21+
"glob": "10.4.5"
1922
},
2023
"engines": {
2124
"node": ">=12.21.0"

template/common/oraclejetconfig.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
"themes": "staged-themes"
1515
}
1616
},
17-
17+
"unversioned": true,
1818
"defaultBrowser": "chrome",
1919
"sassVer": "8.0.0",
2020
"defaultTheme": "redwood",
21-
"typescriptLibraries": "typescript@5.3.2 yargs-parser@~13.1.2",
21+
"fontUrl": "https://static.oracle.com/cdn/fnd/gallery/2404.0.0/images/iconfont/ojuxIconFont.min.css",
22+
"typescriptLibraries": "typescript@5.4.5 yargs-parser@~13.1.2",
2223
"webpackLibraries": "webpack@5.76.0 @types/node@18.16.3 webpack-dev-server style-loader css-loader sass-loader sass ts-loader@8.4.0 raw-loader noop-loader html-webpack-plugin html-replace-webpack-plugin copy-webpack-plugin @prefresh/webpack @prefresh/babel-plugin webpack-merge compression-webpack-plugin mini-css-extract-plugin clean-webpack-plugin css-fix-url-loader",
2324
"mochaTestingLibraries": "karma mocha sinon chai@4.4.1 coverage karma-chai@0.1.0 karma-coverage@2.2.0 karma-chrome-launcher@3.1.1 karma-mocha@2.0.1 karma-mocha-reporter@2.2.5 karma-requirejs@1.1.0 karma-fixture@0.2.6 karma-sinon@1.0.5 karma-typescript@5.5.4 @types/chai@4.3.4 @types/karma-fixture@0.2.5 @types/mocha@10.0.1 @types/sinon@10.0.13",
24-
"jestTestingLibraries": "jest@29.6.2 @testing-library/preact@3.2.3 @types/jest@29.5.3 jest-environment-jsdom@29.6.2 @oracle/oraclejet-jest-preset@~16.1.0"
25+
"jestTestingLibraries": "jest@29.6.2 @testing-library/preact@3.2.3 @types/jest@29.5.3 jest-environment-jsdom@29.6.2 @oracle/oraclejet-jest-preset@~17.0.0"
2526
}

template/component/js/component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@component-name@",
33
"version": "1.0.0",
4-
"jetVersion": "^16.1.0",
4+
"jetVersion": "^17.0.0",
55
"displayName": "A user friendly, translatable name of the component.",
66
"description": "A translatable high-level description for the component.",
77
"properties": {

0 commit comments

Comments
 (0)