Skip to content

Commit 06e82cf

Browse files
hiteshbal91hiteshbal91
committed
Merge branch 'release/3.3.0'
2 parents 717e907 + ddda114 commit 06e82cf

File tree

8 files changed

+241
-217
lines changed

8 files changed

+241
-217
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
examples/
1+
.DS_Store
2+
examples/*
23
node_modules/*
34
.idea/*
45
reports/*
56
apidocs-templates/*
67
test/smtpconfig.js
7-
test/config.js
8-
8+
test/config.js

‎docs-config.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"opts": {
3-
"template": "csio-templates",
4-
"encoding": "utf8",
5-
"destination": "./js-sdk-reference/",
6-
"recurse": true
7-
},
8-
"source": {
9-
"include": [
10-
"src/core/contentstack.js",
11-
"src/core/stack.js",
12-
"src/core/modules/asset.js",
13-
"src/core/modules/entry.js",
14-
"src/core/modules/query.js",
15-
"src/core/modules/result.js"
16-
],
17-
"exclude": [
18-
"src/core/cache.js"
19-
]
20-
},
21-
"tags": {
22-
"dictionaries": ["jsdoc","closure"]
23-
}
24-
}
2+
"opts": {
3+
"template": "csio-templates",
4+
"encoding": "utf8",
5+
"destination": "./js-sdk-reference/",
6+
"recurse": true
7+
},
8+
"source": {
9+
"include": [
10+
"src/core/contentstack.js",
11+
"src/core/stack.js",
12+
"src/core/modules/assets.js",
13+
"src/core/modules/entry.js",
14+
"src/core/modules/query.js",
15+
"src/core/modules/result.js"
16+
],
17+
"exclude": [
18+
"src/core/cache.js"
19+
]
20+
},
21+
"tags": {
22+
"dictionaries": ["jsdoc", "closure"]
23+
}
24+
}

‎package.json‎

Lines changed: 79 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,83 @@
11
{
2-
"name": "contentstack",
3-
"version": "3.2.1",
4-
"description": "Contentstack Javascript SDK",
5-
"homepage": "https://www.contentstack.com/",
6-
"author": {
7-
"name": "Contentstack",
8-
"url": "https://www.contentstack.com/"
9-
},
10-
"main": "dist/node/contentstack.js",
11-
"browser": "dist/web/contentstack.js",
12-
"_id": "contentstack@3.1.1",
13-
"scripts": {
14-
"test": "node test.js",
15-
"buildnode": "webpack --config webpack/webpack.node.js",
16-
"buildweb": "webpack -p --config webpack/webpack.web.js",
17-
"buildreactnative": "webpack --config webpack/webpack.react-native.js",
18-
"buildall": "npm run buildnode&npm run buildweb&npm run buildreactnative",
19-
"generate-docs": "node_modules/.bin/jsdoc --configure docs-config.json --verbose"
20-
},
21-
"repository": {
22-
"type": "git",
23-
"url": "https://github.com/builtio-contentstack/contentstack-javascript.git"
24-
},
25-
"_shasum": "a328ed07240476a26b31a23261355dc929e1da63",
26-
"_from": "contentstack@latest",
27-
"_npmVersion": "3.8.9",
28-
"_nodeVersion": "6.2.0",
29-
"_npmUser": {
30-
"name": "mynk",
31-
"email": "mayank@raweng.com"
32-
},
33-
"maintainers": [
34-
{
35-
"name": "hiteshbal",
36-
"email": "hitesh.baldaniya@raweng.com"
2+
"name": "contentstack",
3+
"version": "3.3.0",
4+
"description": "Contentstack Javascript SDK",
5+
"homepage": "https://www.contentstack.com/",
6+
"author": {
7+
"name": "Contentstack",
8+
"url": "https://www.contentstack.com/"
379
},
38-
{
39-
"name": "mynk",
40-
"email": "mayank@raweng.com"
10+
"main": "dist/node/contentstack.js",
11+
"browser": "dist/web/contentstack.js",
12+
"_id": "contentstack@3.1.1",
13+
"scripts": {
14+
"test": "node test.js",
15+
"buildnode": "webpack --config webpack/webpack.node.js",
16+
"buildweb": "webpack -p --config webpack/webpack.web.js",
17+
"buildreactnative": "webpack --config webpack/webpack.react-native.js",
18+
"buildall": "npm run buildnode&npm run buildweb&npm run buildreactnative",
19+
"generate-docs": "node_modules/.bin/jsdoc --configure docs-config.json --verbose"
20+
},
21+
"repository": {
22+
"type": "git",
23+
"url": "https://github.com/builtio-contentstack/contentstack-javascript.git"
24+
},
25+
"_shasum": "a328ed07240476a26b31a23261355dc929e1da63",
26+
"_from": "contentstack@latest",
27+
"_npmVersion": "3.8.9",
28+
"_nodeVersion": "6.2.0",
29+
"_npmUser": {
30+
"name": "mynk",
31+
"email": "mayank@raweng.com"
32+
},
33+
"maintainers": [
34+
{
35+
"name": "hiteshbal",
36+
"email": "hitesh.baldaniya@raweng.com"
37+
},
38+
{
39+
"name": "mynk",
40+
"email": "mayank@raweng.com"
41+
}
42+
],
43+
"dist": {
44+
"shasum": "a328ed07240476a26b31a23261355dc929e1da63",
45+
"tarball": "https://registry.npmjs.org/contentstack/-/contentstack-3.0.0.tgz"
46+
},
47+
"license": "MIT",
48+
"directories": {},
49+
"_resolved": "https://registry.npmjs.org/contentstack/-/contentstack-3.0.0.tgz",
50+
"_npmOperationalInternal": {
51+
"host": "packages-18-east.internal.npmjs.com",
52+
"tmp": "tmp/contentstack-3.0.0.tgz_1477830884275_0.9869455888401717"
53+
},
54+
"devDependencies": {
55+
"babel-core": "6.26.0",
56+
"babel-loader": "7.1.2",
57+
"babel-plugin-transform-runtime": "6.23.0",
58+
"babel-preset-env": "1.6.1",
59+
"babel-preset-es2015": "6.24.1",
60+
"babel-preset-es2016": "6.24.1",
61+
"babel-preset-stage-1": "6.24.1",
62+
"babel-runtime": "6.26.0",
63+
"compression-webpack-plugin": "1.0.1",
64+
"es3ify-loader": "0.2.0",
65+
"jsdoc": "3.5.5",
66+
"jshint": "2.9.5",
67+
"nodemailer": "^4.3.1",
68+
"request": "^2.83.0",
69+
"string-replace-loader": "1.3.0",
70+
"string-replace-webpack-plugin": "0.1.3",
71+
"tap-json": "1.0.0",
72+
"tape": "4.8.0",
73+
"uglify-js": "2.8.29",
74+
"webpack": "2.7.0",
75+
"webpack-md5-hash": "0.0.5",
76+
"webpack-merge": "4.1.0"
77+
},
78+
"dependencies": {
79+
"es6-promise": "4.1.1",
80+
"isomorphic-fetch": "2.2.1",
81+
"localStorage": "1.0.3"
4182
}
42-
],
43-
"dist": {
44-
"shasum": "a328ed07240476a26b31a23261355dc929e1da63",
45-
"tarball": "https://registry.npmjs.org/contentstack/-/contentstack-3.0.0.tgz"
46-
},
47-
"license": "MIT",
48-
"directories": {},
49-
"_resolved": "https://registry.npmjs.org/contentstack/-/contentstack-3.0.0.tgz",
50-
"_npmOperationalInternal": {
51-
"host": "packages-18-east.internal.npmjs.com",
52-
"tmp": "tmp/contentstack-3.0.0.tgz_1477830884275_0.9869455888401717"
53-
},
54-
"devDependencies": {
55-
"babel-core": "6.24.0",
56-
"babel-loader": "6.4.1",
57-
"babel-plugin-transform-runtime": "6.23.0",
58-
"babel-preset-env": "1.3.2",
59-
"babel-preset-es2015": "6.16.0",
60-
"babel-preset-es2016": "6.22.0",
61-
"babel-preset-stage-1": "6.22.0",
62-
"compression-webpack-plugin": "0.3.1",
63-
"es3ify-loader": "0.2.0",
64-
"jshint": "2.6.3",
65-
"string-replace-webpack-plugin": "0.0.3",
66-
"tap-json": "0.1.1",
67-
"tape": "4.4.0",
68-
"jsdoc": "3.4.0",
69-
"uglify-js": "2.6.2",
70-
"webpack": "2.2.1",
71-
"webpack-md5-hash": "0.0.5",
72-
"webpack-merge": "0.17.0",
73-
"babel-runtime": "6.23.0",
74-
"string-replace-loader": "1.3.0"
75-
},
76-
"dependencies": {
77-
"es6-promise": "4.1.1",
78-
"isomorphic-fetch": "2.2.1",
79-
"localStorage": "1.0.3"
80-
}
8183
}

‎webpack/webpack.common.js‎

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,37 @@ const webpack = require('webpack');
44
const path = require('path');
55

66
const Package = require('./../package.json');
7-
8-
module.exports = function (options) {
9-
return {
10-
11-
entry: {
12-
contentstack: "./src/core/contentstack",
13-
},
14-
15-
resolve: {
16-
extensions: ['.js']
17-
},
18-
19-
module: {
20-
rules: [
21-
{
22-
test: /\.js?$/,
23-
exclude: ['../node_modules'],
24-
use: [
25-
{
26-
loader:'babel-loader',
27-
options: {
28-
presets: ['es2015'],
29-
}
30-
},
31-
{
32-
loader:'string-replace-loader',
33-
query: {
34-
search: '{{VERSION}}',
35-
replace: Package.version
36-
}
37-
}
38-
],
39-
}
40-
]
41-
42-
},
43-
44-
plugins: [
45-
new webpack.IgnorePlugin(/vertx/),
46-
]
47-
48-
};
49-
}
50-
517

8+
module.exports = function(options) {
9+
return {
10+
entry: {
11+
contentstack: "./src/core/contentstack",
12+
},
13+
resolve: {
14+
extensions: ['.js']
15+
},
16+
module: {
17+
rules: [{
18+
test: /\.js?$/,
19+
exclude: ['../node_modules'],
20+
use: [{
21+
loader: 'babel-loader',
22+
options: {
23+
presets: ['es2015'],
24+
}
25+
},
26+
{
27+
loader: 'string-replace-loader',
28+
query: {
29+
search: '{{VERSION}}',
30+
replace: Package.version
31+
}
32+
}
33+
],
34+
}]
35+
},
36+
plugins: [
37+
new webpack.IgnorePlugin(/vertx/),
38+
]
39+
};
40+
}

‎webpack/webpack.node.js‎

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,40 @@
11
'use strict';
22
const path = require('path');
3-
const webpackMerge = require('webpack-merge');
3+
const webpackMerge = require('webpack-merge');
44

55
const commonConfig = require('./webpack.common.js');
66

7-
module.exports = function (options) {
8-
return webpackMerge(commonConfig(),{
9-
output: {
10-
library: "Contentstack",
11-
libraryTarget:"commonjs2",
12-
path: path.join(__dirname, "../dist/node"),
13-
filename: "contentstack.js"
14-
},
15-
target: "node",
16-
resolve: {
17-
alias:{
18-
runtime: path.resolve( __dirname, '../src/runtime/node')
19-
},
20-
modules: [
21-
'../src',
22-
'../src/runtimes/node',
23-
'node_modules',
24-
]
25-
}
26-
});
27-
}
28-
29-
7+
module.exports = function(options) {
8+
return webpackMerge(commonConfig(), {
9+
output: {
10+
library: "Contentstack",
11+
libraryTarget: "commonjs2",
12+
path: path.join(__dirname, "../dist/node"),
13+
filename: "contentstack.js"
14+
},
15+
target: "node",
16+
resolve: {
17+
alias: {
18+
runtime: path.resolve(__dirname, '../src/runtime/node')
19+
},
20+
modules: [
21+
'../src',
22+
'../src/runtimes/node',
23+
'node_modules',
24+
]
25+
},
26+
module: {
27+
rules: [{
28+
test: /\.js?$/,
29+
exclude: ['../node_modules'],
30+
use: [{
31+
loader: 'string-replace-loader',
32+
query: {
33+
search: '{{PLATFORM}}',
34+
replace: 'nodejs'
35+
}
36+
}],
37+
}]
38+
}
39+
});
40+
}

0 commit comments

Comments
 (0)