Skip to content
This repository has been archived by the owner on Jan 1, 2020. It is now read-only.

Commit

Permalink
feat: Make clipped.config jointed (#50)
Browse files Browse the repository at this point in the history
* feat: Make  jointed

* fix: Bump jointed version for setter bug
  • Loading branch information
IniZio authored Jan 28, 2018
1 parent dd79131 commit db27db2
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 12 deletions.
1 change: 1 addition & 0 deletions packages/clipped/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"fs-extra": "^5.0.0",
"generator-clipped-base": "^0.1.3",
"git-url-parse": "^7.0.1",
"jointed": "^1.4.3",
"lodash": "^4.17.4",
"mem-fs": "^1.1.3",
"mem-fs-editor": "^3.0.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/clipped/src/instance/preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import yeoman from 'yeoman-environment'
import {promisify} from 'util'
import memFs from 'mem-fs'
import fsEditor from 'mem-fs-editor'
import {createChainable} from 'jointed'
const baseGenerator = require('generator-clipped-base')

const stockPresets = {}
Expand All @@ -13,7 +14,7 @@ const stockPresets = {}
export function basePreset (clipped: Object, opt: Object = {}) {
// Initialize properties
clipped.opt = opt
clipped.config = ({
clipped.config = createChainable({
context: clipped.opt.context || process.cwd()
}: clippedConfig)

Expand Down
4 changes: 2 additions & 2 deletions presets/webpack-backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clipped-preset-webpack-backend",
"version": "1.9.1",
"version": "1.9.2",
"description": "",
"main": "clipped.config.js",
"scripts": {
Expand All @@ -10,7 +10,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"clipped-preset-webpack-nodejs": "^1.9.1",
"clipped-preset-webpack-nodejs": "latest",
"nodemon": "^1.14.7"
}
}
4 changes: 2 additions & 2 deletions presets/webpack-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "clipped-preset-webpack-frontend",
"version": "1.9.0",
"version": "1.9.1",
"description": "",
"main": "clipped.config.js",
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"babel-preset-react": "^6.24.1",
"clipped-preset-webpack": "^0.4.0",
"clipped-preset-webpack": "latest",
"css-loader": "^0.28.7",
"deepmerge": "^2.0.1",
"file-loader": "^1.1.6",
Expand Down
4 changes: 2 additions & 2 deletions presets/webpack-nodejs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clipped-preset-webpack-nodejs",
"version": "1.9.1",
"version": "1.9.2",
"description": "",
"main": "clipped.config.js",
"scripts": {
Expand All @@ -12,7 +12,7 @@
"dependencies": {
"babel-preset-backpack": "^0.4.3",
"babel-preset-flow": "^6.23.0",
"clipped-preset-webpack": "^1.9.1",
"clipped-preset-webpack": "latest",
"source-map-support": "^0.5.0",
"webpack": "^3.10.0",
"webpack-node-externals": "^1.6.0"
Expand Down
2 changes: 1 addition & 1 deletion presets/webpack/clipped.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Chain = require('webpack-chain')
const CleanWebpackPlugin = require('clean-webpack-plugin')

module.exports = (clipped, opt = {babel: {options: {}}}) => {
clipped.config = Object.assign({dev: {enableLint: false}}, clipped.config)
clipped.config.dev = {enableLint: false}

try {
clipped.config['webpack'] = new Chain()
Expand Down
2 changes: 1 addition & 1 deletion presets/webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clipped-preset-webpack",
"version": "1.9.1",
"version": "1.9.2",
"description": "",
"main": "clipped.config.js",
"keywords": [],
Expand Down
19 changes: 16 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1564,9 +1564,9 @@ cli-width@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"

clipped-preset-webpack@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/clipped-preset-webpack/-/clipped-preset-webpack-0.4.0.tgz#09b3df9c6214527def901f4d3e969b32f4afb88f"
clipped-preset-webpack@latest:
version "1.9.1"
resolved "https://registry.yarnpkg.com/clipped-preset-webpack/-/clipped-preset-webpack-1.9.1.tgz#1fcdb7b289e445532ca957ef62af8bbc9e728902"
dependencies:
babel-core "^6.26.0"
babel-eslint "^8.1.2"
Expand Down Expand Up @@ -4874,6 +4874,15 @@ joi@^6.4.x:
moment "2.x.x"
topo "1.x.x"

jointed@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/jointed/-/jointed-1.4.2.tgz#39dcbdeb1541b27e5eb6886d1438c0f79cf8ac4f"
dependencies:
deepmerge "^2.0.1"
lodash "^4.17.4"
node-uuid "^1.4.8"
webpack-chain "^4.5.0"

js-base64@^2.1.8, js-base64@^2.1.9:
version "2.4.0"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
Expand Down Expand Up @@ -5740,6 +5749,10 @@ node-sass@^4.7.2:
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"

node-uuid@^1.4.8:
version "1.4.8"
resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"

nodemon@^1.11.0:
version "1.14.6"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.6.tgz#d1b2fa204137b8d2c9242d797cd0b394d05fe77d"
Expand Down

0 comments on commit db27db2

Please sign in to comment.