Skip to content

Commit a85f4b1

Browse files
ricardo-devis-agulloricardo-devis-agullo
committed
Merge branch 'master' into simplify-log-parameter-names
2 parents b565b64 + ab3537e commit a85f4b1

File tree

7 files changed

+38
-50
lines changed

7 files changed

+38
-50
lines changed

‎.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"env": {
44
"browser": true,
55
"es6": true,
6-
"node": true,
7-
"mocha": true
6+
"node": true
87
},
98
"extends": [
109
"eslint:recommended",

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@
114114
"oc-get-unix-utc-timestamp": "1.0.5",
115115
"oc-s3-storage-adapter": "1.1.6",
116116
"oc-storage-adapters-utils": "1.0.4",
117-
"oc-template-es6": "1.0.5",
118-
"oc-template-es6-compiler": "1.1.12",
119-
"oc-template-handlebars": "6.0.23",
120-
"oc-template-handlebars-compiler": "6.2.17",
121-
"oc-template-jade": "7.0.4",
122-
"oc-template-jade-compiler": "7.0.5",
117+
"oc-template-es6": "1.0.6",
118+
"oc-template-es6-compiler": "1.1.13",
119+
"oc-template-handlebars": "6.0.24",
120+
"oc-template-handlebars-compiler": "6.2.18",
121+
"oc-template-jade": "7.0.5",
122+
"oc-template-jade-compiler": "7.0.6",
123123
"open": "8.3.0",
124124
"parse-author": "2.0.0",
125125
"read": "1.0.7",

‎src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export interface Template {
207207
getCompiledTemplate: (
208208
templateString: string,
209209
key: string,
210-
context: Record<string, unknown>
210+
context?: Record<string, unknown>
211211
) => CompiledTemplate;
212212
getInfo: () => TemplateInfo;
213213
render: (

‎src/utils/npm-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const buildInstallCommand = (options: {
99
save?: boolean;
1010
isDev?: boolean;
1111
}) => {
12-
const args = ['install', '--prefix', options.installPath];
12+
const args = ['install'];
1313

1414
if (options.save) {
1515
args.push('--save-exact');

‎test/.eslintrc.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"env": {
3+
"mocha": true
4+
},
5+
"extends": "../.eslintrc.json",
6+
"rules": {
7+
"@typescript-eslint/no-var-requires": "off",
8+
"@typescript-eslint/no-empty-function": "off"
9+
}
10+
}

‎test/unit/utils-npm-utils.js

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ describe('utils : npm-utils', () => {
7474
},
7575
output: [
7676
'install',
77-
'--prefix',
78-
'path/to/component',
7977
'--save-exact',
8078
'--save-dev',
8179
'oc-template-jade-compiler',
@@ -89,14 +87,7 @@ describe('utils : npm-utils', () => {
8987
isDev: true,
9088
save: false
9189
},
92-
output: [
93-
'install',
94-
'--prefix',
95-
'path/to/component',
96-
'--no-save',
97-
'lodash',
98-
'--no-package-lock'
99-
]
90+
output: ['install', '--no-save', 'lodash', '--no-package-lock']
10091
},
10192
{
10293
input: {
@@ -107,8 +98,6 @@ describe('utils : npm-utils', () => {
10798
},
10899
output: [
109100
'install',
110-
'--prefix',
111-
'path/to/component',
112101
'--save-exact',
113102
'--save',
114103
'underscore',
@@ -119,8 +108,6 @@ describe('utils : npm-utils', () => {
119108
input: { dependency: 'oc-client@~1.2.3', installPath, save: false },
120109
output: [
121110
'install',
122-
'--prefix',
123-
'path/to/component',
124111
'--no-save',
125112
'oc-client@~1.2.3',
126113
'--no-package-lock'
@@ -184,8 +171,6 @@ describe('utils : npm-utils', () => {
184171
},
185172
output: [
186173
'install',
187-
'--prefix',
188-
'path/to/component',
189174
'--save-exact',
190175
'--save-dev',
191176
'oc-template-jade-compiler',
@@ -202,8 +187,6 @@ describe('utils : npm-utils', () => {
202187
},
203188
output: [
204189
'install',
205-
'--prefix',
206-
'path/to/component',
207190
'--no-save',
208191
'moment',
209192
'lodash',
@@ -219,8 +202,6 @@ describe('utils : npm-utils', () => {
219202
},
220203
output: [
221204
'install',
222-
'--prefix',
223-
'path/to/component',
224205
'--save-exact',
225206
'--save',
226207
'underscore',
@@ -236,8 +217,6 @@ describe('utils : npm-utils', () => {
236217
},
237218
output: [
238219
'install',
239-
'--prefix',
240-
'path/to/component',
241220
'--no-save',
242221
'oc-client@~1.2.3',
243222
'oc-template-react-compiler',

‎tsconfig.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,24 @@
7676

7777
/* Type Checking */
7878
"strict": true /* Enable all strict type-checking options. */,
79-
"noImplicitAny": false /* Enable error reporting for expressions and declarations with an implied `any` type.. */,
80-
// "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */
81-
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
82-
// "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
83-
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
84-
// "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */
85-
// "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */
86-
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
87-
// "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */
88-
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */
89-
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
90-
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
91-
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
92-
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
93-
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
94-
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */
95-
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
96-
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
79+
"noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied `any` type.. */,
80+
"strictNullChecks": true /* When type checking, take into account `null` and `undefined`. */,
81+
"strictFunctionTypes": true /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */,
82+
"strictBindCallApply": true /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */,
83+
"strictPropertyInitialization": true /* Check for class properties that are declared but not set in the constructor. */,
84+
"noImplicitThis": true /* Enable error reporting when `this` is given the type `any`. */,
85+
"useUnknownInCatchVariables": true /* Type catch clause variables as 'unknown' instead of 'any'. */,
86+
"alwaysStrict": true /* Ensure 'use strict' is always emitted. */,
87+
"noUnusedLocals": true /* Enable error reporting when a local variables aren't read. */,
88+
// "noUnusedParameters": true /* Raise an error when a function parameter isn't read */,
89+
// "exactOptionalPropertyTypes": true /* Interpret optional property types as written, rather than adding 'undefined'. */,
90+
// "noImplicitReturns": true /* Enable error reporting for codepaths that do not explicitly return in a function. */,
91+
"noFallthroughCasesInSwitch": true /* Enable error reporting for fallthrough cases in switch statements. */,
92+
// "noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
93+
"noImplicitOverride": true /* Ensure overriding members in derived classes are marked with an override modifier. */,
94+
// "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
95+
"allowUnusedLabels": false /* Disable error reporting for unused labels. */,
96+
"allowUnreachableCode": false /* Disable error reporting for unreachable code. */,
9797

9898
/* Completeness */
9999
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */

0 commit comments

Comments
 (0)