mirror of
https://github.com/google/blockly.git
synced 2026-01-10 02:17:09 +01:00
af75ca6fcc
Merge changes made in the master branch since the v9.0.0 release (specifically, updating the version number to 9.0.1 and correcting an error in renamings.json5) so as to reduce the liklihood of merge conflicts when we next release (by merging from develop to master). There were conflicts in * core/field_angle.ts * core/field_dropdown.ts * core/field_variable.ts that were due to having cherry-picked changes from develop into master for the 9.0.1 release; these were "resolved" by resetting those files to the develop version, since the "changes" thereby lost were just adapting the cherry-picks to fit code in master that had not had various intermediate PRs applied to it yet. Similarly, conflicts in blockly_compressed.js and .js.map were "resolved" by restting those files; I note that we could do a rebuild to update the pre-built files in develop but they will soon be deleted anyway, and in any case rebuilding them would not make them the same as the 9.0.1 release as many other PRs have landed in the meantime. A conflict in package-lock.json was resolved by resetting that file to the develop version and then running npm install to update package-lock.json with the change to the blockly version number.
111 lines
3.7 KiB
JSON
111 lines
3.7 KiB
JSON
{
|
|
"name": "blockly",
|
|
"version": "9.0.1",
|
|
"description": "Blockly is a library for building visual programming editors.",
|
|
"keywords": [
|
|
"blockly"
|
|
],
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/google/blockly.git"
|
|
},
|
|
"bugs": {
|
|
"url": "https://github.com/google/blockly/issues"
|
|
},
|
|
"homepage": "https://developers.google.com/blockly/",
|
|
"author": {
|
|
"name": "Neil Fraser"
|
|
},
|
|
"scripts": {
|
|
"build": "gulp build",
|
|
"build-debug": "gulp build --verbose --debug",
|
|
"build-debug-log": "npm run build:debug > build-debug.log 2>&1 && tail -3 build-debug.log",
|
|
"build-strict": "gulp build --verbose --strict",
|
|
"build-strict-log": "npm run build:strict > build-debug.log 2>&1 && tail -3 build-debug.log",
|
|
"build:compiled": "gulp buildCompiled",
|
|
"build:compressed": "npm run build:compiled",
|
|
"build:deps": "gulp buildJavaScriptAndDeps",
|
|
"build:js": "gulp buildJavaScript",
|
|
"build:langfiles": "gulp buildLangfiles",
|
|
"bump": "npm --no-git-tag-version version 4.$(date +'%Y%m%d').0",
|
|
"clean": "gulp clean",
|
|
"clean:build": "gulp cleanBuildDir",
|
|
"clean:release": "gulp cleanReleaseDir",
|
|
"checkin": "gulp checkin",
|
|
"checkin:built": "gulp checkinBuilt",
|
|
"deployDemos": "gulp deployDemos",
|
|
"deployDemos:beta": "gulp deployDemosBeta",
|
|
"format": "gulp clangFormat",
|
|
"format:sortrequires": "gulp sortRequires",
|
|
"generate:langfiles": "gulp generateLangfiles",
|
|
"license": "gulp checkLicenses",
|
|
"lint": "eslint .",
|
|
"lint:fix": "eslint . --fix",
|
|
"package": "gulp package",
|
|
"prepare": "gulp prepare",
|
|
"prepareDemos": "gulp prepareDemos",
|
|
"publish": "gulp publish",
|
|
"publish:beta": "gulp publishBeta",
|
|
"recompile": "gulp recompile",
|
|
"release": "gulp gitCreateRC",
|
|
"start": "http-server ./ -o /tests/playground.html -c-1",
|
|
"test": "tests/run_all_tests.sh",
|
|
"test:generators": "tests/scripts/run_generators.sh",
|
|
"test:mocha:interactive": "http-server ./ -o /tests/mocha/index.html -c-1",
|
|
"test:compile:advanced": "gulp buildAdvancedCompilationTest --debug",
|
|
"updateGithubPages": "gulp gitUpdateGithubPages"
|
|
},
|
|
"main": "./index.js",
|
|
"umd": "./blockly.min.js",
|
|
"unpkg": "./blockly.min.js",
|
|
"types": "./index.d.ts",
|
|
"browser": {
|
|
"./node.js": "./browser.js",
|
|
"./core.js": "./core-browser.js",
|
|
"./blockly-node.js": "./blockly.js"
|
|
},
|
|
"license": "Apache-2.0",
|
|
"devDependencies": {
|
|
"@blockly/block-test": "^3.0.0",
|
|
"@blockly/dev-tools": "^5.0.0",
|
|
"@blockly/theme-modern": "^3.0.0",
|
|
"@hyperjump/json-schema": "^0.18.4",
|
|
"@microsoft/api-extractor": "^7.29.5",
|
|
"@typescript-eslint/eslint-plugin": "^5.33.1",
|
|
"@wdio/selenium-standalone-service": "^7.10.1",
|
|
"chai": "^4.2.0",
|
|
"clang-format": "^1.6.0",
|
|
"closure-calculate-chunks": "^3.0.2",
|
|
"concurrently": "^7.0.0",
|
|
"eslint": "^8.4.1",
|
|
"eslint-config-google": "^0.14.0",
|
|
"eslint-plugin-jsdoc": "^39.3.6",
|
|
"google-closure-compiler": "^20221004.0.0",
|
|
"google-closure-deps": "^20220905.0.0",
|
|
"gulp": "^4.0.2",
|
|
"gulp-clang-format": "^1.0.27",
|
|
"gulp-concat": "^2.6.1",
|
|
"gulp-insert": "^0.5.0",
|
|
"gulp-rename": "^2.0.0",
|
|
"gulp-replace": "^1.0.0",
|
|
"gulp-series": "^1.0.2",
|
|
"gulp-shell": "^0.8.0",
|
|
"gulp-sourcemaps": "^3.0.0",
|
|
"gulp-umd": "^2.0.0",
|
|
"http-server": "^14.0.0",
|
|
"js-green-licenses": "^3.0.0",
|
|
"json5": "^2.2.0",
|
|
"mocha": "^10.0.0",
|
|
"readline-sync": "^1.4.10",
|
|
"rimraf": "^3.0.2",
|
|
"selenium-standalone": "^8.0.3",
|
|
"through2": "^4.0.2",
|
|
"typescript": "^4.3.2",
|
|
"webdriverio": "^7.0.3",
|
|
"yargs": "^17.2.1"
|
|
},
|
|
"dependencies": {
|
|
"jsdom": "15.2.1"
|
|
}
|
|
}
|