Skip to content
Permalink
Browse files

fix(deploy): misc. re-arrange scripts and organize

  • Loading branch information...
raisedadead committed Jun 16, 2019
1 parent a6afaf1 commit c5fd478d9a04c0029651a3b9554b7e4b78820d6f
@@ -29,8 +29,3 @@ jobs:
- stage: Unit and Integration tests
script: npm test

- stage: Artifacts builds
if: branch = master && type != pull_request
script: bash tools/scripts/builds/trigger-build.sh
install: skip
before_script: skip
@@ -1,6 +1,7 @@
{
"name": "@freecodecamp/api-server",
"version": "0.1.0",
"private": true,
"version": "0.0.1",
"repository": "freecodecamp/freecodecamp",
"private": true,
"main": "development-entry.js",
@@ -1,5 +1,6 @@
{
"name": "@freecodecamp/client",
"private": true,
"description": "The freeCodeCamp web client",
"version": "1.0.0",
"author": "freeCodeCamp <team@freecodecamp.org>",
@@ -76,7 +77,7 @@
"license": "MIT",
"scripts": {
"clean": "gatsby clean",
"prebuild": "npm run build:workers && node ../tools/scripts/ensure-env.js",
"prebuild": "npm run build:workers && node ../tools/scripts/build/ensure-env.js",
"build": "node --max_old_space_size=7168 node_modules/gatsby-cli build",
"build:workers": "node --max_old_space_size=7168 node_modules/webpack-cli --env.production --config ./webpack-workers.js --progress",
"predevelop": "npm run prebuild",
@@ -1,5 +1,6 @@
{
"name": "fcc-create-nav-data",
"private": true,
"version": "0.0.1",
"scripts": {
"test": "mocha -R spec \"./{,!(node_modules)/**/}*.test.js\"",
@@ -1 +1,5 @@
{"name": "fcc-source-challenges"}
{
"name": "fcc-source-challenges",
"private": true,
"version": "0.0.1"
}
@@ -1,5 +1,5 @@
{
"name": "gatsby-remark-fcc-forum-emoji",
"description": "A plugin to help fix the styling of forum emoji in the Guide",
"main": "index.js"
"private": true,
"version": "0.0.1"
}
@@ -1 +1,5 @@
{"name": "gatsby-plugin-node-identity", "version": "0.1.0"}
{
"name": "gatsby-plugin-node-identity",
"private": true,
"version": "0.0.1"
}
@@ -6,7 +6,8 @@
"curriculum",
"search-indexing",
"tools/challenge-md-parser",
"tools/scripts/seed"
"tools/scripts/seed",
"tools/scripts/build"
],
"version": "independent"
}
@@ -1,11 +1,13 @@
{
"name": "@freecodecamp/freecodecamp",
"private": true,
"version": "0.0.1",
"scripts": {
"bootstrap": "lerna bootstrap --ci",
"clean": "npm-run-all clean:client clean:all-deps",
"clean:all-deps": "lerna clean && shx rm -rf node_modules",
"clean:client": "cd ./client && npm run clean",
"clean": "npm-run-all clean:gatsby-site clean:packages",
"clean:root-deps": "shx rm -rf node_modules",
"clean:packages": "lerna clean -y",
"clean:gatsby-site": "cd ./client && npm run clean",
"develop": "npm-run-all ensure-env -p develop:*",
"develop:client": "cd ./client && npm run develop",
"develop:server": "cd ./api-server && npm run develop",
@@ -16,7 +18,7 @@
"docker:seed": "docker-compose run --rm freecodecamp npm run seed",
"docker:test": "docker-compose -f docker-compose.tests.yml run --rm tests bash",
"docker:test:init": "docker-compose -f docker-compose.tests.yml run -u root --rm tests bash change_volumes_owner.sh",
"ensure-env": "cross-env DEBUG=fcc:* node ./tools/scripts/ensure-env.js",
"ensure-env": "cross-env DEBUG=fcc:* node ./tools/scripts/build/ensure-env.js",
"format": "npm run lint -- --fix",
"hooks:install": "node node_modules/husky/husky.js install",
"hooks:uninstall": "node node_modules/husky/husky.js uninstall",
@@ -1,5 +1,6 @@
{
"name": "@freecodecamp/search-indexing",
"private": true,
"version": "0.0.1",
"description": "A repository to hold all of our search assets",
"main": "N/A",
@@ -1,6 +1,7 @@
{
"name": "@freecodecamp/challenge-md-parser",
"version": "1.0.0",
"private": true,
"version": "0.0.1",
"description": "",
"main": "index.js",
"publishConfig": {
File renamed without changes.
File renamed without changes.
@@ -2,10 +2,10 @@ const fs = require('fs');
const path = require('path');
const debug = require('debug');

const env = require('../../config/env');
const env = require('../../../config/env');

const { getChallengesForLang } = require('../../curriculum/getChallenges');
const { createPathMigrationMap } = require('./seed/createPathMigrationMap');
const { getChallengesForLang } = require('../../../curriculum/getChallenges');
const { createPathMigrationMap } = require('../seed/createPathMigrationMap');

const { createRedirects } = require('./createRedirects');

@@ -20,10 +20,10 @@ const {
newsLocation: news
} = env;

const apiPath = path.resolve(__dirname, '../../api-server');
const clientPath = path.resolve(__dirname, '../../client');
const apiPath = path.resolve(__dirname, '../../../api-server');
const clientPath = path.resolve(__dirname, '../../../client');
const clientStaticPath = path.resolve(clientPath, 'static');
const globalConfigPath = path.resolve(__dirname, '../../config');
const globalConfigPath = path.resolve(__dirname, '../../../config');

if (NODE_ENV === 'production') {
const redirects = createRedirects({ api, news, forum });
@@ -2,8 +2,8 @@ const fs = require('fs');
const path = require('path');
const debug = require('debug');

const { getChallengesForLang } = require('../../curriculum/getChallenges');
const { createPathMigrationMap } = require('./seed/createPathMigrationMap');
const { getChallengesForLang } = require('../../../curriculum/getChallenges');
const { createPathMigrationMap } = require('../seed/createPathMigrationMap');

const log = debug('fcc:tools:ensure-env');

0 comments on commit c5fd478

Please sign in to comment.
You can’t perform that action at this time.