diff --git a/package.json b/package.json index 48b152c24..bbda8d229 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "bracket-matcher": "https://github.com/pulsar-edit/bracket-matcher.git#c877977", "chai": "4.3.4", "clear-cut": "^2.0.2", - "coffee-script": "1.12.7", + "coffeescript": "1.12.7", "color": "3.1.3", "command-palette": "file:packages/command-palette", "dalek": "file:packages/dalek", diff --git a/packages/language-gfm/package-lock.json b/packages/language-gfm/package-lock.json index 424e387f5..97dd9d53b 100644 --- a/packages/language-gfm/package-lock.json +++ b/packages/language-gfm/package-lock.json @@ -9,17 +9,16 @@ "version": "0.90.8", "license": "MIT", "devDependencies": { - "coffee-script": "1.7.0" + "coffeescript": "^1.7.0" }, "engines": { "atom": "*" } }, - "node_modules/coffee-script": { + "node_modules/coffeescript": { "version": "1.7.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.0.tgz", - "integrity": "sha512-XbFPBAz+NkyJbvpku9BBj6iGP5PHIjuplSh0e9M9c+Ef28hKCHWlBDrDPjvAsZ2vDQRIVttHx9BONzwrWmUdWw==", - "deprecated": "CoffeeScript on NPM has moved to \"coffeescript\" (no hyphen)", + "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.7.0.tgz", + "integrity": "sha512-qRRHmRVRomUAtkx1+9lmgAnwpoFaHjJPLnUtwDQbwdbFGGeeEojYxMa/hTHnp/7YeezyjvHgzYUzrWPPzfNBFw==", "dev": true, "dependencies": { "mkdirp": "~0.3.5" diff --git a/packages/language-gfm/package.json b/packages/language-gfm/package.json index 7e000be64..b74c4aa5a 100644 --- a/packages/language-gfm/package.json +++ b/packages/language-gfm/package.json @@ -8,6 +8,6 @@ "atom": "*" }, "devDependencies": { - "coffee-script": "1.7.0" + "coffeescript": "^1.7.0" } } diff --git a/spec/compile-cache-spec.js b/spec/compile-cache-spec.js index 9689b7601..c550ce11c 100644 --- a/spec/compile-cache-spec.js +++ b/spec/compile-cache-spec.js @@ -8,7 +8,7 @@ const path = require('path'); const temp = require('temp').track(); const babelCompiler = require('../src/babel'); -const CoffeeScript = require('coffee-script'); +const CoffeeScript = require('coffeescript'); const {TypeScriptSimple} = require('typescript-simple'); const CSON = require('season'); const CompileCache = require('../src/compile-cache'); diff --git a/src/coffee-script.js b/src/coffee-script.js index dcd93ca2e..508c1e244 100644 --- a/src/coffee-script.js +++ b/src/coffee-script.js @@ -21,9 +21,9 @@ exports.getCachePath = function(sourceCode) { exports.compile = function(sourceCode, filePath) { if (!CoffeeScript) { const previousPrepareStackTrace = Error.prepareStackTrace; - CoffeeScript = require('coffee-script'); + CoffeeScript = require('coffeescript'); - // When it loads, coffee-script reassigns Error.prepareStackTrace. We have + // When it loads, coffeescript reassigns Error.prepareStackTrace. We have // already reassigned it via the 'source-map-support' module, so we need // to set it back. Error.prepareStackTrace = previousPrepareStackTrace; diff --git a/src/compile-cache.js b/src/compile-cache.js index 35c5c8314..14c3d85bc 100644 --- a/src/compile-cache.js +++ b/src/compile-cache.js @@ -16,7 +16,7 @@ const COMPILERS = { '.ts': packageTranspilationRegistry.wrapTranspiler(require('./typescript')), '.tsx': packageTranspilationRegistry.wrapTranspiler(require('./typescript')), '.coffee': packageTranspilationRegistry.wrapTranspiler( - require('./coffee-script') + require('./coffeescript') ) }; diff --git a/yarn.lock b/yarn.lock index 3340b203d..601a700a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2349,9 +2349,9 @@ atom-slick@^2, atom-slick@^2.0.0: "autocomplete-html@file:packages/autocomplete-html": version "0.8.9" -"autocomplete-plus@https://github.com/pulsar-edit/autocomplete-plus.git#48ecced": +"autocomplete-plus@https://github.com/pulsar-edit/autocomplete-plus.git#1f056ef": version "2.42.6" - resolved "https://github.com/pulsar-edit/autocomplete-plus.git#48eccede0d3f2dfe4ba3deb050f4cd241efc6153" + resolved "https://github.com/pulsar-edit/autocomplete-plus.git#1f056ef9c1fbc666309433024318678370f6bbc5" dependencies: atom-slick "^2.0.0" dompurify "^2.2.6" @@ -2652,9 +2652,9 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" -"bracket-matcher@https://codeload.github.com/atom/bracket-matcher/legacy.tar.gz/refs/tags/v0.92.0": +"bracket-matcher@https://github.com/pulsar-edit/bracket-matcher.git#c877977": version "0.92.0" - resolved "https://codeload.github.com/atom/bracket-matcher/legacy.tar.gz/refs/tags/v0.92.0#fe75cb7dd3f286d9f20b1d1edd7fec085730a866" + resolved "https://github.com/pulsar-edit/bracket-matcher.git#c877977ac7e9b7fe43c2100a1880c7ffc119280b" dependencies: first-mate "^7.4.1" underscore-plus "1.x" @@ -3099,7 +3099,7 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== -coffee-script@1.12.7, coffee-script@>=1.0.1, coffee-script@^1.10.0: +coffee-script@>=1.0.1, coffee-script@^1.10.0: version "1.12.7" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw== @@ -3111,6 +3111,11 @@ coffee-script@~1.8.0: dependencies: mkdirp "~0.3.5" +coffeescript@1.12.7: + version "1.12.7" + resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" + integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== + "coffeestack@>=1 <2": version "1.2.0" resolved "https://registry.yarnpkg.com/coffeestack/-/coffeestack-1.2.0.tgz#dfe2c50f769d04b2eb2a052a442894cebe8faa8f" @@ -5460,7 +5465,6 @@ image-size@~0.5.0: dependencies: bytes "^3.0.0" etch "0.9.0" - fs-plus "^3.0.0" import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" @@ -8698,13 +8702,12 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -"snippets@https://codeload.github.com/pulsar-edit/snippets/legacy.tar.gz/refs/tags/v1.6.1": +"snippets@https://github.com/pulsar-edit/snippets.git#fe00fd6": version "1.6.1" - resolved "https://codeload.github.com/pulsar-edit/snippets/legacy.tar.gz/refs/tags/v1.6.1#dc5e28086e77beeec63b35b3d52f6b32dc5994ab" + resolved "https://github.com/pulsar-edit/snippets.git#fe00fd6933fa33f819d14cdd6938d538d25ba1dd" dependencies: async "~0.2.6" atom-select-list "^0.7.0" - fs-plus "^3.0.0" loophole "^1" pegjs "~0.8.0" scoped-property-store "^0.17.0"