forked from openstreetmap/iD
-
Notifications
You must be signed in to change notification settings - Fork 4
Re: https://github.com/OpenHistoricalMap/issues/issues/877 #231
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
erictheise
wants to merge
4
commits into
staging
Choose a base branch
from
877-ensure-tasking-manager-uses-latest-id
base: staging
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ab6833b
Re: https://github.com/OpenHistoricalMap/issues/issues/877, pull esli…
erictheise 6fed55d
Re: https://github.com/OpenHistoricalMap/issues/issues/877, add iD.mi…
erictheise 221460e
Re: https://github.com/OpenHistoricalMap/issues/issues/877, bump vers…
erictheise 770b3e5
Re: https://github.com/OpenHistoricalMap/issues/issues/877, correct r…
erictheise File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import js from '@eslint/js'; | ||
| import globals from 'globals'; | ||
|
|
||
| export default [ | ||
| js.configs.recommended, | ||
| { | ||
| files: ['**/*.js', '**/*.mjs'], | ||
| languageOptions: { | ||
| ecmaVersion: 'latest', | ||
| sourceType: 'module', | ||
| globals: { | ||
| ...globals.browser, | ||
| } | ||
| }, | ||
| rules: { | ||
| 'accessor-pairs': 'error', | ||
| 'array-callback-return': 'warn', | ||
| 'arrow-spacing': 'warn', | ||
| 'block-scoped-var': 'error', | ||
| 'block-spacing': ['warn', 'always'], | ||
| 'brace-style': ['warn', '1tbs', { 'allowSingleLine': true }], | ||
| 'complexity': ['warn', 50], | ||
| 'curly': ['warn', 'multi-line'], | ||
| 'default-case-last': 'error', | ||
| 'default-param-last': 'error', | ||
| 'dot-notation': 'error', | ||
| 'eqeqeq': ['error', 'smart'], | ||
| 'func-call-spacing': ['warn', 'never'], | ||
| 'grouped-accessor-pairs': 'error', | ||
| 'indent': ['off', 4], | ||
| 'keyword-spacing': 'error', | ||
| 'linebreak-style': ['error', 'unix'], | ||
| 'no-await-in-loop': 'error', | ||
| 'no-caller': 'error', | ||
| 'no-catch-shadow': 'error', | ||
| 'no-console': 'warn', | ||
| 'no-constructor-return': 'error', | ||
| 'no-div-regex': 'error', | ||
| 'no-duplicate-imports': 'warn', | ||
| 'no-eq-null': 'error', | ||
| 'no-eval': 'error', | ||
| 'no-extend-native': 'error', | ||
| 'no-extra-bind': 'error', | ||
| 'no-extra-label': 'error', | ||
| 'no-floating-decimal': 'error', | ||
| 'no-global-assign': 'error', | ||
| 'no-implicit-coercion': ['warn', { 'boolean': false, 'number': false }], | ||
| 'no-implied-eval': 'error', | ||
| 'no-invalid-this': 'off', | ||
| 'no-iterator': 'error', | ||
| 'no-labels': 'error', | ||
| 'no-label-var': 'error', | ||
| 'no-lone-blocks': 'error', | ||
| 'no-loop-func': 'error', | ||
| 'no-loss-of-precision': 'error', | ||
| 'no-multi-str': 'error', | ||
| 'no-new': 'error', | ||
| 'no-new-func': 'error', | ||
| 'no-new-wrappers': 'error', | ||
| 'no-octal': 'error', | ||
| 'no-octal-escape': 'error', | ||
| 'no-process-env': 'error', | ||
| 'no-promise-executor-return': 'error', | ||
| 'no-proto': 'error', | ||
| 'no-prototype-builtins': 'off', | ||
| 'no-restricted-properties': 'error', | ||
| 'no-return-assign': 'off', | ||
| 'no-return-await': 'error', | ||
| 'no-script-url': 'error', | ||
| 'no-self-compare': 'error', | ||
| 'no-sequences': 'error', | ||
| 'no-shadow': 'off', | ||
| 'no-shadow-restricted-names': 'error', | ||
| 'no-template-curly-in-string': 'warn', | ||
| 'no-throw-literal': 'error', | ||
| 'no-trailing-spaces': 'warn', | ||
| 'no-undef': 'error', | ||
| 'no-undef-init': 'warn', | ||
| 'no-unexpected-multiline': 'error', | ||
| 'no-unneeded-ternary': 'error', | ||
| 'no-unmodified-loop-condition': 'error', | ||
| 'no-unreachable': 'warn', | ||
| 'no-unreachable-loop': 'warn', | ||
| 'no-unused-expressions': 'error', | ||
| 'no-unused-vars': 'warn', | ||
| 'no-use-before-define': ['off', 'nofunc'], | ||
| 'no-useless-backreference': 'warn', | ||
| 'no-useless-call': 'warn', | ||
| 'no-useless-computed-key': 'warn', | ||
| 'no-useless-concat': 'warn', | ||
| 'no-useless-constructor': 'warn', | ||
| 'no-useless-escape': 'off', | ||
| 'no-useless-rename': 'warn', | ||
| 'no-void': 'error', | ||
| 'no-warning-comments': 'warn', | ||
| 'no-whitespace-before-property': 'warn', | ||
| 'no-with': 'error', | ||
| 'quotes': ['error', 'single'], | ||
| 'radix': ['error', 'always'], | ||
| 'require-atomic-updates': 'error', | ||
| 'require-await': 'error', | ||
| 'semi': ['error', 'always'], | ||
| 'semi-spacing': 'error', | ||
| 'space-unary-ops': 'error', | ||
| 'wrap-regex': 'off' | ||
| } | ||
| }, | ||
| { | ||
| files: ['test/**/*.js', 'test/**/*.mjs'], | ||
| languageOptions: { | ||
| globals: { | ||
| ...globals.node, | ||
| ...globals.jest, | ||
| 'before': 'readonly', | ||
| 'after': 'readonly', | ||
| 'd3': 'readonly', | ||
| 'iD': 'readonly', | ||
| 'vi': 'readonly', | ||
| 'sinon': 'readonly', | ||
| 'happen': 'readonly', | ||
| 'fetchMock': 'readonly', | ||
| 'jsdom': 'readonly', | ||
| 'expect': 'writable' | ||
| } | ||
| }, | ||
| rules: { | ||
| 'no-unused-expressions': 'off' | ||
| } | ||
| }, | ||
| { | ||
| files: ['scripts/**/*.js', 'scripts/**/*.mjs', 'config/**/*.js', 'config/**/*.mjs'], | ||
| languageOptions: { | ||
| globals: { | ||
| ...globals.node, | ||
| } | ||
| } | ||
| } | ||
| ]; | ||
|
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the minified build artifact be checked into staging? Upstream only does that in a release branch, not in the develop branch, equivalent to our staging branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it should.
Since we are pulling it in to HOT's tasking-manager where it's consumed as an npm module where we need to look is in their fork of iD. https://github.com/hotosm/iD/tree/2.x/dist
My dev server will not load without it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This may make future merges with upstream iD more error-prone. Can we merge staging into https://github.com/OpenHistoricalMap/iD/tree/release, build these artifacts there, and publish them to NPM, as iD does?
Edit: Looks like we’ve already checked in some of the built artifacts but not the minified version. I see how that would be a problem, but ideally we would keep both dist/iD.js and dist/iD.min.js out of staging.