Skip to content

Commit eaf4341

Browse files
author
Ives van Hoorne
committed
Merge branch 'lerna' into binary-support
2 parents e321cbb + 93254d0 commit eaf4341

File tree

161 files changed

+13938
-1310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+13938
-1310
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
build:
55
working_directory: ~/codesandbox-client
66
docker:
7-
- image: circleci/node:8.4.0
7+
- image: circleci/node:9.0
88
environment:
99
TZ: "/usr/share/zoneinfo/Europe/Amsterdam"
1010
steps:
@@ -13,7 +13,7 @@ jobs:
1313
key: dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
1414
- run:
1515
name: Install Dependency
16-
command: yarn install && yarn add puppeteer
16+
command: yarn install && yarn add puppeteer -W
1717
- save_cache:
1818
key: dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
1919
paths:

‎.eslintrc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@
2020
"import/prefer-default-export": 0,
2121
"class-methods-use-this": 0,
2222
"no-console": ["error", { "allow": ["error"] }],
23-
"prefer-template": "off"
23+
"prefer-template": "off",
24+
"no-plusplus": 0
2425
},
2526
"settings": {
26-
"import/resolver": {
27-
"webpack": {
28-
"config": "config/webpack.common.js"
29-
}
30-
}
27+
"import/resolver": "webpack"
3128
}
3229
}

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See http://help.github.com/ignore-files/ for more about ignoring files.
22

33
# dependencies
4-
/node_modules
4+
node_modules
55

66
/integration-tests/**/__diff_output__
77

@@ -20,3 +20,5 @@ yarn-error.log
2020
.vscode
2121
.idea
2222
jest
23+
24+
lerna-debug.log

‎.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
workspaces-experimental true

‎CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ The CodeSandbox client is currently divided in to 5 parts.
1212

1313
This version of CodeSandbox is using the production server as source of truth, this is specified by the environment variable `LOCAL_SERVER`. It's not yet possible to sign in using this version, I haven't figured out how to handle this yet.
1414

15+
**Working on your first Pull Request?** You can learn how from this *free* series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
16+
1517
## Setting Up the project locally
1618

1719
To install the project you need to have `yarn` and `node`

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:8.2.1
1+
FROM node:8.9
22
LABEL maintainer "Ives van Hoorne"
33

44
RUN mkdir /usr/src/app

‎Gulpfile.js

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,11 @@
11
const gulp = require('gulp');
2-
const postcss = require('gulp-postcss');
3-
const autoprefixer = require('autoprefixer');
4-
const cssnano = require('cssnano');
5-
const rev = require('gulp-rev');
6-
const replace = require('gulp-replace');
72
const runSequence = require('run-sequence');
83

94
const config = require('./config/paths');
105

11-
gulp.task('css', function() {
6+
gulp.task('homepage', function() {
127
return gulp
13-
.src('src/homepage/**/*.css')
14-
.pipe(postcss([autoprefixer, cssnano]))
15-
.pipe(rev())
16-
.pipe(gulp.dest(`${config.appBuild}/`))
17-
.pipe(rev.manifest())
18-
.pipe(gulp.dest(`${config.appBuild}/`));
19-
});
20-
21-
gulp.task('javascript', function() {
22-
return gulp
23-
.src('src/homepage/**/*.js')
24-
.pipe(gulp.dest(`${config.appBuild}/`));
25-
});
26-
27-
gulp.task('html', function() {
28-
const manifest = require(`${config.appBuild}/rev-manifest.json`);
29-
30-
return gulp
31-
.src('src/homepage/index.html')
32-
.pipe(replace('static/css/main.css', manifest['static/css/main.css']))
8+
.src('src/homepage/public/**/*.*')
339
.pipe(gulp.dest(`${config.appBuild}/`));
3410
});
3511

@@ -40,7 +16,7 @@ gulp.task('static', function() {
4016
});
4117

4218
gulp.task('build', function(cb) {
43-
return runSequence(['css', 'javascript', 'static'], 'html', cb);
19+
return runSequence(['homepage', 'static'], cb);
4420
});
4521

4622
gulp.task('default', ['build']);

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [CodeSandbox](https://codesandbox.io) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/KE3TbEZ) [![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors) [![Build Status](https://travis-ci.org/CompuIves/codesandbox-client.svg?branch=master)](https://travis-ci.org/CompuIves/codesandbox-client)
1+
# [CodeSandbox](https://codesandbox.io) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/KE3TbEZ) [![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors) [![Build Status](https://travis-ci.org/CompuIves/codesandbox-client.svg?branch=master)](https://travis-ci.org/CompuIves/codesandbox-client) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/)
22

33
An online code editor with a focus on React.
44

‎config/webpack.common.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ module.exports = {
130130

131131
resolve: {
132132
mainFields: ['browser', 'module', 'jsnext:main', 'main'],
133-
modules: ['src', 'node_modules'],
133+
modules: ['node_modules'],
134134

135135
extensions: ['.js', '.json'],
136136

@@ -244,10 +244,10 @@ module.exports = {
244244
from: 'static',
245245
to: 'static',
246246
},
247-
{
248-
from: 'src/homepage/static',
249-
to: 'static',
250-
},
247+
// {
248+
// from: 'src/homepage/static',
249+
// to: 'static',
250+
// },
251251
].filter(x => x)
252252
),
253253
// We first create a common chunk between embed and app, to share components

‎lerna.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"lerna": "2.4.0",
3+
"version": "independent",
4+
"npmClient": "yarn",
5+
"useWorkspaces": true
6+
}

0 commit comments

Comments
 (0)