Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Commit

Permalink
update pkg and remove nextjs support
Browse files Browse the repository at this point in the history
  • Loading branch information
@abz53378
abz53378 committed Jul 9, 2018
1 parent 3d3c757 commit e882bc3
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 91 deletions.
1 change: 1 addition & 0 deletions .babelrc
View file
Expand Up @@ -9,5 +9,6 @@
}]
],
"plugins": [
"@babel/plugin-proposal-class-properties"
]
}
3 changes: 2 additions & 1 deletion .gitignore
View file
Expand Up @@ -4,4 +4,5 @@ npm-debug.log
lib
.DS_Store
_gh-pages
*.log
*.log
.cache
10 changes: 4 additions & 6 deletions package.json
View file
Expand Up @@ -37,16 +37,15 @@
"@babel/cli": "^7.0.0-beta.52",
"@babel/core": "^7.0.0-beta.52",
"@babel/preset-env": "^7.0.0-beta.52",
"@babel/preset-flow": "^7.0.0-beta.52",
"@babel/preset-react": "^7.0.0-beta.52",
"@babel/preset-stage-0": "^7.0.0-beta.52",
"@babel/preset-flow": "^7.0.0-beta.52",
"@babel/register": "^7.0.0-beta.52",
"babel-eslint": "^8.2.2",
"babel-jest": "^23.0.0-alpha.7",
"babel-loader": "^8.0.0-beta",
"canner-graphql-interface": "^1.14.0",
"canner-schema-loader": "^1.2.2",
"canner-script": "^1.1.5",
"canner-schema-loader": "^1.2.6",
"canner-script": "^1.1.10",
"cross-env": "^5.1.3",
"css-loader": "^0.28.10",
"enzyme": "^3.3.0",
Expand Down Expand Up @@ -82,15 +81,14 @@
"apollo-boost": "^0.1.4",
"bson-objectid": "^1.2.2",
"canner-compiler": "^0.1.6",
"canner-helpers": "^0.1.15",
"canner-helpers": "^0.1.16",
"canner-ref-id": "^0.1.2",
"graphql-tag": "^2.9.1",
"immer": "^1.3.0",
"immutable": "4.0.0-rc.9",
"invariant": "^2.2.4",
"lodash": "^4.17.5",
"lowdb": "^1.0.0",
"next": "^6.1.1",
"pluralize": "^7.0.0",
"promise-polyfill": "^7.1.0",
"prop-types": "^15.6.1",
Expand Down
20 changes: 4 additions & 16 deletions src/components/Generator.js
View file
Expand Up @@ -18,7 +18,6 @@ import get from 'lodash/get';
import isUndefined from 'lodash/isUndefined';
import mapValues from 'lodash/mapValues';
import RefId from 'canner-ref-id';
import dynamic, {SameLoopPromise} from 'next/dynamic';

function defaultHoc(Component) {
return Component;
Expand Down Expand Up @@ -148,21 +147,10 @@ export default class Generator extends React.PureComponent<Props, State> {
if (isFieldset(copyNode)) {
component = () => <Item />;
} else {
// if using next.js framework dynamic route should use next.js's dynmic function.
if (process.env.ENGINE === 'nextjs') {
component = dynamic(new SameLoopPromise((resolve, reject) => copyNode.loader.then(resolve).catch(reject)),
{
// Since we don't know whether the components are supporting SSR, so we are not going to SSR components.
ssr: false,
loading: Loading
}
)
} else {
component = Loadable({
loader: () => copyNode.loader || Promise.reject(`There is no loader in ${copyNode.path}`),
loading: Loading,
});
}
component = Loadable({
loader: () => copyNode.loader || Promise.reject(`There is no loader in ${copyNode.path}`),
loading: Loading,
});
}
component = this.wrapByHOC(component, ['title', 'onDeploy', 'deploy', 'request', 'query', 'cache', 'route', 'id', 'context'] || []);
}
Expand Down
25 changes: 25 additions & 0 deletions webpack.config.dev.js
View file
@@ -1,5 +1,6 @@
const path = require('path');
const webpack = require('webpack');
const fs = require('fs');

module.exports = {
devServer: {
Expand Down Expand Up @@ -42,6 +43,18 @@ module.exports = {
loader: 'canner-schema-loader',
}, {
loader: 'babel-loader',
/**
* babel-loader doesn't load the .babelrc
* TODO: Remove once the issue is addressed
* https://github.com/babel/babel-loader/issues/624
*/
options: Object.assign(
{
babelrc: false,
cacheDirectory: true
},
JSON.parse(fs.readFileSync(path.join(__dirname, '.babelrc'), 'utf-8'))
),
}],
},
{
Expand All @@ -53,6 +66,18 @@ module.exports = {
],
use: {
loader: 'babel-loader',
/**
* babel-loader doesn't load the .babelrc
* TODO: Remove once the issue is addressed
* https://github.com/babel/babel-loader/issues/624
*/
options: Object.assign(
{
babelrc: false,
cacheDirectory: true
},
JSON.parse(fs.readFileSync(path.join(__dirname, '.babelrc'), 'utf-8'))
),
},
},
{
Expand Down
27 changes: 27 additions & 0 deletions webpack.config.prod.js
View file
@@ -1,3 +1,6 @@
const path = require('path');
const fs = require('fs');

module.exports = {
module: {
rules: [
Expand All @@ -6,6 +9,18 @@ module.exports = {
exclude: /node_modules/,
use: {
loader: 'babel-loader',
/**
* babel-loader doesn't load the .babelrc
* TODO: Remove once the issue is addressed
* https://github.com/babel/babel-loader/issues/624
*/
options: Object.assign(
{
babelrc: false,
cacheDirectory: true
},
JSON.parse(fs.readFileSync(path.join(__dirname, '.babelrc'), 'utf-8'))
),
},
},
{
Expand All @@ -14,6 +29,18 @@ module.exports = {
loader: 'canner-schema-loader',
}, {
loader: 'babel-loader',
/**
* babel-loader doesn't load the .babelrc
* TODO: Remove once the issue is addressed
* https://github.com/babel/babel-loader/issues/624
*/
options: Object.assign(
{
babelrc: false,
cacheDirectory: true
},
JSON.parse(fs.readFileSync(path.join(__dirname, '.babelrc'), 'utf-8'))
),
}],
},
{
Expand Down
81 changes: 13 additions & 68 deletions yarn.lock
View file
Expand Up @@ -1418,18 +1418,6 @@
"@babel/plugin-syntax-dynamic-import" "7.0.0-beta.52"
"@babel/plugin-syntax-import-meta" "7.0.0-beta.52"

"@babel/register@^7.0.0-beta.52":
version "7.0.0-beta.52"
resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0-beta.52.tgz#011f925e087919ac3a75a3e8b8606d1d224046e5"
dependencies:
core-js "^2.5.7"
find-cache-dir "^1.0.0"
home-or-tmp "^3.0.0"
lodash "^4.17.5"
mkdirp "^0.5.1"
pirates "^3.0.1"
source-map-support "^0.4.2"

"@babel/runtime@7.0.0-beta.42":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f"
Expand Down Expand Up @@ -3946,28 +3934,6 @@ canner-compiler@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/canner-compiler/-/canner-compiler-0.1.6.tgz#516b5b2ded2029cf94fe4ef65ce024adad79fdd0"

canner-graphql-interface@^1.12.0:
version "1.12.0"
resolved "https://registry.yarnpkg.com/canner-graphql-interface/-/canner-graphql-interface-1.12.0.tgz#1e216866cfb76fd46fa8469d83ce4052b23bd44f"
dependencies:
apollo-cache "^1.1.7"
apollo-cache-inmemory "^1.1.12"
apollo-client "^2.2.8"
apollo-link "^1.2.2"
apollo-link-http "^1.5.4"
apollo-utilities "^1.0.11"
canner-graphql-utils "^1.4.0"
firebase "^4.13.1"
graphql "0.13.0"
graphql-anywhere "^4.1.6"
graphql-tag "^2.8.0"
graphql-tools "^2.21.0"
isomorphic-fetch "^2.2.1"
lodash "^4.17.5"
lowdb "^1.0.0"
pluralize "^7.0.0"
uuid "^3.2.1"

canner-graphql-interface@^1.14.0:
version "1.14.0"
resolved "https://registry.yarnpkg.com/canner-graphql-interface/-/canner-graphql-interface-1.14.0.tgz#24d7904f80cbb41583e412e29f95fa8b2051c39f"
Expand Down Expand Up @@ -3998,16 +3964,9 @@ canner-graphql-utils@^1.4.0:
lowdb "^1.0.0"
pluralize "^7.0.0"

canner-helpers@^0.1.14:
version "0.1.14"
resolved "https://registry.yarnpkg.com/canner-helpers/-/canner-helpers-0.1.14.tgz#19e0992a1b0194ba0456b63f12e8effe687a4a79"
dependencies:
immutable "^4.0.0-rc.9"
lodash "^4.17.5"

canner-helpers@^0.1.15:
version "0.1.15"
resolved "https://registry.yarnpkg.com/canner-helpers/-/canner-helpers-0.1.15.tgz#85afb80f0e317ca66f9ab3c5d5a8fd3027f4d489"
canner-helpers@^0.1.16:
version "0.1.16"
resolved "https://registry.yarnpkg.com/canner-helpers/-/canner-helpers-0.1.16.tgz#3410ae9b5f07555f17b15790adb89c9debd85a4d"
dependencies:
immutable "^4.0.0-rc.9"
lodash "^4.17.5"
Expand All @@ -4031,9 +3990,9 @@ canner-ref-id@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/canner-ref-id/-/canner-ref-id-0.1.2.tgz#9c534d517818e915cef1004116012458bd165d83"

canner-schema-loader@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/canner-schema-loader/-/canner-schema-loader-1.2.2.tgz#825246c79d76cd8a87cad28f650a0761ebb9a902"
canner-schema-loader@^1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/canner-schema-loader/-/canner-schema-loader-1.2.6.tgz#07a12bbd70c4f6f9ef58ed87cd9f7d9aa8b84582"
dependencies:
"@canner/antd-array-gallery" "0.1.35"
"@canner/antd-array-panel" "0.1.35"
Expand Down Expand Up @@ -4072,12 +4031,12 @@ canner-schema-loader@^1.2.2:
schema-utils "^0.4.5"
strip-bom "^3.0.0"

canner-script@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/canner-script/-/canner-script-1.1.5.tgz#ee3e3f1cb0c9710e1d48a9e41218aa6fcf5c74ff"
canner-script@^1.1.10:
version "1.1.10"
resolved "https://registry.yarnpkg.com/canner-script/-/canner-script-1.1.10.tgz#67d1ac0593c1b331cfd753559bbe57e9681adce8"
dependencies:
canner-graphql-interface "^1.12.0"
canner-helpers "^0.1.14"
canner-graphql-interface "^1.14.0"
canner-helpers "^0.1.16"
canner-layouts "^1.0.6"
eval "^0.1.2"
object-path "^0.11.4"
Expand Down Expand Up @@ -4597,7 +4556,7 @@ core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
version "2.5.6"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"

core-js@^2.5.3, core-js@^2.5.7:
core-js@^2.5.3:
version "2.5.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"

Expand Down Expand Up @@ -6709,10 +6668,6 @@ home-or-tmp@^2.0.0:
os-homedir "^1.0.0"
os-tmpdir "^1.0.1"

home-or-tmp@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"

homedir-polyfill@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
Expand Down Expand Up @@ -8986,10 +8941,6 @@ node-libs-browser@^2.0.0:
util "^0.10.3"
vm-browserify "0.0.4"

node-modules-regexp@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"

node-notifier@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
Expand Down Expand Up @@ -9646,12 +9597,6 @@ pinkie@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"

pirates@^3.0.1:
version "3.0.2"
resolved "https://registry.yarnpkg.com/pirates/-/pirates-3.0.2.tgz#7e6f85413fd9161ab4e12b539b06010d85954bb9"
dependencies:
node-modules-regexp "^1.0.0"

pkg-dir@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
Expand Down Expand Up @@ -11929,7 +11874,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"

source-map-support@^0.4.15, source-map-support@^0.4.2:
source-map-support@^0.4.15:
version "0.4.18"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
dependencies:
Expand Down

0 comments on commit e882bc3

Please sign in to comment.