Skip to content

Commit

Permalink
Merge pull request #135 from code-dot-org/webpack-closure
Browse files Browse the repository at this point in the history
Run closure compiler under webpack
  • Loading branch information
balderdash authored Jul 13, 2018
2 parents f35429b + f460317 commit 11828e5
Show file tree
Hide file tree
Showing 18 changed files with 91 additions and 34,977 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/
dist/
.DS_Store
/.idea
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Major additions and changes in this fork:
```
cd blockly
npm install
./deploy.sh
npm run build
```

## Usage
Expand All @@ -59,11 +59,11 @@ cd {code-dot-org repo directory}/apps
npm link @code-dot-org/blockly
```

Apps will now reference your local blockly repository rather than the npm package. If you then make local changes to your repo, you can simply rebuild blockly (via `./deploy`) and then apps (via `npm run build`) to communicate those changes to apps.
Apps will now reference your local blockly repository rather than the npm package. If you then make local changes to your repo, you can simply rebuild blockly (via `npm run build` in this repo) and then apps (via `npm run build` in code-dot-org/apps) to communicate those changes to apps.

### Publishing changes

To publish a new version to npm switch to the master branch, use `npm login` to sign in as an account with access to the `@code-dot-org` scope, then `npm version [major|minor|patch]` for the appropriate version bump. This will do the following:
To publish a new version to npm switch to the master branch, use `npm login` to sign in as an account with access to the `@code-dot-org` scope, then `npm version [major|minor|patch|premajor|preminor|prepatch]` for the appropriate version bump. This will do the following:

* Run linting and tests to verify your local repo.
* Rebuild the release package.
Expand Down
1 change: 1 addition & 0 deletions blocks/functional_procedures.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
goog.provide('Blockly.Blocks.functionalProcedures');

goog.require('Blockly.Blocks');
goog.require('Blockly.Blocks.procedures');

/**
* Definition block for a custom functional block
Expand Down
1,785 changes: 0 additions & 1,785 deletions build-output/blockly_compressed.js

This file was deleted.

9 changes: 0 additions & 9 deletions build-output/blockly_compressed.js.map

This file was deleted.

Loading

0 comments on commit 11828e5

Please sign in to comment.