Release 13.1.0

README.md

@@ -1,4 +1,4 @@
-# @oracle/ojet-cli 13.0.0
+# @oracle/ojet-cli 13.1.0
 
 ## About the module
 This module contains a command line interface for Oracle JET web and hybrid mobile application development.
@@ -64,7 +64,7 @@ Or view help on adding a plugin:
 ojet help add plugin
 ```
 
-For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1300&id=homepage).
+For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1310&id=homepage).
 
 ## [Contributing](https://github.com/oracle/ojet-cli/blob/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See [CONTRIBUTING](https://github.com/oracle/ojet-cli/blob/master/CONTRIBUTING.md) for details.

RELEASENOTES.md

@@ -1,5 +1,11 @@
 ## Release Notes for ojet-cli ##
 
+### 13.1.0
+
+* In index.html, the injected <script> type will be changed to 'module' for CDN bundle config loading if 'cdn' and 'bundles-config-esm.js' is selected in path_mapping.json, to support the new self-locating JET CDN bundle configuration file
+* Hybrid build/serve capability based on Cordova is deprecated as of 10.1.0 and is planned for removal in version 15.0.0
+
+
 ### 13.0.0
 
 * Metadata to support API documentation is now emitted for vcomponents during build

common/component.js

@@ -223,7 +223,7 @@ function _replaceComponentTemplateToken(generator, pack) {
   const componentBasePath = _getComponentDestPath(generator);
   const folderPaths = [
     componentBasePath,
-    path.join(componentBasePath, 'resources/nls'),
+    path.join(componentBasePath, 'resources/nls/root'),
     path.join(componentBasePath, 'themes/base'),
     path.join(componentBasePath, 'themes/redwood'),
     path.join(componentBasePath, 'themes/stable')
@@ -327,7 +327,7 @@ function _renameComponentTemplatePrefix(generator) {
   const componentName = _getComponentName(generator);
   const folderPaths = [
     componentBasePath,
-    path.join(componentBasePath, 'resources/nls'),
+    path.join(componentBasePath, 'resources/nls/root'),
     path.join(componentBasePath, 'themes/base'),
     path.join(componentBasePath, 'themes/redwood'),
     path.join(componentBasePath, 'themes/stable')

generators/app/templates/common/package.json

@@ -3,13 +3,13 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "dependencies": {
-    "@oracle/oraclejet": "~13.0.0"
+    "@oracle/oraclejet": "~13.1.0"
   },
   "devDependencies": {
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "@oracle/oraclejet-tooling": "~13.0.0"
+    "@oracle/oraclejet-tooling": "~13.1.0"
   },
   "engines": {
     "node": ">=12.21.0"

generators/hybrid/templates/common/package.json

@@ -3,13 +3,13 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit (JET) mobile app",
   "dependencies": {
-    "@oracle/oraclejet": "~13.0.0"
+    "@oracle/oraclejet": "~13.1.0"
   },
   "devDependencies": {
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "@oracle/oraclejet-tooling": "~13.0.0"
+    "@oracle/oraclejet-tooling": "~13.1.0"
   },
   "engines": {
     "node": ">=12.21.0"

lib/util/utils.js

@@ -933,14 +933,12 @@ utils.getToolingPath = () => {
  */
 utils.getInstallerCommand = (options) => {
   const useCI = utils.hasProperty(options, 'ci');
-  if (useCI) {
-    return { installer: 'npm', verbs: { install: 'ci' } };
-  }
   let installerCmd = options.installer;
   if (!installerCmd) {
     const configPath = path.join(process.cwd(), constants.APP_CONFIG_JSON);
     const configJson = utils.readJsonAndReturnObject(configPath);
     installerCmd = configJson.installer || constants.DEFAULT_INSTALLER;
   }
-  return installerCmd === 'yarn' ? { installer: 'yarn', verbs: { install: 'install' } } : { installer: 'npm', verbs: { install: 'install' } };
+  const npmInstallCmd = useCI ? 'ci' : 'install';
+  return installerCmd === 'yarn' ? { installer: 'yarn', verbs: { install: 'install' } } : { installer: 'npm', verbs: { install: npmInstallCmd } };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oracle/ojet-cli",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "Oracle JET Command Line Interface",
   "license": "UPL-1.0",
   "homepage": "http://www.oracle.com/jet",
@@ -15,8 +15,8 @@
     "inquirer": "~8.2.2",
     "minimist": "~1.2.0",
     "@xmldom/xmldom": "0.8.1",
-    "@oracle/oraclejet-tooling": "~13.0.0",
-    "@oracle/oraclejet-templates": "~13.0.0"
+    "@oracle/oraclejet-tooling": "~13.1.0",
+    "@oracle/oraclejet-templates": "~13.1.0"
   },
   "engines": {
     "node": ">=12.21.0"

template/component/js/component.json

@@ -1,7 +1,7 @@
 {
   "name": "@component-name@",
   "version": "1.0.0",
-  "jetVersion": "^13.0.0",
+  "jetVersion": "^13.1.0",
   "displayName": "A user friendly, translatable name of the component.",
   "description": "A translatable high-level description for the component.",
   "properties": {

template/component/js/resources/nls/@component@-strings.js → template/component/js/resources/nls/root/@component@-strings.js

@@ -5,9 +5,7 @@
 
 */
 define({
-  "root": {
-    "@component-name@" : {
-    		"sampleString": "The strings file can be used to manage translatable resources"
-    }
+  "@component-name@" : {
+    	"sampleString": "The strings file can be used to manage translatable resources"
   }
 });

template/component/ts/component.json

@@ -1,7 +1,7 @@
 {
   "name": "@component-name@",
   "version": "1.0.0",
-  "jetVersion": "^13.0.0",
+  "jetVersion": "^13.1.0",
   "displayName": "A user friendly, translatable name of the component.",
   "description": "A translatable high-level description for the component.",
   "properties": {

template/component/ts/resources/nls/root/@component@-strings.ts

@@ -0,0 +1,5 @@
+export = {
+  "@component-name@": {
+    "sampleString": "The strings file can be used to manage translatable resources"
+  }
+};

template/component/tsx/resources/nls/root/@component@-strings.ts

@@ -0,0 +1,5 @@
+export = {
+  "@component-name@": {
+    "sampleString": "The strings file can be used to manage translatable resources"
+  }
+};

template/resource-component/component.json

@@ -2,7 +2,7 @@
     "name": "@component-name@",
     "type": "resource",
     "version": "1.0.0",
-    "jetVersion": "^13.0.0",
+    "jetVersion": "^13.1.0",
     "displayName": "A user friendly, translatable name of the component.",
     "description": "A translatable high-level description for the component.",
     "publicModules": [

test/buildConfig.json

@@ -1,17 +1,17 @@
-{
-  "ios": {
-      "debug": {
-        "provisioningProfile": "72a690e6-b96f-4a62-9f10-757cff093cc9",
-        "developmentTeam": "52QHD847TQ",
-        "codeSignIdentity": "iPhone Distribution",
-        "packageType": "enterprise"
-      },
-
-      "release": {
-        "provisioningProfile": "72a690e6-b96f-4a62-9f10-757cff093cc9",
-        "developmentTeam": "52QHD847TQ",
-        "codeSignIdentity": "iPhone Distribution",
-        "packageType": "enterprise"
-      }
-    }
+{
+  "ios": {
+      "debug": {
+        "provisioningProfile": "9ee22e98-ecd9-4d96-a49f-f2f0bb0ca2f0",
+        "developmentTeam": "52QHD847TQ",
+        "codeSignIdentity": "iPhone Distribution",
+        "packageType": "enterprise"
+      },
+  
+      "release": {
+        "provisioningProfile": "9ee22e98-ecd9-4d96-a49f-f2f0bb0ca2f0",
+        "developmentTeam": "52QHD847TQ",
+        "codeSignIdentity": "iPhone Distribution",
+        "packageType": "enterprise"
+      }
+    }
   }