Skip to content

GitLab

S
scratch-www
Commit 5f7f3a6f authored by Ray Schamp's avatar Ray Schamp
Browse files
Options

Merge pull request #291 from LLK/release/2.2.4 

Release 2.2.4
parents e688d62c 25948c9a
Hide whitespace changes
Inline Side-by-side
Showing with 5133 additions and 106 deletions
Makefile
View file @ 5f7f3a6f
ESLINT=./node_modules/.bin/eslint
NODE=node
SASSLINT=./node_modules/.bin/sass-lint -v
TAP=./node_modules/.bin/tap
WATCH=./node_modules/.bin/watch
WEBPACK=./node_modules/.bin/webpack
GIT_VERSION=$(shell git rev-parse --verify --short=5 HEAD 2> /dev/null)
GIT_VERSION?=$(WWW_VERSION)
GIT_MESSAGE=$(shell git log -1 --pretty=%s 2> /dev/null)
# ------------------------------------
build:
@make clean
@make static
@make translations
@make webpack
@make tag
clean:
rm -rf ./build
......@@ -19,7 +23,7 @@ clean:
deploy:
ifeq ($(shell grep "artifact: deploy.zip" .elasticbeanstalk/config.yml), )
ifeq ($(shell grep "artifact: deploy.zip" .elasticbeanstalk/config.yml 2> /dev/null), )
@echo "You must configure elasticbeanstalk to deploy an artifact."
@echo "Add the following to your .elasticbeanstalk/config.yml"
@echo "deploy:\n artifact: deploy.zip"
......@@ -27,30 +31,20 @@ else
@make build
git archive -o deploy.zip HEAD
zip -rv deploy.zip build
eb deploy -l $$(git rev-parse --verify --short=5 HEAD) -m "$$(git log -1 --pretty=%s)"
eb deploy -l $(GIT_VERSION) -m "$(GIT_MESSAGE)"
endif
static:
cp -a ./static/. ./build/
tag:
echo $(GIT_VERSION) > ./build/version.txt
translations:
./src/scripts/build-locales locales/translations.json
./lib/bin/build-locales locales/translations.json
webpack:
$(WEBPACK) --bail
# ------------------------------------
watch:
$(WATCH) "make clean && make static" ./static &
$(WEBPACK) -d --watch &
wait
stop:
-pkill -f "$(WEBPACK) -d --watch"
-pkill -f "$(WATCH) make clean && make static ./static"
-pkill -f "$(NODE) ./server/index.js"
start:
$(NODE) ./server/index.js
......@@ -59,6 +53,11 @@ start:
test:
@make lint
@make build
@echo ""
@make unit
@echo ""
@make functional
@echo ""
lint:
$(ESLINT) ./*.js
......@@ -72,6 +71,15 @@ lint:
$(SASSLINT) ./src/views/**/*.scss
$(SASSLINT) ./src/components/**/*.scss
unit:
$(TAP) ./test/unit/*.js
functional:
$(TAP) ./test/functional/*.js
integration:
$(TAP) ./test/integration/*.js
# ------------------------------------
.PHONY: build clean deploy static translations webpack watch stop start test lint
.PHONY: build clean deploy static tag translations webpack watch stop start test lint
README.md
View file @ 5f7f3a6f
......@@ -9,38 +9,41 @@ npm install
npm run build
```
During development, you can use `npm run watch` to cause any update you make to files in either `./static` or `./src` to trigger a rebuild of the project.
### To Run
```bash
npm start
```
or to start and watch at once
```bash
npm run dev
```
During development, `npm start` watches any update you make to files in either `./static` or `./src` and triggers a rebuild of the project. In development the build is stored in memory, and not served from the `./build` directory.
Once running, open `http://localhost:8333` in your browser. If you wish to have the server reload automatically, you can install either [nodemon](https://github.com/remy/nodemon) or [forever](https://github.com/foreverjs/forever).
### To stop
```bash
# Stops all `start` and `watch` processes
npm stop
```
Use `^C` to stop the node process `npm start` starts.
#### Configuration
`npm start` and `npm run watch` can be configured with the following environment variables
`npm start` can be configured with the following environment variables
| Variable | Default | Description |
| ------------- | ------------------------------------- | ---------------------------------------------- |
| `API_HOST` | `https://api.scratch.mit.edu` | Hostname for API requests |
| `NODE_ENV` | `null` | If not `production`, app acts like development |
| `PORT` | `8333` | Port for devserver (http://localhost:XXXX) |
| `PROXY_HOST` | `https://scratch.mit.edu` | Pass-through location for scratchr2 |
| `FALLBACK` | `''` | Pass-through location for scratchr2 |
### To Test
```bash
npm test
```
### Current issues with the development
We're currently in the process of transitioning into this web client from Scratch's existing structure. As we transition, there are going to be some issues along the way that relate to how this client needs to interact with the existing infrastructure to work properly in production.
On top of migrating to using this as our web client, Scratch is also transitioning into using a new API backend, Scratch REST API. As that is also currently in development and incomplete, we are set up to fall back to using existing Scratch endpoints if an API endpoint does not exist – which is where the `FALLBACK` comes in.
Most of the issues we have currently revolve around the use of `FALLBACK`. This variable is used to specify what url to fall back onto should a request fail within the context of this webclient, or when using the `API_HOST`. If not specified in the process, it will not be used, and any request that is not made through the web client or the API will be unreachable.
Setting `FALLBACK=https://scratch.mit.edu` allows the web client to retrieve data from the Scratch website in your development environment. However, because of security concerns, trying to send data to Scratch through your development environment won't work. This means the following things will be broken for the time being:
* Login on the splash page (*In the process of being fixed*)
* Some update attempts to production data made through a development version of the web client
custom-locales.json 0 → 100644
View file @ 5f7f3a6f
{
"an": {
"locale": "an",
"parentLocale": "ca"
},
"la": {
"locale": "la",
"parentLocale": "it"
},
"yum": {
"locale": "yum",
"parentLocale": "en"
},
"cat": {
"locale": "cat",
"parentLocale": "en"
}
}
en.json
View file @ 5f7f3a6f
{
"general.accountSettings": "Account settings",
"general.about": "About",
"general.aboutScratch": "About Scratch",
"general.donate": "Donate",
"general.collaborators": "Collaborators",
"general.community": "Community",
......@@ -21,6 +22,7 @@
"general.legal": "Legal",
"general.learnMore": "Learn More",
"general.messages": "Messages",
"general.myClasses": "My Classes",
"general.myStuff": "My Stuff",
"general.offlineEditor": "Offline Editor",
"general.profile": "Profile",
......@@ -45,10 +47,37 @@
"general.viewAll": "View All",
"general.whatsHappening": "What's Happening?",
"general.wiki": "Scratch Wiki",
"about.introOne": "With Scratch, you can program your own interactive stories, games, and animations — and share your creations with others in the online community.",
"about.introTwo": "Scratch helps young people learn to think creatively, reason systematically, and work collaboratively — essential skills for life in the 21st century.",
"about.introThree": "Scratch is a project of the Lifelong Kindergarten Group at the MIT Media Lab. It is provided free of charge.",
"about.introParents": "Info for parents",
"about.introEducators": "Info for educators",
"about.whoUsesScratch": "Who Uses Scratch?",
"about.whoUsesScratchDescription": "Scratch is designed especially for ages 8 to 16, but is used by people of all ages. Millions of people are creating Scratch projects in a wide variety of settings, including homes, schools, museums, libraries, and community centers.",
"about.aroundTheWorld": "Around the World",
"about.aroundTheWorldDescription": "Scratch is used in more than 150 different countries and available in more than 40 languages. To change languages, click the menu at the bottom of the page. Or, in the Project Editor, click the globe at the top of the page. To add or improve a translation, see the <a href=\"http://wiki.scratch.mit.edu/wiki/How_to_Translate_Scratch\">translation</a> page.",
"about.quotes": "Quotes",
"about.quotesDescription": "The Scratch Team has received many emails from youth, parents, and educators expressing thanks for Scratch. Want to see what people are saying? You can read a collection of the <a href=\"/info/quotes\">quotes</a> we&#39;ve received.",
"about.learnMore": "Learn More About Scratch",
"about.learnMoreHelp": "Scratch Help Page",
"about.learnMoreFaq": "Frequently Asked Questions",
"about.learnMoreParents": "Information for Parents",
"about.learnMoreCredits": "Scratch Credits",
"about.literacy": "Learn to Code, Code to Learn",
"about.literacyDescription": "The ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.",
"about.schools": "Scratch in Schools",
"about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educators share stories, exchange resources, ask questions, and find people on the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd website</a>.",
"about.research": "Research",
"about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see <a href=\"http://web.media.mit.edu/~mres/papers/Scratch-CACM-final.pdf\">Scratch: Programming for All</a>). Find out more about Scratch <a href=\"/info/research\">research</a> and <a href=\"/statistics\">statistics</a> about Scratch.",
"about.support": "Support and Funding",
"about.supportDescription": "The Scratch project, initiated in 2003, has received generous support from the National Science Foundation (grants 0325828, 1002713, 1027848, 1019396), Intel Foundation, Microsoft, MacArthur Foundation, LEGO Foundation, Code-to-Learn Foundation, Google, Dell, Fastly, Inversoft, and MIT Media Lab research consortia. If you&#39;d like to support Scratch, please see our <a href=\"https://secure.donationpay.org/scratchfoundation/\">donate page</a>, or contact us at donate@scratch.mit.edu.",
"footer.about": "About Scratch",
"footer.discuss": "Discussion Forums",
"footer.help": "Help Page",
"footer.scratchFamily": "Scratch Family",
"hoc.activityCards": "Activity Cards",
"hoc.activityCardsHeader": "Activity Cards and Guides",
"hoc.activityCardsInfo1": "Want tips and ideas for these Hour of Code&trade; activities? Use the activity cards to get ideas for creating with Scratch. Facilitator guides can help you plan a group activity.",
......@@ -66,20 +95,25 @@
"hoc.subTitle": "With Scratch, you can program your own stories, games, and animations — and share them online.",
"hoc.tipsDescription": "Need help getting started? Looking for ideas?&nbsp; You can find tutorials and helpful hints in the <a href=\"/projects/editor/?tip_bar=home\">Tips Window</a>",
"hoc.title": "Get Creative with Coding",
"intro.aboutScratch": "ABOUT SCRATCH",
"intro.forEducators": "FOR EDUCATORS",
"infro.forParents": "FOR PARENTS",
"intro.forParents": "FOR PARENTS",
"intro.joinScratch": "JOIN SCRATCH",
"intro.seeExamples": "SEE EXAMPLES",
"intro.tagLine": "Create stories, games, and animations<br /> Share with others around the world",
"intro.tryItOut": "TRY IT OUT",
"login.forgotPassword": "Forgot Password?",
"navigation.signOut": "Sign out",
"news.scratchNews": "Scratch News",
"parents.FaqAgeRangeA": "While Scratch is primarily designed for 8 to 16 year olds, it is also used by people of all ages, including younger children with their parents.",
"parents.FaqAgeRangeQ": "What is the age range for Scratch?",
"parents.FaqResourcesQ": "What resources are available for learning Scratch?",
"parents.introDescription": "Scratch is a programming language and an online community where children can program and share interactive media such as stories, games, and animation with people from all over the world. As children create with Scratch, they learn to think creatively, work collaboratively, and reason systematically. Scratch is designed and maintained by the Lifelong Kindergarten group at the MIT Media Lab.",
"splash.featuredProjects": "Featured Projects",
"splash.featuredStudios": "Featured Studios",
"splash.projectsCuratedBy": "Projects Curated by",
......@@ -91,6 +125,7 @@
"splash.projectsInStudiosFollowing": "Projects in Studios I'm Following",
"splash.communityRemixing": "What the Community is Remixing",
"splash.communityLoving": "What the Community is Loving",
"welcome.welcomeToScratch": "Welcome to Scratch!",
"welcome.learn": "Learn how to make a project in Scratch",
"welcome.tryOut": "Try out starter projects",
......
languages.json
View file @ 5f7f3a6f
......@@ -16,7 +16,6 @@
"es": "Español",
"eu": "Euskara",
"fr": "Français",
"fr-ca": "Français (Canada)",
"ga": "Gaeilge",
"gd": "Gàidhlig",
"gl": "Galego",
......@@ -33,6 +32,7 @@
"cat": "Meow",
"nl": "Nederlands",
"nb": "Norsk Bokmål",
"uz": "Oʻzbekcha",
"pl": "Polski",
"pt": "Português",
"pt-br": "Português Brasileiro",
......
src/scripts/build-locales → lib/bin/build-locales
View file @ 5f7f3a6f
......@@ -5,29 +5,17 @@
Requires po2json in order to work. Takes as input a directory
in which to store the resulting json translation files.
*/
var fs = require('fs');
var glob = require('glob');
var path = require('path');
var po2icu = require('po2icu');
/*
Existing translations should be in the key value format specified by react-intl (i.e.
formatted message id, with icu string as the value). New Translations should be in the
format returned by po2icu (i.e. a source language icu string for key, and a localized
language icu string for value).
var localeCompare = require('../locale-compare');
// -----------------------------------------------------------------------------
// Main script
// -----------------------------------------------------------------------------
ICU Map is an object in the reverse react-intl formatting (icu string as key), which will
help determine if the translation belongs in www currently.
*/
var mergeNewTranslations = function (existingTranslations, newTranslations, icuMap) {
for (var id in newTranslations) {
if (icuMap.hasOwnProperty(id) && newTranslations[id].length > 0) {
existingTranslations[icuMap[id]] = newTranslations[id];
}
}
return existingTranslations;
};
var args = process.argv.slice(2);
......@@ -49,13 +37,15 @@ try {
var icuTemplateFile = path.resolve(__dirname, '../../en.json');
var idsWithICU = JSON.parse(fs.readFileSync(icuTemplateFile, 'utf8'));
var locales = {
en: idsWithICU
};
var icuWithIds = {};
for (var id in idsWithICU) {
icuWithIds[idsWithICU[id]] = id;
}
var locales = {
en: idsWithICU
};
var md5WithIds = localeCompare.getMD5Map(icuWithIds);
// Get ui localization strings first
glob(poUiDir + '/*', function (err, files) {
......@@ -67,16 +57,17 @@ glob(poUiDir + '/*', function (err, files) {
var pyFile = path.resolve(file, 'LC_MESSAGES/django.po');
var translations = {};
try {
var jsTranslations = po2icu.poFileToICUSync(lang, jsFile);
translations = mergeNewTranslations(translations, jsTranslations, icuWithIds);
translations = localeCompare.mergeNewTranslations(translations, jsTranslations, idsWithICU, md5WithIds);
} catch (err) {
process.stdout.write(lang + ': ' + err + '\n');
}
try {
var pyTranslations = po2icu.poFileToICUSync(lang, pyFile);
translations = mergeNewTranslations(translations, pyTranslations, icuWithIds);
translations = localeCompare.mergeNewTranslations(translations, pyTranslations, idsWithICU, md5WithIds);
} catch (err) {
process.stdout.write(lang + ': ' + err + '\n');
}
......
lib/locale-compare.js 0 → 100644
View file @ 5f7f3a6f
// -----------------------------------------------------------------------------
// Helper Methods for build-locales node script.
// -----------------------------------------------------------------------------
var crypto = require('crypto');
var Helpers = {};
/**
* Get the md5 has of a string with whitespace removed.
*
* @param {string} string a string
* @return {string} an md5 hash of the string in hex.
*/
Helpers.getMD5 = function (string) {
var cleanedString = string.replace(/\s+/g, '');
return crypto.createHash('md5').update(cleanedString, 'utf8').digest('hex');
};
/*
Existing translations should be in the key value format specified by react-intl (i.e.
formatted message id, with icu string as the value). New Translations should be in the
format returned by po2icu (i.e. a source language icu string for key, and a localized
language icu string for value).
ICU Map is an object in the reverse react-intl formatting (icu string as key), which will
help determine if the translation belongs in www currently.
*/
Helpers.mergeNewTranslations = function (existingTranslations, newTranslations, icuTemplate, md5Map) {
for (var id in newTranslations) {
var md5 = Helpers.getMD5(id);
if (md5Map.hasOwnProperty(md5) && newTranslations[id].length > 0) {
existingTranslations[md5Map[md5]] = newTranslations[id];
}
}
//Fill in defaults
for (var id in icuTemplate) {
if (!existingTranslations.hasOwnProperty(id)) existingTranslations[id] = icuTemplate[id];
}
return existingTranslations;
};
/**
* Converts a map of icu strings with react-intl id values into a map
* with md5 hashes of the icu strings as keys and react-intl id values.
* This is done so as to eliminate potential po conversion misses that
* could be caused by different white space formatting between po and icu.
*
* The md5 is generated after all white space is removed from the string.
*
* @param {object} idICUMap map where key=icuString, value=react-intl id
*
* @return {object}
*/
Helpers.getMD5Map = function (ICUIdMap) {
var md5Map = {};
for (var icu in ICUIdMap) {
var md5 = Helpers.getMD5(icu);
md5Map[md5] = ICUIdMap[icu];
}
return md5Map;
};
module.exports = Helpers;
server/index.js
View file @ 5f7f3a6f
......@@ -7,18 +7,21 @@ var express = require('express');
var path = require('path');
var proxy = require('express-http-proxy');
var url = require('url');
var webpackDevMiddleware = require('webpack-dev-middleware');
var webpack = require('webpack');
var handler = require('./handler');
var log = require('./log');
var proxies = require('./proxies.json');
var routes = require('./routes.json');
var isProduction = process.env.NODE_ENV === 'production';
// Create server
var app = express();
app.disable('x-powered-by');
// Block POST & PUT requests in production
if (process.env.NODE_ENV === 'production') {
if (isProduction) {
app.use(function (req, res, next) {
if (req.method === 'GET') return next();
if (req.method === 'OPTIONS') return next();
......@@ -32,10 +35,12 @@ if (process.env.NODE_ENV === 'production') {
// Server setup
app.use(log());
app.use(compression());
app.use(express.static(path.resolve(__dirname, '../build'), {
lastModified: true,
maxAge: '1y'
}));
if (isProduction) {
app.use(express.static(path.resolve(__dirname, '../build'), {
lastModified: true,
maxAge: '1y'
}));
}
app.use(function (req, res, next) {
req._path = url.parse(req.url).path;
next();
......@@ -65,21 +70,21 @@ if (typeof process.env.NODE_SENTRY_DSN === 'string') {
});
}
// Bind proxies in development
if (process.env.NODE_ENV !== 'production') {
var proxyHost = process.env.PROXY_HOST || 'https://scratch.mit.edu';
app.use('/', proxy(proxyHost, {
filter: function (req) {
for (var i in proxies) {
if (req._path.indexOf(proxies[i]) === 0) return true;
}
return false;
},
forwardPath: function (req) {
return req._path;
if (!isProduction) {
// Use webpack-dev-server in development
var compiler = webpack(require('../webpack.config.js'));
app.use(webpackDevMiddleware(compiler, {
headers: {
'X-From-Webpack': true
}
}));
var proxyHost = process.env.FALLBACK || '';
if (proxyHost !== '') {
// Fall back to scratchr2 in development
// This proxy middleware must come last
app.use('/', proxy(proxyHost));
}
}
// Start listening
......
server/proxies.json deleted 100644 → 0
View file @ e688d62c
[
"/accounts/",
"/csrf_token/",
"/fragment/",
"/get_image/",
"/i18n/setlang/",
"/login_retry/",
"/media/",
"/scratch_admin/homepage/clear-cache/",
"/session/",
"/site-api",
"/static/"
]
server/routes.json
View file @ 5f7f3a6f
......@@ -18,5 +18,10 @@
"pattern": "/hoc",
"view": "hoc",
"title": "Hour of Code"
},
{
"pattern": "/info/credits",
"view": "credits",
"title": "Credits"
}
]
server/template.html
View file @ 5f7f3a6f
......@@ -7,7 +7,7 @@
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta http-equiv="x-frame-options" content="deny">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=942, initial-scale=1">
<title>Scratch - {{title}}</title>
......@@ -48,6 +48,7 @@
<!-- Scripts -->
<script src="/js/lib/react{{min}}.js"></script>
<script src="/js/lib/react-dom{{min}}.js"></script>
<script src="/js/lib/react-intl-with-locales{{min}}.js"></script>
<script src="/js/lib/raven.min.js"></script>
<script src="/js/main.bundle.js"></script>
......
src/components/footer/footer.jsx
View file @ 5f7f3a6f
......@@ -132,7 +132,7 @@ var Footer = React.createClass({
</a>
</dd>
<dd>
<a href="https://secure.donationpay.org/codetolearn/">
<a href="https://secure.donationpay.org/scratchfoundation/">
<FormattedMessage
id='general.donate'
defaultMessage={'Donate'} />
......
src/components/navigation/navigation.jsx
View file @ 5f7f3a6f
......@@ -281,6 +281,15 @@ var Navigation = React.createClass({
<FormattedMessage {...defaultMessages.myStuff} />
</a>
</li>
{this.state.session.permissions.educator ? [
<li>
<a href="/educators/classes/">
<FormattedMessage
id='general.myClasses'
defaultMessage={'My Classes'} />
</a>
</li>
] : []}
<li>
<a href="/accounts/settings/">
<FormattedMessage
......
src/components/news/news.jsx
View file @ 5f7f3a6f
......@@ -35,7 +35,7 @@ var News = React.createClass({
className="news"
title={formatMessage(defaultMessages.scratchNews)}
moreTitle={formatMessage(defaultMessages.viewAll)}
moreHref="/news">
moreHref="/discuss/5/">
<ul>
{this.props.items.map(function (item) {
......
src/lib/intl.jsx 0 → 100644
View file @ 5f7f3a6f
var ReactIntl = require('react-intl');
var customLanguages = require('../../custom-locales.json');
for (var locale in customLanguages) {
ReactIntl.addLocaleData(customLanguages[locale]);
}
module.exports = ReactIntl;
src/lib/render.jsx
View file @ 5f7f3a6f
var ReactDOM = require('react-dom');
var ReactIntl = require('react-intl');
var ReactIntl = require('./intl.jsx');
var IntlProvider = ReactIntl.IntlProvider;
var render = function (jsx, element) {
......
src/mixins/api.jsx
View file @ 5f7f3a6f
......@@ -34,6 +34,9 @@ var Api = {
}
xhr(opts, function (err, res, body) {
if (err) log.error(err);
// Legacy API responses come as lists, and indicate to redirect the client like
// [{success: true, redirect: "/location/to/redirect"}]
if (body && body[0] && 'redirect' in body[0]) window.location = body[0].redirect;
callback(err, body);
});
}.bind(this);
......
src/views/about/about.jsx
View file @ 5f7f3a6f
var React = require('react');
var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
var FormattedMessage = require('react-intl').FormattedMessage;
var render = require('../../lib/render.jsx');
require('./about.scss');
......@@ -7,8 +9,92 @@ var About = React.createClass({
type: 'About',
render: function () {
return (
<div>
<h1>I am the about page!</h1>
<div className="inner">
<h1><FormattedMessage id='general.aboutScratch' /></h1>
<div className="masthead">
<div>
<p><FormattedMessage id='about.introOne' /></p>
<p><FormattedMessage id='about.introTwo' /></p>
<p><FormattedMessage id='about.introThree' /></p>
<ul>
<li><a href = "/parents/"><FormattedMessage id="about.introParents" /></a></li>
<li><a href = "/educators/"><FormattedMessage id="about.introEducators" /></a></li>
</ul>
</div>
<div>
<iframe
src="https://player.vimeo.com/video/65583694?title=0&byline=0&portrait=0"
frameBorder="0"
webkitAllowFullScreen
mozallowfullscreen
allowFullScreen />
</div>
</div>
<div className="body">
<ul>
<li>
<h2><FormattedMessage id='about.whoUsesScratch' /></h2>
<img src="/images/about/who-uses-scratch.jpg" />
<p><FormattedHTMLMessage id='about.whoUsesScratchDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.literacy' /></h2>
<iframe
src="https://embed-ssl.ted.com/talks/mitch_resnick_let_s_teach_kids_to_code.html"
scrolling="no"
webkitAllowFullScreen
mozallowfullscreen
allowFullScreen />
<p><FormattedHTMLMessage id='about.literacyDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.aroundTheWorld' /></h2>
<img src="/images/about/around-the-world.png" />
<p><FormattedHTMLMessage id='about.aroundTheWorldDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.schools' /></h2>
<img src="/images/about/scratch-in-schools.jpg" />
<p><FormattedHTMLMessage id='about.schoolsDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.quotes' /></h2>
<img src="/images/about/quotes.gif" />
<p><FormattedHTMLMessage id='about.quotesDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.research' /></h2>
<img src="/images/about/research-remix.png" />
<p><FormattedHTMLMessage id='about.researchDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.learnMore' /></h2>
<p>
<ul className="list">
<li><a href="/help"><FormattedMessage id='about.learnMoreHelp' /></a></li>
<li><a href="/info/faq"><FormattedMessage id='about.learnMoreFaq' /></a></li>
<li><a href="/parents"><FormattedMessage id='about.learnMoreParents' /></a></li>
<li><a href="/credits"><FormattedMessage id='about.learnMoreCredits' /></a></li>
</ul>
</p>
</li>
<li>
<h2><FormattedMessage id='about.support' /></h2>
<p><FormattedHTMLMessage id='about.supportDescription' /></p>
</li>
</ul>
</div>
</div>
);
}
......
src/views/about/about.scss
View file @ 5f7f3a6f
@import "../../colors";
#view {
.masthead {
display: flex;
flex-wrap: no-wrap;
justify-content: space-between;
align-items: stretch;
div {
display: inline-block;
width: calc(50% - 10px);
ul {
margin: 0;
padding: 0;
list-style: none;
}
li {
display: inline-block;
text-transform: uppercase;
&:nth-child(odd) {
margin-right: 10px;
border-right: 1px solid $ui-gray;
padding-right: 10px;
}
}
iframe {
border: 1px solid $ui-gray;
width: 460px;
height: 290px;
}
}
}
.body {
position: relative;
margin: 20px 0 0;
border: 1px solid $ui-gray;
border-radius: 10px;
background: $ui-white;
padding: 26px 40px 6px;
width: calc(100% - 80px);
ul {
display: flex;
margin: 0;
padding: 0;
list-style: none;
justify-content: space-between;
flex-wrap: wrap;
}
li {
display: inline-block;
margin-bottom: 20px;
width: calc(384px + 5px + 5px);
}
img, iframe {
display: block;
border: 1px solid $ui-gray;
padding: 5px;
width: 396px;
height: 222px;
}
}
}
src/views/credits/credits.jsx 0 → 100644
View file @ 5f7f3a6f
var React = require('react');
var render = require('../../lib/render.jsx');
require('./credits.scss');
var Credits = React.createClass({
type: 'Credits',
render: function () {
return (
<div className="inner">
<h1>Scratch Credits and Contributors</h1>
<h2>MIT Scratch Team</h2>
<p>Scratch is designed and developed by the Lifelong Kindergarten Group at MIT Media Lab:</p>
<ul>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/167_170x170.png" />
<span className="name">Mitchel Resnick</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/169_170x170.png" />
<span className="name">Natalie Rusk</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/573207_170x170.png" />
<span className="name">Sayamindu Dasgupta</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/13682_170x170.png" />
<span className="name">Ricarose Roque</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/2584924_170x170.png" />
<span className="name">Ray Schamp</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/3484484_170x170.png" />
<span className="name">Eric Schilling</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/3532363_170x170.png" />
<span className="name">Chris Willis-Ford</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/3581881_170x170.png" />
<span className="name">Carl Bowman</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/4373707_170x170.png" />
<span className="name">Matthew Taylor</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/4598206_170x170.png" />
<span className="name">Kasia Chmielinski</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/703844_170x170.png" />
<span className="name">Tim Mickel</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/2752403_170x170.png" />
<span className="name">Saskia Leggett</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/2755634_170x170.png" />
<span className="name">Christan Balch</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/5721684_170x170.png" />
<span className="name">Randy Jou</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/10866958_170x170.png" />
<span className="name">Colby Gutierrez-Kraybill</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/1709047_170x170.png" />
<span className="name">Andrew Sliwinski</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" />
<span className="name">Ben Berg</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/2286560_170x170.png" />
<span className="name">Carmelo Presicce</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" />
<span className="name">Moran Tsur</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/3661900_170x170.png" />
<span className="name">Juanita Buitrago</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" />
<span className="name">Shruti Mohnot</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/1915915_170x170.png" />
<span className="name">Hannah Cole</span>
</li>
</ul>
<p>The team of Scratch moderators manages, supports, and improves the Scratch online community:</p>
<ul>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/49156_170x170.png" />
<span className="name">Mark Goff</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/159139_170x170.png" />
<span className="name">Franchette Viloria</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/246290_170x170.png" />
<span className="name">Sarah Otts</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/2496866_170x170.png" />
<span className="name">Jolie Castellucci</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/3087865_170x170.png" />
<span className="name">Andrea Saxman</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/373646_170x170.png" />
<span className="name">Dalton Miner</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/586054_170x170.png" />
<span className="name">Megan Haddadi</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/4836354_170x170.png" />
<span className="name">Christina Huang</span>
</li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/4747093_170x170.png" />
<span className="name">Annie Whitehouse</span>
</li>
</ul>
<h2>Previous MIT Scratch Team Members</h2>
<p>
Many important contributions have been made by previous Scratch Team members,
including John Maloney (who led software development for the first decade of Scratch),
Andrés Monroy-Hernández (who led the development of the first Scratch community website),
Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond,
Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini,
Michelle Chung, Margarita Dekoli, Dave Feinberg, Chris Graves, Tony Hwang, Di Liu, Tammy Stern,
Lis Sylvan, and Claudia Urrea.
</p>
<h2>Design and Development Partners</h2>
<p>
Paula Bontá and Brian Silverman, Playful Invention Company (who started contributing to the
design of Scratch even before it was called Scratch).
</p>
<h2>Scratch Researchers</h2>
<p>
<a href="https://scratch.mit.edu/info/research/">Research on Scratch </a>
is being conducted by members of the MIT Scratch Team and researchers at
other universities, including Yasmin Kafai (who collaborated on the
<a href="http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828"> initial NSF Scratch grant</a>
) at the University of Pennsylvania Graduate School of Education, Karen Brennan (who leads the
<a href="http://scratched.gse.harvard.edu/"> ScratchEd project</a>) at the Harvard Graduate School
of Education, Benjamin Mako Hill at the University of Washington, Andrés Monroy Hernández at
Microsoft Research, Mimi Ito and Crystle Martin at the University of California, Irvine, Quinn
Burke at College of Charleston, Deborah Fields at Utah State University, and Kylie Peppler at
Indiana University.
</p>
<h2>Acknowledgements</h2>
<p>
The following people have also contributed to the development and support of Scratch over the
years: Susan Abend, Robbie Berg, Lauren Bessen, Keith Braadfladt, Susan Carillo, Will Denton,
Nathan Dinsmore, Catherine Feldman, Jodi Finch, Ioana Fineberg, Rachel Garber, Chris Garrity,
Cassy Gibbs, Brian Harvey, Roland Hebert, Tracy Ho, Benjamin Howe, Kapaya Katongo, Evan Karatzas,
Christine Kim, Joren Lauwers, Mike Lee, Jeff Lieberman, Mark Loughridge, Kelly Liu, Anthony Lu,
Danny Lutz, David Malan, Wayne Marshall, John McIntosh, Paul Medlock-Walton, Dongfang (Tian) Mi,
Ximena Miranda, Jens Moenig, Evan Moore, Geetha Narayanan, Kate Nazemi, Liddy Nevile, Wing Ngan,
Derek O&#39;Connell, Tim Radvan, Karen Randall, Ian Reynolds, Miriam Ruiz, Chinua Shaw, Ed Shems,
Cynthia Solomon, Daniel Strimpel, Kilmer Sweazy, John Henry Thompson, Ubong Ukoh, Vladimir Vuksan,
Han Xu, and the many volunteer <a href="http://wiki.scratch.mit.edu/wiki/Translators"> Scratch
Translators</a> from around the world.
</p>
<p>
We greatly appreciate all of the contributions by members of the worldwide Scratch community,
who have shaped the direction of Scratch by sharing their projects, comments, and ideas.
</p>
<p>
The ideas of Seymour Papert and Alan Kay have deeply inspired and influenced our work on Scratch.
</p>
<h2>Supporting Organizations</h2>
<p>
The following organizations have provided major financial support for Scratch:
</p>
<p>
<a href="http://www.nsf.gov/">National Science Foundation</a>,
<a href="http://www.scratchfoundation.org/"> Scratch Foundation</a>,
<a href="http://www.google.org/"> Google</a>,
<a href="http://www.legofoundation.com/"> LEGO Foundation</a>,
<a href="http://www.intel.com/">Intel Foundation</a>,
<a href="https://www.macfound.org/"> MacArthur Foundation</a>.
</p>
<p>
The following organizations donate their services to help keep the Scratch project running:
</p>
<p>
<a href="http://www.advancedinstaller.com/"> Advanced Installer</a>,
<a href="http://aws.amazon.com/"> Amazon Web Services</a>,
<a href="https://codetree.com/"> Codetree</a>,
<a href="https://www.fastly.com/"> Fastly</a>,
<a href="https://www.geckoboard.com"> Geckoboard</a>,
<a href="https://github.com/"> Github</a>,
<a href="https://www.inversoft.com/"> Inversoft</a>,
<a href="http://mailchimp.com/"> MailChimp</a>,
<a href="http://mandrill.com/"> Mandrill</a>,
<a href="http://newrelic.com/"> New Relic</a>,
<a href="https://www.pagerduty.com/"> PagerDuty</a>,
<a href="https://www.pingdom.com/"> Pingdom</a>,
<a href="https://www.rallydev.com/"> Rally</a>,
<a href="https://saucelabs.com/"> SauceLabs</a>,
<a href="https://screenhero.com/"> Screenhero</a>,
<a href="https://getsentry.com/welcome/"> Sentry</a>,
and <a href="http://www.git-tower.com/"> Tower</a>.
</p>
<p>
Scratch would not be possible without free and open source software, including:
</p>
<p>
<a href="https://www.djangoproject.com/"> Django</a>,
<a href="http://djangobb.org/"> DjangoBB</a>,
<a href="https://www.docker.com/"> Docker</a>,
<a href="https://www.elastic.co/"> Elasticsearch</a>,
<a href="http://ganglia.sourceforge.net/"> Ganglia</a>,
<a href="gunicorn.org"> Gunicorn</a>,
<a href="https://jenkins-ci.org/"> Jenkins</a>,
<a href="http://www.linux.org/"> Linux</a>,
<a href="http://memcached.org/"> Memcached</a>,
<a href="https://www.mediawiki.org/wiki/MediaWiki"> MediaWiki</a>,
<a href="http://www.mysql.com/"> MySQL</a>,
<a href="https://www.nagios.org/"> Nagios</a>,
<a href="https://www.nginx.com/resources/wiki/"> Nginx</a>,
<a href="https://nodejs.org/en/"> Node.js</a>,
<a href="http://pootle.translatehouse.org/"> Pootle</a>,
<a href="http://www.postgresql.org/"> PostgreSQL</a>,
<a href="https://www.python.org/"> Python</a>,
<a href="http://redis.io/"> Redis</a>,
<a href="http://saltstack.com/"> SaltStack</a>,
<a href="https://github.com/etsy/statsd/"> StatsD</a>,
<a href="http://www.ubuntu.com/"> Ubuntu</a>,
and <a href="https://www.varnish-cache.org/"> Varnish</a>.
</p>
</div>
);
}
});
render(<Credits />, document.getElementById('view'));
src/views/credits/credits.scss 0 → 100644
View file @ 5f7f3a6f
@import "../../colors";
#view {
p {
line-height: 1.5rem;
}
ul {
display: flex;
margin: 0;
padding: 0;
list-style: none;
flex-wrap: wrap;
}
li {
display: inline-block;
margin: 10px 0;
width: 188px;
text-align: center;
img {
margin: 10px 23px;
border: 2px;
border-style: solid;
border-radius: 50%;
border-color: $ui-dark-gray;
background-color: $ui-white;
padding: 20px;
width: 85px;
height: 85px;
}
}
}
src/views/hoc/hoc.jsx
View file @ 5f7f3a6f
......@@ -399,9 +399,8 @@ var Hoc = React.createClass({
</div>
</section>
</div>
<img src = "https://code.org/api/hour/begin_scratch.png" />
</div>
);
}
});
......
static/js/lib/react-intl-with-locales.js 0 → 100644
View file @ 5f7f3a6f
This source diff could not be displayed because it is too large. You can view the blob instead.
static/js/lib/react-intl-with-locales.min.js 0 → 100644
View file @ 5f7f3a6f
This source diff could not be displayed because it is too large. You can view the blob instead.
test/fixtures/build_locales.json 0 → 100644
View file @ 5f7f3a6f
{
"<p> <img src=\"{STATIC_URL}/images/help/ask-and-wait.png\" /> asks a question and stores the keyboard input in <img src=\"{STATIC_URL}/images/help/answer.png\" />. The answer is shared by all sprites. </p><p>If you want to save the current answer, you can store it in a variable or list. For example, <img src=\"{STATIC_URL}/images/help/answer-ex2.png\"/> </p><p>To view the value of answer, click the checkbox next to the answer block.<br><img src=\"{STATIC_URL}/images/help/answer-checkbox.png\" /></p>": "test.id1",
"<p> <img src=\"{STATIC_URL}/images/help/ask-and-wait.png\" /> asks a question and stores the keyboard input in <img src=\"{STATIC_URL}/images/help/answer.png\" />. The question appears in a voice balloon on the screen. The program waits as the user types in a response, until the Enter key is pressed or the check mark is clicked. </p>": "test.id2"
}
test/fixtures/test_es.po 0 → 100644
View file @ 5f7f3a6f
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-20 14:16+0000\n"
"PO-Revision-Date: 2015-09-21 17:37+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.1.1\n"
"X-POOTLE-MTIME: 1442857052.000000\n"
#: test.html:15
#, python-format
msgid ""
"\n"
"<p> <img src=\"%(STATIC_URL)s/images/help/ask-and-wait.png\" /> asks a "
"question and stores the keyboard input in <img src=\"%(STATIC_URL)s/images/"
"help/answer.png\" />. The answer is shared by all sprites. </p>\n"
"<p>If you want to save the current answer, you can store it in a variable or "
"list. For example, <img src=\"%(STATIC_URL)s/images/help/answer-ex2.png\"/"
"> \n"
"</p>\n"
"\n"
"<p>\n"
"To view the value of answer, click the checkbox next to the answer block."
"<br>\n"
"<img src=\"%(STATIC_URL)s/images/help/answer-checkbox.png\" />\n"
"</p>"
msgstr ""
"\n"
"<p><img src=\"%(STATIC_URL)s/images/help/es/ask-and-wait.png\" /> hace una "
"pregunta y almacena la entrada de teclado en <img src=\"%(STATIC_URL)s/"
"images/help/es/answer.png\" />. La respuesta se comparte para todos los "
"objetos. </p>\n"
"<p>Si deseas guardar la respuesta actual, debes almacenarla en una variable "
"o una lista. Por ejemplo, <img src=\"%(STATIC_URL)s/images/help/es/answer-"
"ex2.png\"/> \n"
"</p>\n"
"\n"
"<p>\n"
"Si deseas ver el valor de una respuesta, haz clic en la casilla que aparece "
"junto al bloque de respuesta.<br>\n"
"<img src=\"%(STATIC_URL)s/images/help/es/answer-checkbox.png\" />\n"
"</p>"
#: test.html:18
#, python-format
msgid ""
"\n"
"<p> <img src=\"%(STATIC_URL)s/images/help/ask-and-wait.png\" /> asks a "
"question and stores the keyboard input in <img src=\"%(STATIC_URL)s/images/"
"help/answer.png\" />. The question appears in a voice balloon on the screen. "
"The program waits as the user types in a response, until the Enter key is "
"pressed or the check mark is clicked. \n"
"</p>"
msgstr ""
"\n"
"<p> <img src=\"%(STATIC_URL)s/images/help/es/ask-and-wait.png\" /> hace una "
"pregunta y almacena la entrada de teclado en <img src=\"%(STATIC_URL)s/"
"images/help/es/answer.png\" />. La pregunta aparece en un globo de voz en la "
"pantalla. El programa espera hasta que el usuario escriba una respuesta y "
"presione Enter o haga clic en la casilla de aprobación.\n"
"</p>"
test/fixtures/test_es_md5map.json 0 → 100644
View file @ 5f7f3a6f
{
"2ec20d41b181e1a41c071e13f414a74d": "test.id1",
"37ba6d5ef524504215f478912155f9ba": "test.id2"
}
test/functional/build_locales_complex_strings.js 0 → 100644
View file @ 5f7f3a6f
var fs = require('fs');
var path = require('path');
var po2icu = require('po2icu');
var tap = require('tap');
var buildLocales = require('../../lib/locale-compare');
tap.test('buildLocalesFile', function (t) {
var md5map = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../fixtures/test_es_md5map.json'), 'utf8'));
var newTranslations = po2icu.poFileToICUSync('es', path.resolve(__dirname, '../fixtures/test_es.po'));
var translations = buildLocales.mergeNewTranslations({}, newTranslations, {}, md5map);
t.ok(translations['test.id1'] !== undefined);
t.ok(translations['test.id2'] !== undefined);
t.end();
});
test/functional/build_locales_md5map.js 0 → 100644
View file @ 5f7f3a6f
var fs = require('fs');
var path = require('path');
var tap = require('tap');
var buildLocales = require('../../lib/locale-compare');
tap.test('buildLocalesFile', function (t) {
var actualMd5map = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../fixtures/test_es_md5map.json'), 'utf8'));
var templates = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../fixtures/build_locales.json'), 'utf8'));
var testMd5map = buildLocales.getMD5Map(templates);
for (var key in actualMd5map) {
t.ok(testMd5map[key] !== undefined);
}
t.end();
});
test/functional/build_locales_mergeTranslations.js 0 → 100644
View file @ 5f7f3a6f
var tap = require('tap');
var buildLocales = require('../../lib/locale-compare');
tap.test('buildLocalesMergeTranslations', function (t) {
var existingTranslations = {
'test.test1': 'It\'s like raaayaaain, on your wedding day',
'test.test2': 'Free to flyyy, when you already paid'
};
var newTranslations = {
'Isn\'t it ironic? No.': 'Es irónico? No.'
};
var md5map = {
'c21ce5ceefe167028182032d4255a384': 'test.test1',
'9c40648034e467e16f8d6ae24bd610ab': 'test.test2',
'6885a345adafb3a9dd43d9f549430c88': 'test.test3'
};
var mergedTranslations = buildLocales.mergeNewTranslations(existingTranslations, newTranslations, {}, md5map);
t.ok(mergedTranslations['test.test3'] !== undefined);
t.ok(mergedTranslations['test.test2'] !== undefined);
t.end();
});
test/unit/build_locales_getmd5.js 0 → 100644
View file @ 5f7f3a6f
var tap = require('tap');
var buildLocales = require('../../lib/locale-compare');
tap.test('buildLocalesGetMD5', function (t) {
var testString1 = 'are there bears here?';
var testString2 = 'are\nthere\tbears here?';
t.equal(buildLocales.getMD5(testString1), buildLocales.getMD5(testString2));
t.end();
});
webpack.config.js
View file @ 5f7f3a6f
var CopyWebpackPlugin = require('copy-webpack-plugin');
var path = require('path');
var webpack = require('webpack');
......@@ -9,9 +10,7 @@ var entry = {
main: './src/main.jsx'
};
routes.forEach(function (route) {
if ( ! route.static ) {
entry[route.view] = './src/views/' + route.view + '/' + route.view + '.jsx';
}
entry[route.view] = './src/views/' + route.view + '/' + route.view + '.jsx';
});
// Config
......@@ -21,11 +20,12 @@ module.exports = {
externals: {
'react': 'React',
'react/addons': 'React',
'react-dom': 'ReactDOM'
'react-dom': 'ReactDOM',
'react-intl': 'ReactIntl'
},
output: {
path: path.resolve(__dirname, 'build/js'),
filename: '[name].bundle.js'
path: path.resolve(__dirname, 'build'),
filename: 'js/[name].bundle.js'
},
module: {
loaders: [
......@@ -52,12 +52,14 @@ module.exports = {
fs: 'empty'
},
plugins: [
new CopyWebpackPlugin([
{from: 'static'}
]),
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false
}
}),
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.optimize.DedupePlugin()
new webpack.optimize.OccurenceOrderPlugin()
]
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment