Skip to content

Commit 3c28362

Browse files
committed
Merge branch 'bug/promise-handled' into feature/live-preview
2 parents e3351db + ef97dcc commit 3c28362

File tree

9 files changed

+1195
-1583
lines changed

9 files changed

+1195
-1583
lines changed

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @contentstack/security-admin @contentstack/sdk-admin

index.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export interface StackConfig {
6161

6262
// ContentTypeCollection
6363
export interface ContentTypeCollection{
64-
contentTypes: Array<any>
64+
content_types: Array<any>
6565
count?: number
6666
}
6767

@@ -231,4 +231,4 @@ export class Query extends Entry {
231231

232232
find(fetchOptions?: object): Promise<any>;
233233
findOne(): Promise<any>;
234-
}
234+
}

package-lock.json

Lines changed: 1172 additions & 1567 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"babel-preset-es2016": "6.24.1",
7474
"babel-preset-stage-1": "6.24.1",
7575
"babel-runtime": "6.26.0",
76+
"clean-webpack-plugin": "^4.0.0",
7677
"compression-webpack-plugin": "1.0.1",
7778
"es3ify-loader": "0.2.0",
7879
"fetch-mock-jest": "^1.3.0",
@@ -81,25 +82,25 @@
8182
"jest": "^26.4.2",
8283
"jest-html-reporters": "^2.1.6",
8384
"jsdoc": "^3.6.7",
84-
"jshint": "^2.13.0",
85-
"nodemailer": "^6.6.3",
85+
"jshint": "^2.13.1",
86+
"nodemailer": "^6.6.5",
8687
"request": "^2.88.2",
8788
"string-replace-loader": "1.3.0",
8889
"string-replace-webpack-plugin": "0.1.3",
8990
"tap-html": "^1.0.1",
9091
"tap-json": "1.0.0",
9192
"tape": "4.8.0",
9293
"ts-jest": "^26.5.6",
93-
"typescript": "^4.3.5",
94+
"typescript": "^4.4.3",
9495
"uglify-js": "2.8.29",
95-
"webpack": "^5.44.0",
96+
"webpack": "^5.56.1",
9697
"webpack-cli": "^3.3.12",
9798
"webpack-md5-hash": "0.0.5",
9899
"webpack-merge": "4.1.0"
99100
},
100101
"dependencies": {
101102
"@contentstack/utils": "^1.0.2",
102-
"es6-promise": "4.1.1",
103+
"es6-promise": "^4.1.1",
103104
"isomorphic-fetch": "^3.0.0",
104105
"localStorage": "1.0.3"
105106
}

webpack/webpack.common.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const webpack = require('webpack');
4-
const path = require('path');
4+
const { CleanWebpackPlugin } = require('clean-webpack-plugin')
55

66
const Package = require('./../package.json');
77

@@ -28,7 +28,7 @@ module.exports = function(options) {
2828
},
2929
{
3030
loader: 'string-replace-loader',
31-
query: {
31+
options: {
3232
search: '{{VERSION}}',
3333
replace: Package.version
3434
}
@@ -37,7 +37,13 @@ module.exports = function(options) {
3737
}]
3838
},
3939
plugins: [
40-
new webpack.IgnorePlugin(/vertx/),
40+
new webpack.WatchIgnorePlugin({
41+
paths: [/vertx/]
42+
}),
43+
new CleanWebpackPlugin({
44+
protectWebpackAssets: false,
45+
cleanAfterEveryBuildPatterns: ['*.LICENSE.txt']
46+
})
4147
]
4248
};
4349
}

webpack/webpack.nativescript.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = function(options) {
2929
exclude: '/node_modules/',
3030
use: [{
3131
loader: 'string-replace-loader',
32-
query: {
32+
options: {
3333
search: '{{PLATFORM}}',
3434
replace: 'react-native'
3535
}

webpack/webpack.node.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const commonConfig = require('./webpack.common.js');
77
module.exports = function(options) {
88
return webpackMerge(commonConfig(), {
99
output: {
10-
library: "Contentstack",
1110
libraryTarget: "commonjs2",
1211
path: path.join(__dirname, "../dist/node"),
1312
filename: "contentstack.js"
@@ -29,12 +28,12 @@ module.exports = function(options) {
2928
exclude: '/node_modules/',
3029
use: [{
3130
loader: 'string-replace-loader',
32-
query: {
31+
options: {
3332
search: '{{PLATFORM}}',
3433
replace: 'nodejs'
3534
}
3635
}],
3736
}]
38-
}
37+
},
3938
});
4039
}

webpack/webpack.react-native.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = function(options) {
2929
exclude: '/node_modules/',
3030
use: [{
3131
loader: 'string-replace-loader',
32-
query: {
32+
options: {
3333
search: '{{PLATFORM}}',
3434
replace: 'react-native'
3535
}

webpack/webpack.web.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = function(options) {
2929
exclude: '/node_modules/',
3030
use: [{
3131
loader: 'string-replace-loader',
32-
query: {
32+
options: {
3333
search: '{{PLATFORM}}',
3434
replace: 'web'
3535
}

0 commit comments

Comments
 (0)