marko 4.28.4 → 4.28.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. package/dist/node_modules/@internal/loader/index.js +11 -12
  2. package/package.json +1 -1
  3. package/src/node_modules/@internal/loader/index.js +12 -13
package/dist/node_modules/@internal/loader/index.js CHANGED
@@ -94,22 +94,22 @@ function getCachedTemplate(path) {
94
94
  function getPreviousTemplate(templatePath, options) {
95
95
  /*
96
96
  The require.cache is search in the following order:
97
- 1) /path/to/my-template.js
98
- 2) /path/to/my-template.marko.js
97
+ 1) /path/to/my-template.marko.js
98
+ 2) /path/to/my-template.js
99
99
  3) /path/to/my-template.marko
100
100
  *
101
101
  If the template is not found in require.cache and `assumeUpToDate` is true
102
102
  then we will check the disk for the precompiled templates in the following
103
103
  order:
104
- 1) /path/to/my-template.js
105
- 2) /path/to/my-template.marko.js
104
+ 1) /path/to/my-template.marko.js
105
+ 2) /path/to/my-template.js
106
106
  */
107
107
  var ext = nodePath.extname(templatePath);
108
- var targetFilePrecompiled = templatePath.slice(0, 0 - ext.length) + ".js";
109
- var targetFileDebug = templatePath + ".js";
108
+ var targetPrecompiledMarkoJS = templatePath + ".js";
109
+ var targetPrecompiledJS = templatePath.slice(0, 0 - ext.length) + ".js";
110
110
 
111
111
  // Short-circuit loading if the template has already been cached in the Node.js require cache
112
- var cachedTemplate = getCachedTemplate(targetFilePrecompiled) || getCachedTemplate(targetFileDebug) || getCachedTemplate(templatePath);
112
+ var cachedTemplate = getCachedTemplate(targetPrecompiledMarkoJS) || getCachedTemplate(targetPrecompiledJS) || getCachedTemplate(templatePath);
113
113
 
114
114
  if (cachedTemplate) {
115
115
  return cachedTemplate;
@@ -119,12 +119,11 @@ function getPreviousTemplate(templatePath, options) {
119
119
  templatePath = nodePath.resolve(cwd, templatePath);
120
120
 
121
121
  if (options.assumeUpToDate) {
122
- if (fs.existsSync(targetFilePrecompiled)) {
123
- return require(targetFilePrecompiled);
122
+ if (fs.existsSync(targetPrecompiledMarkoJS)) {
123
+ return require(targetPrecompiledMarkoJS);
124
124
  }
125
-
126
- if (fs.existsSync(targetFileDebug)) {
127
- return require(targetFileDebug);
125
+ if (fs.existsSync(targetPrecompiledJS)) {
126
+ return require(targetPrecompiledJS);
128
127
  }
129
128
  }
130
129
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "marko",
3
- "version": "4.28.4",
3
+ "version": "4.28.5",
4
4
  "license": "MIT",
5
5
  "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
6
6
  "dependencies": {
package/src/node_modules/@internal/loader/index.js CHANGED
@@ -96,24 +96,24 @@ function getCachedTemplate(path) {
96
96
  function getPreviousTemplate(templatePath, options) {
97
97
  /*
98
98
  The require.cache is search in the following order:
99
- 1) /path/to/my-template.js
100
- 2) /path/to/my-template.marko.js
99
+ 1) /path/to/my-template.marko.js
100
+ 2) /path/to/my-template.js
101
101
  3) /path/to/my-template.marko
102
102
  *
103
103
  If the template is not found in require.cache and `assumeUpToDate` is true
104
104
  then we will check the disk for the precompiled templates in the following
105
105
  order:
106
- 1) /path/to/my-template.js
107
- 2) /path/to/my-template.marko.js
106
+ 1) /path/to/my-template.marko.js
107
+ 2) /path/to/my-template.js
108
108
  */
109
109
  var ext = nodePath.extname(templatePath);
110
- var targetFilePrecompiled = templatePath.slice(0, 0 - ext.length) + ".js";
111
- var targetFileDebug = templatePath + ".js";
110
+ var targetPrecompiledMarkoJS = templatePath + ".js";
111
+ var targetPrecompiledJS = templatePath.slice(0, 0 - ext.length) + ".js";
112
112
 
113
113
  // Short-circuit loading if the template has already been cached in the Node.js require cache
114
114
  var cachedTemplate =
115
- getCachedTemplate(targetFilePrecompiled) ||
116
- getCachedTemplate(targetFileDebug) ||
115
+ getCachedTemplate(targetPrecompiledMarkoJS) ||
116
+ getCachedTemplate(targetPrecompiledJS) ||
117
117
  getCachedTemplate(templatePath);
118
118
 
119
119
  if (cachedTemplate) {
@@ -124,12 +124,11 @@ function getPreviousTemplate(templatePath, options) {
124
124
  templatePath = nodePath.resolve(cwd, templatePath);
125
125
 
126
126
  if (options.assumeUpToDate) {
127
- if (fs.existsSync(targetFilePrecompiled)) {
128
- return require(targetFilePrecompiled);
127
+ if (fs.existsSync(targetPrecompiledMarkoJS)) {
128
+ return require(targetPrecompiledMarkoJS);
129
129
  }
130
-
131
- if (fs.existsSync(targetFileDebug)) {
132
- return require(targetFileDebug);
130
+ if (fs.existsSync(targetPrecompiledJS)) {
131
+ return require(targetPrecompiledJS);
133
132
  }
134
133
  }
135
134